nano-2.3.3

Conflicts:
	src/proto.h

Change-Id: Iff4e12122b9c485d794e5a9028735d733e1e0fe2

163 files changed, 38895 insertions, 33397 deletions

diff --git a/AUTHORS b/AUTHORS
index 1a6a0a3d..59ea86b7 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/ChangeLog b/ChangeLog
index e032ca70..a48a4730 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,110 +1,963 @@
+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.
+	* 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.  Fixess crash on justify by Joshua Rogers.
+	* 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.  
+	  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!
+	* 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): Initalize 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.
+	* 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 based on it.
+	* configure.ac: Check for ncursesw5-config and base $CPPFLAGS on it.
 
 2013-01-09 Fabian Groffen <grobian@Savannah>
-        * configure.ac, src/nano.h: Make search for ncursesw more generalized.
+	* 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.
+	* 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
+	* 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
+	* 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.  Commands line "-G" 
-          or "--locking", nanorc option "locking".  New functions 
-          src/files.c:do_lockfile(), write_lockfile(), and delete_lockfile().
+	* 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 od values in the 
-	  array but its 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 
+	* 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, size the previous line's size was
-	  already counted.  Fixes bug reported by Robert Spanjaard.
+	* 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
+	* 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
+	* 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
+	* 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.
+	* 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>.
+	* 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>
+	* 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
+	* 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. 
+	  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(), 
+	  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 seach in.  Fixes
+	  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>
@@ -112,27 +965,26 @@ GNU nano 2.3.0 - 2011.02.26
 	  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>
+	* 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
+	* winio.c (edit_redraw): Removed unused variable.
 
 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.
+	* 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
@@ -140,82 +992,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>
@@ -225,9 +1076,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>
@@ -250,94 +1101,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>
@@ -350,91 +1200,91 @@ 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.
+	* 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
@@ -451,41 +1301,40 @@ GNU nano 2.1.11 - 2009.09.14
 
 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
+	* 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.
@@ -494,19 +1343,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
@@ -518,7 +1367,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>
@@ -530,23 +1379,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
 	  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
@@ -556,21 +1406,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
@@ -580,58 +1429,59 @@ 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
@@ -639,80 +1489,81 @@ GNU nano 2.1.5 - 2008.08.30
 	  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>
@@ -735,24 +1586,24 @@ 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>
@@ -760,16 +1611,16 @@ GNU nano 2.1.1 - 2008.04.01
 	   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/Makefile.in b/Makefile.in
index a753277f..ab3558f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        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; \
-    test $$am__dry = yes; \
-  }
+    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@
@@ -51,14 +78,15 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 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 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 \
@@ -72,17 +100,30 @@ 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;; \
@@ -90,11 +131,33 @@ am__can_run_installinfo = \
   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)
@@ -105,6 +168,7 @@ am__remove_distdir = \
       && 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,'; \
@@ -132,12 +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@
@@ -183,7 +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@
@@ -195,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@
@@ -224,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@
@@ -317,22 +390,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; \
@@ -347,57 +423,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 \
@@ -413,12 +444,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; \
@@ -430,15 +456,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
@@ -447,9 +469,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)
@@ -517,40 +561,36 @@ 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=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
 	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
@@ -561,8 +601,6 @@ 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*) \
@@ -574,9 +612,9 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+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,^[^:\\/]:[\\/],/,'` \
@@ -608,7 +646,7 @@ 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'
@@ -742,13 +780,12 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.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-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+.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 \
@@ -758,8 +795,8 @@ uninstall-am:
 	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
+	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 f8dd4d66..22170d0b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,75 +1,101 @@
+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
+		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 
+		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.  
+		tweaks.
 
-2011.05.10 - GNU nano 2.3.1 "I'm in space" is released.  This 
+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 
+		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 bring several new 
+		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 flags, 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.  
+		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.
+		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,
@@ -82,19 +108,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
@@ -103,54 +128,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.
@@ -160,76 +185,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
@@ -242,42 +266,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 
+		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!
@@ -755,7 +779,7 @@
 		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 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 --quotestr and --regexp really work
@@ -916,7 +940,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)
@@ -1335,4 +1359,4 @@
 		update your bookmarks, tell your friends, and all that
 		jazz.
 
-$Id: NEWS 4570 2013-03-22 14:06:58Z astyanax $
+$Id: NEWS 4621 2014-02-27 20:54:26Z bens $
diff --git a/README b/README
index abbb8921..4546558f 100644
--- a/README
+++ b/README
@@ -65,8 +65,8 @@ 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.
+	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.
 
-$Id: README 4057 2007-01-29 12:40:48Z dolorous $
+$Id: README 4576 2013-06-14 02:17:57Z astyanax $
diff --git a/README.SVN b/README.SVN
index f5476f2e..5dfa84de 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 4efd9ec0..5aafb24a 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,62 @@ 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
 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 +84,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 4666 2014-03-22 20:37:14Z bens $
diff --git a/aclocal.m4 b/aclocal.m4
index 35cc9820..a4c2e8d1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.3 -*- 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, 2010, 2011 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.
@@ -12,33 +11,191 @@
 # 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.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'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# 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.
+
+# 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,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # 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.13'
 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.6], [],
+m4_if([$1], [1.13.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -54,24 +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.6])dnl
+[AM_AUTOMAKE_VERSION([1.13.3])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, 2011 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 1
-
 # 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
@@ -90,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,
@@ -116,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
@@ -150,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,
-# 2010, 2011 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 12
 
-# 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
@@ -169,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
@@ -182,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],
@@ -195,8 +346,8 @@ 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
@@ -236,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
@@ -254,8 +405,8 @@ 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
@@ -263,7 +414,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # 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}
@@ -311,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
@@ -321,9 +472,13 @@ 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='\'
@@ -338,20 +493,18 @@ _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
@@ -364,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.
@@ -376,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"])`
@@ -408,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],
@@ -418,15 +569,12 @@ 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.
 
@@ -442,7 +590,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
@@ -471,31 +619,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
@@ -506,28 +663,32 @@ _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
+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],
@@ -555,15 +716,12 @@ 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, 2011 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 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -577,16 +735,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],
@@ -602,14 +758,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.
@@ -627,7 +781,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
@@ -654,15 +808,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],
@@ -670,11 +821,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
@@ -687,54 +837,22 @@ 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, 2011 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 1
-
-# 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, 2010 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 5
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -744,7 +862,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # 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)
 # ------------------------
@@ -760,22 +878,16 @@ AC_DEFUN([_AM_IF_OPTION],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# 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 5
-
 # 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='
@@ -786,32 +898,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
@@ -821,46 +941,118 @@ 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, 2011 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.
 
-# serial 1
+# 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,
+# with or without modifications, as long as this notice is preserved.
 
 # 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, 2010 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 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -874,18 +1066,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 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
@@ -895,81 +1085,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.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} 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.
+
+# 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/config.h.in b/config.h.in
index 435a085c..e799b9d2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,6 +6,12 @@
 /* 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
 
@@ -15,6 +21,12 @@
 /* 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 +37,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 +53,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. */
@@ -133,6 +135,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
 
@@ -193,9 +198,6 @@
 /* Define to 1 if you have the `wcwidth' function. */
 #undef HAVE_WCWIDTH
 
-/* Define this to enable extra stuff. */
-#undef NANO_EXTRA
-
 /* Define this to make the nano executable as small as possible. */
 #undef NANO_TINY
 
@@ -230,12 +232,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
@@ -243,7 +245,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.  */
diff --git a/configure b/configure
index f357754c..873ada4d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU nano 2.3.2.
+# Generated by GNU Autoconf 2.69 for GNU nano 2.3.3.
 #
 # Report bugs to <nano-devel@gnu.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU nano'
 PACKAGE_TARNAME='nano'
-PACKAGE_VERSION='2.3.2'
-PACKAGE_STRING='GNU nano 2.3.2'
+PACKAGE_VERSION='2.3.3'
+PACKAGE_STRING='GNU nano 2.3.3'
 PACKAGE_BUGREPORT='nano-devel@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/nano/'
 
@@ -622,20 +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
@@ -655,6 +662,9 @@ XGETTEXT
 GMSGFMT
 MSGFMT
 MKINSTALLDIRS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 LN_S
 EGREP
 GREP
@@ -676,6 +686,10 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -748,6 +762,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_dependency_tracking
 enable_largefile
 with_gnu_ld
@@ -755,25 +770,25 @@ 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_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
 '
@@ -785,7 +800,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.
@@ -1326,7 +1348,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.3.2 to adapt to many kinds of systems.
+\`configure' configures GNU nano 2.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1396,7 +1418,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU nano 2.3.2:";;
+     short | recursive ) echo "Configuration of GNU nano 2.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1404,29 +1426,35 @@ 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-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:
@@ -1437,8 +1465,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-wordbounds            Use GNU-style word boundary delimiters
+  --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
@@ -1449,6 +1477,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.
@@ -1518,7 +1559,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU nano configure 2.3.2
+GNU nano configure 2.3.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1887,7 +1928,7 @@ 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.3.2, which was
+It was created by GNU nano $as_me 2.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2167,6 +2208,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+as_fn_append ac_header_list " magic.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2336,7 +2378,7 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-am__api_version='1.11'
+am__api_version='1.13'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2433,9 +2475,6 @@ 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='
@@ -2446,32 +2485,40 @@ case `pwd` in
 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
@@ -2483,6 +2530,16 @@ 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.
@@ -2505,12 +2562,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
@@ -2522,10 +2579,10 @@ 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.
@@ -2664,12 +2721,6 @@ 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.
@@ -2752,6 +2803,45 @@ 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."
@@ -2774,7 +2864,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='nano'
- VERSION='2.3.2'
+ VERSION='2.3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2802,24 +2892,36 @@ 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.  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 -'
 
 
 
 
 
+
 ac_config_headers="$ac_config_headers config.h"
 
 
 
 
 
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -2839,7 +2941,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
@@ -3683,8 +3785,8 @@ else
   # 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
@@ -3719,16 +3821,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
@@ -3737,8 +3839,8 @@ 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
@@ -3746,7 +3848,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # 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}
@@ -4810,8 +4912,8 @@ else
   # 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
@@ -4846,16 +4948,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
@@ -4864,8 +4966,8 @@ 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
@@ -4873,7 +4975,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # 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}
@@ -5185,6 +5287,126 @@ 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
+
+
+
+
         MKINSTALLDIRS=
   if test -n "$ac_aux_dir"; then
     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
@@ -6639,7 +6861,7 @@ _ACEOF
 
 
 
-for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h magic.h
+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"
@@ -6654,239 +6876,283 @@ done
 
 
 
-# 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 DEBUG 1" >>confdefs.h
- debug_support=yes
-fi
-fi
-
-
-if test x$debug_support != xyes; then
-
-$as_echo "#define NDEBUG 1" >>confdefs.h
-
+# Check whether --enable-browser was given.
+if test "${enable_browser+set}" = set; then :
+  enableval=$enable_browser;
 fi
 
-# Check whether --enable-tiny was given.
-if test "${enable_tiny+set}" = set; then :
-  enableval=$enable_tiny; if test x$enableval = xyes; then
-
-$as_echo "#define NANO_TINY 1" >>confdefs.h
- tiny_support=yes
+if test "x$enable_browser" = xno; then
 
 $as_echo "#define DISABLE_BROWSER 1" >>confdefs.h
 
+fi
 
-$as_echo "#define DISABLE_HELP 1" >>confdefs.h
-
-
-$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h
-
-
-$as_echo "#define DISABLE_MOUSE 1" >>confdefs.h
-
-
-$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h
-
-
-$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h
-
-
-$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h
-
-
-$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h
-
+# Check whether --enable-color was given.
+if test "${enable_color+set}" = set; then :
+  enableval=$enable_color;
 fi
+
+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
 
+$as_echo "#define DISABLE_COLOR 1" >>confdefs.h
 
+else
+    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; if test x$enableval != xno; then
-
-$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
+  enableval=$enable_extra;
 fi
 
+if test "x$enable_extra" = 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_EXTRA 1" >>confdefs.h
 
 fi
-fi
-
 
 # Check whether --enable-help was given.
 if test "${enable_help+set}" = set; then :
-  enableval=$enable_help; if test x$enableval != xyes; then
+  enableval=$enable_help;
+fi
+
+if test "x$enable_help" = xno; then
 
 $as_echo "#define DISABLE_HELP 1" >>confdefs.h
 
 fi
-fi
-
 
 # Check whether --enable-justify was given.
 if test "${enable_justify+set}" = set; then :
-  enableval=$enable_justify; if test x$enableval != xyes; then
+  enableval=$enable_justify;
+fi
+
+if test "x$enable_justify" = xno; then
 
 $as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h
 
 fi
+
+# Check whether --enable-libmagic was given.
+if test "${enable_libmagic+set}" = set; then :
+  enableval=$enable_libmagic;
 fi
 
 
 # Check whether --enable-mouse was given.
 if test "${enable_mouse+set}" = set; then :
-  enableval=$enable_mouse; if test x$enableval != xyes; then
+  enableval=$enable_mouse;
+fi
+
+if test "x$enable_mouse" = xno; then
 
 $as_echo "#define DISABLE_MOUSE 1" >>confdefs.h
 
 fi
+
+# 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_MULTIBUFFER 1" >>confdefs.h
+
+fi
+
+# 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_NANORC 1" >>confdefs.h
+
+else
+    nanorc_support=yes
+fi
 
 # Check whether --enable-operatingdir was given.
 if test "${enable_operatingdir+set}" = set; then :
-  enableval=$enable_operatingdir; if test x$enableval != xyes; then
+  enableval=$enable_operatingdir;
+fi
+
+if test "x$enable_operatingdir" = xno; then
 
 $as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h
 
 fi
-fi
-
 
 # Check whether --enable-speller was given.
 if test "${enable_speller+set}" = set; then :
-  enableval=$enable_speller; if test x$enableval != xyes; then
+  enableval=$enable_speller;
+fi
+
+if test "x$enable_speller" = xno; then
 
 $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; if test x$enableval != xyes; then
+  enableval=$enable_tabcomp;
+fi
+
+if test "x$enable_tabcomp" = xno; then
 
 $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; if test x$enableval != xyes; then
+  enableval=$enable_wrapping;
+fi
+
+if test "x$enable_wrapping" = xno; then
 
 $as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h
 
 fi
-fi
-
 
 # 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
+  enableval=$enable_wrapping_as_root;
+fi
+
+if test "x$enable_wrapping_as_root" = xno; then
 
 $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-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
+$as_echo "#define DEBUG 1" >>confdefs.h
 
-$as_echo "#define ENABLE_NANORC 1" >>confdefs.h
- nanorc_support=yes
+else
+
+$as_echo "#define NDEBUG 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
 
-$as_echo "#define ENABLE_NANORC 1" >>confdefs.h
- nanorc_support=yes
+# Check whether --enable-tiny was given.
+if test "${enable_tiny+set}" = set; then :
+  enableval=$enable_tiny;
+fi
+
+if test "x$enable_tiny" = xyes; then
 
-$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
+$as_echo "#define NANO_TINY 1" >>confdefs.h
+
+    if test "x$enable_browser" != xyes; then
+
+$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h
+
+    fi
+    if test "x$enable_color" != xyes; then
+
+$as_echo "#define DISABLE_COLOR 1" >>confdefs.h
+
+	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
 
-fi
+$as_echo "#define DISABLE_EXTRA 1" >>confdefs.h
 
+    fi
+    if test "x$enable_help" != xyes; then
 
-# Check whether --enable-multibuffer was given.
-if test "${enable_multibuffer+set}" = set; then :
-  enableval=$enable_multibuffer; if test x$enableval != xno; then
+$as_echo "#define DISABLE_HELP 1" >>confdefs.h
 
-$as_echo "#define ENABLE_MULTIBUFFER 1" >>confdefs.h
- multibuffer_support=yes
-fi
-else
-  if test x$enable_tiny != xyes; then
+    fi
+    if test "x$enable_justify" != xyes; then
+
+$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h
 
-$as_echo "#define ENABLE_MULTIBUFFER 1" >>confdefs.h
- multibuffer_support=yes
     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-nanorc was given.
-if test "${enable_nanorc+set}" = set; then :
-  enableval=$enable_nanorc; if test x$enableval != xno; then
+    fi
+    if test "x$enable_multibuffer" != 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_MULTIBUFFER 1" >>confdefs.h
 
-$as_echo "#define ENABLE_NANORC 1" >>confdefs.h
- nanorc_support=yes
     fi
-fi
+    if test "x$enable_nanorc" != xyes; then
+
+$as_echo "#define DISABLE_NANORC 1" >>confdefs.h
+
+    fi
+    if test "x$enable_operatingdir" != xyes; then
+
+$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h
+
+    fi
+    if test "x$enable_speller" != xyes; then
 
+$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h
+
+    fi
+    if test "x$enable_tabcomp" != xyes; then
 
-# 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"
+$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h
+
+    fi
+    if test "x$enable_wrapping" != xyes; then
+
+$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h
+
+    fi
+fi
+
+ 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
 
 
@@ -6894,17 +7160,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; }
@@ -6922,12 +7195,12 @@ $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" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLutf8_enable in -lslang" >&5
@@ -6953,7 +7226,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"
@@ -6965,7 +7238,7 @@ 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
@@ -7034,7 +7307,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"
@@ -7046,7 +7319,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"
@@ -7069,7 +7342,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"
@@ -7107,8 +7380,8 @@ 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
 
@@ -7137,7 +7410,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
@@ -7148,7 +7421,7 @@ 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
@@ -7217,7 +7490,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
@@ -7228,7 +7501,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"
@@ -7251,7 +7524,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
@@ -7302,91 +7575,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"
-if eval test \"x\$"$as_ac_var"\" = 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"
-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
+
+
+  rm -f conf.glibtest
 
 fi
 
@@ -7661,9 +8160,9 @@ rm -f core conftest.err conftest.$ac_objext \
      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
+*** 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
 
 
@@ -7675,6 +8174,44 @@ 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 ${ac_cv_type_signal+:} false; then :
@@ -7739,6 +8276,164 @@ 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 :
@@ -7753,7 +8448,7 @@ fi
 done
 
 
-    if test x$enable_utf8 != xno; then
+    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.
@@ -7994,7 +8689,7 @@ 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 ${ac_cv_lib_curses_get_wch+:} false; then :
@@ -8038,7 +8733,7 @@ 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 ${ac_cv_lib_curses_initscr+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -8152,7 +8847,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 && \
@@ -8167,14 +8862,14 @@ if test x$enable_utf8 != xno && \
 $as_echo "#define ENABLE_UTF8 1" >>confdefs.h
 
 else
-    if test x$enable_utf8 = xyes; then
+    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
@@ -8191,7 +8886,7 @@ $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; }
 
@@ -8207,12 +8902,12 @@ $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 cant test the target
+		# 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
+		;;
+	  esac
 
 else
 
@@ -8235,9 +8930,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
@@ -8344,7 +9039,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; }
@@ -8357,7 +9052,29 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_open in -lmagic" >&5
+
+
+
+  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
@@ -8403,17 +9120,23 @@ _ACEOF
 fi
 
 
-# Check for groff html support
+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
@@ -8425,6 +9148,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"
 
@@ -8538,6 +9309,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='#'
@@ -8574,6 +9353,10 @@ if test -z "${GROFF_HTML_TRUE}" && test -z "${GROFF_HTML_FALSE}"; then
   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}"
 ac_write_fail=0
@@ -8971,7 +9754,7 @@ 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.3.2, which was
+This file was extended by GNU nano $as_me 2.3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9039,7 +9822,7 @@ _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.3.2
+GNU nano config.status 2.3.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -9785,7 +10568,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
@@ -9798,7 +10581,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.
@@ -9832,21 +10615,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" ||
diff --git a/configure.ac b/configure.ac
index 3c805d29..d60cfdd7 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 4570 2013-03-22 14:06:58Z astyanax $
+# $Id: configure.ac 4826 2014-04-30 20:18:26Z bens $
 
-AC_INIT([GNU nano], [2.3.2], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.3.3], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 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,165 +52,187 @@ AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 
 dnl Checks for header files.
 
-AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h magic.h)
+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(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_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)
@@ -216,12 +241,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
@@ -234,7 +259,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"
@@ -244,7 +269,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
@@ -260,7 +285,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"
@@ -270,7 +295,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([
@@ -281,7 +306,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"
@@ -301,8 +326,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
 
@@ -318,7 +343,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
@@ -327,7 +352,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
@@ -343,7 +368,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
@@ -352,7 +377,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([
@@ -363,7 +388,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
@@ -391,56 +416,68 @@ 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
+    if test "x$enable_utf8" != xno; then
 	OLDLIBS="$LIBS"
 	AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no)
 	if test "x$NCURSESW_CONFIG" != xno; then
@@ -462,12 +499,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
 
@@ -495,7 +532,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 && \
@@ -508,14 +545,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
@@ -526,11 +563,11 @@ 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_ARG_WITH(wordbounds,
-        [  --with-wordbounds            Use GNU-style word boundary delimiters],
+        AS_HELP_STRING([--with-wordbounds], [Use GNU-style word boundary delimiters]),
 	[ case "$with_wordbounds" in
 	    no)
 		AC_MSG_RESULT(no)
@@ -538,11 +575,11 @@ if test x$color_support = xyes; then
 	    *)
 		AC_MSG_RESULT(yes)
 		# We explicitly don't check if the user forced the option, because
-		# this is needed for cross compilers and we cant test the target
-		AC_DEFINE(GNU_WORDBOUNDS, 1, [Define if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
-                ;;
-          esac
-        ], [
+		# 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>
@@ -555,13 +592,13 @@ 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_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])
 	)
@@ -603,28 +640,35 @@ 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]))
 
-AC_CHECK_LIB(magic, magic_open)
+AS_IF([test "x$enable_libmagic" != "xno"], [
+  AC_CHECK_HEADERS_ONCE([magic.h])
+  AC_CHECK_LIB(magic, magic_open)
+])
 
-# 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/doc/Makefile.am b/doc/Makefile.am
index 15f35ee6..c197ceb0 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 1e6086d6..4099cf73 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,24 +13,53 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  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@
@@ -50,11 +78,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@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 \
@@ -66,25 +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
@@ -116,6 +210,7 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -161,7 +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@
@@ -173,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@
@@ -202,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@
@@ -230,9 +332,8 @@ target_alias = @target_alias@
 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:
@@ -268,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; \
@@ -300,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 \
@@ -366,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; \
@@ -383,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
@@ -400,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
@@ -461,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
@@ -514,7 +603,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-dist_htmlDATA
 
 install-dvi: install-dvi-recursive
 
@@ -558,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 2d80be2f..d24a895b 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>
@@ -47,7 +46,7 @@
   <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><br>
-  <a href="#4.15">4.15. On startup I get a message that says "Detected a legacy nano history file".  Now other nano versionc can't find my search history!</a></p></blockquote>
+  <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>
@@ -85,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%">
@@ -94,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>
@@ -102,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%">
@@ -122,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>
@@ -135,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>
@@ -209,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>
@@ -218,24 +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 other nano versionc can't find my search history!</h2>
-<blockquote><p>In nano 2.3.0, cursor position history was introduced, and both 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 previous search history.  To fix this, run the following commands:<br>
+<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%">
@@ -252,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>
@@ -332,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 4530 2011-02-18 07:30:57Z 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 fbcdce86..f7ad09a9 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 d2018c7f..45c454e9 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  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@
@@ -51,10 +78,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@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 \
@@ -66,15 +100,28 @@ 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;; \
@@ -109,16 +156,37 @@ am__uninstall_files_from_dir = { \
   }
 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
@@ -150,6 +218,7 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -195,7 +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@
@@ -207,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@
@@ -236,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@
@@ -264,18 +340,12 @@ target_alias = @target_alias@
 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
 
@@ -310,10 +380,10 @@ $(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)
 	@list1=''; \
-	list2='$(man_MANS)'; \
+	list2='$(dist_man_MANS)'; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
@@ -348,15 +418,15 @@ 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,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man5: $(man_MANS)
+install-man5: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
 	@list1=''; \
-	list2='$(man_MANS)'; \
+	list2='$(dist_man_MANS)'; \
 	test -n "$(man5dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
@@ -391,50 +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,.,'`; \
 	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-htmlmanDATA: $(htmlman_DATA)
+install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(htmlmandir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(htmlmandir)" || exit 1; \
+	  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|^.*/||'`; \
-	dir='$(DESTDIR)$(htmlmandir)'; $(am__uninstall_files_from_dir)
+	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; \
@@ -449,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 \
@@ -515,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; \
@@ -532,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
@@ -549,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)'; \
@@ -627,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)
@@ -682,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
 
@@ -726,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 7a430520..d8c2d18c 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 8d83bf24..d8cfc5da 100644
--- a/doc/man/fr/Makefile.in
+++ b/doc/man/fr/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  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@
@@ -51,10 +78,16 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@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 \
@@ -66,6 +99,18 @@ 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 = \
@@ -102,14 +147,17 @@ am__uninstall_files_from_dir = { \
   }
 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@
@@ -155,7 +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@
@@ -167,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@
@@ -196,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@
@@ -224,16 +279,11 @@ target_alias = @target_alias@
 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
 
@@ -268,10 +318,10 @@ $(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)
 	@list1=''; \
-	list2='$(man_MANS)'; \
+	list2='$(dist_man_MANS)'; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
@@ -306,15 +356,15 @@ 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,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man5: $(man_MANS)
+install-man5: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
 	@list1=''; \
-	list2='$(man_MANS)'; \
+	list2='$(dist_man_MANS)'; \
 	test -n "$(man5dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
@@ -349,53 +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,.,'`; \
 	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-htmlmanDATA: $(htmlman_DATA)
+install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(htmlmandir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(htmlmandir)" || exit 1; \
+	  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|^.*/||'`; \
-	dir='$(DESTDIR)$(htmlmandir)'; $(am__uninstall_files_from_dir)
-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)'; \
@@ -430,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)
@@ -485,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
 
@@ -529,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.html b/doc/man/fr/nano.1.html
index c13e9a79..aaf85cab 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: Sat Jun 16 21:10:37 2012 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Mon Feb 24 05:20:26 2014 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
diff --git a/doc/man/fr/nanorc.5.html b/doc/man/fr/nanorc.5.html
index f2d77a96..5342d370 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: Sat Jun 16 21:10:38 2012 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Mon Feb 24 05:20:26 2014 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
diff --git a/doc/man/fr/rnano.1.html b/doc/man/fr/rnano.1.html
index 81d9b330..d0e6561d 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: Sat Jun 16 21:10:38 2012 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Mon Feb 24 05:20:26 2014 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 4d4d67ac..15837321 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -1,6 +1,6 @@
 .\" Hey, EMACS: -*- nroff -*-
 .\" 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 +18,8 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id: nano.1 4549 2013-01-01 03:24:39Z astyanax $
-.TH NANO 1 "version 2.2.0" "November 30, 2009"
+.\" $Id: nano.1 4846 2014-05-06 20:43:00Z bens $
+.TH NANO 1 "version 2.3.3" "April 2014"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -28,30 +28,22 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone
 
 .SH SYNOPSIS
 .B nano
-.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
+.RI [ options "] [[\+" line , column "]\ " file "]..."
 .br
 
 .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.
-.TP
-.B \-?
-Same as \fB-h (\-\-help)\fP.
+default line 1, column 1.
 .TP
 .B \-A (\-\-smarthome)
 Make the Home key smarter.  When Home is pressed anywhere but at the
@@ -62,10 +54,10 @@ line.
 .TP
 .B \-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
+Set the directory where \fBnano\fP puts unique backup files, if file
 backups are enabled.
 .TP
 .B \-D (\-\-boldtext)
@@ -102,6 +94,10 @@ Disable automatic conversion of files from DOS/Mac format.
 .B \-O (\-\-morespace)
 Use the blank line below the titlebar as extra editing space.
 .TP
+.B \-P (\-\-poslog)
+Log and later read back the location of the cursor and place it there
+again.
+.TP
 .B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP)
 Set the quoting string for justifying.  The default is
 "\fI^([\ \\t]*[#:>\\|}])+\fP" if extended regular expression support is
@@ -110,23 +106,23 @@ Tab.
 .TP
 .B \-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").
+command line; don't read any \fInanorc\fP files; don't allow suspending;
+don't allow a file to be appended to, prepended to, or saved under a
+different name if it already has one; don't use backup files nor spell
+checking.  This restricted mode is also accessible by invoking \fBnano\fP
+with any name beginning with 'r' (e.g. "rnano").
 .TP
 .B \-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.
+.B \-T \fInumber\fP (\-\-tabsize=\fInumber\fP)
+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)
 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)
 Show the current version number and exit.
@@ -140,7 +136,7 @@ Specify a specific syntax highlighting from the \fInanorc\fP to use, if
 available.
 .TP
 .B \-c (\-\-const)
-Constantly show the cursor position.  Note that this overrides \fB-U\fP.
+Constantly show the cursor position.  Note that this overrides \fB\-U\fP.
 .TP
 .B \-d (\-\-rebinddelete)
 Interpret the Delete key differently so that both Backspace and Delete
@@ -148,14 +144,15 @@ 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.
+Show a summary of the available command-line options and exit.
 .TP
 .B \-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.
+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)
 If the file being edited is a symbolic link, replace the link with
@@ -166,7 +163,15 @@ a new file instead of following it.  Good for editing files in
 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 \-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 \-o \fIdir\fP (\-\-operatingdir=\fIdir\fP)
 Set operating directory.  Makes \fBnano\fP set up something similar to a
@@ -177,41 +182,46 @@ 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
+Do not report errors in the \fInanorc\fP file 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
+.B \-r \fInumber\fP (\-\-fill=\fInumber\fP)
+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)
+.B \-s \fIprogram\fP (\-\-speller=\fIprogram\fP)
 Enable alternative spell checker command.
 .TP
 .B \-t (\-\-tempfile)
-Always save changed buffer without prompting.  Same as Pico's \fB-t\fP
+Always save 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.
+Enable the experimental generic-purpose undo/redo code.  The default undo
+and redo shortcuts are Meta-U and Meta-E, respectively.
 .TP
 .B \-v (\-\-view)
-View file (read only) mode.
+View-file (read-only) mode.
 .TP
 .B \-w (\-\-nowrap)
-Disable wrapping of long lines.
+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.
+Don't show the two help lines at the bottom of the screen.
 .TP
 .B \-z (\-\-suspend)
-Enable suspend ability.
+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
+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 \-$').
diff --git a/doc/man/nano.1.html b/doc/man/nano.1.html
index 4c385fd0..283c1e02 100644
--- a/doc/man/nano.1.html
+++ b/doc/man/nano.1.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Fri Mar 22 10:06:07 2013 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Sat May 10 22:54:14 2014 -->
 <!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,29 +71,12 @@ 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>Same as <b>-h (&minus;&minus;help)</b>.</p></td>
-<td width="48%">
-</td></tr>
-</table>
+<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 style="margin-left:11%;"><b>&minus;A
 (&minus;&minus;smarthome)</b></p>
@@ -112,13 +93,13 @@ beginning of the line.</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: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
@@ -185,6 +166,12 @@ files from DOS/Mac format.</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;P
+(&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</b> <i>str</i>
 <b>(&minus;&minus;quotestr=</b><i>str</i><b>)</b></p>
 
@@ -200,12 +187,13 @@ stands for a Tab.</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; don&rsquo;t allow
+suspending; don&rsquo;t allow a file to be appended to,
+prepended to, or saved under a different name if it already
+has one; don&rsquo;t use backup files nor spell checking.
+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>
@@ -214,11 +202,11 @@ name beginning with &rsquo;r&rsquo; (e.g.
 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</b> <i>number</i>
+<b>(&minus;&minus;tabsize=</b><i>number</i><b>)</b></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
@@ -226,7 +214,7 @@ greater than 0. The default value is 8.</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>
@@ -252,7 +240,7 @@ available.</p>
 (&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>
@@ -265,8 +253,8 @@ like Delete on your system.</p>
 <p style="margin-left:11%;"><b>&minus;h
 (&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>
@@ -278,8 +266,10 @@ source code.</p>
 <p style="margin-left:11%;"><b>&minus;k
 (&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>
@@ -296,7 +286,20 @@ perhaps?</p>
 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
+(&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>
@@ -315,21 +318,22 @@ terminal.</p>
 (&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> file 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:11%;"><b>&minus;r</b> <i>number</i>
+<b>(&minus;&minus;fill=</b><i>number</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: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</b> <i>program</i>
+<b>(&minus;&minus;speller=</b><i>program</i><b>)</b></p>
 
 <p style="margin-left:22%;">Enable alternative spell
 checker command.</p>
@@ -338,45 +342,47 @@ checker command.</p>
 (&minus;&minus;tempfile)</b></p>
 
 <p style="margin-left:22%;">Always save changed buffer
-without prompting. Same as Pico&rsquo;s <b>-t</b>
+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
+<p style="margin-left:22%;">Enable the experimental
+generic-purpose undo/redo code. The default 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: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: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: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: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: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
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 86091da4..deb189ae 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -1,6 +1,6 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
-.\" Free Software Foundation, Inc.
+.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+.\" 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,41 +18,34 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id: nanorc.5 4568 2013-01-21 03:40:08Z astyanax $
-.TH NANORC 5 "version 2.0.0" "August 23, 2007"
+.\" $Id: nanorc.5 4852 2014-05-09 21:02:14Z bens $
+.TH NANORC 5 "version 2.3.3" "May 2014"
 .\" 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 \fBSYSCONFDIR/nanorc\fP, 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.
 
 Options in \fInanorc\fP files take precedence over nano's defaults, and
-command line options override \fInanorc\fP settings.  Also, options are
+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
 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.
 
 The supported commands and arguments are:
 
@@ -66,50 +59,62 @@ NOT enable this option unless you are sure you need it.
 Use auto-indentation.
 .TP
 .B set/unset backup
-Create backup files in \fIfilename~\fP.
+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
 Do backwards searches by default.
 .TP
 .B set/unset boldtext
-Use bold text instead of reverse video text.
+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.
+Do case-sensitive searches by default.
 .TP
 .B set/unset const
 Constantly display the cursor position in the status bar.
 .TP
 .B set/unset cut
-Use cut to end of line by default.
+Use cut-to-end-of-line by default, instead of cutting the whole line.
 .TP
 .B set fill \fIn\fP
-Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the
+Hard-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.
 .TP
+.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.
+Enable the use of \fB~/.nano_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/unset 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
 Use the blank line below the titlebar as extra editing space.
@@ -118,7 +123,8 @@ Use the blank line below the titlebar as extra editing space.
 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
 Allow inserting files into their own buffers.
@@ -130,13 +136,13 @@ Don't convert files from DOS/Mac format.
 Don't follow symlinks when writing files.
 .TP
 .B set/unset nohelp
-Don't display the help lists at the bottom of the screen.
+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.
+Don't automatically add a newline to the ends of files.
 .TP
 .B set/unset nowrap
-Don't wrap text at all.
+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
@@ -144,30 +150,33 @@ 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.
 .TP
+.B set/unset poslog
+Save the cursor position of files between editing sessions.
+.TP
 .B set/unset 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".
-.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.
+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 quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
 keystroke instead of 25.
 .TP
+.B set/unset 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
@@ -183,9 +192,6 @@ won't work properly with this option enabled.
 .B set/unset regexp
 Do extended regular expression searches by default.
 .TP
-.B set/unset poslog
-Save the cursor position of files between editing sessions.
-.TP
 .B set/unset 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
@@ -203,6 +209,10 @@ Enable soft line wrapping for easier viewing of very long lines.
 Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
+.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/unset suspend
 Allow \fBnano\fP to be suspended.
 .TP
@@ -216,57 +226,76 @@ Convert typed tabs to spaces.
 .B set/unset tempfile
 Save automatically on exit, don't prompt.
 .TP
+.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 undo
-Enable experimental generic-purpose undo code.
+Enable the experimental generic-purpose undo/redo code.
 .TP
 .B set/unset 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
 Detect word boundaries more accurately by treating punctuation
 characters as parts of words.
+
+.SH SYNTAX HIGHLIGHTING
+Coloring the different syntactic elements of a file
+can be defined via the following commands:
 .TP
-.B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
+.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 magic ["\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
+.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 \fBmagic\fP database when attempting
-to determine which highlighting rules to use for a given file. This 
+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\fP,\fIbgcolor\fP "\fIregex\fP" ...
+.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,
@@ -275,19 +304,35 @@ 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
+.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:
 .TP
 .B ^ 
 followed by an alpha character or the word "Space".
@@ -301,218 +346,262 @@ Example: M-C
 followed by a numeric value from 1 to 16.
 Example: F10
 .TP
-Valid function names to be bound include:
-.TP 3
+
+Valid \fIfunction\fP names to be bound include:
+
+.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.
 .TP
 .B searchagain
-Repeat the last search command.
-.TP
-.B up
-Move up in the editor or browser.
-.TP
-.B down
-Move down in the editor or browser.
+Repeats the last search command.
 .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 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.
-.TP
-.B fulljustify
-Justify the entire current file.
+Deletes the character under the cursor.
 .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.
+Switches back to searching instead of replacing.
 .TP
 .B gototext
-Search for files matching a string in the file browser (reading or writing files).
+Searches for files matching a string in the file browser (reading or writing files).
 .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 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 available).
+.TP
+.B mouse
+Toggles mouse support.
+.TP
+.B noconvert
+Toggles automatic conversion of files from DOS/Mac format.
 .TP
 .B suspendenable
-Toggle whether the suspend sequence (normally ^Z) will suspend the editor window.
+Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.
 .TP
 
-Valid menu sections are:
-.TP
+Valid \fImenu\fP sections are:
+
+.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).
@@ -533,14 +622,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
@@ -548,26 +640,19 @@ 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.
 
-.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
+.B SYSCONFDIR/nanorc
 System-wide configuration file
 .TP
-.I ~/.nanorc
+.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 5a48edd8..90060c14 100644
--- a/doc/man/nanorc.5.html
+++ b/doc/man/nanorc.5.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Fri Mar 22 10:06:07 2013 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Sat May 10 22:54:14 2014 -->
 <!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>SYSCONFDIR/nanorc</b>, and then the user-specific
+settings, from <b>~/.nanorc</b>.</p>
 
 <h2>OPTIONS
 <a name="OPTIONS"></a>
@@ -71,15 +61,14 @@ 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>
+defaults, and command-line options override <i>nanorc</i>
 settings. Also, options are unset by default, except for
 those that take arguments.</p>
 
@@ -87,9 +76,9 @@ those that take arguments.</p>
 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>
+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>
@@ -106,14 +95,14 @@ enable this option unless you are sure you need it.</p>
 
 <p style="margin-left:11%;"><b>set/unset 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>
@@ -123,23 +112,26 @@ default.</p>
 
 <p style="margin-left:11%;"><b>set/unset 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: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>
@@ -149,20 +141,37 @@ position in the status bar.</p>
 
 <p style="margin-left:11%;"><b>set/unset 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>n</i></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:15%;">Hard-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 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/unset historylog</b></p>
 
-<p style="margin-left:15%;">Enable <i>~/.nano_history</i>
-for saving and reading search/replace strings.</p>
+<p style="margin-left:15%;">Enable the use of
+<b>~/.nano_history</b> for saving and reading search/replace
+strings.</p>
+
+<p style="margin-left:11%;"><b>set keycolor</b>
+<i>fgcolor</i>,<i>bgcolor</i></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:11%;"><b>set/unset locking</b></p>
 
@@ -173,10 +182,10 @@ when editing files.</p>
 <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>
 
@@ -189,7 +198,9 @@ titlebar as extra editing space.</p>
 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>
@@ -209,17 +220,17 @@ when writing files.</p>
 
 <p style="margin-left:11%;"><b>set/unset 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: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: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>
@@ -231,6 +242,11 @@ Also, the current directory is changed to here, so files are
 inserted from this directory. By default, the operating
 directory feature is turned off.</p>
 
+<p style="margin-left:11%;"><b>set/unset 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/unset preserve</b></p>
 
 <p style="margin-left:15%;">Preserve the XON and XOFF keys
@@ -240,18 +256,11 @@ 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>
 
@@ -259,6 +268,14 @@ effective.</p>
 Statusbar messages will disappear after 1 keystroke instead
 of 25.</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 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>
 
@@ -266,9 +283,9 @@ 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
@@ -292,11 +309,6 @@ won&rsquo;t work properly with this option enabled.</p>
 <p style="margin-left:15%;">Do extended regular expression
 searches by default.</p>
 
-<p style="margin-left:11%;"><b>set/unset 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/unset smarthome</b></p>
 
 <p style="margin-left:15%;">Make the Home key smarter. When
@@ -323,6 +335,13 @@ easier viewing of very long lines.</p>
 <i>spellprog</i> instead of the built-in one, which calls
 <i>spell</i>.</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/unset suspend</b></p>
 
 <p style="margin-left:15%;">Allow <b>nano</b> to be
@@ -345,26 +364,31 @@ spaces.</p>
 <p style="margin-left:15%;">Save automatically on exit,
 don&rsquo;t prompt.</p>
 
+<p style="margin-left:11%;"><b>set titlecolor</b>
+<i>fgcolor</i>,<i>bgcolor</i></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 undo</b></p>
 
-<p style="margin-left:15%;">Enable experimental
-generic-purpose undo code.</p>
+<p style="margin-left:15%;">Enable the experimental
+generic-purpose undo/redo code.</p>
 
 <p style="margin-left:11%;"><b>set/unset 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>
 
@@ -372,62 +396,89 @@ be single-column characters.</p>
 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 can be defined 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>magic
-[&quot;</b><i>regex</i><b>&quot; ... ]</b></p>
+<p style="margin-left:11%;"><b>linter</b> <i>program</i>
+[<i>arg</i> ...]</p>
 
-<p style="margin-left:15%;">For the currently defined
+<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>header</b>
+[&quot;<i>regex</i>&quot; ...]</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>
+[&quot;<i>regex</i>&quot; ...]</p>
+
+<p style="margin-left:22%;">For the currently defined
 syntax, add one or more regexes which will be compared
-against the <b>magic</b> database when attempting to
-determine which highlighting rules to use for a given file.
-This functionality only works when <b>libmagic</b> is
-installed on the system and will be silently ignored
-otherwise.</p>
+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
@@ -438,23 +489,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>
 
 
@@ -464,7 +526,18 @@ 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">
@@ -506,452 +579,502 @@ new function named <i>function</i> in the context of menu
 F10</p> </td></tr>
 </table>
 
-<p style="margin-left:11%;">Valid function names to be
-bound include: <b><br>
+<p style="margin-left:11%; margin-top: 1em">Valid
+<i>function</i> names to be bound include: <b><br>
 help</b></p>
 
-<p style="margin-left:15%;">Invoke the help menu.</p>
+<p style="margin-left:14%;">Invokes the help viewer.</p>
 
 <p style="margin-left:11%;"><b>cancel</b></p>
 
-<p style="margin-left:15%;">Cancel the current command.</p>
+<p style="margin-left:14%;">Cancels the current
+command.</p>
 
 <p style="margin-left:11%;"><b>exit</b></p>
 
-<p style="margin-left:15%;">Exit from the program.</p>
+<p style="margin-left:14%;">Exits from the program (or from
+the help viewer or the file browser).</p>
 
 <p style="margin-left:11%;"><b>writeout</b></p>
 
-<p style="margin-left:15%;">Write the current buffer to
+<p style="margin-left:14%;">Writes the current buffer to
 disk.</p>
 
-<p style="margin-left:11%;"><b>justify</b></p>
-
-<p style="margin-left:15%;">Justify the current text.</p>
-
 <p style="margin-left:11%;"><b>insert</b></p>
 
-<p style="margin-left:15%;">Insert a file into the current
+<p style="margin-left:14%;">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%;">Search for text in the current
-buffer.</p>
+<p style="margin-left:14%;">Searches for text in the
+current buffer.</p>
 
 <p style="margin-left:11%;"><b>searchagain</b></p>
 
-<p style="margin-left:15%;">Repeat the last search
+<p style="margin-left:14%;">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:11%;"><b>replace</b></p>
 
+<p style="margin-left:14%;">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:11%;"><b>cut</b></p>
 
+<p style="margin-left:14%;">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:11%;"><b>copytext</b></p>
 
-<p style="margin-left:11%;"><b>down</b></p>
+<p style="margin-left:14%;">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:11%;"><b>uncut</b></p>
 
-<p style="margin-left:11%;"><b>left</b></p>
+<p style="margin-left:14%;">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:11%;"><b>mark</b></p>
 
-<p style="margin-left:11%;"><b>right</b></p>
+<p style="margin-left:14%;">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:11%;"><b>cutrestoffile</b></p>
 
-<p style="margin-left:11%;"><b>cut</b></p>
+<p style="margin-left:14%;">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:11%;"><b>curpos</b></p>
 
-<p style="margin-left:11%;"><b>uncut</b></p>
+<p style="margin-left:14%;">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:11%;"><b>wordcount</b></p>
 
-<p style="margin-left:11%;"><b>curpos</b></p>
+<p style="margin-left:14%;">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:11%;"><b>speller</b></p>
 
-<p style="margin-left:11%;"><b>firstline</b></p>
+<p style="margin-left:14%;">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:11%;"><b>justify</b></p>
 
-<p style="margin-left:11%;"><b>lastline</b></p>
+<p style="margin-left:14%;">Justifies the current
+paragraph.</p>
 
-<p style="margin-left:15%;">Move to the last line of the
-file.</p>
+<p style="margin-left:11%;"><b>fulljustify</b></p>
 
-<p style="margin-left:11%;"><b>gotoline</b></p>
+<p style="margin-left:14%;">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:11%;"><b>indent</b></p>
 
-<p style="margin-left:11%;"><b>replace</b></p>
+<p style="margin-left:14%;">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:11%;"><b>unindent</b></p>
 
-<p style="margin-left:11%;"><b>mark</b></p>
+<p style="margin-left:14%;">Unindents (shifts to the left)
+the currently marked text.</p>
 
-<p style="margin-left:15%;">Begin selecting text for
-cutting or pasting at the current position.</p>
+<p style="margin-left:11%;"><b>left</b></p>
 
-<p style="margin-left:11%;"><b>copytext</b></p>
+<p style="margin-left:14%;">Goes left 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:11%;"><b>right</b></p>
 
-<p style="margin-left:11%;"><b>indent</b></p>
+<p style="margin-left:14%;">Goes right one position (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:11%;"><b>up</b></p>
 
-<p style="margin-left:11%;"><b>unindent</b></p>
+<p style="margin-left:14%;">Goes one line up (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:11%;"><b>down</b></p>
+
+<p style="margin-left:14%;">Goes one line down (in the
+editor or browser).</p>
+
+<p style="margin-left:11%;"><b>scrollup</b></p>
+
+<p style="margin-left:14%;">Scrolls up one line of text
+from the current position.</p>
+
+<p style="margin-left:11%;"><b>scrolldown</b></p>
+
+<p style="margin-left:14%;">Scrolls down one line of text
+from the current position.</p>
 
 <p style="margin-left:11%;"><b>nextword</b></p>
 
-<p style="margin-left:15%;">Move the cursor to the
+<p style="margin-left:14%;">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%;">Move the cursor to the
+<p style="margin-left:14%;">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%;">Move the cursor to the
+<p style="margin-left:14%;">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%;">Move the cursor to the end of
+<p style="margin-left:14%;">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%;">Move the cursor to the
+<p style="margin-left:14%;">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%;">Move the cursor to the end of
+<p style="margin-left:14%;">Moves the cursor to the end of
 the current paragraph.</p>
 
-<p style="margin-left:11%;"><b>findbracket</b></p>
+<p style="margin-left:11%;"><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:14%;">Goes up one screenful.</p>
 
-<p style="margin-left:11%;"><b>scrollup</b></p>
+<p style="margin-left:11%;"><b>nextpage</b></p>
 
-<p style="margin-left:15%;">Scroll up one line of text from
-the current position.</p>
+<p style="margin-left:14%;">Goes down one screenful.</p>
 
-<p style="margin-left:11%;"><b>scrolldown</b></p>
+<p style="margin-left:11%;"><b>firstline</b></p>
 
-<p style="margin-left:15%;">Scroll down one line of text
-from the current position.</p>
+<p style="margin-left:14%;">Goes to the first line of the
+file.</p>
+
+<p style="margin-left:11%;"><b>lastline</b></p>
+
+<p style="margin-left:14%;">Goes to the last line of the
+file.</p>
+
+<p style="margin-left:11%;"><b>gotoline</b></p>
+
+<p style="margin-left:14%;">Goes to a specific line (and
+column if specified).</p>
+
+<p style="margin-left:11%;"><b>findbracket</b></p>
+
+<p style="margin-left:14%;">Moves the cursor to the bracket
+(brace, parenthesis, etc.) that matches (pairs) with the one
+under the cursor.</p>
 
 <p style="margin-left:11%;"><b>prevbuf</b></p>
 
-<p style="margin-left:15%;">Switch to editing/viewing the
+<p style="margin-left:14%;">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%;">Switch to editing/viewing the
+<p style="margin-left:14%;">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%;">Insert the next character
+<p style="margin-left:14%;">Inserts the next character
 verbatim into the file.</p>
 
 <p style="margin-left:11%;"><b>tab</b></p>
 
-<p style="margin-left:15%;">Insert a tab at the current
+<p style="margin-left:14%;">Inserts a tab at the current
 cursor location.</p>
 
 <p style="margin-left:11%;"><b>enter</b></p>
 
-<p style="margin-left:15%;">Insert a new line below the
+<p style="margin-left:14%;">Inserts a new line below the
 current one.</p>
 
 <p style="margin-left:11%;"><b>delete</b></p>
 
-<p style="margin-left:15%;">Delete the character under the
+<p style="margin-left:14%;">Deletes the character under the
 cursor.</p>
 
-<p style="margin-left:11%;"><b>fulljustify</b></p>
-
-<p style="margin-left:15%;">Justify the entire current
-file.</p>
-
-<p style="margin-left:11%;"><b>wordcount</b></p>
-
-<p style="margin-left:15%;">Count the number of words in
-the current buffer.</p>
-
-<p style="margin-left:11%;"><b>refresh</b></p>
+<p style="margin-left:11%;"><b>backspace</b></p>
 
-<p style="margin-left:15%;">Refresh the screen.</p>
+<p style="margin-left:14%;">Deletes the character before
+the cursor.</p>
 
 <p style="margin-left:11%;"><b>undo</b></p>
 
-<p style="margin-left:15%;">Undo the text action peformed
-(add text, delete text, etc).</p>
+<p style="margin-left:14%;">Undoes the last performed text
+action (add text, delete text, etc).</p>
 
 <p style="margin-left:11%;"><b>redo</b></p>
 
-<p style="margin-left:15%;">Redo the last undone action
-(i.e., undo an undo).</p>
+<p style="margin-left:14%;">Redoes the last undone action
+(i.e., it undoes an undo).</p>
+
+<p style="margin-left:11%;"><b>refresh</b></p>
+
+<p style="margin-left:14%;">Refreshes the screen.</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:14%;">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%;">Toggle case sensitivity in
+<p style="margin-left:14%;">Toggles case sensitivity in
 searching (search/replace menus only).</p>
 
 <p style="margin-left:11%;"><b>regexp</b></p>
 
-<p style="margin-left:15%;">Toggle whether
+<p style="margin-left:14%;">Toggles whether
 searching/replacing is based on literal strings or regular
 expressions.</p>
 
+<p style="margin-left:11%;"><b>backwards</b></p>
+
+<p style="margin-left:14%;">Toggles whether
+searching/replacing goes forward or backward.</p>
+
 <p style="margin-left:11%;"><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:14%;">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%;">Show the next history entry in
+<p style="margin-left:14%;">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%;">Switch back to searching
+<p style="margin-left:14%;">Switches back to searching
 instead of replacing.</p>
 
 <p style="margin-left:11%;"><b>gototext</b></p>
 
-<p style="margin-left:15%;">Search for files matching a
+<p style="margin-left:14%;">Searches for files matching a
 string in the file browser (reading or writing files).</p>
 
 <p style="margin-left:11%;"><b>dosformat</b></p>
 
-<p style="margin-left:15%;">When writing a file, switch to
-writing a DOS format (CR/LF).</p>
+<p style="margin-left:14%;">When writing a file, switches
+to writing a DOS format (CR/LF).</p>
 
 <p style="margin-left:11%;"><b>macformat</b></p>
 
-<p style="margin-left:15%;">When writing a file, switch to
-writing a Mac format.</p>
+<p style="margin-left:14%;">When writing a file, switches
+to writing a Mac format.</p>
 
 <p style="margin-left:11%;"><b>append</b></p>
 
-<p style="margin-left:15%;">When writing a file, append to
+<p style="margin-left:14%;">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%;">When writing a file,
-&rsquo;prepend&rsquo; (write at the beginning) instead of
+<p style="margin-left:14%;">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%;">When writing a file, create a
+<p style="margin-left:14%;">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%;">Move to the first file when
+<p style="margin-left:14%;">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%;">Move to the last file when
+<p style="margin-left:14%;">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%;">Toggle showing/hiding the
+<p style="margin-left:14%;">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%;">Constantly display the current
-line, column, word positions.</p>
+<p style="margin-left:14%;">Toggles the constant display of
+the current line, column, and character positions.</p>
 
 <p style="margin-left:11%;"><b>morespace</b></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:14%;">Toggles the presence of the
+blank line which &rsquo;separates&rsquo; the titlebar from
+the file text.</p>
 
 <p style="margin-left:11%;"><b>smoothscroll</b></p>
 
-<p style="margin-left:15%;">Toggle smooth scrolling when
-moving via the arrow keys.</p>
+<p style="margin-left:14%;">Toggles smooth scrolling (when
+moving around with the arrow keys).</p>
+
+<p style="margin-left:11%;"><b>softwrap</b></p>
+
+<p style="margin-left:14%;">Toggles the displaying of
+overlong lines on multiple screen lines.</p>
 
 <p style="margin-left:11%;"><b>whitespacedisplay</b></p>
 
-<p style="margin-left:15%;">Toggle whether whitespace is
-shown.</p>
+<p style="margin-left:14%;">Toggles the showing of
+whitespace.</p>
+
+<p style="margin-left:11%;"><b>nosyntax</b></p>
+
+<p style="margin-left:14%;">Toggles syntax
+highlighting.</p>
 
 <p style="margin-left:11%;"><b>smarthome</b></p>
 
-<p style="margin-left:15%;">Toggle whether the smart home
-key function is enabled.</p>
+<p style="margin-left:14%;">Toggles the smartness of the
+Home key.</p>
 
 <p style="margin-left:11%;"><b>autoindent</b></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:14%;">Toggles whether new lines will
+contain the same amount of whitespace as the preceding
+line.</p>
 
 <p style="margin-left:11%;"><b>cuttoend</b></p>
 
-<p style="margin-left:15%;">Toggle whether cutting text
+<p style="margin-left:14%;">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%;">Toggle whether long lines will
-be wrapped to the next line.</p>
+<p style="margin-left:14%;">Toggles whether long lines will
+be hard-wrapped to the next line.</p>
+
+<p style="margin-left:11%;"><b>tabstospaces</b></p>
+
+<p style="margin-left:14%;">Toggles whether typed tabs will
+be converted to spaces.</p>
+
+<p style="margin-left:11%;"><b>backupfile</b></p>
+
+<p style="margin-left:14%;">Toggles whether a backup will
+be made of the file to be edited.</p>
+
+<p style="margin-left:11%;"><b>multibuffer</b></p>
+
+<p style="margin-left:14%;">Toggles the use of multiple
+file buffers (if available).</p>
+
+<p style="margin-left:11%;"><b>mouse</b></p>
+
+<p style="margin-left:14%;">Toggles mouse support.</p>
+
+<p style="margin-left:11%;"><b>noconvert</b></p>
+
+<p style="margin-left:14%;">Toggles automatic conversion of
+files from DOS/Mac format.</p>
 
 <p style="margin-left:11%;"><b>suspendenable</b></p>
 
-<p style="margin-left:15%;">Toggle whether the suspend
+<p style="margin-left:14%;">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>
+<p style="margin-left:11%; margin-top: 1em">Valid
+<i>menu</i> sections are: <b><br>
 main</b></p>
 
-<p style="margin-left:15%;">The main editor window where
-text is entered.</p>
+<p style="margin-left:14%;">The main editor window where
+text is entered and edited.</p>
 
 <p style="margin-left:11%;"><b>search</b></p>
 
-<p style="margin-left:15%;">The search menu (AKA
+<p style="margin-left:14%;">The search menu (AKA
 whereis).</p>
 
 <p style="margin-left:11%;"><b>replace</b></p>
 
-<p style="margin-left:15%;">The &rsquo;search to
+<p style="margin-left:14%;">The &rsquo;search to
 replace&rsquo; menu.</p>
 
 <p style="margin-left:11%;"><b>replacewith</b></p>
 
-<p style="margin-left:15%;">The &rsquo;replace with&rsquo;
+<p style="margin-left:14%;">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%;">The &rsquo;goto line (and
+<p style="margin-left:14%;">The &rsquo;goto line (and
 column)&rsquo; menu.</p>
 
 <p style="margin-left:11%;"><b>writeout</b></p>
 
-<p style="margin-left:15%;">The &rsquo;write file&rsquo;
+<p style="margin-left:14%;">The &rsquo;write file&rsquo;
 menu.</p>
 
 <p style="margin-left:11%;"><b>insert</b></p>
 
-<p style="margin-left:15%;">The &rsquo;insert file&rsquo;
+<p style="margin-left:14%;">The &rsquo;insert file&rsquo;
 menu.</p>
 
 <p style="margin-left:11%;"><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:14%;">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%;">The help menu.</p>
+<p style="margin-left:14%;">The help-viewer menu.</p>
 
 <p style="margin-left:11%;"><b>spell</b></p>
 
-<p style="margin-left:15%;">The interactive spell checker
+<p style="margin-left:14%;">The interactive spell checker
 Yes/no menu.</p>
 
+<p style="margin-left:11%;"><b>linter</b></p>
+
+<p style="margin-left:14%;">The linter menu.</p>
+
 <p style="margin-left:11%;"><b>browser</b></p>
 
-<p style="margin-left:15%;">The file browser for inserting
+<p style="margin-left:14%;">The file browser for inserting
 or writing a file.</p>
 
 <p style="margin-left:11%;"><b>whereisfile</b></p>
 
-<p style="margin-left:15%;">The &rsquo;search for a
+<p style="margin-left:14%;">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:14%;">The &rsquo;go to
+directory&rsquo; menu in the file browser.</p>
 
 <p style="margin-left:11%;"><b>all</b></p>
 
-<p style="margin-left:15%;">A special name meaning: apply
+<p style="margin-left:14%;">A special name meaning: apply
 to all menus where this function exists.</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>
-
 <h2>FILES
 <a name="FILES"></a>
 </h2>
 
 
 
-<p style="margin-left:11%; margin-top: 1em"><i>SYSCONFDIR/nanorc</i></p>
+<p style="margin-left:11%; margin-top: 1em"><b>SYSCONFDIR/nanorc</b></p>
 
 <p style="margin-left:22%;">System-wide configuration
 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>
 
@@ -960,21 +1083,24 @@ file</p>
 </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 6b8a9b8a..f4a3407f 100644
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -19,8 +19,8 @@
 .\"   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"
+.\" $Id: rnano.1 4756 2014-04-08 20:01:17Z bens $
+.TH RNANO 1 "version 2.3.3" "April 2014"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -29,18 +29,13 @@ Pico clone
 
 .SH SYNOPSIS
 .B rnano
-.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
+.RI [ options "] [[\+" line , column "]\ " file "]..."
 .br
 
 .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
@@ -63,14 +58,6 @@ 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.
 .TP
diff --git a/doc/man/rnano.1.html b/doc/man/rnano.1.html
index b7bbc871..6b336020 100644
--- a/doc/man/rnano.1.html
+++ b/doc/man/rnano.1.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Sat Jun 16 21:10:37 2012 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Sat May 10 22:54:14 2014 -->
 <!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>
 
@@ -139,32 +137,7 @@ under a different name;</p></td></tr>
 </h2>
 
 
-
-<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
+<p style="margin-left:11%; margin-top: 1em"><b>&minus;h
 (&minus;&minus;help)</b></p>
 
 <p style="margin-left:22%;">Show a summary of command line
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index 192f9b44..d2dc9661 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,23 +39,21 @@
 ## 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.
@@ -64,7 +67,6 @@
 ## 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.
@@ -74,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.
@@ -101,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
 
@@ -112,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.
@@ -146,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.
@@ -176,14 +175,25 @@
 ## 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:
 ##
@@ -198,8 +208,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
@@ -212,9 +222,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"
 ##
@@ -223,95 +234,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 13bf6194..03bc8e3e 100644
--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -1,14 +1,19 @@
 pkgdata_DATA =	asm.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 \
@@ -20,6 +25,7 @@ pkgdata_DATA =	asm.nanorc \
 		patch.nanorc \
 		perl.nanorc \
 		php.nanorc \
+		po.nanorc \
 		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
@@ -27,6 +33,7 @@ pkgdata_DATA =	asm.nanorc \
 		spec.nanorc \
 		tcl.nanorc \
 		tex.nanorc \
+		texinfo.nanorc \
 		xml.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/doc/syntax/Makefile.in b/doc/syntax/Makefile.in
index 2f3dd6e7..c61d0134 100644
--- a/doc/syntax/Makefile.in
+++ b/doc/syntax/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  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@
@@ -52,9 +79,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 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 \
@@ -66,6 +95,18 @@ 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 = \
@@ -102,9 +143,11 @@ am__uninstall_files_from_dir = { \
   }
 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@
@@ -150,7 +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@
@@ -162,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@
@@ -191,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@
@@ -221,15 +271,20 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 pkgdata_DATA = asm.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 \
@@ -241,6 +296,7 @@ pkgdata_DATA = asm.nanorc \
 		patch.nanorc \
 		perl.nanorc \
 		php.nanorc \
+		po.nanorc \
 		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
@@ -248,6 +304,7 @@ pkgdata_DATA = asm.nanorc \
 		spec.nanorc \
 		tcl.nanorc \
 		tex.nanorc \
+		texinfo.nanorc \
 		xml.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)
@@ -305,11 +362,11 @@ uninstall-pkgdataDATA:
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -447,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 9d927604..4e215915 100644
--- a/doc/syntax/asm.nanorc
+++ b/doc/syntax/asm.nanorc
@@ -1,18 +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 b84d2fdc..bfc6387c 100644
--- a/doc/syntax/awk.nanorc
+++ b/doc/syntax/awk.nanorc
@@ -1,24 +1,25 @@
 ## Here is an example for awk.
-##
+
 syntax "awk" "\.awk$"
 magic "awk.*script text"
-## records
+
+# 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)\>"
@@ -26,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 59f0f3b6..8fe7088d 100644
--- a/doc/syntax/c.nanorc
+++ b/doc/syntax/c.nanorc
@@ -1,9 +1,10 @@
 ## Here is an example for C/C++.
-##
-syntax "c" "\.(c(c|pp|xx)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
-magic "ASCII C(\+\+)? program text"
-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)\>"
@@ -11,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 00000000..60666bd5
--- /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 3c52f7de..dc437024 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 98eea180..a806d7c5 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 a945deea..1083abe7 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).
-##
+## Here is an example for apt's sources.list.
+
 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...
+
+# 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|ftp|rsh|ssh|file|copy):/[^ ]+|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
+# URIs.
+color brightgreen "(http|ftp|rsh|ssh|file|copy):/[^ ]+"
+# 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 00000000..8d8e0397
--- /dev/null
+++ b/doc/syntax/default.nanorc
@@ -0,0 +1,13 @@
+## A default syntax, which is used
+## for files that do not match any other syntax.
+
+syntax "default"
+
+# Spaces in front of tabs.
+color ,red " +	+"
+
+# Trailing blanks.
+color ,red "[[:blank:]]+$"
+
+# 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 cc0c726a..45873ac7 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 2ad15971..249e224d 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 00000000..58ef1812
--- /dev/null
+++ b/doc/syntax/go.nanorc
@@ -0,0 +1,42 @@
+## 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:]]+$"
diff --git a/doc/syntax/groff.nanorc b/doc/syntax/groff.nanorc
index 02b82b8e..70f641d3 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 c94bfec9..8782dc36 100644
--- a/doc/syntax/html.nanorc
+++ b/doc/syntax/html.nanorc
@@ -1,6 +1,8 @@
 ## Here is a short example for HTML.
-##
-syntax "html" "\.html$"
+
+syntax "html" "\.html?$"
 magic "HTML document text"
-color blue start="<" end=">"
-color red "&[^;[[:space:]]]*;"
+
+color cyan start="<" end=">"
+color red "&[^;[:space:]]*;"
+color green ""(\\.|[^"])*""
diff --git a/doc/syntax/java.nanorc b/doc/syntax/java.nanorc
index f45b0c94..0beebf47 100644
--- a/doc/syntax/java.nanorc
+++ b/doc/syntax/java.nanorc
@@ -1,7 +1,8 @@
 ## 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)\>"
diff --git a/doc/syntax/javascript.nanorc b/doc/syntax/javascript.nanorc
new file mode 100644
index 00000000..991f54bf
--- /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 00000000..0f799f16
--- /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
index af9d1402..7512f53c 100644
--- a/doc/syntax/lua.nanorc
+++ b/doc/syntax/lua.nanorc
@@ -1,17 +1,9 @@
-##############################################################################
+## Syntax highlighting for Lua.
 #
-# Lua syntax highlighting for Nano.
-#
-# Author:  Matthew Wild <mwild1 (at) gmail.com>
-# License: GPL 3 or later
-#
-# Version: 2011-05-05
-#
-# Notes: Originally based on Ruby syntax rc by Josef 'Jupp' Schugt
-##############################################################################
+## Author:  Matthew Wild <mwild1 (at) gmail.com>
+## License: GPL 3 or later
+## Version: 2011-05-05
 
-
-# Automatically use for '.lua' files
 syntax "lua" "\.lua$"
 
 color brightwhite "\[\[.*\]\]"
@@ -51,7 +43,6 @@ color red "\<([0-9]+)\>"
 # Symbols
 color brightmagenta "(\(|\)|\[|\]|\{|\})"
 
-
 # Shebang
 color brightcyan   "^#!.*"
 
@@ -62,15 +53,8 @@ color green        "\-\-.*$"
 color green         start="\-\-\[\[" end="\]\]"
 
 # Strings
-#color green "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
-
-# Strings
 color red "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
-
-# color red         start="\[\[" end="\]\]"
-
+##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 93a1e76d..04163909 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 0dfa6feb..6c296bb6 100644
--- a/doc/syntax/man.nanorc
+++ b/doc/syntax/man.nanorc
@@ -1,10 +1,17 @@
 ## Here is an example for manpages.
-##
+
 syntax "man" "\.[1-9]x?$"
 magic "troff or preprocessor input text"
-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)"
+
+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 daba2827..c0a5d203 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 2e683998..80fbcf46 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 2c9f23a4..730b939f 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|poslog|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|speller|suspend|suspendenable|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds|locking)\>"
-icolor green "^[[:space:]]*(set|unset|include|syntax|header|magic)\>"
-## 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|undo|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]))[[:space:]]+[[:alpha:]]+[[:space:]]+[[:alpha:]]+[[:space:]]*$"
+icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^|M-)([[:alpha:]]|space|[]]|[0-9_=+{}|;:'\",./<>\?-])|F([1-9]|1[0-6]))[[:space:]]+[[:alpha:]]+[[:space:]]*$"
+icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|linter)[[: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 cdf6e485..bfbae126 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 fc71ae23..8decb727 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 5f101186..f5c1dd59 100644
--- a/doc/syntax/patch.nanorc
+++ b/doc/syntax/patch.nanorc
@@ -1,11 +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 21acb145..5f39c176 100644
--- a/doc/syntax/perl.nanorc
+++ b/doc/syntax/perl.nanorc
@@ -1,8 +1,9 @@
 ## Here is an example for Perl.
-##
+
 syntax "perl" "\.p[lm]$"
-magic "perl.*script text"
 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 9cf54412..e3c4f1fa 100644
--- a/doc/syntax/php.nanorc
+++ b/doc/syntax/php.nanorc
@@ -1,31 +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 00000000..567ef7ad
--- /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 298b2012..b7033b10 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 42802749..4679cf10 100644
--- a/doc/syntax/python.nanorc
+++ b/doc/syntax/python.nanorc
@@ -1,10 +1,24 @@
 ## Here is an example for Python.
-##
+
 syntax "python" "\.py$"
 header "^#!.*/python[-0-9._]*"
+
+# Function definitions.
 icolor brightblue "def [0-9A-Z_]+"
+# Keywords.
 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)\>"
+
+# 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 b30b229d..3566e1fe 100644
--- a/doc/syntax/ruby.nanorc
+++ b/doc/syntax/ruby.nanorc
@@ -1,31 +1,32 @@
 ## Here is an example for Ruby.
-##
+
 syntax "ruby" "\.rb$"
 header "^#!.*/ruby[-0-9._]*"
-## Asciibetical list of reserved words
+
+# 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
+# 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 f6601057..823cc5d1 100644
--- a/doc/syntax/sh.nanorc
+++ b/doc/syntax/sh.nanorc
@@ -1,15 +1,27 @@
 ## Here is an example for Bourne shell scripts.
-##
+
 syntax "sh" "\.sh$"
-magic "(POSIX|Bourne.*) shell script text"
 header "^#!.*/(ba|k|pdk)?sh[-0-9_]*"
+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
index f4afb1b3..a0fff88a 100644
--- a/doc/syntax/spec.nanorc
+++ b/doc/syntax/spec.nanorc
@@ -1,8 +1,8 @@
-# RPM spec files syntax highlighting
-# Parts taken from kate (KDE) syntax highlighting
-# Asterios Dramis
+## Syntax highlighting for RPM spec files.
+
 syntax "spec" "\.(spec$|spec\.*)"
-# Main tags
+
+# 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:]]*:)"
@@ -11,28 +11,29 @@ 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
+# 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)"
-# Architectures conditionals
+# Architecture conditionals.
 color brightred "(ifarch|ifnarch)"
-# OS conditionals
+# OS conditionals.
 color brightred "(ifos|ifnos)"
-# %* strings
+# %* 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
+# Sections.
 color red "^%(build$|changelog|check$|clean$|description|files|install$|package|pre|prep$|preun|post|postun)"
 color red "^%(trigger|triggerin|triggerpostun|triggerun|verifyscript)"
-# Conditionals and Defines
+# Conditionals and defines.
 color brightred "%(if|else|endif|define|global|undefine)"
-# Comments
+
+# Comments.
 color cyan "#.*$"
-# "# norootforbuild" is handled as main tag
+# Special case: "# norootforbuild" is handled as main tag.
 color brightblue "^# norootforbuild"
-# %changelog date entries
+# %changelog date entries.
 color brightyellow "^\* .*\)$"
-# Trailing whitespace
+# Trailing whitespace.
 color ,green "[[:space:]]+$"
diff --git a/doc/syntax/tcl.nanorc b/doc/syntax/tcl.nanorc
index ad3401fb..8bcec246 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 23ca3a44..7fa417c4 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 00000000..63354bae
--- /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 9005d614..69982ea8 100644
--- a/doc/syntax/xml.nanorc
+++ b/doc/syntax/xml.nanorc
@@ -1,7 +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.*document text"
+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 46df6bdf..41cb275c 100644
--- a/doc/texinfo/Makefile.in
+++ b/doc/texinfo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  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@
@@ -51,9 +78,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 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 \
@@ -65,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
@@ -112,9 +181,11 @@ am__uninstall_files_from_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@
@@ -160,7 +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@
@@ -172,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@
@@ -201,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@
@@ -269,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 \
@@ -291,18 +369,20 @@ $(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 $@; \
@@ -317,8 +397,8 @@ $(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)
@@ -397,9 +477,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" \
@@ -411,11 +489,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)
@@ -653,16 +731,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 b6735577..e68b9133 100644
--- a/doc/texinfo/nano.html
+++ b/doc/texinfo/nano.html
@@ -1,363 +1,542 @@
-<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.1, 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="previous">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="previous">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><code>+&lt;line&gt;,&lt;column&gt;</code></dt>
+<dd><p>Start at line number &lt;line&gt; and column number &lt;column&gt; (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><code>-A, --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>-B, --backup</code><dd>When saving a file, back up the previous version of it to the current
+</p>
+</dd>
+<dt><code>-B, --backup</code></dt>
+<dd><p>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><code>-C &lt;dir&gt;, --backupdir=&lt;dir&gt;</code></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
+</p>
+</dd>
+<dt><code>-D, --boldtext</code></dt>
+<dd><p>Use bold text instead of reverse video text.
+</p>
+</dd>
+<dt><code>-E, --tabstospaces</code></dt>
+<dd><p>Convert typed tabs to spaces.
+</p>
+</dd>
+<dt><code>-F, --multibuffer</code></dt>
+<dd><p>Enable multiple file buffers, if available.
+</p>
+</dd>
+<dt><code>-G, --locking</code></dt>
+<dd><p>Enable vim-style file locking when editing files.
+</p>
+</dd>
+<dt><code>-H, --historylog</code></dt>
+<dd><p>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
+</p>
+</dd>
+<dt><code>-I, --ignorercfiles</code></dt>
+<dd><p>Don&rsquo;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><code>-K, --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>-L, --nonewlines</code></dt>
+<dd><p>Don&rsquo;t add newlines to the ends of files.
+</p>
+</dd>
+<dt><code>-N, --noconvert</code></dt>
+<dd><p>Disable automatic conversion of files from DOS/Mac format.
+</p>
+</dd>
+<dt><code>-O, --morespace</code></dt>
+<dd><p>Use the blank line below the titlebar as extra editing space.
+</p>
+</dd>
+<dt><code>-P, --poslog</code></dt>
+<dd><p>Log and later read back the location of the cursor and place it
+there again.
+</p>
+</dd>
+<dt><code>-Q &lt;str&gt;, --quotestr=&lt;str&gt;</code></dt>
+<dd><p>Set the quoting string for justifying.  The default value is
+</p>
+<blockquote>
+<p><code>^([ \t]*[|&gt;:}#])+</code>
+</p></blockquote>
+
+<p>if extended regular expression support is available, or &quot;&gt; &quot; 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><code>-R, --restricted</code></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; don&rsquo;t allow suspending; don&rsquo;t
+allow a file to be appended to, prepended to, or saved under a different
+name if it already has one; don&rsquo;t use backup files nor spell checking.
+This restricted mode is also accessible by invoking <code>nano</code> with
+any name beginning with &rsquo;r&rsquo; (e.g. &quot;rnano&quot;).
+</p>
+</dd>
+<dt><code>-S, --smooth</code></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
+</p>
+</dd>
+<dt><code>-T &lt;number&gt;, --tabsize=&lt;number&gt;</code></dt>
+<dd><p>Set the displayed tab length to &lt;number&gt; columns.  The value of &lt;number&gt;
+must be greater than 0.  The default value is 8.
+</p>
+</dd>
+<dt><code>-U, --quickblank</code></dt>
+<dd><p>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><code>-V, --version</code></dt>
+<dd><p>Show the current version number and exit.
+</p>
+</dd>
+<dt><code>-W, --wordbounds</code></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. 
+</p>
+</dd>
+<dt><code>-Y &lt;str&gt;, --syntax=&lt;str&gt;</code></dt>
+<dd><p>Specify a specific syntax from the nanorc to use for highlighting, if
+available.  See See <a href="#Syntax-Highlighting">Syntax Highlighting</a>, for more info.
+</p>
+</dd>
+<dt><code>-c, --const</code></dt>
+<dd><p>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><code>-d, --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>-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><code>-h, --help</code></dt>
+<dd><p>Show a summary of command-line options and exit.
+</p>
+</dd>
+<dt><code>-i, --autoindent</code></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><code>-k, --cut</code></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><code>-l, --nofollow</code></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><code>-m, --mouse</code></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
+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><code>-n, --noread</code></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><code>-o &lt;dir&gt;, --operatingdir=&lt;dir&gt;</code></dt>
+<dd><p>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
+</p>
+</dd>
+<dt><code>-p, --preserve</code></dt>
+<dd><p>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
+</p>
+</dd>
+<dt><code>-q, --quiet</code></dt>
+<dd><p>Do not report errors in the nanorc file and 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>
+</p>
+</dd>
+<dt><code>-r &lt;number&gt;, --fill=&lt;number&gt;</code></dt>
+<dd><p>Hard-wrap lines at column &lt;number&gt; (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 &ndash; the last
+one given takes effect.
+</p>
+</dd>
+<dt><code>-s &lt;program&gt;, --speller=&lt;program&gt;</code></dt>
+<dd><p>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><code>-t, --tempfile</code></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><code>-u, --undo</code></dt>
+<dd><p>Enable the experimental generic-purpose undo/redo code.  The default undo
+and redo shortcuts are Meta-U and Meta-E, respectively.
+</p>
+</dd>
+<dt><code>-v, --view</code></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><code>-w, --nowrap</code></dt>
+<dd><p>Don&rsquo;t hard-wrap long lines at any length.  This option conflicts with
+-r &ndash; the last one given takes effect.
+</p>
+<a name="Expert-Mode"></a></dd>
+<dt><code>-x, --nohelp</code></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><code>-z, --suspend</code></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><code>-$, --softwrap</code></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
+&rsquo;$&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><code>-a, -b, -e, -f, -g, -j</code></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="previous">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="previous">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="previous">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="previous">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="previous">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="previous">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 +544,1018 @@ 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="previous">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="previous">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="previous">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="previous">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 if you have a &quot;whitespace&quot; option in
+your nanorc.  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="previous">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
+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,
+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.  Options are also unset
 by default, except for those that take arguments.
-
-   <p>Quotes inside string parameters don't have to be escaped with
+</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/unset 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/unset autoindent</code></dt>
+<dd><p>Use auto-indentation.
+</p>
+</dd>
+<dt><code>set/unset 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. 
-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
+</p>
+</dd>
+<dt><code>set/unset backwards</code></dt>
+<dd><p>Do backwards searches by default.
+</p>
+</dd>
+<dt><code>set/unset 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;string&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><code>&quot;&quot;')&gt;]}&quot;</code>
+</p></blockquote>
+
+</dd>
+<dt><code>set/unset casesensitive</code></dt>
+<dd><p>Do case-sensitive searches by default.
+</p>
+</dd>
+<dt><code>set/unset const</code></dt>
+<dd><p>Constantly display the cursor position in the status bar.
+</p>
+</dd>
+<dt><code>set/unset 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 &quot;n&quot;</code></dt>
+<dd><p>Hard-wrap lines at column number &quot;n&quot;.  If &quot;n&quot; is 0 or less, the maximum line
+length will be the screen width less &quot;n&quot; 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>
+</dd>
+<dt><code>set functioncolor fgcolor,bgcolor</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 &quot;set titlecolor&quot; for more details.
+</p>
+</dd>
+<dt><code>set/unset historylog</code></dt>
+<dd><p>Enable ~/.nano_history for saving and reading search/replace strings.
+</p>
+</dd>
+<dt><code>set keycolor fgcolor,bgcolor</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 &quot;set titlecolor&quot; for more details.
+</p>
+</dd>
+<dt><code>set/unset locking</code></dt>
+<dd><p>Enable vim-style lock-files for when editing files.
+</p>
+</dd>
+<dt><code>set matchbrackets &quot;string&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
+</p>
+<blockquote>
+<p><code>&quot;(&lt;[{)&gt;]}&quot;</code>
+</p></blockquote>
+
+</dd>
+<dt><code>set/unset morespace</code></dt>
+<dd><p>Use the blank line below the titlebar as extra editing space.
+</p>
+</dd>
+<dt><code>set/unset 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/unset multibuffer</code></dt>
+<dd><p>Allow inserting files into their own buffers.
+</p>
+</dd>
+<dt><code>set/unset noconvert</code></dt>
+<dd><p>Don&rsquo;t convert files from DOS/Mac format.
+</p>
+</dd>
+<dt><code>set/unset nofollow</code></dt>
+<dd><p>Don&rsquo;t follow symlinks when writing files.
+</p>
+</dd>
+<dt><code>set/unset nohelp</code></dt>
+<dd><p>Don&rsquo;t display the help lists at the bottom of the screen.
+</p>
+</dd>
+<dt><code>set/unset nonewlines</code></dt>
+<dd><p>Don&rsquo;t add newlines to the ends of files.
+</p>
+</dd>
+<dt><code>set/unset 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/unset poslog</code></dt>
+<dd><p>Save the cursor position of files between editing sessions.
+</p>
+</dd>
+<dt><code>set/unset preserve</code></dt>
+<dd><p>Preserve the XON and XOFF keys (^Q and ^S).
+</p>
+</dd>
+<dt><code>set punct &quot;string&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 <code>&quot;!.?&quot;</code>.
+</p>
+</dd>
+<dt><code>set/unset 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/unset 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;string&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><code>&quot;^([ \\t]*[#:&gt;\\|}])+&quot;</code>
+</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/unset 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/unset 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/unset regexp</code></dt>
+<dd><p>Do extended regular expression searches by default.
+</p>
+</dd>
+<dt><code>set/unset 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. 
+</p>
+</dd>
+<dt><code>set/unset smooth</code></dt>
+<dd><p>Use smooth scrolling by default.
+</p>
+</dd>
+<dt><code>set/unset 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 fgcolor,bgcolor</code></dt>
+<dd><p>Specify the color combination to use for the statusbar.
+See &quot;set titlecolor&quot; for more details.
+</p>
+</dd>
+<dt><code>set/unset suspend</code></dt>
+<dd><p>Allow <code>nano</code> to be suspended.
+</p>
+</dd>
+<dt><code>set tabsize &quot;n&quot;</code></dt>
+<dd><p>Use a tab size of &quot;n&quot; columns.  The value of &quot;n&quot; 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/unset tabstospaces</code></dt>
+<dd><p>Convert typed tabs to spaces.
+</p>
+</dd>
+<dt><code>set/unset tempfile</code></dt>
+<dd><p>Save automatically on exit, don&rsquo;t prompt.
+</p>
+</dd>
+<dt><code>set titlecolor fgcolor,bgcolor</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 &quot;fgcolor&quot; or &quot;,bgcolor&quot; may be left out.
+</p>
+</dd>
+<dt><code>set/unset undo</code></dt>
+<dd><p>Enable the experimental generic-purpose undo/redo code.
+</p>
+</dd>
+<dt><code>set/unset view</code></dt>
+<dd><p>Disallow file modification.
+</p>
+<a name="Whitespace"></a></dd>
+<dt><code>set whitespace &quot;string&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/unset 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="previous">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 can be defined
+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>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="previous">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 the specified <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.
+</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>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>dontreplace</code></dt>
+<dd><p>Switches back to searching instead of replacing.
+</p>
+</dd>
+<dt><code>gototext</code></dt>
+<dd><p>Searches for files matching a string in the file browser (reading or writing files).
+</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>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 meaning: apply to all menus where this function 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="previous">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="previous">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 +1564,210 @@ 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="previous">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 syntax coloring of files using the nanorc file.
+</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
+</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.
-
-     <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-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.
+</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.
+</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 use of the
 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 f4cd7ed0..abb3b3fe 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.1 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,213 @@ 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:
-
-`+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.
+'nano' takes the following options from the command line:
 
-`-?'
-     Same as `-h, --help'.
+'+<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.
 
-`-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 ~.
 
-`-C <dir>, --backupdir=<dir>'
-     Set the directory where `nano' puts unique backup files if file
+'-C <dir>, --backupdir=<dir>'
+     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'
+'-F, --multibuffer'
      Enable multiple file buffers, if available.
 
-`-H, --historylog'
+'-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.
 
-`-I, --ignorercfiles'
+'-I, --ignorercfiles'
      Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
      available.
 
-`-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 and later read back the location of the cursor and place it
+     there again.
+
+'-Q <str>, --quotestr=<str>'
      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
+     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; don't allow
+     suspending; don't allow a file to be appended to, prepended to, or
+     saved under a different name if it already has one; don't use
+     backup files nor spell checking.  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.
 
-`-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 <str>, --syntax=<str>'
+     Specify a specific syntax from the nanorc to use for highlighting,
+     if available.  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.
 
-`-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
+     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 <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.
+'-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'
+'-q, --quiet'
      Do not report errors in the nanorc file and 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.
+'-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 <prog>, --speller=<prog>'
-     Invoke the given program as the spell checker.  By default, `nano'
+'-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.
+     requires the 'spell' program to be installed on your system.
 
-`-t, --tempfile'
+'-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.
+     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.
+'-u, --undo'
+     Enable the experimental generic-purpose undo/redo code.  The
+     default undo and redo shortcuts are Meta-U and Meta-E,
+     respectively.
 
-`-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 -$').
+'-$, --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'
+'-a, -b, -e, -f, -g, -j'
      Ignored, for compatibility with Pico.
 
 
@@ -271,66 +294,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).
+
+
+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).
 
-2.3 The Titlebar
+   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 +398,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 +412,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 +431,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 +443,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)'
+'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.
+     in your nanorc.  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.
+     your nanorc.  See *Note Syntax Highlighting::, for more info.
 
-`Suspend Toggle (Meta-Z)'
-     toggles the -z (`--suspend') command line option.
-
-`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 +506,300 @@ 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, 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.
+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.  Options are also unset
+   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.
 
    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:
 
-   will match `"', `'', `)', `>', `]', and `}'.
+* Settings::
+* Syntax Highlighting::
+* Rebinding Keys::
 
-   The supported commands and arguments are:
+
+File: nano.info,  Node: Settings,  Next: Syntax Highlighting,  Up: Nanorc Files
 
-`set/unset autoindent'
+5.1 Settings
+============
+
+The supported settings in a nanorc file are:
+
+'set/unset 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'
      Use auto-indentation.
 
-`set/unset backup'
-     Create backup files in "filename~".
+'set/unset 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/unset backwards'
      Do backwards searches by default.
 
-`set/unset boldtext'
-     Use bold text instead of reverse video text.
+'set/unset 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/unset casesensitive'
+     Do case-sensitive searches by default.
 
-`set/unset const'
+'set/unset 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/unset 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
+'set fill "n"'
+     Hard-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/unset historylog'
+'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/unset historylog'
      Enable ~/.nano_history for saving and reading search/replace
      strings.
 
-`set matchbrackets "string"'
+'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/unset 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/unset morespace'
      Use the blank line below the titlebar as extra editing space.
 
-`set/unset mouse'
+'set/unset 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/unset multibuffer'
      Allow inserting files into their own buffers.
 
-`set/unset noconvert'
+'set/unset noconvert'
      Don't convert files from DOS/Mac format.
 
-`set/unset nofollow'
+'set/unset nofollow'
      Don't follow symlinks when writing files.
 
-`set/unset nohelp'
+'set/unset nohelp'
      Don't display the help lists at the bottom of the screen.
 
-`set/unset nonewlines'
+'set/unset nonewlines'
      Don't add newlines to the ends of files.
 
-`set/unset nowrap'
-     Don't wrap text at all.
+'set/unset 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/unset poslog'
+     Save the cursor position of files between editing sessions.
+
+'set/unset 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/unset quickblank'
      Do quick statusbar blanking.  Statusbar messages will disappear
      after 1 keystroke instead of 25.
 
-`set quotestr "string"'
+'set/unset 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/unset 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/unset 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/unset regexp'
      Do extended regular expression searches by default.
 
-`set/unset smarthome'
+'set/unset 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/unset smooth'
      Use smooth scrolling by default.
 
-`set/unset softwrap'
-     Use soft wrapping by default.
+'set/unset 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/unset suspend'
+     Allow 'nano' to be suspended.
 
-`set tabsize "n"'
+'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/unset tabstospaces'
+'set/unset tabstospaces'
      Convert typed tabs to spaces.
 
-`set/unset tempfile'
+'set/unset 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 undo'
+     Enable the experimental generic-purpose undo/redo code.
 
-`set/unset view'
+'set/unset 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/unset 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 can be defined 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).
+
+'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 +808,363 @@ 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 the specified '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.
+
+'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).
+
+'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).
+
+'dontreplace'
+     Switches back to searching instead of replacing.
+
+'gototext'
+     Searches for files matching a string in the file browser (reading
+     or writing files).
+
+'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.
+
+'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 meaning: apply to all menus where this function
+     exists.
 
 
 File: nano.info,  Node: The File Browser,  Next: Pico Compatibility,  Prev: Nanorc Files,  Up: Top
@@ -707,52 +1191,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 +1244,131 @@ 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 syntax coloring of files using the nanorc file.
+
+'--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-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-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-operatingdir'
-     Disable setting the operating directory.  This also disables the -o
-     command line option, which sets the operating directory.
+'--disable-mouse'
+     Disable all mouse functionality.  This also eliminates the -m
+     command-line option, which enables the mouse functionality.
 
-`--disable-speller'
-     Disable use of the spell checker.  This also disables the -s
-     command line option, which allows specifying an alternate spell
+'--disable-multibuffer'
+     Disable support for opening multiple files at a time and switching
+     between them on the fly.
+
+'--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.
+
+'--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.
 
-`--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.
-
-`--enable-color'
-     Enable support for syntax coloring of files using the nanorc file.
-     This enables nanorc support as well.
+     messy, so chances are you only want this feature when you're
+     working on the nano source.
 
-`--enable-multibuffer'
-     Enable support for opening multiple files at a time and switching
-     between them on the fly.
-
-`--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'
+'--disable-nls'
      Disables Native Language support.  This will disable use of the
-     available GNU `nano' translations.
+     available GNU 'nano' translations.
 
-`--disable-wrapping-as-root'
-     Disable long line wrapping by default when nano is run as root.
+'--disable-wrapping-as-root'
+     Disable hard-wrapping of overlong lines 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 Mode8834
+Node: Editor Basics9791
+Node: Entering Text10071
+Node: Special Functions10397
+Node: The Cutbuffer11437
+Node: The Mark12124
+Node: The Titlebar12861
+Node: The Statusbar13577
+Node: Shortcut Lists14150
+Node: Using the Mouse14430
+Node: Online Help15023
+Node: Feature Toggles15399
+Node: Nanorc Files17510
+Node: Settings18732
+Ref: Whitespace25594
+Node: Syntax Highlighting25952
+Node: Rebinding Keys29553
+Node: The File Browser37504
+Node: Pico Compatibility38326
+Node: Building and Configure Options40986
 
 End Tag Table
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index fe12428c..62d146ed 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -8,8 +8,8 @@
 @c Run 'makeinfo' rather than 'texinfo-format-buffer'.
 @smallbook
 @set EDITION 0.1
-@set VERSION 2.2.0
-@set UPDATED 30 Nov 2009
+@set VERSION 2.3.3
+@set UPDATED May 2014
 
 @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.3.3
 
 @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 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,19 +116,16 @@ 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:
 
 @table @code
-@item +LINE,COLUMN
-Start at line number LINE and column number COLUMN (at least one of
+@item +<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.
 
-@item -?
-Same as @code{-h, --help}.
-
 @item -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
@@ -150,6 +150,9 @@ Convert typed tabs to spaces.
 @item -F, --multibuffer
 Enable multiple file buffers, if available.
 
+@item -G, --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.
@@ -167,11 +170,15 @@ won't work properly with this option enabled.
 Don't add newlines to the ends of files.
 
 @item -N, --noconvert
-Don't convert files from DOS/Mac format.
+Disable automatic conversion of files from DOS/Mac format.
 
 @item -O, --morespace
 Use the blank line below the titlebar as extra editing space.
 
+@item -P, --poslog
+Log and later read back the location of the cursor and place it
+there again.
+
 @item -Q <str>, --quotestr=<str>
 Set the quoting string for justifying.  The default value is
 
@@ -184,18 +191,19 @@ Note that @code{\t} above stands for a literal Tab character.
 
 @item -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 @code{nano} with any name beginning with 'r' (e.g. "rnano").
+command line; don't read any nanorc files; don't allow suspending; don't
+allow a file to be appended to, prepended to, or saved under a different
+name if it already has one; don't use backup files nor spell checking.
+This restricted mode is also accessible by invoking @code{nano} with
+any name beginning with 'r' (e.g. "rnano").
 
 @item -S, --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 <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.
 
 @item -U, --quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
@@ -209,8 +217,8 @@ 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.
+Specify a specific syntax from the nanorc to use for highlighting, if
+available.  See @xref{Syntax Highlighting}, for more info.
 
 @item -c, --const
 Constantly display the cursor position and line number on the statusbar.
@@ -222,14 +230,15 @@ 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.
+Show a summary of command-line options and exit.
 
 @item -i, --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.
+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
 When writing files, if the given file is a symbolic link, it is removed
@@ -239,7 +248,15 @@ and a new file is created.
 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.
+
+@item -n, --noread
+Treat any name given on the command line as a new file.  This allows
+@code{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
+@code{nano} can be used as an editor in combination with for instance
+@code{gpg} without having to write sensitive data to disk first.
 
 @item -o <dir>, --operatingdir=<dir>
 Set operating directory.  Makes @code{nano} set up something similar to
@@ -253,13 +270,15 @@ editor can be can be stopped and started.
 Do not report errors in the nanorc file and 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 -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.
 
-@item -s <prog>, --speller=<prog>
+@item -s <program>, --speller=<program>
 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
@@ -271,8 +290,8 @@ exiting, assume yes.  This is most useful when using @code{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.
+Enable the experimental generic-purpose undo/redo code.  The default undo
+and redo shortcuts are Meta-U and Meta-E, respectively.
 
 @item -v, --view
 Don't allow the contents of the file to be altered.  Note that this
@@ -280,8 +299,8 @@ 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.
+Don't hard-wrap long lines at any length.  This option conflicts with
+-r -- the last one given takes effect.
 
 @anchor{Expert Mode}
 @item -x, --nohelp
@@ -290,68 +309,99 @@ 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
+Enable the ability to suspend @code{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
+Enable 'soft wrapping'.  This will make @code{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 -$').
+this option last when using other options (e.g. @code{nano -wS$}) or pass it
+separately (e.g. @code{nano -wS -$}).
 
 @item -a, -b, -e, -f, -g, -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 +415,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 +425,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:
 
@@ -444,7 +496,7 @@ 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.
+your nanorc.  See @xref{Whitespace}, for more info.
 
 @item Tabs to Spaces Toggle (Meta-Q)
 toggles the -E (@code{--tabstospaces}) command line option.
@@ -457,7 +509,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,87 +520,111 @@ 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,
+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
+command-line options override nanorc settings.  Options are also unset
 by default, except for those that take arguments.
 
 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 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/unset autoindent
 Use auto-indentation.
 
 @item set/unset backup
-Create backup files in "filename~".
+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
 Do backwards searches by default.
 
 @item set/unset boldtext
-Use bold text instead of reverse video text.
+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"
 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.
+Do case-sensitive searches by default.
 
 @item set/unset 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.
+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
+Hard-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 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.
+
 @item set/unset historylog
 Enable ~/.nano_history for saving and reading search/replace strings.
 
+@item 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.
+
+@item set/unset locking
+Enable vim-style lock-files for when editing files.
+
 @item 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
 
 @quotation
 @code{"(<[@{)>]@}"}
@@ -577,7 +653,7 @@ Don't display the help lists at the bottom of the screen.
 Don't add newlines to the ends of files.
 
 @item set/unset nowrap
-Don't wrap text at all.
+Don't hard-wrap text at all.
 
 @item set operatingdir "directory"
 @code{nano} will only read and write files inside "directory" and its
@@ -585,19 +661,27 @@ 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 poslog
+Save the cursor position of files between editing sessions.
+
 @item set/unset preserve
 Preserve the XON and XOFF keys (^Q and ^S).
 
 @item 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 @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 @code{"!.?"}.
 
 @item set/unset quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
 keystroke instead of 25.
 
+@item set/unset 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 "string"
 The email-quote string, used to justify email-quoted paragraphs.  This
 is an extended regular expression if your system supports them,
@@ -607,7 +691,7 @@ otherwise a literal string.  The default value is
 @code{"^([ \\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
@@ -634,19 +718,19 @@ line.
 Use smooth scrolling by default.
 
 @item set/unset softwrap
-Use soft wrapping by default.
+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 statuscolor fgcolor,bgcolor
+Specify the color combination to use for the statusbar.
+See "set titlecolor" for more details.
+
 @item set/unset suspend
 Allow @code{nano} to be suspended.
 
-@item set/unset suspendenable
-If @code{nano} is allowed to be suspended, allow the suspend key
-(usually ^Z) to actually suspend it.
-
 @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.
@@ -657,40 +741,74 @@ Convert typed tabs to spaces.
 @item set/unset tempfile
 Save automatically on exit, don't prompt.
 
+@item 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.
+
 @item set/unset undo
-Enable experimental generic-purpose undo code.
+Enable the experimental generic-purpose undo/redo code.
 
 @item set/unset view
 Disallow file modification.
 
+@anchor{Whitespace}
 @item set whitespace "string"
-Set the two characters used to display the first characters of tabs and
-spaces.  They must be single-column characters.
+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
 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 can be defined
+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 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 +827,357 @@ 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 the specified @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.
+
+@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.
+
+@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 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 dontreplace
+Switches back to searching instead of replacing.
+
+@item gototext
+Searches for files matching a string in the file browser (reading or writing files).
+
+@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 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.
 
-@node The File Browser, Pico Compatibility, Nanorc Files, Top
+@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 meaning: apply to all menus where this function 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 +1193,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 +1230,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 +1245,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,6 +1268,13 @@ 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 syntax coloring of files using the nanorc file.
+
+@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
@@ -811,73 +1283,69 @@ things about using the editor.
 @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.
+
+@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.
 
 @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.
 
 @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
 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/m4/Makefile.in b/m4/Makefile.in
index d00c02cd..c83e707b 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        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; \
-    test $$am__dry = yes; \
-  }
+  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@
@@ -51,9 +78,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 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 \
@@ -65,6 +94,18 @@ 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 = \
@@ -72,9 +113,11 @@ am__can_run_installinfo = \
     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@
@@ -120,7 +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@
@@ -132,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@
@@ -161,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@
@@ -228,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)
@@ -367,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 00000000..51df0c09
--- /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/nano.spec b/nano.spec
index 05d17565..66dcf8e6 100644
--- a/nano.spec
+++ b/nano.spec
@@ -1,5 +1,5 @@
 %define name	nano
-%define version	2.3.2
+%define version	2.3.3
 %define release	1
 
 Summary	: Pico editor clone with enhancements
@@ -21,7 +21,7 @@ Pico text editor while also offering a few enhancements.
 %setup -q
 
 %build
-%configure --enable-all
+%configure
 make
 
 %install
diff --git a/nano.spec.in b/nano.spec.in
index 3126213b..9c8c07bc 100644
--- a/nano.spec.in
+++ b/nano.spec.in
@@ -21,7 +21,7 @@ Pico text editor while also offering a few enhancements.
 %setup -q
 
 %build
-%configure --enable-all
+%configure
 make
 
 %install
diff --git a/po/ChangeLog b/po/ChangeLog
index 10db5482..72b5a8ae 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 639d8ce5..25a1cd75 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # List of available languages.
-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 rw sl 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 f961306d..99ed60df 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index 6fc4c694..facbaaff 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,17 +1,14 @@
 # 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: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -21,136 +18,133 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Отиване в директори�"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Грешка при четене на %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(дир)"
 
 # TODO: по-добър превод
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(родит.дир.)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [�азад]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Това е един�твеното �ъвпадение"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "��ма въведен низ за тър�ене"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "�еу�пех при �ъздаването на временен файл: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Грешка при запи�а на временен файл: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Грешка при запи�а на временен файл: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Грешка при четене на %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "�е може да �е вмъкне файл извън %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "��ма повече буфери за отвар�не на файлове"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Превключено на %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "�ов буфер"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -161,14 +155,14 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS и Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS и Mac формат)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -177,14 +171,14 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от Mac формат)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -193,99 +187,99 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS формат)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Прочетен %lu ред"
 msgstr[1] "Прочетени %lu реда"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Четене на файл"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "�ов файл"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s“ не е намерен"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ е директори�"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ е файл за у�трой�тво"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда за изпълнение в нов буфер [от %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда за изпълнение [от %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл за вмъкване в нови� буфер [от %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл за вмъкване [от %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Клавишът е недопу�тим в режим без буфери"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "�е може да �е запише извън %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "�е може да �е добав� нищо към �имволна връзка, на�троена � --nofollow"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Грешка при запи�а на временен файл: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Твърде много резервни копи�?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Грешка при запи� на %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка при запи�а на временен файл: %s"
@@ -341,15 +335,15 @@ msgstr "Файлът �ъще�твува, ПРЕЗ�ПИСВ��Е? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Запазване под Р�ЗЛИЧ�О ИМЕ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(повече)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -358,28 +352,28 @@ msgstr ""
 "\n"
 "�ати�нете „Enter“, за да продължи �тартирането на nano\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -387,664 +381,692 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Отм�на"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Зам�на"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Без зам�на"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Зач. м/г"
+msgid "Exit"
+msgstr "Изход"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "�азад"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Рег.израз"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "ПредИ�тор."
+msgid "Close"
+msgstr "Затвар�не"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "СледИ�тор."
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "По�тав�не"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Отиване на тек�т"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Изкл.подр."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "КъдеE�ледв."
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Първи файл"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "По�л. файл"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Към файловете"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS формат"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac формат"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Добав�не в кра�"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Добав�не в нач."
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Резервно копие"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Изпълнение на команда"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Отиване в директори�"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Помощ"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Изход"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Тър�ене"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "ПредСтр"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "СледвСтр"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Първи ред"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Зам�на"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "По�л. ред"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Отив. ред"
 
-#: src/global.c:538
-#, fuzzy
-msgid "Suspend"
-msgstr "Временно �пиране"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Предишен ред"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "�ач. абзац"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Следващ ред"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Край абзац"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Отвар�не"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Пълно подравн."
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Опре�н�ване"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Вмъкване на файл"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Отив. ред"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Отм�на на текущата функци�"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Извежда тази помощна информаци�"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Затвар�не на текущи� файлов буфер/Изход от nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Изход от nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Запазване на текущи� файл на ди�ка"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Вмъкване на друг файл в текущи�"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Тър�ене на низ или регул�рен израз"
 
-#: src/global.c:571
+#: src/global.c:520
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Отиване на предишни� екран"
+msgid "Search for a string"
+msgstr "Тър�ене на низ или регул�рен израз"
 
-#: src/global.c:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Отиване на �ледващи� екран"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Отр�зване на текущи� ред и �ъхран�ване в буфера за обмен"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Отр�зване от буфера за обмен и по�тав�не в текущи� ред"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Показване на положението на кур�ора"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Извикване на програмата за проверка на правопи�а"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Зам�на на низ или регул�рен израз"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Отиване на по�очен ред и �тълб"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Маркиране на тек�т в позици�та на кур�ора"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Повтар�не на по�ледното тър�ене"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Отр�зване на текущи� ред и �ъхран�ване в буфера за обмен"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "От�тъп вд��но на текущи� ред"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Маха от�тъпа на текущи� ред"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:544
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Отиване един �имвол напред"
 
-#: src/global.c:595
+#: src/global.c:545
 #, fuzzy
 msgid "Go back one character"
 msgstr "Отиване един �имвол назад"
 
-#: src/global.c:597
+#: src/global.c:547
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Отиване напред � една дума"
 
-#: src/global.c:598
+#: src/global.c:548
 #, fuzzy
 msgid "Go back one word"
 msgstr "Отиване назад � една дума"
 
-#: src/global.c:600
+#: src/global.c:550
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Отиване на предишни� ред"
 
-#: src/global.c:601
+#: src/global.c:551
 #, fuzzy
 msgid "Go to next line"
 msgstr "Отиване на �ледващи� ред"
 
-#: src/global.c:602
+#: src/global.c:552
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Отиване в началото на текущи� ред"
 
-#: src/global.c:603
+#: src/global.c:553
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Отиване в кра� на текущи� ред"
 
-#: src/global.c:606
+#: src/global.c:556
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Отиване в началото на текущи� абзац"
 
-#: src/global.c:608
+#: src/global.c:558
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Отиване в кра� на текущи� абзац"
 
-#: src/global.c:611
+#: src/global.c:560
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Отиване в началото на файла"
 
-#: src/global.c:613
+#: src/global.c:561
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Отиване в кра� на файла"
 
-#: src/global.c:615
+#: src/global.c:563
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Отиване при �ъответната �коба"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Превърта нагоре � един ред без да ме�ти кур�ора"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Превърта надолу � един ред без да ме�ти кур�ора"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Превключване на предишни� файлов буфер"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Превключване на �ледващи� файлов буфер"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Вмъкване на �ледващи� клавиш до�ловно"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Вмъкване на �имвол за табулаци� при кур�ора"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Вмъкване на �имвол за нов ред при кур�ора"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Изтриване на �имвола под кур�ора"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Изтриване на �имвола вл�во от кур�ора"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Отр�зване от позици�та на кур�ора до кра� на файла"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Подравн�ване на цели� файл"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Пребро�ване на думите, редовете и знаците във файла"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Опре�н�ване на текущи� екран"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Зачитане малки/големи букви при тър�ене (вкл/изкл)"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Обратна по�ока на тър�ене"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Използване на регул�рни изрази (вкл/изкл)"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Връща предишни� низ за тър�ене/зам�на"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Връща �ледващи� низ за тър�ене/зам�на"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Отиване във файлов браузър"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Запазване на файла в DOS формат (вкл/изкл)"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Запазване на файла в Mac формат (вкл/изкл)"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Вмъкване в кра� на файла (вкл/изкл)"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Вмъкване в началото на файла (вкл/изкл)"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Резервно копира �ъще�твуващи файлове (вкл/изкл)"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Изпълнение на външна команда"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Използване на нов буфер (вкл/изкл)"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Изход от файлови� браузър"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Отиване при първи� файл от �пи�ъка"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Отиване при по�ледни� файл от �пи�ъка"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Отиване при по�ледни� файл от �пи�ъка"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Отиване при първи� файл от �пи�ъка"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Отиване при по�ледни� файл от �пи�ъка"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Отиване в директори�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Затвар�не"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Извикване на програмата за проверка на правопи�а"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Отиване на предишни� ред"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Отиване на �ледващи� ред"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Помощ"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Отм�на"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Запазване"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Отиване в директори�"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Отр�зване"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Подравн."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Отвар�не"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Правопи�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Отр�зване"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Отив. ред"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Изкл.подр."
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Зач. м/г"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "По�тав�не"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Рег.израз"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "�азад"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Без зам�на"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Поз.кур�ор"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Правопи�"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "ПредСтр"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "СледвСтр"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Първи ред"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "По�л. ред"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "�е е �коба"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Избор на тек�т"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Копиране"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "От�тъп"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Без от�тъп"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "�апред"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "�азад"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Следваща дума"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "�апред"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Предишна дума"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Предишен ред"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Следващ ред"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Следваща дума"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "End"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "�амиране на другата �коба"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "�ач. абзац"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Край абзац"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Превъртане нагоре"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Превъртане надолу"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Предишен файл"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Следващ файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "До�ловен вход"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "Отр. до кра�"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Брой на думи"
 
-#: src/global.c:1299
+#: src/global.c:898
+#, fuzzy
+msgid "Suspend"
+msgstr "Временно �пиране"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "ПредИ�тор."
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "СледИ�тор."
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Отиване на тек�т"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS формат"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac формат"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Добав�не в кра�"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Добав�не в нач."
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Резервно копие"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Изпълнение на команда"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Към файловете"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Първи файл"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "По�л. файл"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Предишен ред"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "Режим на помощ"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "По�то�нно показване на позици�та на кур�ора"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Използване на още един ред за редактиране"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Плавно превъртане"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Без прена��не на дългите редове"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Показване на интервали"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Синтактично о�вет�ване"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Интелигентен клавиш „Home“"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "�втоматичен от�тъп"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Отр�зване до кра�"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "�втоматично прена��не"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Без прена��не на дългите редове"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Превръщане на табулации в интервали"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Запазване на резервни копи�"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Много файлови буфери"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Поддръжка на мишка"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Без конвертиране от DOS/Mac формат"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Временно �пиране"
 
-#: src/global.c:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "�втоматично прена��не"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1066,7 +1088,7 @@ msgstr ""
 "тър�ене. �ко нати�нете „Enter“, без да въвеждате тек�т, ще �е извърши "
 "предишнто тър�ене.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1080,7 +1102,7 @@ msgstr ""
 " Следните клавиши за до�тъпни в режим „Тър�ене“:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1100,7 +1122,7 @@ msgstr ""
 " Следните клавишни комбинации �а налични в режим „Отиване на ред“:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1122,7 +1144,7 @@ msgstr ""
 "за вмъкване ще �е зареди в отделен буфер. Използвайте Meta-< и >, за да "
 "превключвате между буферите.  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1136,7 +1158,7 @@ msgstr ""
 " Следните клавишни комбинации �а налични в режим „Вмъкване на файл“:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1162,7 +1184,7 @@ msgstr ""
 " Следните клавишни комбинации �а налични в режим „Запазване на файл“:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1186,7 +1208,7 @@ msgstr ""
 " Следните клавишни комбинации �а налични във файлови� браузър:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1210,7 +1232,7 @@ msgstr ""
 "предишното тър�ене.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1218,7 +1240,7 @@ msgstr ""
 "Следните функционални клавиши �а до�тъпни в режим „Тър�ене“:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1241,7 +1263,7 @@ msgstr ""
 "браузъра:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1265,7 +1287,7 @@ msgstr ""
 " Може да �е използват �ледните допълнителни функционални клавиши:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1286,7 +1308,7 @@ msgstr ""
 " Може да �е използват �ледните функционални клавиши:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1306,7 +1328,7 @@ msgstr ""
 "редактора, показващ редактирани� файл. Лентата за �ъ�то�нието е трети�т ред "
 "от долу нагоре и е предназначен за важни �ъобщени�.  "
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1325,7 +1347,7 @@ msgstr ""
 "да бъдат въвеждани � клавишите „Esc“, „Alt“ или „Meta“ в зави�имо�т от "
 "на�тройките на клавиатурата.   "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1339,15 +1361,15 @@ msgstr ""
 "алтернативните �а показани в �коби:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "(вкл/изкл)"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "�епозволен клавиш в режим на преглед"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1356,7 +1378,7 @@ msgstr ""
 "\n"
 "Буферът е запи�ан в %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1365,7 +1387,7 @@ msgstr ""
 "\n"
 "Буферът не е запи�ан в %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1374,11 +1396,11 @@ msgstr ""
 "\n"
 "Буферът не е запи�ан: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Размерът на прозореца е твърде малък за nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1387,262 +1409,267 @@ msgstr ""
 "Използване: nano [ОПЦИИ] [[+РЕД,СТЪЛБ]] Ф�ЙЛ]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опци�\t\tДълга опци�\t\tЗначение\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опци�\t\tЗначение\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Показва тази �правка"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+РЕД,СТЪЛБ"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Започва от ред РЕД, �тълб СТЪЛБ"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "С интелигентен клавиш „Home“"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Резервно копира �ъще�твуващи файлове"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <дир>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<дир>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Директори� за резервните копи�"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Удебелен шрифт вме�то инвер�но видео"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Прави въведените табулации на интервали"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Позвол�ва много файлови буфери"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Запазва/чете и�тори�та на тър�ене/зам�на"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Пренебрегва конфиг. файлове nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Коригира объркване от цифрови� клав.блок"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Без знак за нов ред в кра� на файловете"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Без преобразуване от DOS/Mac формат"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Използване още един ред за редактиране"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Вмъкване на �имвол за табулаци� при кур�ора"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <низ>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<низ>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "�из за цитиране"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Ограничен режим"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#�тълбове>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#�тълбове>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Широчината на табулаци�та - #�тълбове"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Бързо изключване на лентата за �ъ�то�ние"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Показва вер�и�та и излиза"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Открива прецизно между�ловните граници"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <низ>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<низ>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "По�очва �интак�и� за оцвет�ване"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "По�то�нно показва позици�та на кур�ора"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Коригира объркване на „Backspace/Delete“"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Извежда тази помощна информаци�"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "�втоматичен от�тъп при нови редове"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Отр�зване от кур�ора до кра� на реда"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "�е �ледва �имволните връзки, заме�тва ги"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "С използване на мишка"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <дир>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<дир>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Работна директори�"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Запазва клавишите „XON“(^Q) и „XOFF“(^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#�тълбове>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#�тълбове>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Прена�� редовете при ширина #�тълбове"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <прог>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<прог>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "�лтернативен правопи�ен коректор"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "При изход запазва файла без питане"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Режим на преглед (�амо за четене)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Без прена��не на дългите редове"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Без двата по�ледни реда � помощ"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Позвол�ва временно �пиране"
 
-#: src/nano.c:935
+#: src/nano.c:950
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "�втоматично прена��не"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(не �е използват,за �ъвме�тимо�т � Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano, вер�и� %s (компилиран в %s ча�а на %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1651,166 +1678,171 @@ msgstr ""
 "\n"
 " Компилирани опции:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "За �ъжаление поддръжката за тази функци� е изключена"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Запазване на променени� буфер? (ПРИ ОТГОВОР „�е“ ПРОМЕ�ИТЕ ЩЕ СЕ З�ГУБЯТ)"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получи �е SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Използвайте „fg“, за да �е върнете в nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "активирано"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "деактивирано"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "�еизве�тна команда"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "„XON“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "„XOFF“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Пои�кани�т размер на табулаци� „%s“ е неправилен"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Пои�кани�т размер „%s“ за мак�имална дължина на редове е неправилен"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn�н"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "В�ички"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "�е"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Грешка в %s на ред %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "�ргументът „%s“ има незатворенa \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "�изовете за регул�рни изрази тр�бва да започват и завършват �ъ� �имвола \""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "�еправилен регул�рен израз \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Лип�ва името на �интак�и�а"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтак�и�ът „none“ е запазен"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Синтак�и�ът „default“ не приема разширени�"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Лип�ва низът за регул�рни� израз"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Missing key name"
 msgstr "Лип�ва името на �интак�и�а"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:512
+#: src/rcfile.c:467
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "�еу�пех при извикване на „%s“"
+#: src/rcfile.c:474
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
 
-#: src/rcfile.c:540
+#: src/rcfile.c:497
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Грешка при четене на %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1825,94 +1857,120 @@ msgstr ""
 "„black“, � възможна пред�тавка „bright“\n"
 "за цветове на преден план."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Лип�ва името на цвета"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Цветът за фон „%s“ не може да бъде �рък"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Лип�ва низът за регул�рни� израз"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ изи�ква �ъответ�тващ „end=“"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Цветът за фон „%s“ не може да бъде �рък"
+
+#: src/rcfile.c:819
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Лип�ва низът за регул�рни� израз"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Лип�ва името на цвета"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Командата „%s“ не е позволена във вмъкван файл"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтак�и�ът „%s“ н�ма команди за цветове"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Командата „%s“ е неизве�тна"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Лип�ващ флаг"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Лип�ва името на цвета"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опци�та „%s“ изи�ква аргумент"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Опци�та не е правилен многобайтов низ"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "�еобходими �а �имволи, които не �а празни"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "�еобходими �а два �имвола � нормална ширина"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "�е може да �е отмени флаг „%s“"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "�еизве�тен флаг „%s“"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "�е може да бъде намерена домашната директори�! �х!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1926,43 +1984,47 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ не е намерен"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (за зам�на) в избрани� тек�т"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (за зам�на)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Зам�на на това �ъвпадение?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Зам�на �"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Въведете номер на ред и �тълб"
 
-#: src/search.c:1061
+#: src/search.c:1074
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Въведете номер на ред и �тълб"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "�е е �коба"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "��ма �ъвпадаща �коба"
 
@@ -1974,232 +2036,290 @@ msgstr "У�тавено е маркиране"
 msgid "Mark Unset"
 msgstr "Отменено е маркирането"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 #, fuzzy
 msgid "text delete"
 msgstr "Следващ файл"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 #, fuzzy
 msgid "line wrap"
 msgstr "�втоматично прена��не"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 #, fuzzy
 msgid "text insert"
 msgstr "Следващ ред"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 #, 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "�еу�пех при pipe"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "�еу�пех при �ъздаването на pipe"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "�еу�пех при fork"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "�еправилен низ за цитиране %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Сега може да �е отмени подравн�ването!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Редактиране на зам�на"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "�еу�пех при �ъздаването на pipe"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Създаване на �пи�ък �ъ� �грешени думи, изчакайте..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "�е може да �е определи размера на буфера на pipe"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Грешка при извикване на „spell“"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при извикване на „sort -f“"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при извикване на „uniq“"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Проверката на правопи�а завърши"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при извикване на „%s“"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Извикване на програмата за проверка на правопи�а"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "�еу�пех при проверката на правопи�а: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "�еу�пех при проверката на правопи�а: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Без знак за нов ред в кра� на файловете"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Показва тази �правка"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Показва тази �правка"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sДуми: %lu  Редове: %ld  Знаци: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "В избрани� тек�т: "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "До�ловен вход"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Вход уникод"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Променен"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Преглед"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "ДИР:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Тек�тов редактор nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "вер�и�"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Създадено от:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Специални благодарно�ти на:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "Фондаци� „Свободен �офтуер“"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "За ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "и в�ички о�танали, които �ме забравили..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 "От�тъп на маркирани� тек�т"
 
@@ -2278,3 +2398,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 f405dad4..b26486c7 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index b2964608..fb2c95c6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,14 +1,14 @@
 # Catalan messages for the GNU nano editor.
 # Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.11pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
 "PO-Revision-Date: 2009-09-19 13:28+0200\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -18,135 +18,132 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Vés a un directori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, 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:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(directori pare)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Cap Enrere]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Aquesta és la única coincidència"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "No hi ha cap patró de recerca actual"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "No s'ha pogut crear un fitxer temporal: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "S'ha produït un error en escriure la còpia de seguretat %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "S'ha produït un error en escriure la còpia de seguretat %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "S'ha produït un error en escriure la còpia de seguretat %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, 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:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "No hi ha més búfers de fitxer oberts"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "S'ha canviat a %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Nou búfer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -161,14 +158,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:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -181,14 +178,14 @@ msgstr[1] ""
 "%lu línies llegides (convertides des del format Mac - Avís: no hi ha permís "
 "d'escriptura)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -201,100 +198,100 @@ msgstr[1] ""
 "%lu línies llegides (convertides des del format DOS - Avís: no hi ha permís "
 "d'escriptura)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, 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:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "S'està llegint el fitxer"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Nou fitxer"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "«%s» no trobat"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» és un directori"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» és un fitxer de dispositiu"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, 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:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ordre a executar [des de %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, 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:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fitxer a inserir [des de %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla il·legal en mode no-multibuffer"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No es pot escriure fora de %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, 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:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Massa fitxers de còpia de seguretat?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "S'ha produït un error en escriure %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "S'ha produït un error en escriure un fitxer temporal: %s"
@@ -350,15 +347,15 @@ msgstr "El fitxer existeix, el voleu SOBREESCRIURE? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Voleu desar el fitxer sota un NOM DIFERENT? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(més)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -367,28 +364,28 @@ msgstr ""
 "\n"
 "Premeu Intro per a continuar carregant nano.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -396,650 +393,683 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Reemplaça"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "No reemplaces"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Maj/Min"
+msgid "Exit"
+msgstr "Surt"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Cap Enrere"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Expreg"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "HistPrèv"
+msgid "Close"
+msgstr "Tanca"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "HistSeg"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Destalla el text"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Vés al text"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Desjustifica"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "On és la següent"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Primer fitxer"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Últim fitxer"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "A fitxers"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Afegeix"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Avantposa"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Fes còpia de seguretat"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Executa una ordre"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Vés a directori"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Ajuda"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Surt"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Pàg Ant"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Pàg Seg"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Primera línia"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Reemplaça"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Última línia"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Vés a línia"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Suspèn"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Ant Línia"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Princ de par"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Seg Línia"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Final de par"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Llegeix"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "JustCompl"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Insereix un fitxer"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Vés a línia"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Cancel·la la funció actual"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Mostra aquest text d'ajuda"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tanca el búfer de fitxer actual / Surt del nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Surt del nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Escriu el fitxer actual al disc"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Insereix un altre fitxer dins de l'actual"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Cerca una cadena o expressió regular"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Vés a la pàgina anterior"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Cerca una cadena o expressió regular"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Vés a la pàgina següent"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Vés a la pàgina següent"
+
+#: src/global.c:525
 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:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Enganxa el cutbuffer a la línia actual"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Mostra la posició del cursor"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Invoca el corrector ortogràfic, si està disponible"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Reemplaça una cadena o una expressió regular"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Vés a un número de línia i columna"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Marca text a la posició del cursor"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Repeteix l'última recerca"
 
-#: src/global.c:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Ajusta el fitxer actual"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Desajusta el fitxer actual"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Desfés l'última operació"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Refés l'última operació"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Vés endavant un caràcter"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Vés enrere un caràcter"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Vés endavant una paraula"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Vés enrere una paraula"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Vés a la línia anterior"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Vés a la línia següent"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Vés al principi de la línia actual"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Vés al final de la línia actual"
 
-#: src/global.c:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Vés a la primera línia del fitxer"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Vés a l'última línia del fitxer"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Vés a la clau corresponent"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desplaça amunt una línia sense desplaçar el cursor"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desplaça avall una línia sense desplaçar el cursor"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Canvia a l'anterior búfer de fitxer"
 
-#: src/global.c:625
+#: src/global.c:571
 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:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Insereix la següent premuda de tecla textualment"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Insereix una tabulació a la posició del cursor"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Insereix una línia nova a la posició del cursor"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Suprimeix el caràcter sota el cursor"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Suprimeix el caràcter a l'esquerra del cursor"
 
-#: src/global.c:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Justifica el fitxer sencer"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Compta el nombre de paraules, línies i caràcters"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibuixa la pantalla actual"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspèn l'editor (si la suspensió és habilitada)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Commuta la sensibilitat a majúscules de la cerca"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Inverteix la direcció de la cerca"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Commuta l'ús d'expressions regulars"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça anterior"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça següent"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Vés al navegador de fitxers"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Commuta l'ús del format DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Commuta l'ús del format Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Commuta l'afegiment"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Commuta l'avantposat"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Commuta la creació d'una còpia de seguretat del fitxer original"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Executa una ordre externa"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Commuta l'ús d'un búfer nou"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Surt del navegador de fitxers"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Vés al primer fitxer de la llista"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Vés a l'últim fitxer de la llista"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Vés a l'últim fitxer de la llista"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Vés al primer fitxer de la llista"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Vés a l'últim fitxer de la llista"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Vés al directori"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Tanca"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Invoca el corrector ortogràfic, si està disponible"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Vés a la línia anterior"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Vés a la línia següent"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Ajuda"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Desa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Vés a directori"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Retalla"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Justifica"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Llegeix"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Retalla"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Vés a línia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Desjustifica"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Maj/Min"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Destalla el text"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Expreg"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Cap Enrere"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "No reemplaces"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Pos Act"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Pàg Ant"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Pàg Seg"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Primera línia"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Última línia"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "No és una clau"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Marca text"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Copia text"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Sagna text"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Desagna text"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Refés"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Endavant"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Enrere"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Paraula següent"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Endavant"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Paraula anterior"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Ant Línia"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Seg Línia"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Paraula següent"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Inici"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Fi"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Troba la clau corresponent"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Princ de par"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Final de par"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Desplaça amunt"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Desplaça avall"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Anterior fitxer"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Següent fitxer"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Entrada textual"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Retorn"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Retrocés"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "RetallaFinsFinal"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Compte de paraules"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Suspèn"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "HistPrèv"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "HistSeg"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Vés al text"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Afegeix"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Avantposa"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Fes còpia de seguretat"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Executa una ordre"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "A fitxers"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Primer fitxer"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Últim fitxer"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Ant Línia"
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Seg Línia"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mode ajuda"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Visualització constant de la posició del cursor"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Utilitza una línia més per a editar"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Desplaçament suau"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "No ajustes les línies llargues"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Mostra l'espai en blanc"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Resaltat de sintaxi en color"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Tecla «Inici» intel·ligent"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Sagna automàticament"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Retalla fins al final"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Ajustament de línies llargues"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "No ajustes les línies llargues"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversió de les tabulacions introduïdes a espais"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Fitxers de còpia de seguretat"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Múltiples búfers de fitxers"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Suport per a ratolí"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Sense conversió des del format DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Suspensió"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Ajustament de línies suau"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1062,7 +1092,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:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1076,7 +1106,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode Cerca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1096,7 +1126,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1118,7 +1148,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:253
 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"
@@ -1133,7 +1163,7 @@ msgstr ""
 "fitxer:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1161,7 +1191,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:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1187,7 +1217,7 @@ msgstr ""
 "fitxers:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1212,7 +1242,7 @@ msgstr ""
 "l'anterior recerca.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1221,7 +1251,7 @@ msgstr ""
 "navegador:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1244,7 +1274,7 @@ msgstr ""
 "«anar a un directori»:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1269,7 +1299,7 @@ msgstr ""
 "d'ortografia:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1289,7 +1319,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles al mode Executa una ordre:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1310,7 +1340,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1329,7 +1359,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:359
 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 "
@@ -1343,15 +1373,15 @@ msgstr ""
 "alternatives estan representades entre parèntesi:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "habilita/inhabilita"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "La tecla és il·legal al mode visualització"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1360,7 +1390,7 @@ msgstr ""
 "\n"
 "S'ha escrit el búfer en %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1369,7 +1399,7 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer a %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1378,272 +1408,277 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "La mida de la terminal és massa petita per a nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, 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:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opció\t\tOpció llarga GNU\tSignificat\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opció\t\tSignificat\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Mostra aquest missatge"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+L�NIA,COLUMNA"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Comença en la línia número L�NIA, columna COLUMNA"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Habilita la tecla «inici» intel·ligent"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Fes còpies de seguretat dels fitxers existents"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Directori on desar els fitxers de còpia de seguretat únics"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Utilitza negreta en comptes de text amb els colors invertits"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Converteix les tabulacions introduïdes a espais"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Habilita múltiples búfers de fitxers"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Registra i llegeix la història de cerca/reemplaça"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "No faces servir els fitxers nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Arregla el problema de confusió del teclat numèric"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "No afegeixes retorns de carro al final dels fitxers"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "No converteixes des del format DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Utilitza una línia més per a editar"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Insereix una tabulació a la posició del cursor"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<cad>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Marcador de cita"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Mode restringit"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Desplaça't per línies en lloc de mitges pantalles"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Estableix l'amplada de tab a #cols columnes"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Neteja la barra d'estat ràpidament"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Imprimeix informació sobre la versió i surt"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Detecta els límits entre paraules amb més detall"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <cad>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<cad>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Definició de sintaxi a utilitzar per a colorejar"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Mostra contínuament la posició del cursor"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arregla el problema de confusió entre Esborra/Suprimeix"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Mostra aquest text d'ajuda"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Sagna automàticament noves línies"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Retalla des del cursor al final de línia"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "No segueixes enllaços simbòlics, sobreescriu-los"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Habilita l'ús del ratolí"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Estableix directori d'operació"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserva les tecles XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Omet silenciosament problemes d'inici com errors al fitxer rc"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Estableix el punt d'ajustament a la columna #cols"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Habilita un corrector alternatiu"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Desa automàticament en sortir, no preguntes"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Permet el desfer genèric [EXPERIMENTAL]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Mode de visualització (només lectura)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "No ajustes les línies llargues"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "No mostres les dues línies d'ajuda"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Habilita la suspensió"
 
-#: src/nano.c:935
+#: src/nano.c:950
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Habilita l¡ajustament suau de línies"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorades, per a compatibilitat amb Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano versió %s (compilat %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1652,164 +1687,171 @@ msgstr ""
 "\n"
 " Opcions compilades:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "El suport per a aquesta funció està inhabilitat"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Voleu desar el búfer modificat (RESPONDRE «No» DESTRUIRÀ ELS CANVIS) ?"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 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:1135
+#: src/nano.c:1187
 #, 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:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "S'ha rebut SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilitzeu «fg» per a tornar a nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "habilitat"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "inhabilitat"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "L'ordre és desconeguda"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorat, blah, blah"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorat, blah, blah"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "La mida de tabulador demanada «%s» és invàlida"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "La mida de plenat demanada «%s» és invàlida"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Sí"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Totes"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Error en %s en la línia %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argument «%s» té una «\"» no terminada"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "L'expreg «%s» és invàlida: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Manca el nom de la sintaxi"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintaxi «none» és reservada"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "La sintaxi «default» no admet extensions"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "No es pot afegir una expreg de capçalera sense una ordre de sintaxi"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Manca la cadena d'expreg"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Manca el nom de la clau"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "les assignacions de tecles han de començar amb «^», «M» o «F»"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, fuzzy
+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:504 src/rcfile.c:596
-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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "No s'ha pogut assignar «%s» a una funció"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "No s'ha pogut assignar el nom «%s» a un menú"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "La combinació «%s» és una assignació il·legal"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "S'ha produït un error en llegir %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1824,95 +1866,121 @@ msgstr ""
 "«black», amb el prefix opcional «bright»\n"
 "per als colors de primer pla."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Manca el nom del color"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "El color de fons «%s» no pot ser brillant"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Manca la cadena d'expreg"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requereix el seu «end=» corresponent"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "El color de fons «%s» no pot ser brillant"
+
+#: src/rcfile.c:819
 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:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "No es pot afegir una expreg de capçalera sense una ordre de sintaxi"
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Manca la cadena d'expreg"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "No es pot afegir una expreg de capçalera sense una ordre de sintaxi"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Manca el nom del color"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Error fatal: no hi ha lletres asignades per a la funció «%s»"
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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 ""
 "S'està sortint. Useu nano amb l'opció -I si heu d'ajustar les vostres "
 "preferències\n"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "No s'ha pogut assignar el nom «%s» a un menú"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, 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:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxi «%s» no té ordres de colors"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "No es pot entendre l'ordre «%s»"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Manca el senyalador"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Manca el nom del color"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opció «%s» requereix un argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "L'opció no és una cadena d'octets múltiples vàlida"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Es requereixen caràcters que no siguen d'espaiat"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Es necessiten dos caràcters d'una columna"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "No es pot llevar el senyalador «%s»"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "El senyalador «%s» és desconegut"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "No s'ha pogut trobar el directori d'usuari! Wah!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1926,42 +1994,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» no trobat"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (a reemplaçar) dins de la selecció"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (a reemplaçar)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Voleu reemplaçar aquesta instància?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Reemplaça amb"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 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:1074
 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:1228
 msgid "Not a bracket"
 msgstr "No és una clau"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "No hi ha clau corresponent"
 
@@ -1973,226 +2045,299 @@ msgstr "Marca establida"
 msgid "Mark Unset"
 msgstr "Marca esborrada"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "No hi ha res al búfer de desfer."
 
-#: 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:440 src/text.c:578
+#, fuzzy, c-format
+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"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:451 src/text.c:588
 msgid "text add"
 msgstr "afegiment de text"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "supressió de text"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "ajustament de línies llargues"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "unió de línia"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "tall de text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "enganxada de text"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "trencat de línia"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "inserció de text"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "S'ha desfet l'acció (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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"
+#: src/text.c:572
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Error intern: la configuració del refer ha fallat. Deseu el vostre treball"
+"Error intern: no es pot configurar l'enganxada. Deseu el vostre treball."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "S'ha refet l'acció (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "No s'ha pogut canalitzar"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "No s'ha pogut crear un conducte"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "No s'ha pogut iniciar un altre procés"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+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:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Error intern: tipus desconegut. Deseu el vostre treball."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "El marcador de cita %s és erroni: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Ara podeu desjustificar!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Edita un reemplaçament"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "No s'ha pogut crear un conducte"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "S'està creant una llista de paraules incorrectes, espereu..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 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:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "S'ha produït un error en iniciar «spell»"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "S'ha produït un error en iniciar «sort -f»"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "S'ha produït un error en iniciar «uniq»"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Revisió d'ortografia finalitzada"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "S'ha produït un error en iniciar executar «%s»"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Invoca el corrector ortogràfic, si està disponible"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "No afegeixes retorns de carro al final dels fitxers"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Mostra aquest missatge"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Mostra aquest missatge"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParaules: %lu  Línies: %ld  Caràcters: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "A la selecció:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Entrada textual"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Entrada d'Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Modificat"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Visualitza"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fitxer:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "L'editor de text GNU nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versió"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Per cortesia de:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Agraïments especials per a:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "La Fundació per al Software Lliure (FSF)"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "i per qualsevol dels qui ens hem oblidat esmentar..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Gràcies per fer servir nano!"
 
+#~ 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 "(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"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 244f9d47..9f62fedf 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 0bc1f128..8ac9012e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,15 +1,15 @@
-# 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, 2012.
 # Václav Haisman <V.Haisman@sh.cvut.cz>, 2000, 2001.
+# Pavel Fric <pavelfric@seznam.cz>, 2010, 2012, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.0\n"
+"Project-Id-Version: nano 2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2012-08-17 11:36+0200\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2013-06-07 16:24+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
@@ -17,130 +17,127 @@ msgstr ""
 "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.5\n"
+"X-Generator: Lokalize 1.4\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
 msgstr "Jít do adresáře"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Chyba při �tení: %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(adresář)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(rodi�ovský adresář)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Zpět]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Toto je jediný výskyt"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Žádný sou�asný vzor hledání"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr ""
-
-#: src/files.c:143
-#, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr ""
+msgstr "Nepodařilo se ur�it moji identitu pro soubor lock (getpwuid() selhal)"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:144
 #, fuzzy, 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:170 src/files.c:207 src/files.c:217
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Chyba při zápisu zálohovacího souboru %s: %s"
+msgstr "Chyba při zápisu souboru lock %s: %s"
 
-#: src/files.c:234
-#, fuzzy, c-format
+#: src/files.c:232
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Chyba při zápisu zálohovacího souboru %s: %s"
+msgstr "Chyba při mazání souboru lock %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "Chyba při zápisu zálohovacího souboru %s: %s"
+msgid "Error opening lock file %s: %s"
+msgstr "Chyba při otevírání souboru lock %s: %s"
 
-#: src/files.c:281
-#, c-format
-msgid "Error reading lockfile %s: Not enough data read"
-msgstr ""
+#: src/files.c:276
+#, fuzzy, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Chyba �tení souboru lock %s: Nepře�ten dostatek dat"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nelze vložit soubor z vně %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Žádné další otevřené souborové vyrovnávací paměti"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Přepnuto na %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Nová vyrovnávací paměť"
 
-#: src/files.c:840
+#: src/files.c:835
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -148,7 +145,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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -166,7 +163,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:851
+#: src/files.c:846
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -174,7 +171,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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -190,7 +187,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:861
+#: src/files.c:856
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -198,7 +195,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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -214,7 +211,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:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -222,7 +219,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:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -230,89 +227,89 @@ 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "ÄŒte se soubor"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Nový soubor"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nenalezen"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ je adresář"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" je soubor zařízení"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, 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:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Příkaz k provedení [z %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, 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:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Soubor k vložení [z %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 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:1594
+#: src/files.c:1591
 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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nelze zapsat vnÄ› %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Chyba při zápisu zálohovacího souboru %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Příliš mnoho zálohovacích souborů?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Chyba při zápisu %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Chyba při zápisu do�asného souboru s: %s"
@@ -369,15 +366,15 @@ msgstr "Soubor existuje. PŘEPSAT?"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Uložit soubor pod JIN�M N�ZVEM? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(více)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -386,7 +383,7 @@ msgstr ""
 "\n"
 "Stiskněte klávesu Enter pro pokra�ování \n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -395,7 +392,7 @@ msgstr ""
 "Nelze vytvořit adresář %s: %s\n"
 "Je vyžadován pro ukládání/nahrávání historie hledání nebo polohy ukazovátka\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -405,7 +402,7 @@ msgstr ""
 "Nano nebude schopen nahrát nebo uložit historii hledání nebo polohu "
 "ukazovátka\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -414,7 +411,7 @@ 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/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -425,645 +422,678 @@ msgstr ""
 "do upřednostňovaného umístění (%s)\n"
 "(viz FAQ pro nano k této změně)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Nahradit"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Žádné nahrazení"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "VELK� P�SMENA/malá písmena"
+msgid "Exit"
+msgstr "Ukon�it"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Zpět"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regulární výraz"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "Předchozí historie"
+msgid "Close"
+msgstr "Zavřít"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Další historie"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Zrušit vyjmutí textu"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Jít na text"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Zrušit zarovnání"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Kde je další"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "První soubor"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Poslední soubor"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Jít na soubory"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Formát DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Formát Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Připojit"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Připojit dopředu"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Soubor se zálohou"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Provést příkaz"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Jít do adresáře"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Získat nápovědu"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Ukon�it"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Kde je"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Předchozí strana"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Další strana"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "První řádek"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Nahradit"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Poslední řádek"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Přejít na řádek"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Odložit (na pozadí)"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Předchozí řádek"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Za�átek odstavce"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Další řádek"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Konec odstavce"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Otevřít soubor"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Plné zarovnání"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Vložit soubor"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Přejít na řádek"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Zrušit sou�asnou funkci"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Zobrazit tento text s nápovědou"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zavřít nynější souborovou vyrovnávací paměť/Ukon�it nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Ukon�it nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Zapsat nynější soubor na disk"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Vložit další soubor do nynějšího"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Hledat řetězec nebo regulární výraz"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Jít na předchozí obrazovku"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Hledat řetězec nebo regulární výraz"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Jít na další obrazovku"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Jít na další obrazovku"
+
+#: src/global.c:525
 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:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Vložit ze schránky do nynějšího řádku"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Zobrazit polohu ukazovátka"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Vyvolat ověření pravopisu (je-li dostupné)"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Nahradit řetězec nebo regulární výraz"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Jít na ur�itý řádek a sloupec"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Ozna�it text v poloze ukazovátka"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Opakovat poslední hledání"
 
-#: src/global.c:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Odsadit nynější řádek"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Zrušit odsazení nynějšího řádku"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Zrušit poslední operaci"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Zopakovat poslední zrušenou operaci"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Jít o jeden znak vpřed"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Jít o jeden znak zpět"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Jít o jedno slovo vpřed"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Jít o jedno slovo zpět"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Jít na předchozí řádek"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Jít na další řádek"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Jít na za�átek nynějšího řádku"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Jít na konec nynějšího řádku"
 
-#: src/global.c:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Jít za koneck odstavce; potom dalšího odstavce"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Jít na první řádek souboru"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Jít na poslední řádek souboru"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Jít na odpovídající závorky"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Posunout obraz o jeden řádek nahoru, aniž by se pohnulo ukazovátko"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Posunout obraz o jeden řádek dolů, aniž by se pohnulo ukazovátko"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Přepnout na předchozí souborovou vyrovnávací paměť"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Přepnout na další souborovou vyrovnávací paměť"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Vložit další znak přímo (doslovně, nevykládaný)"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Vložit zarážku v poloze ukazovátka"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Vložit zalomení řádku v poloze ukazovátka"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Smazat znak v poloze ukazovátka"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Smazat znak nalevo od polohy ukazovátka"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Vyjmout od polohy ukazovátka po konec souboru"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Zarovnat celý soubor"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Spo�ítat po�et slov, řádků a znaků"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Obnovit (překreslit) sou�asnou obrazovku"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Odložit editor na pozadí (je-li povolen \"suspend\")"
 
-#: src/global.c:654
+#: src/global.c:596
 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:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Obrátit směr hledání"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Přepnout používání regulárních výrazů"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Vybavit předchozí řetězec hledání/nahrazení"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Vybavit další řetězec hledání/nahrazení"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Jít do prohlíže�e souborů"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Přepnout zápis ve formátu DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Přepnout zápis ve formátu Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Přepnout připojování"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Přepnout připojování dopředu"
 
-#: src/global.c:679
+#: src/global.c:618
 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:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Provést vnější příkaz"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Přepnout používání nové vyrovnávací paměti"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Ukon�it prohlíže� souborů"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Jít na první řádek v seznamu"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Jít na poslední řádek v seznamu"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Jít na další řádek v seznamu"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Jít na předchozí řádek v seznamu"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Jít na další řádek v seznamu"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Jít do adresáře"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Zavřít"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Vyvolat ověření pravopisu (je-li dostupné)"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Jít na předchozí řádek"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Jít na další řádek"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Získat nápovědu"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Uložit"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Jít do adresáře"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Vyjmout text"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Zarovnat"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Otevřít soubor"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Pravopis"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Vyjmout text"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Přejít na řádek"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Zrušit zarovnání"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "VELK� P�SMENA/malá písmena"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Zrušit vyjmutí textu"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regulární výraz"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Zpět"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Žádné nahrazení"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Poloha ukazovátka"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Pravopis"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Předchozí strana"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Další strana"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "První řádek"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Poslední řádek"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Žádná závorka"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Ozna�it text"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopírovat text"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Odsadit text"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Zrušit odsazení textu"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Vpřed"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Zpět"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Další slovo"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Vpřed"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Předchozí slovo"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Předchozí řádek"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Další řádek"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Další slovo"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Poloha 1"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Najít jiné závorky"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Za�átek odstavce"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Konec odstavce"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Posunout obraz nahoru"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Posunout obraz dolů"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Předchozí soubor"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Další soubor"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Přímé zadání"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Zarážka"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Delete (smazat následující znak)"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backspace (smazat předcházející znak)"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "Vyjmout až po konec"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Po�et slov"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Odložit (na pozadí)"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Předchozí historie"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Další historie"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Jít na text"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Formát DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Formát Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Připojit"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Připojit dopředu"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Soubor se zálohou"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Provést příkaz"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Jít na soubory"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "První soubor"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Poslední soubor"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Předchozí řádek"
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Další řádek"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Režim s nápovědou"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Ukazovat stálou polohu ukazovátka"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Používání ještě jednoho řádku k úpravám"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Plynulé posunování obrazu"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Nezalamovat dlouhé řádky do nových řádků"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Zobrazování prázdného místa"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Barevné zvýrazňování skladby"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Chytrá klávesa pro Polohu 1"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automaticky odsadit"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Vyjmout po konec"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Zalamování dlouhých řádků"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Nezalamovat dlouhé řádky do nových řádků"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Převod zadaných zarážek na mezery"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Zálohovací soubory"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Více souborových vyrovnávacích pamětí"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Podpora pro myš"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Žádný převod z formátů DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Odklad na pozadí"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Plynulé zalamování dlouhých řádků"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1085,7 +1115,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:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1099,7 +1129,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:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1119,7 +1149,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1143,7 +1173,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:253
 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"
@@ -1158,7 +1188,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:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1186,7 +1216,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:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1211,7 +1241,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:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1235,7 +1265,7 @@ msgstr ""
 "provedení předchozího požadavku na hledání.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1244,7 +1274,7 @@ msgstr ""
 "souborů\":\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1268,7 +1298,7 @@ msgstr ""
 "prohlíže�i souborů:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1292,7 +1322,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1313,7 +1343,7 @@ msgstr ""
 " 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:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1332,7 +1362,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1351,7 +1381,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:359
 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 "
@@ -1365,15 +1395,15 @@ msgstr ""
 "uváděny v závorkách:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "Zapnout/Vypnout"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Klávesa nepřípustná v režimu pouze pro �tení"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1382,7 +1412,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť zapsána do %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1391,7 +1421,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána do %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1400,11 +1430,11 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Velikost okna je pro nano příliš malá...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1413,261 +1443,266 @@ msgstr ""
 "Použití: nano [VOLBY] [[+Ř�DEK,SLOUPEC] SOUBOR]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Volba\t\tdlouhá volba GNU\t\tVýznam\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Volba\t\tVýznam\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Ukázat tuto zprávu"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+�DEK,SLOUPEC"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Za�ít na řádku Ř�DEK,sloupec SLOUPEC"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Povolit chytrou klávesu Poloha 1"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Uložit zálohy stávajících souborů"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <adresář>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<adresář>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Adresář pro ukládání jedine�ných zálohovacích souborů"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Použít tu�ný tisk místo opa�ného textu"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Převést zadané zarážky na mezery"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Povolit více souborových vyrovnávacích pamětí"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "Použít soubory lock (ve stylu Vimu)"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Zapisovat a �íst historii hledání/nahrazování řetězců"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Nezkoumat soubory nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Opravit zmatek okolo kláves na �íselné klávesnici"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Nepřidávat zalomení řádku na koncích souborů"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Nepřevádět soubory z formátů DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Používat ještě jeden řádek k úpravám"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "Zapsat & pře�íst umístění polohy ukazovátka"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <řetězec znaků>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<řetězec znaků>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Dání řetězce do uvozovek"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Omezený režim"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Posunovat obraz po řádcích místo po půlobrazovkách"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#sloupce>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#sloupce>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Nastavit velikost zarážky na #sloupce"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Provést rychlé vymazání stavového řádku"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Vytisknout informaci o verzi a ukon�it"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Rozpoznávat hranice slov přesněji"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <řetězec znaků>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<řetězec znaků>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Vymezení skladby k užití pro obarvování"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Stále ukazovat polohu ukazovátka"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Odstranit záměnu kláves Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Zobrazit tento text s nápovědou"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Automaticky odsadit nové řádky"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Vyjmout od polohy ukazovátka po konec řádku"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Nenásledovat symbolické odkazy, nýbrž přepsat"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Povolit použití myši"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <adresář>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<adresář>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Nastavit pracovní adresář"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Zachovat klávesy XON (^Q) a XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 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:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#sloupce>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#sloupce>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Nastavit bod zalomení při sloupci #sloupce"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <program>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<program>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Povolit náhradní program na ověřování pravopisu"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Při ukon�ení automaticky bez zpětného dotazu uložit"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Povolit obecnou funkci pro zpět [pokusné]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Režim pouze pro �tení (žádné změny nejsou možné)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Nezalamovat dlouhé řádky do nových řádků"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Neukazovat dva pomocné řádky"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Povolit odložení na pozadí (zastavit a zpět k shellu)"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Povolit plynulé zalamování dlouhých řádků"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(přechází se, pro slu�itelnost s Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU verze nano %s (sestaveno %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1676,163 +1711,171 @@ msgstr ""
 "\n"
 " Volby při sestavování:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Promiňte, ale tato funkce není podporována"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 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:1109
+#: src/nano.c:1162
 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:1135
+#: src/nano.c:1187
 #, 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:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Přijat SIGHUP nebo SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Použijte \"fg\" pro návrat do nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "povoleno"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "zakázáno"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Neznámý příkaz"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON nebrán na vědomí, huhňání"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF nebrán na vědomí, huhňání"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Požadovaná velikost zarážky \"%s\" je neplatná"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Požadovaná velikost výplně \"%s\" je neplatná"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ano"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "VÅ¡e"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Chyba v %s na řádku %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ má neukon�ené \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Špatný regulární výraz \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Chybí název skladby"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Skladba \"none\" je zamluvena"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Skladba \"default\" nesmí mít žádné přípony"
 
-#: src/rcfile.c:393
-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:398
-msgid "Missing magic string name"
-msgstr "Chybí název kouzelného řetězce"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Chybí název klí�e"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Klávesové zkratky musí za�ínat \"^\", \"M\", nebo \"F\""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Funkce spojená s klávesou musí být zadána"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Nepodařilo se spojit název \"%s\" s funkcí"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nepodařilo se spojit název \"%s\" s nabídkou"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Promiňte, ale keystr \"%s\" není dovoleným přiřazením"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Chyba při �tení: %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1848,95 +1891,120 @@ msgstr ""
 "a „black“ (�erná), s volitelnou předponou „bright“ (světlá)\n"
 "pro barvy popředí."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Chybí název barvy"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Chybí řetězec regulárního výrazu"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ vyžaduje odpovídající „end=“"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
+
+#: src/rcfile.c:819
 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:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+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:880
+msgid "Missing magic string name"
+msgstr "Chybí název kouzelného řetězce"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Nelze přidat regulární výraz pro záhlaví bez příkazu pro skladbu"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Chybí název barvy"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Vážná chyba: s funkcí \"%s\" nejsou spojeny žádné klávesy"
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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 ""
 "Ukon�uje se. Spusťte, prosím, v případě potřeby nano s volbou \"-l\", chcete-"
 "li změnit svá nastavení nanorc\n"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Nepodařilo se spojit název \"%s\" s nabídkou"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Příkaz \"%s\" nedovolen v zahrnutém souboru"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladba \"%s\" nemá pokyny pro barvy"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Příkazu \"%s\" neporozuměno"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Chybí příznak"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Chybí název barvy"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Volba \"%s\" vyžaduje argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Volba není žádným platným řetězcem znaků multibyte"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Požadovány ne-prázdné znaky"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Požadovány dva znaky v rozsahu jednoho sloupce"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Nelze vypnout příznak \"%s\""
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Neznámý příznak \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nemohu najít svůj domovský adresář! Jau!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1950,23 +2018,26 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" nenalezen"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (k nahrazení) ve výběru"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (k nahrazení)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Nahradit tento případ?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Nahradit"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1974,19 +2045,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:1047
 msgid "Enter line number, column number"
 msgstr "Zadat �íslo řádku, �íslo sloupce"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Neplatné �íslo řádku nebo, �íslo sloupce"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Žádná závorka"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Žádná odpovídající závorka"
 
@@ -1998,224 +2070,298 @@ msgstr "Zna�ka nastavena"
 msgid "Mark Unset"
 msgstr "Zna�ka odstraněna"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Nic ve vyrovnávací paměti pro \"Zpět\"!"
 
-#: 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:440 src/text.c:578
+#, fuzzy, 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."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:451 src/text.c:588
 msgid "text add"
 msgstr "Přidat text"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "Smazat text"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "Zalomení řádku"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "Spojit řádek"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "Vyjmout text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "Vzít zpět vyjmutí textu"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "Zalamovat řádky"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "Vložit text"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Operace vrácena zpět (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, fuzzy
+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: vzetí vyjmutí zpět nelze nastavit. Uložte, prosím, svou práci."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operace zopakována (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Přenos dat se nepodařilo provést"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Nepodařilo se vytvořit přenos dat"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Vidlici se nepodařilo provést"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+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:955
-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:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Neplatný řetězec znaku uvozovek %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Nyní lze zrušit zarovnání odstavce!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Upravit nahrazení"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Nepodařilo se vytvořit přenos dat"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Vytváří se seznam nesprávně napsaných slov. Čekejte, prosím,..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 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:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Chyba při vyvolání „spell“"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Chyba při vyvolání „sort -f“"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Chyba při vyvolání „uniq“"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Ověřování pravopisu dokon�eno"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Chyba při vyvolání „%s“"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Vyvolat ověření pravopisu (je-li dostupné)"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Nepřidávat zalomení řádku na koncích souborů"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Ukázat tuto zprávu"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Ukázat tuto zprávu"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSlov: %lu  Řádků: %ld  Znaků: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "Ve výběru:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Přímé zadání"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Vstup Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Změněno"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Pohled"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "Adresář:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Soubor:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 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:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Textový editor nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "Verze"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Vyvíjeno:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Zvláštní poděkování:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Pro ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "a všichni nejmenovaní..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Děkujeme vám za to, že používáte nano!"
 
+#~ 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 "(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 95c60772..7f3cbb2d 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 3ecdddd0..f9d1e9a7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -25,135 +25,132 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "GÃ¥ til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fejl ved læsning af %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(ophavs-kat)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Bagud]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Dette er det eneste tilfælde"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Intet aktuelt søgemønster"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
-#, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr ""
+#: src/files.c:144
+#, 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:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikke indsætte fil fra ydersiden af %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Ikke flere åbne filbuffere"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Skiftede til %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -168,14 +165,14 @@ msgstr[1] ""
 "Læste %lu linjer (Konverteret fra DOS- og Mac-format - Advarsel: Ingen "
 "skriveadgang)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -186,14 +183,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Læste %lu linjer (Konverteret fra Mac-format - Advarsel: Ingen skriveadgang)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -204,101 +201,101 @@ msgstr[0] ""
 msgstr[1] ""
 "Læste %lu linjer (Konverteret fra DOS-format - Advarsel: Ingen skriveadgang)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, 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:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Læser filen"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunne ikke findes"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" er et katalog"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" er en enhedsfil"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Kommando at køre i ny buffer [fra %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Kommando der skal køres [fra %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil at indsætte i ny buffer [fra %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil at indsætte [fra %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten ugyldig i ikke-multibuffer-tilstand"
 
 # afsluttende mellemrum efter strengen bevirker sandsynligvis at tekstmarkøren står rigtigt
-#: src/files.c:1594
+#: src/files.c:1591
 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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive uden for %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "For mange sikkerhedskopifiler?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fejl ved skrivning af %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fejl ved skrivning af midlertidig fil: %s"
@@ -354,15 +351,15 @@ msgstr "Filen findes, OVERSKRIV? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Gem filen under ET ANDET NAVN? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Filen blev ændret siden du sidst åbnede den, gem alligevel? "
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(mere)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -371,7 +368,7 @@ msgstr ""
 "\n"
 "Tryk retur for at fortsætte\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -380,7 +377,7 @@ msgstr ""
 "Kan ikke oprette kataloget %s: %s\n"
 "Dette kræves for at kunne gemme/hente søgehistorik eller markørposition\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -389,7 +386,7 @@ 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"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -398,7 +395,7 @@ 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"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -409,668 +406,700 @@ msgstr ""
 "til den foretrukne placering (%s)\n"
 "(se OSS om nano vedrørende denne ændring)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annullér"
-
-# max 10 tegn
-#: src/global.c:467
-msgid "Replace"
-msgstr "Erstat"
-
-# max 10 tegn
-#: src/global.c:468
-msgid "No Replace"
-msgstr "ErstatIkke"
-
 # max 10 tegn
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "VersalFøls"
+msgid "Exit"
+msgstr "Afslut"
 
-# max 10 tegn
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Baglæns"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regudtr"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "ForrigHist"
+msgid "Close"
+msgstr "Luk"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "NæstHist"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Indsæt"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "GÃ¥ til tekst"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "AfOmbryd"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Find næste"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Første fil"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Sidste fil"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Til filer"
-
-# max 16 tegn
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS-format"
-
-# max 16 tegn
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac-format"
-
-# max 16 tegn
-#: src/global.c:515
-msgid "Append"
-msgstr "Tilføj ved enden"
-
-# max 16 tegn
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Tilføj ved start"
-
-# max 16 tegn
-#: src/global.c:517
-msgid "Backup File"
-msgstr "SikrKopiér fil"
-
-# max 16 tegn
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Kør kommando"
-
-# max 16 tegn
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "GÃ¥ til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Få hjælp"
-
-# max 10 tegn
-#: src/global.c:532
-msgid "Exit"
-msgstr "Afslut"
-
 # max 10 tegn
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Hvor er"
 
 # max 10 tegn
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "ForrigSide"
-
-# max 10 tegn
-#: src/global.c:535
-msgid "Next Page"
-msgstr "NæsteSide"
-
-# max 10 tegn
-#: src/global.c:536
-msgid "First Line"
-msgstr "FørstLinje"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Erstat"
 
-# max 10 tegn
-#: src/global.c:537
-msgid "Last Line"
-msgstr "SidstLinje"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "GÃ¥ til linje"
 
-# max 10 tegn
-#: src/global.c:538
-msgid "Suspend"
-msgstr "I baggrund"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Forrige linje"
 
-# max 10 tegn
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "AfsnitStrt"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Næste linje"
 
-# max 10 tegn
-#: src/global.c:541
-msgid "End of Par"
-msgstr "AfsnitSlut"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Læs fil"
 
 # max 10 tegn
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "FuldOmbryd"
 
 # max 10 tegn
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Opdatér"
 
-# okay, her slutter 'max 10 tegn'-regionen vist, eftersom den engelske er på 11
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Indsæt fil"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "GÃ¥ til linje"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Afbryd den aktuelle funktion"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Vis denne hjælpetekst"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Luk nuværende filbuffer / afslut nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Afslut nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuelle fil til disk"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Indsæt en anden fil i den nuværende"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Søg efter en streng eller et regulært udtryk"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Gå til forrige skærm"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Søg efter en streng eller et regulært udtryk"
+
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Gå til næste skærm"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
 msgstr "Gå til næste skærm"
 
-#: src/global.c:574
+#: src/global.c:525
 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:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Indsæt fra udklipsbufferen i aktuel linje"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Vis markørens position"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontrollen, hvis tilgængelig"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Erstat en streng eller et regulært udtryk"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "GÃ¥ til linje- og kolonnenummer"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Markér tekst ved aktuel markørposition"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Gentag sidste søgning"
 
-#: src/global.c:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Indryk den aktuelle linje"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Fjern indrykning af aktuel linje"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Fortryd sidste handling"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Omgør sidste fortrudte handling"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "GÃ¥ et tegn fremad"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "GÃ¥ et tegn bagud"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "GÃ¥ et ord fremad"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "GÃ¥ et ord bagud"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "GÃ¥ til forrige linje"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Gå til næste linje"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "GÃ¥ til begyndelsen af aktuel linje"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "GÃ¥ til enden af aktuel linje"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå til starten af afsnittet; dernæst af forrige afsnit"
 
-#: src/global.c:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Gå til filens første linje"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "GÃ¥ til filens sidste linje"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "GÃ¥ til modsvarende klamme"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rul en linje op uden at flytte markøren"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rul en linje ned uden at flytte markøren"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "GÃ¥ til forrige filbuffer"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Gå til næste filbuffer"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Indsæt næste tasteanslag ordret"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Indsæt et tabulatortegn ved markørpositionen"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Indsæt et linjeskift ved markørpositionen"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Fjern tegnet under markøren"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Fjern tegnet til venstre for markøren"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Klip fra markørpositionen til filens slutning"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Ombryd hele filen"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Tæl ord, linjer og tegn"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Opdatér (genskriv) den aktuelle skærm"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Kør i baggrunden (hvis suspend er slået til)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Slå forskel på store og små bogstaver til eller fra"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Omvend søgeretning"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Slå brug af regulære udtryk til eller fra"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Husk de foregående søg og erstat-strenge"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Husk de følgende søg og erstat-strenge"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "GÃ¥ til filbrowser"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Slå DOS-format til eller fra"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Slå Mac-format til eller fra"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Slå efterstillet tilføjelse til eller fra"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Slå foranstillet tilføjelse til eller fra"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Slå sikkerhedskopiering af originalfil til eller fra"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Udfør ekstern kommando"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Slå brug af ny buffer til eller fra"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "GÃ¥ ud af filbrowseren"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Gå til første fil i listen"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "GÃ¥ til sidste fil i listen"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Gå til næste fil i listen"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "GÃ¥ til forrige fil i listen"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Gå til næste fil i listen"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "GÃ¥ til katalog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Luk"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Start stavekontrollen, hvis tilgængelig"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "GÃ¥ til forrige linje"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Gå til næste linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Få hjælp"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Annullér"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Gem"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+# max 16 tegn
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "GÃ¥ til katalog"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Klip ud"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Ombryd"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Læs fil"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Stavetjek"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Klip ud"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "GÃ¥ til linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "AfOmbryd"
+# max 10 tegn
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "VersalFøls"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Indsæt"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regudtr"
+
+# max 10 tegn
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Baglæns"
+
+# max 10 tegn
+#: src/global.c:753
+msgid "No Replace"
+msgstr "ErstatIkke"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Stavetjek"
+# max 10 tegn
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "ForrigSide"
 
-#: src/global.c:822
+# max 10 tegn
+#: src/global.c:773
+msgid "Next Page"
+msgstr "NæsteSide"
+
+# max 10 tegn
+#: src/global.c:776
+msgid "First Line"
+msgstr "FørstLinje"
+
+# max 10 tegn
+#: src/global.c:778
+msgid "Last Line"
+msgstr "SidstLinje"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ikke en klamme"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Markér tekst"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopiér tekst"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Indryk tekst"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Fjern indrykning"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Omgør"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Fremad"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Bagud"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Næste ord"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Fremad"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Forrige linje"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Næste linje"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Næste ord"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Find anden klamme"
+# max 10 tegn
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "AfsnitStrt"
+
+# max 10 tegn
+#: src/global.c:839
+msgid "End of Par"
+msgstr "AfsnitSlut"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Rul op"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Rul ned"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Foregående fil"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Næste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Ordret input"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Fjern"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Slet baglæns"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "KlipResten"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Ordtælling"
 
-#: src/global.c:1299
+# max 10 tegn
+#: src/global.c:898
+msgid "Suspend"
+msgstr "I baggrund"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "ForrigHist"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "NæstHist"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "GÃ¥ til tekst"
+
+# max 16 tegn
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS-format"
+
+# max 16 tegn
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac-format"
+
+# max 16 tegn
+#: src/global.c:928
+msgid "Append"
+msgstr "Tilføj ved enden"
+
+# max 16 tegn
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Tilføj ved start"
+
+# max 16 tegn
+#: src/global.c:933
+msgid "Backup File"
+msgstr "SikrKopiér fil"
+
+# max 16 tegn
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Kør kommando"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Første fil"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Sidste fil"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Forrige linje"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "Hjælpetilstand"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Konstant visning af markørposition"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Brug af en ekstra linje til redigering"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Jævn rulning"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ombryd ikke lange linjer"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Visning af mellemrum"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Farvefremhævelse af syntaks"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Smart home-tast"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automatisk indrykning"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Klip ud til enden"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Ombrydning af lange linjer"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ombryd ikke lange linjer"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering af skrevne tab-tegn til mellemrum"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Sikkerhedskopiér filer"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Flere fil-buffere"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Museunderstøttelse"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac-format"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Suspension"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Blød linjeombrydning"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1092,7 +1121,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:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1105,7 +1134,7 @@ msgstr ""
 "\n"
 "Følgende funktionstaster er tilgængelige i søgetilstand:\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1125,7 +1154,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i Gå til linje-tilstand:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1148,7 +1177,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:253
 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"
@@ -1161,7 +1190,7 @@ msgstr ""
 "\n"
 " Følgende funktionstaster er tilgængelige i Indsæt fil-tilstand:\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1189,7 +1218,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i Skriv fil-tilstand:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1213,7 +1242,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i filskimmeren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1237,7 +1266,7 @@ msgstr ""
 "foregående søgning blive udført. \n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1245,7 +1274,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i browsersøgetilstand:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1268,7 +1297,7 @@ msgstr ""
 "filbrowser:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1292,7 +1321,7 @@ msgstr ""
 " Følgende andre funktioner er til stede i stavekontrol-tilstand:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1312,7 +1341,7 @@ msgstr ""
 " Følgende taster er tilgængelige i denne tilstand:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1332,7 +1361,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1350,7 +1379,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:359
 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 "
@@ -1364,15 +1393,15 @@ msgstr ""
 "Alternative taster vises i parenteser:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "aktivér/deaktivér"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Tasten ugyldig i visningstilstand"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1381,7 +1410,7 @@ msgstr ""
 "\n"
 "Bufferen skrevet til %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1390,7 +1419,7 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet til %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1399,11 +1428,11 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Vinduestørrelsen er for lille til Nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1412,259 +1441,264 @@ msgstr ""
 "Brug: nano [FLAG] [[+LINJE,KOLONNE] FIL]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Flag\t\tLangt GNU-flag\t\tBetydning\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Flag\t\tBetydning\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Vis denne meddelelse"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+LINJE,KOLONNE"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Start ved linjenummer LINJE, kolonne KOLONNE"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Brug smart home-tast"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Gem sikkerhedskopier af eksisterende filer"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Katalog til at gemme unikke sikkerhedskopifiler"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Brug fed frem for omvendt video-tekst"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Konvertér skrevne tabulatortegn til mellemrum"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Tillad flere fil-buffere"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Log & læs streng-historik for søg og erstat"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Se ikke på nanorc-filer"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Fiks forvirringsproblem med numerisk tastatur"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Tilføj ikke linjeskift til slut i filer"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Konvertér ikke fra DOS/Mac-format"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Brug en ekstra linje til redigering"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "Gem & læs markørens position"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Anførelsesstreng"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Begrænset tilstand"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Rul linjevis frem for en halv skærm ad gangen"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#kolonner>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kolonner>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Sæt bredden på et tabulatortegn til #kolonner"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Ryd statuslinje hurtigt"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Udskriv versionsinformation og afslut"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Find ordgrænser mere præcist"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaksdefinition for farvelægning"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Vis markørposition hele tiden"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fiks forvirringsproblem med Tilbagetast/Slettetast"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Vis denne hjælpetekst"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Indryk automatisk nye linjer"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Klip fra markøren til linjens slutning"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Følg ikke symbolske lænker, overskriv"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Aktivér styring med mus"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Sæt behandlet katalog"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Behold XON- (^Q) og XOFF- (^S) taster"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Ignorer opstartsproblemer såsom fejl i rc-fil uden fejlmeddelelser"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#kolonner>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kolonner>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Placér ombrydningspunkt ved #kolonner"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Brug alternativ stavekontrol"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Gem automatisk ved afslutning, spørg ikke"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Tillad generisk fortryd [EKSPERIMENTEL]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Visningstilstand (skrivebeskyttet)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ombryd ikke lange linjer"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Vis ikke de to hjælpelinjer"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Slå suspend til"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Brug blød linjeombrydning"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoreret, for Pico-kompatibilitet)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano version %s (kompileret %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1673,162 +1707,171 @@ msgstr ""
 "\n"
 " Kompileringsflag:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Desværre, understøttelse af denne funktion er blevet deaktiveret"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Gem ændret buffer (AT SVARE \"Nej\" VIL ØDELÆGGE ÆNDRINGER)? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke genåbne stdin fra tastaturet, beklager\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Læser fra stdin, ^C for at afbryde\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Modtog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Brug \"fg\" for at returnere til nano\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "aktiveret"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Ukendt kommando"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoreret, mumle mumle"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoreret, mumle mumle"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Ønsket tab-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Ønsket fyld-størrelse \"%s\" er ugyldig"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nej"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fejl i %s på linje %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument \"%s\" har et uafsluttet \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex-strenge skal begynde og ende med et \"-tegn"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Dårligt regulært udtryk \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 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:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\"-syntaksen kan ikke tage udvidelser"
 
-#: src/rcfile.c:393
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Kan ikke tilføje magisk strengregex uden syntakskommando"
-
-#: src/rcfile.c:398
-msgid "Missing magic string name"
-msgstr "Mangler magisk strengnavn"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "tastebindinger skal starte med \"^\", \"M\" eller \"F\""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Skal angive funktion at binde tast til"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Kunne ikke associere navnet \"%s\" med en funktion"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kunne ikke associere navnet \"%s\" med en menu"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Beklager, keystr \"%s\" er en ugyldig binding"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fejl ved læsning af %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1843,96 +1886,121 @@ msgstr ""
 "\"black\", med den valgfri forstavelse \"bright\"\n"
 "til forgrundsfarver."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Baggrundsfarven \"%s\" må ikke være lys"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Mangler regex-streng"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kræver et tilsvarende \"end=\""
 
+#: src/rcfile.c:791
+#, 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:890
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Kan ikke tilføje magisk strengregex uden syntakskommando"
+
+#: src/rcfile.c:880
+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:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Mangler farvenavn"
+
+#: src/rcfile.c:974
+#, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunne ikke associere navnet \"%s\" med en menu"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandoen \"%s\" tillades ikke i inkluderet fil"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Kommando \"%s\" ikke forstået"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Mangler flag"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Flaget \"%s\" kræver et argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Flaget er ikke en gyldig flerbytestreng"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Kræver ikke-blanke tegn"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Der kræves to enkelt-kolonnetegn"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Kan ikke fjerne flag \"%s\""
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Ukendt flag \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jeg kan ikke finde mit hjemmekatalog!  Hulk!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1946,42 +2014,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ikke fundet"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (at erstatte) i markering"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (at erstatte)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Erstat denne forekomst?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Erstat med"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Indtast linjenummer, kolonnenummer"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Ugyldigt linje- eller kolonnenummer"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Ingen modsvarende klamme"
 
@@ -1993,224 +2065,298 @@ msgstr "Markering sat"
 msgid "Mark Unset"
 msgstr "Markering fjernet"
 
-#: src/text.c:443
+#: src/text.c:434
 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:440 src/text.c:578
+#, 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:451 src/text.c:588
 msgid "text add"
 msgstr "tilføj tekst"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "slet tekst"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "ombryd linje"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "sammenføj linje"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "klip tekst"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "indsæt tekst"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 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:519 src/text.c:655
 msgid "text insert"
 msgstr "import af tekst"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Fortrød handling (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, 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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Kunne ikke overføre i datakanal"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Kunne ikke oprette datakanal"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Kunne ikke forgrene"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, 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:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Dårlig anførselsstreng %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Kan nu af-ombryde!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Redigér en erstatning"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Kunne ikke oprette datakanal"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Opretter ordliste med fejlstavelser, vent venligst..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde ikke få størrelse af datakanals-buffer"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Fejl ved kald af \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Fejl ved kald af \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Fejl ved kald af \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Stavekontrol færdiggjort"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fejl ved kald af \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavekontrollen, hvis tilgængelig"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontrollen mislykkedes: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontrollen mislykkedes: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Tilføj ikke linjeskift til slut i filer"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Vis denne meddelelse"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Vis denne meddelelse"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Linjer: %ld  Tegn: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "I markering:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Ordret input"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Unicode-input"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Ændret"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Se"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Tekstredigereren nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Præsenteres af:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Særlig tak til:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "og alle andre som vi har glemt..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Tak for at du bruger nano!"
 
+# 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 "(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 "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 ""
+#~ "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 "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
 #~ "Fejl ved skrivning af sikkerhedskopifil %s: Filens ejer stemmer ikke"
@@ -2269,9 +2415,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 ba541ade..7a5417fd 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index ec3ea10b..9c2867cd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,16 +1,16 @@
-# 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, 2011, 2013.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.2pre4\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2013-03-21 15:08+0100\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2014-05-27 20:08+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -19,137 +19,134 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Gehe zu Verzeichnis"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 msgid "Can't move up a directory"
 msgstr "Konnte nicht ins übergeordnete Verzeichnis wechseln"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(Verz.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(Verz. höher)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Rückwärts]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Das ist das einzige Auftreten"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Kein aktuelles Suchmuster"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Konnte meine Identität für die Lock-Datei nicht bestimmen (getpwuid() "
 "fehlgeschlagen)"
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Konnte Rechnernamen für Lock-Datei nicht bestimmen: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Fehler beim Schreiben der Lock-Datei %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Fehler beim Löschen der Lock-Datei %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Fehler beim Öffnen der Lock-Datei %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr "Fehler beim Lesen der Lock-Datei %s: Nicht genügend Daten gelesen"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kann Datei von außerhalb %s nicht einfügen"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Keine weiteren offenen Dateipuffer"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Umgeschaltet zu %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Neuer Puffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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[1] "%lu Zeilen gelesen (aus DOS- und Mac-Format konvertiert)"
 
-#: src/files.c:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -164,14 +161,14 @@ msgstr[1] ""
 "%lu Zeilen gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
 "Schreibrecht)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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[1] "%lu Zeilen gelesen (aus Mac-Format konvertiert)"
 
-#: src/files.c:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -182,14 +179,14 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu Zeilen gelesen (aus Mac-Format konvertiert – Warnung: Kein Schreibrecht)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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[1] "%lu Zeilen gelesen (aus DOS-Format konvertiert)"
 
-#: src/files.c:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -200,102 +197,102 @@ msgstr[0] ""
 msgstr[1] ""
 "%lu Zeilen gelesen (aus DOS-Format konvertiert – Warnung: Kein Schreibrecht)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "eine Zeile gelesen"
 msgstr[1] "%lu Zeilen gelesen"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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[1] "%lu Zeilen gelesen (Warnung: Kein Schreibrecht)"
 
-#: src/files.c:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Lese Datei"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Neue Datei"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s“ nicht gefunden"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ ist ein Verzeichnis"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ ist eine Gerätedatei"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "In neuem Puffer auszuführender Befehl [von %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Auszuführender Befehl [von %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "in neuen Puffer einzufügende Datei [von %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "einzufügende Datei [von %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Taste unzulässig wenn nicht im Multibuffer-Modus"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 "Konnte Sicherungs-Datei nicht schreiben, weiter speichern? (N wenn unsicher)"
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kann nicht außerhalb von %s schreiben"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fehler beim Schreiben der Sicherungskopie %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Zu viele Sicherungskopien?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Datei: %s"
@@ -351,15 +348,15 @@ msgstr "Datei exisitiert, ÃœBERSCHREIBEN? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Datei unter einem ANDEREN NAMEN speichern? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Datei wurde seit dem Öffnen geändert, dennoch speichern? "
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(mehr)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -368,7 +365,7 @@ msgstr ""
 "\n"
 "Drücken Sie die Eingabetaste zum Fortfahren\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -378,7 +375,7 @@ msgstr ""
 "Es wird benötigt, um Suchhistorie und Cursorposition zu speichern und zu "
 "laden\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -387,7 +384,7 @@ msgstr ""
 "Pfad %s ist kein Verzeichnis, obwohl er eines sein muss.\n"
 "Nano wird Suchhistorie und Cursorposition nicht laden oder speichern können\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -397,7 +394,7 @@ msgstr ""
 "ich versucht habe an die neue bevorzugte Stelle (%s) zu schieben,\n"
 "stieß aber auf Fehler: %s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -408,647 +405,661 @@ msgstr ""
 "ich an die neue bevorzugte Stelle (%s) geschoben habe\n"
 "(siehe die nano-FAQ bezüglich dieser Änderung)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Ersetzen"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Keine Ersetzung"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "GROSS/klein"
+msgid "Exit"
+msgstr "Beenden"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Rückwärts"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "reg. Ausdruck"
+msgid "Close"
+msgstr "Schließen"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "zur. Geschichte"
+#: src/global.c:473
+msgid "Uncut Text"
+msgstr "Einfügen"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "vor Geschichte"
-
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Zu Text"
+#: src/global.c:475
+msgid "Unjustify"
+msgstr "Ausr.rückgängig"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
-msgstr "Wo ist nächstes"
-
-#: src/global.c:508
-msgid "First File"
-msgstr "Erste Datei"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Letzte Datei"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "In Dateien"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS-Format"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac-Format"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Anhängen"
+msgstr "Nächstes?"
 
-#: src/global.c:516
-msgid "Prepend"
-msgstr "vorn Anfügen"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Sicherungskopie"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Befehl ausführen"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Gehe zu Verz."
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Hilfe"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Beenden"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Wo ist"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Seite zurück"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Seite vor"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Erste Zeile"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Ersetzen"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Letzte Zeile"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Zu Zeile"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "in den Hintergrund"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Zeile zurück"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Anf des Abs."
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Zeile vor"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Ende des Abs."
+#: src/global.c:491
+msgid "Read File"
+msgstr "Datei lesen"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
-msgstr "Kompl. Ausr."
+msgstr "Ausrichten (alles)"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Auffrischen"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Datei einfügen"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Zu Zeile"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
-msgstr "Diese Hilfe anzeigen"
+msgstr "diese Hilfe anzeigen"
 
-#: src/global.c:560
+#: src/global.c:507
 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:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "nano beenden"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Datei speichern"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Datei einfügen"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
-msgstr "nach einer Zeichenkette oder einem regulären Ausdruck suchen"
+msgstr "nach Zeichenkette oder regulärem Ausdruck suchen"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "zum vorhergehenden Bildschirm springen"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr "nach einer Zeichenkette suchen"
+
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr "eine Bildschirmseite hoch gehen"
 
-#: src/global.c:572
-msgid "Go to next screen"
-msgstr "zum folgenden Bildschirm springen"
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr "eine Bildschirmseite runter gehen"
 
-#: src/global.c:574
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "die aktuelle Zeile ausschneiden und in der Zwischenablage speichern"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "aus der Zwischenablage einfügen"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "die aktuelle Cursorposition anzeigen"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Rechtschreibprüfung aufrufen (wenn verfügbar)"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "eine Zeichenkette oder einen regulären Ausdruck ersetzen"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "zu einer bestimmten Zeile und Spalte springen"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
-msgstr "Text an der Cursorposition markieren"
+#: src/global.c:535
+msgid "Mark text starting from the cursor position"
+msgstr "Text beginnend an Cursorposition markieren"
 
-#: src/global.c:586
-msgid "Repeat last search"
-msgstr "letzte Suche wiederholen"
+#: src/global.c:536
+msgid "Repeat the last search"
+msgstr "die letzte Suche wiederholen"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "die aktuelle Zeile kopieren und in der Zwischenablage speichern"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "die aktuelle Zeile einrücken"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "die aktuelle Zeile ausrücken"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "letzte Operation rückgängig"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "rückgängig gemachte Operation wiederholen"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "ein Zeichen vorwärts gehen"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "ein Zeichen rückwärts gehen"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "ein Wort vorwärts gehen"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "ein Wort rückwärts gehen"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "zur vorhergehenden Zeile gehen"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "zur folgenden Zeile gehen"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "zum Anfang der aktuellen Zeile springen"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "zum Ende der aktuellen Zeile springen"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "zum Anfang des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "hinter das Ende des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "zur ersten Zeile der Datei springen"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "zur letzten Zeile der Datei springen"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "zur passenden Klammer springen"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "eine Zeile hochrollen, ohne den Cursor zu bewegen"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "eine Zeile hinunterrollen, ohne den Cursor zu bewegen"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "zum vorhergehenden Dateipuffer umschalten"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "zum folgenden Dateipuffer umschalten"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "nächstes Zeichen direkt (nicht interpretiert) einfügen"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "einen Tabulator an der Cursorposition einfügen"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "einen Zeilenumbruch an der Cursorposition einfügen"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Zeichen an der Cursorposition löschen"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Zeichen links vom Cursor löschen"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "vom Cursor bis zum Dateiende ausschneiden"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "die gesamte Datei ausrichten"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "die Zahl der Wörter, Zeilen und Zeichen zählen"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Bildschirm auffrischen (neu zeichnen)"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 "den Editor in den Hintergrund schieben (wenn „suspend“ angeschaltet ist)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Unterscheidung von Groß- und Kleinschreibung bei Suche umschalten"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "die Richtung der Suche umkehren"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Benutzung regulärer Ausdrücke umschalten"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "den vorhergehenden Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "den nächsten Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "zum Dateibrowser"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Schreiben im DOS-Format umschalten"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Schreiben im Mac-Format umschalten"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
-msgstr "Anhängen umschalten"
+msgstr "hinten Anhängen umschalten"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "vorn Anfügen umschalten"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Sicherung existierender Dateien beim Speichern umschalten"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "externen Befehl ausführen"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Benutzung eines neuen Puffers umschalten"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "den Dateibrowser beenden"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "zur ersten Datei der Liste springen"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "zur letzten Datei der Liste springen"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "zur nächsten Datei der Liste springen"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "zur vorigen Datei der Liste springen"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "zur nächsten Datei der Liste springen"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "gehe zu Verzeichnis"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Schließen"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "den Linter aufrufen (wenn verfügbar)"
+
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr "zur vorhergehenden Linter-Meldung gehen"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr "zur folgenden Linter-Meldung gehen"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Hilfe"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/global.c:671
+msgid "Write Out"
 msgstr "Speichern"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Gehe zu Verz."
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Ausschneiden"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Ausrichten"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Datei öffnen"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Rechtschr."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Ausschneiden"
+#: src/global.c:731
+msgid "To Linter"
+msgstr "Zum Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Ausr.rückgängig"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "GROSS/klein"
+
+#: src/global.c:741
+msgid "Regexp"
+msgstr "reg. Ausdruck"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Rückwärts"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Ausschn. rückgängig"
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Keine Ersetzung"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Cursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Rechtschr."
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Seite zurück"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Seite vor"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Erste Zeile"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Letzte Zeile"
+
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "Zu Klammer"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Text markieren"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopieren"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Einrücken"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Ausrücken"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Vorwärts"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Zurück"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Nächstes Wort"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Vorwärts"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Vorheriges Wort"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Zeile zurück"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Zeile vor"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Nächstes Wort"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Pos 1"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Ende"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Andere Klammer finden"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Anf des Abs."
 
-#: src/global.c:899
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Ende des Abs."
+
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Hochrollen"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Herunterrollen"
 
-#: src/global.c:907
-msgid "Previous File"
-msgstr "Vorherige Datei"
+#: src/global.c:851
+msgid "Prev File"
+msgstr "Vorh. Datei"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Nächste Datei"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr "Direkte Eingabe"
+#: src/global.c:862
+msgid "Verbatim"
+msgstr "Direkt"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Rücktaste"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "AusschnBisEnde"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Wortanzahl"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "in den Hintergrund"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Hist.letztes"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Hist.nächstes"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Zu Text"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS-Format"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac-Format"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Anhängen"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "vorn Anfügen"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Sicherungskopie"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Befehl ausführen"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "In Dateien"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Erste Datei"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Letzte Datei"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr "Lintmld. zurück"
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Hilfe-Modus"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Verwendung einer Zeile mehr zum Editieren"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Sanftes Rollen"
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr "Überlange Zeilen fließend umbrechen"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Weißraumanzeige"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Farbige Syntaxhervorhebung"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
-msgstr "Intell. Pos1-Taste"
+msgstr "Intelligente Pos1-Taste"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automatischer Einzug"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Bis Ende ausschneiden"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Lange Zeilen umbrechen"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
+msgstr "Ãœberlange Zeilen hart umbrechen"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Umwandlungen eingegebener Tabulatoren in Leerzeichen"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Sicherungskopien"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Mehrere Dateipuffer"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Mausunterstützung"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
-msgstr "in den Hintergrund"
+msgstr "In den Hintergrund"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Lange Zeilen fließend umbrechen"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1071,7 +1082,7 @@ msgstr ""
 "Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgenwelchen "
 "Textes führt die vorhergehende Suche durch.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1085,7 +1096,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Suchmodus verfügbar:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1105,7 +1116,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Zu-Zeile-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1129,7 +1140,7 @@ msgstr ""
 "laden. (Benutzen Sie Meta-< und >, um zwischen den Dateipuffern "
 "umzuschalten.)  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1144,7 +1155,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Datei-Einfügen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1172,7 +1183,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Datei-Schreiben-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1197,7 +1208,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Dateiwähler verfügbar:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1222,7 +1233,7 @@ msgstr ""
 "Textes führt die vorhergehende Suche durch.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1231,7 +1242,7 @@ msgstr ""
 "verfügbar:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1255,7 +1266,7 @@ msgstr ""
 "Dateiwählers verfügbar:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1279,7 +1290,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind in der Rechtschreibprüfung verfügbar:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1300,7 +1311,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Befehl-Ausführen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1320,7 +1331,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1337,9 +1348,9 @@ msgstr ""
 "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.  "
+"oder Meta eingegeben werden.  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1353,15 +1364,15 @@ msgstr ""
 "Hauptfenster verfügbar. Alternative Tasten stehen in Klammern:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "aktivieren/deaktivieren"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Taste unzulässig im Nur-Lese-Modus"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1370,7 +1381,7 @@ msgstr ""
 "\n"
 "Puffer in %s geschrieben\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1379,7 +1390,7 @@ msgstr ""
 "\n"
 "Puffer nicht in %s geschrieben: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1388,11 +1399,11 @@ msgstr ""
 "\n"
 "Puffer nicht geschrieben: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Fenstergröße ist zu klein für Nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1401,259 +1412,261 @@ msgstr ""
 "Aufruf: nano [OPTIONEN] [[+ZEILE,SPALTE] Datei]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Option\t\tlange GNU-Option\t\tBedeutung\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tBedeutung\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "diese Meldung anzeigen"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+ZEILE,SPALTE"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "bei Zeile ZEILE, Spalte SPALTE beginnen"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "intelligente Pos1-Taste aktivieren"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "existierende Dateien beim Speichern sichern"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <verz>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<verz>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Verzeichnis, um Backupdateien zu schreiben"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Fettdruck anstelle von inversem Text benutzen"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "eingegebebene Tabulatoren in Leerzeichen umwandeln"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Benutzung mehrerer Dateipuffer aktivieren"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr "Benutze Lock-Dateien (nach Art von Vim)"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Geschichte der Suchen-/Ersetzen-Begriffe mitschreiben und lesen"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "die nanorc-Dateien ignorieren"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Verwirrung um Zehnertastatur lösen"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "keine Zeilenvorschübe an die Enden von Dateien anhängen"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "keine Umwandlung aus DOS/Mac-Format"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "eine Zeile mehr zum Editieren verwenden"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "Cursorposition aufzeichnen und lesen"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <zkette>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<zkette>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Zitatzeichen"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "eingeschränkter Modus"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "zeilenweise rollen (statt halb-bildschirm-weise)"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#spalten>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#spalten>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Tabulator-Größe auf #spalten setzen"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "schnelles Löschen der Statuszeile durchführen"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Versionsinfo ausgeben und beenden"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Wortgrenzen genauer erkennen"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <zkette>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<zkette>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "zu benutzende Syntaxdefinition für Einfärben"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Vertauschung von Rücktaste/Entf beheben"
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr "Diese Hilfe anzeigen"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Neue Zeilen automatisch einrücken"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Vom Cursor bis zum Zeilenende ausschneiden"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Symbolischen Links nicht folgen, sondern überschreiben"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Benutzung der Maus aktivieren"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr "Datei nicht lesen (nur schreiben)"
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <verz>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<verz>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Arbeitsverzeichnis setzen"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Tasten XON (^Q) und XOFF (^S) beibehalten"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Startprobleme wie Fehler in den RC-Dateien stillschweigend ignorieren"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#spalten>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#spalten>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
-msgstr "Umbruchpunkt bei #spalten setzen"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Harten Umbruchpunkt bei #spalten setzen"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Alternatives Rechtschreibprüfungsprogramm"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Beim Beenden ohne Rückfrage speichern"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Allgemeine Rückgängig-Function aktivieren [EXPERIMENTELL]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Nur-Lese-Modus (keine Veränderungen möglich)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
-msgstr "Lange Zeilen nicht in neue Zeilen umbrechen"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
+msgstr "Lange Zeilen nicht hart umbrechen"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "die zwei Hilfe-Zeilen nicht anzeigen"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Schieben in den Hintergrund (anhalten und zurück zur Shell) aktivieren"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "fließenden Zeilenumbruch aktivieren"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoriert, für Kompatibilität zu Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano Version %s (compiliert um %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1662,163 +1675,169 @@ msgstr ""
 "\n"
 " Kompilierte Optionen:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tut mir leid, diese Funktion wird nicht unterstützt"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Veränderten Puffer speichern („Nein“ VERWIRFT DIE ÄNDERUNGEN) ? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Konnte Standardeingabe nicht erneut von Tastatur öffnen, sorry\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lese von Standardeingabe, ^C zum Abbrechen\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP oder SIGTERM empfangen\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Benutzen Sie „fg“, um zu nano zurückzukehren.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "aktiviert"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Unbekannter Befehl"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoriert, murmel murmel"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoriert, murmel murmel"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Angeforderte Tabulatorweite „%s“ ungültig"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Angeforderte Füllgröße „%s“ ungültig"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nein"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fehler in %s in Zeile %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ hat nicht beendetes \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ungültiger regulärer Ausdruck „%s“: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Fehlender Syntaxname"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Die Syntax „none“ ist reserviert"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Die Syntax „default“ darf keine Erweiterungen haben"
 
-#: src/rcfile.c:393
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Kann keinen magischen reg. Ausdruck hinzufügen, ohne einen Syntaxbefehl zu "
-"haben"
-
-#: src/rcfile.c:398
-msgid "Missing magic string name"
-msgstr "Fehlender Name für magische Zeichenkette"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Fehlender Schlüsselname"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Tastenkürzel müssen mit „^“, „M“ oder „F“ beginnen"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "Schlüsselname ist zu kurz"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Schlüsselnamen müssen mit „^“, „M“ oder „F“ beginnen"
+
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr "Die an die Taste zu bindene Funktion muss angegeben werden"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Das an die Taste zu bindene Menü (oder „all“) muss angegeben werden"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+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:512
+#: src/rcfile.c:467
 #, 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 function"
+msgstr "Kann „%s“ nicht auf eine Funktion binden"
 
-#: src/rcfile.c:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Konnte „%s“ nicht auf ein Menü binden"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Kann „%s“ nicht auf ein Menü binden"
 
-#: src/rcfile.c:540
+#: src/rcfile.c:497
 #, 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 "Tut mir Leid, Taste „%s“ kann nicht neu zugewiesen werden"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fehler beim Erweitern von %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1833,97 +1852,121 @@ msgstr ""
 "und „black“ (schwarz), mit dem optionalen Präfix „bright“ (hell)\n"
 "für Vordergrundfarben."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kann keine Farbdirektive hinzufügen, ohne einen Syntaxbefehl zu haben"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Fehlender Farbname"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Hintergrundfarbe „%s“ kann nicht hell („bright“) sein"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Fehlender regulärer Ausdruck"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ erfordert ein entsprechendes „end=“"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Hintergrundfarbe „%s“ kann nicht hell („bright“) sein"
+
+#: src/rcfile.c:819
 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"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Kann keinen magischen reg. Ausdruck hinzufügen, ohne einen Syntaxbefehl zu "
+"haben"
+
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "Fehlender Name für magische Zeichenkette"
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kann keinen Linter hinzufügen, ohne einen Syntaxbefehl zu haben"
+
+#: src/rcfile.c:944
+msgid "Missing linter command"
+msgstr "Fehlender Linter-Name"
+
+#: src/rcfile.c:974
 #, 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. Beende.\n"
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Konnte zu erweiternde Syntax „%s“ nicht finden"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Befehl „%s“ nicht in eingebundener Datei erlaubt"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax „%s“ hat keine Farbbefehle"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Befehl „%s“ nicht verstanden"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Fehlendes Flag"
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Fehlende Option"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Option „%s“ erfordert ein Argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Option ist keine gültige Multibyte-Zeichenkette"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Nicht-Leerraum-Zeichen erforderlich"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Zwei einspaltige Zeichen erforderlich"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "kann Flag „%s“ nicht löschen"
+msgid "Cannot unset option \"%s\""
+msgstr "kann Option „%s“ nicht zurücksetzen"
 
-#: src/rcfile.c:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Unbekanntes Flag „%s“"
+msgid "Unknown option \"%s\""
+msgstr "Unbekannte Option „%s“"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kann mein Heimatverzeichnis nicht finden!  Autsch!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1937,42 +1980,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ nicht gefunden"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (zu ersetzen) in Auswahl"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (zu ersetzen)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Fundstelle ersetzen?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Ersetzen mit"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "eine Ersetzung vorgenommen"
 msgstr[1] "%lu Ersetzungen vorgenommen"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1047
 msgid "Enter line number, column number"
 msgstr "Zeilennummer, Spaltennummer eingeben"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Ungültige Zeilen- oder Spaltennummer"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Keine Klammer"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Keine passende Klammer"
 
@@ -1984,228 +2031,297 @@ msgstr "Markierung gesetzt"
 msgid "Mark Unset"
 msgstr "Markierung entfernt"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Nichts im Rückgängig-Puffer!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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: kann Zeile %d nicht finden. Bitte speichern Sie Ihre Arbeit."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:451 src/text.c:588
 msgid "text add"
 msgstr "Text hinzu"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "Text löschen"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "Zeilenumbruch"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "Zeile verbinden"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "Text ausschneiden"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "Text ausschneiden zurücknehmen"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "Zeilenvorschub"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "Text einfügen"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Operation rückgangig gemacht (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+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: kann „Erneut durchführen“ nicht aufsetzen. Bitte speichern "
+"Sie Ihre Arbeit."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operation wiederholt (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Konnte kein Pipe durchführen"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Konnte keine Pipe erstellen"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Konnte kein Fork durchführen"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+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"
 
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Interner Fehler: Unbekannter Typ. Bitte speichern Sie Ihre Arbeit"
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ungültiges Zitatzeichen %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Kann Absatzausrichtung jetzt rückgängig machen"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Ersetzung editieren"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Konnte keine Pipe erstellen"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Erstelle Liste falsch geschriebener Wörter, bitte warten..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Konnte Größe des Pipe-Puffers nicht bestimmen"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Fehler beim Aufruf von „spell“"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Fehler beim Aufruf von „sort -f“"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Fehler beim Aufruf von „uniq“"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fehler beim Aufruf von „%s“"
 
-#: src/text.c:2970
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr "Rechtschreibprüfung aufrufen, bitte warten"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr "Kein Linter für diesen Dateitype definiert"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr "Geänderten Puffer vor dem Linter-Aufruf speichern?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "Rufe Linter auf, bitte warten"
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Habe 0 parsebare Zeilen vom Befehl erhalten: %s"
+
+#: src/text.c:3238
+#, 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:3286
+msgid "At last message"
+msgstr "Bei letzter Meldung"
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr "Bei erster Meldung"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sWörter: %lu  Zeilen: %ld  Zeichen: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "In Auswahl:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Direkte Eingabe"
+
 #: src/utils.c:409 src/utils.c:421
 msgid "nano is out of memory!"
 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:1558
 msgid "Unicode Input"
 msgstr "Unicode-Eingabe"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Verändert"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Ansehen"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "Verz.:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Datei:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Warnung: Ändere Datei, die nicht gesperrt ist, Verzeichnis-Rechte prüfen?"
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Der nano-Text-Editor"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "Version"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Entwickelt von:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Speziellen Dank an:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Für ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "und alle Nichtgenannten..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Danke für die Benutzung von nano!"
 
+#~ msgid "Insert File"
+#~ msgstr "Datei einfügen"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "zum vorhergehenden Bildschirm springen"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Andere Klammer finden"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Lange Zeilen umbrechen"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Lange Zeilen fließend umbrechen"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignoriert, für Kompatibilität zu Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Das an die Taste zu bindene Menü (oder „all“) muss angegeben werden"
+
+#~ msgid "Missing flag"
+#~ msgstr "Fehlendes Flag"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Interner Fehler: unbekannter Typ. Bitte speichern Sie Ihre Arbeit"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Interner Fehler: Vorbereitung für Wiederholen fehlgeschlagen. Bitte "
+#~ "speichern Sie Ihre Arbeit"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Konnte kein Pipe durchführen"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
 #~ "Fehler beim Schreiben der Sicherungskopie %s: Besitzer stimmt nicht "
diff --git a/po/eo.gmo b/po/eo.gmo
index b43eac63..afd35c51 100644
--- a/po/eo.gmo
+++ b/po/eo.gmo
diff --git a/po/eo.po b/po/eo.po
index f167e436..27d1212d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,17 +1,17 @@
 # Esperanto translations for GNU nano.
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # "Wovor hat diese Stadt Angst?
 # Es haben doch alle goldene Nasen hier!"
 #
-# Benno Schulenberg <benno@vertaalt.nl>, 2010, 2011, 2013.
+# Benno Schulenberg <benno@vertaalt.nl>, 2010, 2011, 2013, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.2pre4\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2013-03-18 21:02+0100\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2014-05-28 21:45+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
@@ -21,136 +21,133 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Iri dosierujon"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Rezignita"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:277 src/browser.c:324 src/browser.c:347 src/files.c:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Eraro dum legado de %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:665 src/browser.c:674
+#: src/browser.c:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(ujo)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(patra ujo)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 msgid "Search"
 msgstr "Serĉi"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [usklecdistinge]"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:194
+#: src/browser.c:806 src/search.c:192
 msgid " [Regexp]"
 msgstr " [regulesprime]"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [malantaÅ­en]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 msgid "Search Wrapped"
 msgstr "Serĉado ĉirkaŭiris"
 
-#: 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Ĉi tiu estas la ununura aperaĵo"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Mankas ankoraŭ serĉendaĵo"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
-"ne eblas eltrovi mian identecon por rigla dosiero (getpwuid() malsukcesis)"
+"Malsukcesis eltrovi mian identecon por rigla dosiero (getpwuid() fiaskis)"
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr "ne eblas eltrovi komputilretnomon por rigla dosiero: %s"
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Malsukcesis eltrovi komputilretnomon por rigla dosiero: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Eraro dum skribado de rigla dosiero %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Eraro dum forigo de rigla dosiero %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Eraro dum malfermo de rigla dosiero %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr "Eraro dum legado de rigla dosiero %s: nesufiĉaj datumoj legi�is"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ne eblas enmeti dosieron el ekstere de %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Ne ekzistas pliaj malfermaj bufroj"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Åœaltita al %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Nova bufro"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -165,14 +162,14 @@ msgstr[1] ""
 "Legi�is %lu linioj (konvertita el DOS- kaj Mac-aran�o -- Averto: skribrajto "
 "mankas)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -183,14 +180,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Legi�is %lu linioj (konvertitaj el Mac-aran�o -- Averto: skribrajto mankas)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -201,99 +198,99 @@ msgstr[0] ""
 msgstr[1] ""
 "Legi�is %lu linioj (konvertitaj el DOS-aran�o -- Averto: skribrajto mankas)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, 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:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Legado de dosiero"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Nova dosiero"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ne trovatas"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" estas dosierujo"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" estas aparato"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Rulenda komando en nova bufro [el %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Rulenda komando [el %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Enmetenda dosiero en nova bufro [el %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Enmetenda dosiero [el %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Klavo nur validas en multbufra moduso"
 
-#: src/files.c:1594
+#: src/files.c:1591
 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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ne eblas skribi ekstere de %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Eraro dum skribado de savkopio %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Ĉu troaj savkopioj?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Eraro dum skribado de %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Eraro dum skribado de portempa dosiero: %s"
@@ -349,15 +346,15 @@ msgstr "Dosiero jam ekzistas; ĉu ANSTATAŬIGI? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Ĉu konservi ALINOME? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Dosiero modifi�is post malfermo; ĉu tamen surskribi �in? "
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(plu)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -366,7 +363,7 @@ msgstr ""
 "\n"
 "Premu \"Enter\" por daÅ­rigi.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -376,7 +373,7 @@ msgstr ""
 "Ĉi tiu dosierujo bezonatas por konservi/relegi serĉan historion kaj kursoran "
 "pozicion.\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -385,7 +382,7 @@ msgstr ""
 "Vojo %s ne estas dosierujo sed devas esti.\n"
 "'Nano' ne kapablos konservi/relegi serĉan historion nek kursoran pozicion.\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -395,7 +392,7 @@ msgstr ""
 "dum movo al preferata loko (%s)\n"
 "okazis eraro: %s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -406,645 +403,659 @@ msgstr ""
 "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 five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Rezigni"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "AnstataÅ­igi"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Ne anstataÅ­igi"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Usklece"
+msgid "Exit"
+msgstr "Fini"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "MalantaÅ­en"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regulesprime"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "Pli olda"
+msgid "Close"
+msgstr "Fermi"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Malpli olda"
+#: src/global.c:473
+msgid "Uncut Text"
+msgstr "Alglui"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Serĉi"
+#: src/global.c:475
+msgid "Unjustify"
+msgstr "Malrektigi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Serĉi sekvan"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Unua dosiero"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Lasta dosiero"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Dosierlisto"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS-aran�o"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac-aran�o"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Postglui"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "AntaÅ­glui"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Savkopii"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Ruli komandon"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Iri dosierujon"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Helpo"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Fini"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Serĉi"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Pa�o supren"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Pa�o suben"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Unua linio"
+#: src/global.c:487
+msgid "Replace"
+msgstr "AnstataÅ­igi"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Lasta linio"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Iri linion"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "PaÅ­zigi"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Linio supren"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Alineo-eken"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Linio suben"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Alineo-finen"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Enmeti"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Rektigi ĉion"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Remontri"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Enmeti dosieron"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Iri linion"
-
-#: src/global.c:551
+#. 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:501
 msgid "Justify the current paragraph"
 msgstr "Rektigi la nunan alineon"
 
-#. 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Rezigni la nunan operacion"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Montri ĉi tiun helptekston"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Fermi la nunan bufron / Eliri el 'nano'"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Eliri el 'nano'"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Konservi la nunan dosieron sur disko"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Enmeti alian dosieron en la nuna bufro"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Serĉi signoĉenon aŭ regulesprimon"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Iri al la supra pa�o"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr "Serĉi parton de dosiernomo"
 
-#: src/global.c:572
-msgid "Go to next screen"
-msgstr "Iri al la suba pa�o"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr "Iri unu pa�o supren"
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr "Iri unu pa�o suben"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Eltondi la nunan linion kaj konservi �in en tondbufro"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Glui tekstaĵon el la tondbufro en la nuna linio"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Montri la pozicion de la kursoro"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Ruli literumilon (se disponeblas)"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Anstataŭigi signoĉenon aŭ regulesprimon"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Iri al linionumero (kaj kolumnonumero)"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+msgid "Mark text starting from the cursor position"
 msgstr "Marki tekston ekde la kursora pozicio"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+msgid "Repeat the last search"
 msgstr "Ripeti lastan serĉon"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopii la nunan linion kaj konservi �in en tondbufro"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "De�ovi enen la nunan linion"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "De�ovi eksteren la nunan linion"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Malfari la lastan operacion"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Refari la lastan malfaratan operacion"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Iri unu signon antaÅ­en"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Iri unu signon malantaÅ­en"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Iri unu vorton antaÅ­en"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Iri unu vorton malantaÅ­en"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Iri al la supra linio"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Iri al la suba linio"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Iri al la komenco de la nuna linio"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Iri al la fino de la nuna linio"
 
-#: src/global.c:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Iri al la unua linio de la dosiero"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Iri al la lasta linio de la dosiero"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Iri al para krampo"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rulumi unu linion supren sen movi la kursoron"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rulumi unu linion suben sen movi la kursoron"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Åœalti al malsekva dosierbufro"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Åœalti al sekva dosierbufro"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Enmeti la tujsekvan klavon tielkiel"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Enmeti tabon je la kursora pozicio"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Enmeti novlinion je la kursora pozicio"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Forigi la signon sub la kursoro"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Forigi la signon maldekstran de la kursoro"
 
-#: src/global.c:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Rektigi la tutan dosieron"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Nombri la vortojn, liniojn, kaj signojn"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Aktualigi (redesegni) la nunan ekranon"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Paŭzigi la redaktilon (se paŭzigebleco en�altitas)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Ŝalti la usklecdistingon de serĉo"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Mali la direkton de serĉo"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Åœalti la uzon de regulesprimoj"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Repreni la antaŭan serĉitan signoĉenon"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Repreni la postan serĉitan signoĉenon"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Iri al dosieresplorilo"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Ŝalti la uzon de DOS-aran�o"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Ŝalti la uzon de Mac-aran�o"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Åœalti postgluon"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Åœalti antaÅ­gluon"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Åœalti fari savkopion de redaktota dosiero"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Ruli eksteran komandon"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Åœalti la uzon de nova bufro"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Eliri el dosieresplorilo"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Iri al la unua dosiero en la listo"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Iri al la lasta dosiero en la listo"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Iri al la sekva dosiero en la listo"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Iri al la malsekva dosiero en la listo"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Iri al la sekva dosiero en la listo"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Iri al indikota dosierujo"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Fermi"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "Ruli sintaks-kontrolilon (se disponeblas)"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr "Iri al la antaŭa mesa�o de la kontrolilo"
+
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr "Iri al la sekva mesa�o de la kontrolilo"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Helpo"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Rezigni"
+
+#: src/global.c:671
+msgid "Write Out"
 msgstr "Konservi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Iri dosierujon"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Eltondi"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Rektigi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Enmeti"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Literumo"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Eltondi"
+#: src/global.c:731
+msgid "To Linter"
+msgstr "Trakombi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Malrektigi"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Usklece"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Alglui"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regulesprime"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "MalantaÅ­en"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Ne anstataÅ­igi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Pozicio"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Literumo"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Pa�o supren"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Pa�o suben"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Unua linio"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Lasta linio"
+
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "Al krampo"
+
+#: src/global.c:788
 msgid "Mark Text"
-msgstr "Marki tekston"
+msgstr "Mark�alto"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopii tekston"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "De�ovi enen"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "De�ovi eksteren"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Malfari"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Refari"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "AntaÅ­en"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "MalantaÅ­en"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Posta vorto"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "AntaÅ­en"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "AntaÅ­a vorto"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Linio supren"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Linio suben"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Posta vorto"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Linikomencen"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Linifinen"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Al para krampo"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Alineo-eken"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Alineo-finen"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Rulumi supren"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Rulumi suben"
 
-#: src/global.c:907
-msgid "Previous File"
-msgstr "Malsekvan dosieron"
+#: src/global.c:851
+msgid "Prev File"
+msgstr "Malsekvan"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
-msgstr "Sekvan dosieron"
+msgstr "Sekvan"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr "Konforma enigo"
+#: src/global.c:862
+msgid "Verbatim"
+msgstr "Konforme"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "«Tabo»"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "«Enigo»"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "«Forigo»"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "«Retropa�o»"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
-msgstr "Tondi �is fino"
+msgstr "Tondi reston"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Nombri vortojn"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "PaÅ­zigi"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Pli olda"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Malpli olda"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Serĉi"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS-aran�o"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac-aran�o"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Postglui"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "AntaÅ­glui"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Savkopii"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Ruli komandon"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Dosierlisto"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Unua dosiero"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Lasta dosiero"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr "Antaŭa mesa�o"
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Helpaj linioj"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "DaÅ­ra montro de kursora pozicio"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Uzi unu plian linion por redakti"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Rulumi linie"
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr "Ĉirkaŭfluigo de tro longaj linioj"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Montri blankan spacon"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Kolore montri sintakson"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Inteligenta klavo «Komencen»"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Aŭtomate de�ovi"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
-msgstr "Eltondi �is dosierfino"
+msgstr "Tondi ekde kursoro �is linifino"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Faldi longajn liniojn"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
+msgstr "Faldi longajn liniojn (enmeti linifinon)"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konverti tajpatajn tabojn al spacoj"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Fari savkopion de redaktota dosiero"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Pluraj dosierbufroj"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
-msgstr "Subteni uzon de muso"
+msgstr "Subteno de muso"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Ne konverti el DOS-/Mac-aran�o"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "PaÅ­zigebleco"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Ĉirkaŭfluo de linioj"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1062,10 +1073,10 @@ msgstr ""
 "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.  "
+" 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:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1079,7 +1090,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas en serĉa moduso:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1099,7 +1110,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Iri linion»:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1121,7 +1132,7 @@ msgstr ""
 "aŭ per �alto Meta-F), enmeti dosieron �argos �in en aparta bufro.  Uzu Meta-"
 "< kaj Meta-> por �alti inter bufroj.  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1135,7 +1146,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Enmeti dosieron»:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1161,7 +1172,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Konservi dosieron»:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1185,7 +1196,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas en la dosieresplorilo:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1208,7 +1219,7 @@ msgstr ""
 "«Enigo» sen enigi iun ajn tekston, kontinuigos tiun antaŭan serĉon.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1216,7 +1227,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Serĉi dosieron»:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1238,7 +1249,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Iri dosierujon»:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1253,16 +1264,16 @@ msgid ""
 msgstr ""
 "Helpteksto por literuma kontrolo\n"
 "\n"
-" La literumilo kontrolas la otrografion de la tuta teksto en la nuna "
+" 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ŭigo.  Poste, la literumilo demandas ĉu anstataŭigi la "
+"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:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1282,7 +1293,7 @@ msgstr ""
 " La subaj klavkomandoj disponeblas dum «Ruli komandon»:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1302,7 +1313,7 @@ msgstr ""
 "montras la redaktatan dosieron.  La tria linio ekde la fundo estas la stata "
 "linio, kiu montras gravajn mesa�ojn.  "
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1320,7 +1331,7 @@ msgstr ""
 "\"M-\" kaj eblas enigi ilin premtenante klavon \"Alt\" aÅ­ \"Meta\", aÅ­ "
 "premante antaÅ­e unufoje klavon \"Esc\".  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1335,15 +1346,15 @@ msgstr ""
 "alternativaj kombinoj montri�as inter krampoj:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr " (�alto)"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Klavo ne validas en rigarda re�imo"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1352,7 +1363,7 @@ msgstr ""
 "\n"
 "Bufro skribi�is al %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1361,7 +1372,7 @@ msgstr ""
 "\n"
 "Bufro ne skribi�is al %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1370,11 +1381,11 @@ msgstr ""
 "\n"
 "Bufro ne skribi�is: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Fenestro estas tro malgranda por 'nano'...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1383,261 +1394,261 @@ msgstr ""
 "Uzmaniero:  nano [OPCIO...] [[+LINIO,KOLUMNO] DOSIERO...]\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opcio\t\tLonga GNU-a opcio\t  Signifo\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opcio\t\t  Signifo\n"
 
-# La sekvaj mesa�oj komencas en traduko per minusklo,
-# ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "montri ĉi tiun mesa�on"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+LINIO,KOLUMNO"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
-msgstr "komenci en linio LINIO (kaj kolumno KOLUMNO)"
+msgstr "komenci en ĉi tiu LINIO (kaj KOLUMNO)"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "estigi klavon «Komencen» inteligenta"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "fari savkopion de ekzistanta dosiero"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <ujo>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<ujo>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "dosierujo por konservi unikajn savkopiojn"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "uzi grasan anstataÅ­ negativan tekston"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "konverti tajpatajn tabojn al spacoj"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "ebligi uzon de pluraj dosierbufroj"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr "uzi riglajn dosierojn (kiel je 'vim')"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "memori historion de serĉitaj signoĉenoj"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "ignori 'nanorc'-dosierojn"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "fliki konfuzon je cifera klavareto"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "ne aldoni novlinion al fino de dosiero"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "ne konverti el DOS-/Mac-aran�o"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "uzi unu plian linion por redakti"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "konservi kaj relegi kursoran pozicion"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <ĉeno>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<ĉeno>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "signoĉeno de rekonendaj citiloj"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "limigita re�imo"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "rulumi po linio anstataÅ­ po duon-ekrano"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
-msgstr "-T <kolumnoj>"
+msgstr "-T <nombro>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<kolumnoj>"
+msgstr "--tabsize=<nombro>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "uzenda lar�o de tabo"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "vi�i statlinio tuj post sekva klavtu�o"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "montri programversion kaj fini"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "detekti vortlimojn pli akurate"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
-msgstr "-Y <ĉeno>"
+msgstr "-Y <nomo>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
-msgstr "--syntax=<ĉeno>"
+msgstr "--syntax=<nomo>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "uzenda sintaksdifino por kolorigi"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "daÅ­re montri kursoran pozicion"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "fliki konfuzon pri «Retropa�o»/«Forigo»"
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr "montri ĉi tiun helptekston"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "aŭtomate de�ovi novajn liniojn"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "forigi ekde de la kursoro �is liniofino"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "ne sekvi simbolajn ligilojn; anstataÅ­igi"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "ebligi uzon de muso"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr "ne legi dosieron (nur skribi �in)"
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <ujo>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<ujo>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "uzenda kuranta dosierujo"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "ebligi klavojn ^Q (XON) kaj ^S (XOFF)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "silente ignori lanĉajn problemetojn"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
-msgstr "-r <kolumnoj>"
+msgstr "-r <nombro>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
-msgstr "--fill=<kolumnoj>"
+msgstr "--fill=<nombro>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
 msgstr "uzenda lar�o por faldi/rektigi"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <programo>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<programo>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "uzenda alternativa literumilo"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "aÅ­tomate konservi je fino, sen demandi"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "ebligi �eneralan malfaron [PROVA]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "rigarda re�imo (ne eblas redakti)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
 msgstr "ne faldi longajn liniojn"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "ne montri la du helpajn liniojn"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "ebligi paÅ­zigo"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
-msgstr "ebligi ĉirkaŭfluon de linioj"
-
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoritaj, por kongruo kun 'Pico')"
+msgstr "ĉirkaŭfluigi longajn liniojn"
 
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano  versio %s  (kompilita %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1646,163 +1657,170 @@ msgstr ""
 "\n"
 " Kompilaj opcioj:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Subteno de ĉi tiu funkcio malebli�is"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Ĉu konservi modifitan bufron? (\"N\" DETRUOS ŜANĜOJN) "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Maleblas remalfermi klavaron kiel ĉefenigujon\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Legado el ĉefenigujo; ^C por ĉesigi\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevitas SIGHUP aÅ­ SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Uzu \"fg\" por reveni al 'nano'.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "(en�altitas)"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "(mal�altitas)"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Nekonata komando"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "Mmm-mmm, XON ignoratas"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "Mmm-mmm, XOFF ignoratas"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Petata tablar�o \"%s\" ne validas"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Petata faldlar�o \"%s\" ne validas"
 
+#: src/nano.c:2384
+#, 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:1259
+#: src/prompt.c:1247
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "NnNn"
 
 # Tute, All.
 # "Ĉiujn" ne eblas, ĉar plurbitokajn klavojn 'nano' ĉi tie ne komprenas.
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "TtCcAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Jes"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Tute"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Eraro en %s en linio %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento '%s' havas senparan citilon \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regulesprimaj signoĉenoj devas komenci kaj fini kun citilo \""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Malbonas regulesprimo \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Mankas nomo de sintakso"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintakso \"none\" estas rezervita"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Sintakso \"default\" ne permesas finaĵojn"
 
-#: src/rcfile.c:393
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Ne eblas aldoni regulesprimon por magia signoĉeno sen sintaksa komando"
-
-#: src/rcfile.c:398
-msgid "Missing magic string name"
-msgstr "Mankas nomo de magia signoĉeno"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Mankas nomo de klavo"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Klavligoj devas komenci kun \"^\", \"M\", aÅ­ \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "Klavnomo tro mallongas"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Klavnomo devas komenci kun \"^\", \"M\", aÅ­ \"F\""
+
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr "Mankas funkcio al kiu ligi klavon"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Mankas menuo (aÅ­ \"all\") al kiu ligi klavon"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+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:512
+#: src/rcfile.c:467
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Ĉeno \"%s\" ne estas nomo de funkcio"
 
-#: src/rcfile.c:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Ĉeno \"%s\" ne estas nomo de menuo"
 
-#: src/rcfile.c:540
+#: src/rcfile.c:497
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Ne eblas religi klavĉenon \"%s\""
+
+#: src/rcfile.c:583
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Klavĉeno \"%s\" ne estas valida ligo"
+msgid "Error expanding %s: %s"
+msgstr "Eraro dum malvolvo de %s: %s"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1817,93 +1835,114 @@ msgstr ""
 "\"black\" (nigra) kaj \"white\" (blanka),\n"
 "kun (por malfonaj koloroj) la malnepra prefikso \"bright\" (hela)."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
-msgstr "Ne eblas aldoni koloran komandon sen sintaksa komando"
+msgstr "Ne eblas aldoni komandon 'color' sen komando 'syntax'"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Mankas nomo de koloro"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Fona koloro \"%s\" ne povas esti hela"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Mankas regulesprima signoĉeno"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" bezonas paran \"end=\""
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Fona koloro \"%s\" ne povas esti hela"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Ne eblas aldoni kapan regulesprimon sen sintaksa komando"
+msgstr "Ne eblas aldoni regulesprimon por kaplinio sen komando 'syntax'"
+
+#: src/rcfile.c:875
+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:960
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "Mankas nomo de magia signoĉeno"
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr "Ne eblas aldoni komandon por 'linter' sen komando 'syntax'"
+
+#: src/rcfile.c:944
+msgid "Missing linter command"
+msgstr "Mankas programnomo post 'linter'"
+
+#: src/rcfile.c:974
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Neignorebla eraro: neniu klavo ligita al funkcio \"%s\""
+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:962
+#: src/rcfile.c:976
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr "Eliro.  Se necesas, uzu 'nano -I' por �ustigi agordojn en 'nanorc'.\n"
+"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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ne trovi�as sintakso '%s' por pliampleksigi"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Komando \"%s\" ne permesatas en inkluda dosiero"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintakso \"%s\" ne havas kolorajn komandojn"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komando \"%s\" ne estas komprenata"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Mankas flago"
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Mankas opcio"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcio \"%s\" bezonas argumenton"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Opcia argumento ne estas valida plurbitoka signoĉeno"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Neblankaj signoj bezonatas"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Du unukolumnaj signoj bezonatas"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Ne eblas mal�alti flagon \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Ne eblas mal�alti opcion \"%s\""
 
-#: src/rcfile.c:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Nekonata flago \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Nekonata opcio \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
-msgstr "Ne eblas trovi hejman dosierujon.  Ve!"
+msgstr "Malsukcesis trovi hejman dosierujon.  Ve!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1917,42 +1956,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ne trovatas"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (por anstataŭigi) en markaĵo"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (por anstataÅ­igi)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Anstataŭigi ĉi tiun aperaĵon?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "AnstataÅ­igi per"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1047
 msgid "Enter line number, column number"
 msgstr "Enigu linionumeron, kolumnonumeron"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Ne validas numero de linio aÅ­ kolumno"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ne estas krampo"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Ne ekzistas para krampo"
 
@@ -1964,223 +2007,294 @@ msgstr "Markado en�altitas"
 msgid "Mark Unset"
 msgstr "Mal�altitas"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Nenio por malfari!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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 "**Programeraro**: ne eblas kongrui linion %d.  Konservu vian laboron."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:451 src/text.c:588
 msgid "text add"
 msgstr "teksta aldono"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "teksta forigo"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "linifaldo"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "linikunigo"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "teksta eltondo"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "teksta algluo"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "linisalto"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "teksta enmeto"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 msgid "text replace"
 msgstr "teksta anstataÅ­igo"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "**Programeraro**: nekonata tipo.  Konservu vian laboron."
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Malfari�is ago (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr "Nenio por refari!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
-"**Programeraro**: refara preparado malsukcesis.  Konservu vian laboron."
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "**Programeraro**: ne eblas prepari refaron.  Konservu vian laboron."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Refari�is ago (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Ne eblas krei dukton"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Malsukcesis krei dukton"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
-msgstr "Ne eblas krei novan procezon"
+msgstr "Malsukcesis krei novan procezon"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "**Programeraro**: ne eblas prepari maltondon.  Konservu vian laboron."
 
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "**Programeraro**: nekonata tipo.  Konservu vian laboron."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Signoĉeno de citiloj %s ne validas: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
-msgstr "Nun eblas malrektigi (per ^U)!"
+msgstr "Nun eblas malrektigi!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Redakti anstataÅ­igon"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Ne eblas krei dukton"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Kreado de listo de misliterumataj vortoj; bonvolu atendi..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Ne eblas scii grandon de dukta bufro"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Eraro dum lanĉo de 'spell'"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Eraro dum lanĉo de 'sort -f'"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Eraro dum lanĉo de 'uniq'"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Fini�is literuma kontrolo"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Eraro dum lanĉo de '%s'"
 
-#: src/text.c:2970
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr "Ekruli�as literumilo, bonvolu atendi"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Literuma kontrolo malsukcesis: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Literuma kontrolo malsukcesis: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr "Ne defini�is sintaks-kontrolilo por ĉi tiu tipo de dosiero"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr "Ĉu konservi modifitan bufron antaŭ la kontrolo?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "Ekruli�as sintaks-kontrolilo, bonvolu atendi"
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Ricevi�is nul analizeblaj linioj de la komando «%s»"
+
+#: src/text.c:3238
+#, 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:3286
+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:3293
+msgid "At first message"
+msgstr "Ĉi tiu estas la unua mesa�o"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sVortoj: %lu  Linioj: %ld  Literoj: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "En markaĵo:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Konforma enigo"
+
 #: src/utils.c:409 src/utils.c:421
 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:1557
+#: src/winio.c:1558
 msgid "Unicode Input"
 msgstr "Enigo de Unikodo"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Ŝan�ita"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Nur rigardi"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "DOSIERUJO:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Dosiero:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 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:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "La tekstredaktilo 'nano'"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versio"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Prezentita al vi per:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Specialan dankon al:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "la “Free Software Foundation�"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "por 'ncurses':"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "kaj iuj ajn kiujn ni forgesis..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Dankon pro via uzo de 'nano'!"
 
+#~ 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 "Internal error: unknown type.  Please save your work"
+#~ msgstr "**Programeraro**: nekonata tipo.  Konservu vian laboron."
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "**Programeraro**: refara preparado malsukcesis.  Konservu vian laboron."
+
+#~ 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 b42121bc..2a9223f2 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 4fd9cee0..d2fac3da 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,306 +1,321 @@
-# 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) 2013 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-1.9.99pre0\n"
+"Project-Id-Version: nano-2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2006-08-30 23:38+0100\n"
-"Last-Translator: Ricardo Javier Cardenes Medina <rcardenes@not.iac.es>\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2013-05-04 12:45+0200\n"
+"Last-Translator: Jorge González <aloriel@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\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: Gtranslator 2.91.6\n"
 
 # a un. sv
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 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:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, 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:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(dir padre)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 msgid " [Case Sensitive]"
-msgstr " [Mayúsc/Minúsc]"
+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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
-msgstr " [Hacia Atrás]"
+msgstr " [Hacia atrás]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 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:1035 src/search.c:580
 msgid "No current search pattern"
-msgstr "No hay patrón de búsqueda"
+msgstr "No hay patrón de búsqueda"
 
-#: src/files.c:137
+#: src/files.c:138
 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:143
-#, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+#: src/files.c:144
+#, fuzzy, 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:169 src/files.c:207 src/files.c:217
-#, fuzzy, c-format
+#: src/files.c:170 src/files.c:207 src/files.c:217
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Error escribiendo en fichero temporal: %s"
+msgstr "Error al escribir el fichero temporal «%s»: %s"
 
-#: src/files.c:234
-#, fuzzy, c-format
+#: src/files.c:232
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Error escribiendo en fichero temporal: %s"
+msgstr "Error al eliminar el fichero de bloqueo «%s»: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "Error leyendo '%s': %s"
+msgid "Error opening lock file %s: %s"
+msgstr "Error al abrir el fichero de bloqueo «%s»: %s"
 
-#: src/files.c:281
-#, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+#: src/files.c:276
+#, fuzzy, c-format
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
+"Error al leer el fichero de bloqueo «%s»: no hay suficientes datos para leer"
 
 # queda raro no usar ni "un" ni "el" antes de fichero. sv
-#: src/files.c:328
+#: src/files.c:322
 #, 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:437
+#: src/files.c:431
 msgid "No more open file buffers"
-msgstr "No hay más ficheros abiertos"
+msgstr "No hay más ficheros abiertos"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Se ha cambiado a %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
-msgstr "Nuevo Búfer"
+msgstr "Búfer nuevo"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
-#, fuzzy, c-format
+#: src/files.c:840
+#, 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:851
+#: src/files.c:846
 #, 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:855
-#, fuzzy, c-format
+#: src/files.c:850
+#, 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:861
+#: src/files.c:856
 #, 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:865
-#, fuzzy, c-format
+#: src/files.c:860
+#, 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:871
+#: src/files.c:866
 #, 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:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
-msgstr "Leyendo Fichero"
+msgstr "Leyendo fichero"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
-msgstr "Nuevo Fichero"
+msgstr "Nuevo fichero"
 
-#: src/files.c:923
+#: src/files.c:918
 #, 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:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+# Aquí pegaría poner "El fichero...", como en el mensaje siguiente. sv
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "El fichero \"%s\" es un directorio"
+msgstr "«%s» es un directorio"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, 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:1031
+#: src/files.c:1026
 #, 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:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Orden a ejecutar [desde %s]"
+msgstr "Comando que ejecutar [desde %s]"
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, 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:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Fichero a insertar [desde %s] "
+msgstr "Fichero que insertar [desde %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 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:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
+"Falló al escribir el archivo de respaldo, ¿continuar guardándolo? (responda "
+"N si no está seguro)"
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No se puede escribir fuera de %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
-#, fuzzy, c-format
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
+#, 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:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
-msgstr "Demasiados ficheros de respaldo?"
+msgstr "¿Demasiados ficheros de respaldo?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Error guardando '%s': %s"
+msgstr "Error al escirbir «%s»: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, 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:2140
 #, 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:2245
 msgid " [DOS Format]"
@@ -317,16 +332,16 @@ msgstr " [Respaldo]"
 # Como antes, me suena raro que antes de Fichero no haya "un" o "el". sv
 #: src/files.c:2256
 msgid "Prepend Selection to File"
-msgstr "Anteponer selección al fichero"
+msgstr "Anteponer selección al fichero"
 
 #: src/files.c:2257
 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:2258
 msgid "Write Selection to File"
-msgstr "Escribir selección al fichero"
+msgstr "Escribir selección al fichero"
 
 # de -> del. sv
 #: src/files.c:2261
@@ -336,740 +351,760 @@ msgstr "Nombre del fichero al que anteponer"
 # de -> del. sv
 #: src/files.c:2262
 msgid "File Name to Append to"
-msgstr "Nombre del fichero al que añadir"
+msgstr "Nombre del fichero al que añadir"
 
-# ídem. sv
+# ídem. sv
 #: src/files.c:2263
 msgid "File Name to Write"
 msgstr "Nombre del fichero a escribir"
 
 #: src/files.c:2394
 msgid "File exists, OVERWRITE ? "
-msgstr "El fichero existe, ¿ SOBREESCRIBIR ?"
+msgstr "El fichero existe, ¿SOBREESCRIBIR?"
 
 #: src/files.c:2403
 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:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
-msgstr "(más)"
+msgstr "(más)"
 
-#: src/files.c:2942
-#, fuzzy, c-format
+#: src/files.c:2939
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"Pulsa intro para continuar iniciando nano\n"
+"Pulse Intro para continuar\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\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/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
+"La ruta %s no es un directorio y debe serlo.\n"
+"Nano no podrá cargar o guardar la búsqueda o la posición del cursor en el "
+"histórico.\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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 fichero de histórico de compatibilidad de nano (%s) que se \n"
+"intenó mover a la ubicación preferida (%s) pero se encontró un error: %s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, 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 fichero histórico de compatibilidad de nano (%s) que se\n"
+"movío a la ubicación preferida (%s)\n"
+"(consulte las P+F de nano acerca de este cambio)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Reemplazar"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "No sustituir"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "May/Min"
+msgid "Exit"
+msgstr "Salir"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Hacia Atrás"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "ExpReg"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "HistóricoPrev"
+msgid "Close"
+msgstr "Cerrar"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "HistSig"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Pegar texto"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Ir a texto"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Desjustificar"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
-msgstr "DóndeEstá Sig"
-
-#: src/global.c:508
-msgid "First File"
-msgstr "Primer Fich"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Último Fich"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "A ficheros"
+msgstr "DóndeEstá sig."
 
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Añadir"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Anteponer"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Respaldar fich"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Ejecutar orden"
-
-# a un. sv
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Ir a un dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Ver ayuda"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Salir"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Buscar"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Pág Ant"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Pág Sig"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Prim. lín."
+#: src/global.c:487
+msgid "Replace"
+msgstr "Reemplazar"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Última línea"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Ir a línea"
 
-#: src/global.c:538
-#, fuzzy
-msgid "Suspend"
-msgstr "Suspensión"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Línea anterior"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Ini de Pár"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Línea siguiente"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Fin de Pár"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Leer fich."
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "JustifTodo"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
-msgstr "Refrescar"
-
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Inserte fichero"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Ir a Línea"
-
-#: src/global.c:551
-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:556
+#: src/global.c:501
+msgid "Justify the current paragraph"
+msgstr "Justificar el párrafo actual"
+
+#: src/global.c:503
 msgid "Cancel the current function"
-msgstr "Cancelar la función actual"
+msgstr "Cancelar la función actual"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Mostrar esta ayuda"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Cerrar el fichero mostrado / Salir de nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Salir de nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Escribir el fichero actual a disco"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Insertar otro fichero en el actual"
 
-#: src/global.c:570
+#: src/global.c:517
 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:571
+#: src/global.c:520
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Moverse a la página anterior"
+msgid "Search for a string"
+msgstr "Buscar una cadena o expresión regular"
 
-#: src/global.c:572
+#: src/global.c:522
 #, fuzzy
-msgid "Go to next screen"
-msgstr "Moverse a la página siguiente"
+msgid "Go one screenful up"
+msgstr "Ir a la siguiente pantalla"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Ir a la siguiente pantalla"
+
+#: src/global.c:525
 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:576
+#: src/global.c:527
 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:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
-msgstr "Mostrar la posición del cursor"
+msgstr "Mostrar la posición del cursor"
 
-#: src/global.c:580
+#: src/global.c:530
 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:582
+#: src/global.c:532
 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:583
+#: src/global.c:533
 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:585
-msgid "Mark text at the cursor position"
-msgstr "Marcar texto en la posición actual del cursor"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
+msgstr "Marcar texto en la posición actual del cursor"
 
-#: src/global.c:586
-msgid "Repeat last search"
-msgstr "Repetir la última búsqueda"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
+msgstr "Repetir la última búsqueda"
 
-#: src/global.c:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 msgid "Indent the current line"
-msgstr "Sangrar la línea actual"
+msgstr "Sangrar la línea actual"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
-msgstr "Quitar sangrado a la línea actual"
+msgstr "Quitar sangrado a la línea actual"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Deshacer la última operación"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Rehacer la última operación deshecha"
 
-#: src/global.c:594
-#, fuzzy
+#: src/global.c:544
 msgid "Go forward one character"
-msgstr "Moverse hacia adelante un carácter"
+msgstr "Ir hacia adelante un carácter"
 
-#: src/global.c:595
-#, fuzzy
+#: src/global.c:545
 msgid "Go back one character"
-msgstr "Moverse hacia atrás un carácter"
+msgstr "Ir hacia atrás un carácter"
 
-#: src/global.c:597
-#, fuzzy
+#: src/global.c:547
 msgid "Go forward one word"
-msgstr "Moverse hacia adelante una palabra"
+msgstr "Ir hacia adelante una palabra"
 
-#: src/global.c:598
-#, fuzzy
+#: src/global.c:548
 msgid "Go back one word"
-msgstr "Moverse una palabra atrás"
+msgstr "Ir una palabra atrás"
 
-#: src/global.c:600
-#, fuzzy
+#: src/global.c:550
 msgid "Go to previous line"
-msgstr "Moverse a la línea anterior"
+msgstr "Ir a la línea anterior"
 
-#: src/global.c:601
-#, fuzzy
+#: src/global.c:551
 msgid "Go to next line"
-msgstr "Moverse a la línea siguiente"
+msgstr "Ir a la siguiente línea"
 
-#: src/global.c:602
-#, fuzzy
+#: src/global.c:552
 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:603
-#, fuzzy
+#: src/global.c:553
 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:606
-#, fuzzy
+#: src/global.c:556
 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:608
-#, fuzzy
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Moverse al final del párrafo actual"
+msgstr "Go just beyond end of paragraph; then of next paragraph"
 
-#: src/global.c:611
-#, fuzzy
+#: src/global.c:560
 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 archivo"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:561
 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 archivo"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:563
 msgid "Go to the matching bracket"
-msgstr "Mover a la llave correspondiente"
+msgstr "Ir a la llave correspondiente"
 
-#: src/global.c:617
+#: src/global.c:565
 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:619
+#: src/global.c:567
 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:623
+#: src/global.c:570
 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:625
+#: src/global.c:571
 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:628
+#: src/global.c:573
 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:630
+#: src/global.c:574
 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:632
+#: src/global.c:575
 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:634
+#: src/global.c:576
 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:636
+#: src/global.c:578
 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:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Justificar el fichero completo"
 
-#: src/global.c:646
+#: src/global.c:588
 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:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibujar la pantalla actual"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspender el editor (si suspender está activado)"
 
-#: src/global.c:654
+#: src/global.c:596
 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:656
+#: src/global.c:598
 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:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Cambiar el uso de expresiones regulares"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
-msgstr "Recupera la cadena previa de búsqueda/reemplazo"
+msgstr "Recupera la cadena previa de búsqueda/reemplazo"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
-msgstr "Recupera la siguiente cadena de búsqueda/reemplazo"
+msgstr "Recupera la siguiente cadena de búsqueda/reemplazo"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Ir al navegador de ficheros"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Conmuta el uso de formato DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Conmuta el uso de formato Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
-msgstr "Conmuta añadir texto"
+msgstr "Conmuta añadir texto"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Conmuta prefijar texto"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
-msgstr "Conmuta creación de ficheros de respaldo"
+msgstr "Conmuta creación de ficheros de respaldo"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Ejecutar orden externa"
 
-# Ídem de ídem. Te dejo que revises los que siguen.
-#: src/global.c:684
+# �dem de ídem. Te dejo que revises los que siguen.
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
-msgstr "Conmuta el uso de nuevo búfer"
+msgstr "Conmuta el uso de nuevo búfer"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Salir del navegador de ficheros"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Ir al primer fichero de la lista"
 
-#: src/global.c:691
+#: src/global.c:627
 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:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Ir al último fichero de la lista"
-
-#: src/global.c:693
-#, fuzzy
+#: src/global.c:628
 msgid "Go to the previous file in the list"
-msgstr "Ir al primer fichero de la lista"
+msgstr "Ir al archivo anterior en la lista"
+
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Ir al siguiente archivo en la lista"
 
 # a un. sv
-#: src/global.c:694
+#: src/global.c:630
 msgid "Go to directory"
-msgstr "Ir a un Directorio"
+msgstr "Ir a un directorio"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Cerrar"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Invocar el corrector ortográfico (si está disponible)"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Ir a la línea anterior"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Ir a la siguiente línea"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Ver ayuda"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Guardar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+# a un. sv
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Ir a un dir"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Cortar texto"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Justificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Leer Fich"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Ortografía"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "CortarTxt"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Ir a línea"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Desjustificar"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "May/min"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "PegarTxt"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "ExpReg"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Hacia Atrás"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "No sustituir"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Pos actual"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Ortografía"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Pág Ant."
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Pág Sig."
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Prim. lín."
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Última línea"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "No es una llave"
+
+#: src/global.c:788
 msgid "Mark Text"
-msgstr "MarcarTxt"
+msgstr "Marcar texto"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
-msgstr "CopiarTxt"
+msgstr "Copiar texto"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
-msgstr "SangrarTxt"
+msgstr "Sangrar texto"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
-msgstr "DesangrarTxt"
+msgstr "Desangrar texto"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
-msgstr ""
+msgstr "Deshacer"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Adelante"
+msgstr "Rehacer"
 
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
-msgstr "Atrás"
+msgstr "Atrás"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Palabra siguiente"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Adelante"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Palabra anterior"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Línea Ant"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Línea siguiente"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Palabra siguiente"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Buscar la otra llave"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Ini de pár."
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Fin de pár."
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
-msgstr "DesplArriba"
+msgstr "Despl arriba"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
-msgstr "DesplAbajo"
+msgstr "Despl abajo"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Fichero anterior"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Fichero siguiente"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Entrada literal"
 
-#: src/global.c:918
+#: src/global.c:865
 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:921
+# Ok, es Intro (pero no se usa, parece, reportaré el bug) jm
+#: src/global.c:867
 msgid "Enter"
 msgstr "Intro"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Suprimir"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Borrar"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "CortarHastaFinal"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
-msgstr "Contar Palabras"
+msgstr "Contar palabras"
+
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "HistóricoPrev"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "HistSig"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Ir a texto"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Añadir"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Anteponer"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Respaldar fich."
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Ejecutar orden"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "A ficheros"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Primer fich."
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Último fich."
 
-#: src/global.c:1299
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Línea anterior"
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Línea siguiente"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Modo ayuda"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
-msgstr "Posición del cursor constante"
+msgstr "Posición del cursor constante"
 
-#: src/global.c:1303
+#: src/global.c:1219
 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:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Desplazamiento suave"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "No wrapear líneas largas"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Mostrar blancos"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Coloreado de sintaxis"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
-msgstr "Tecla 'smart home'"
+msgstr "Tecla «smart 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:1313
+# 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:1231
 msgid "Auto indent"
 msgstr "Auto sangrar"
 
-# de la línea. sv
-#: src/global.c:1315
+# de la línea. sv
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Cortar hasta el final"
 
-# 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:1317
-msgid "Long line wrapping"
-msgstr "Ajuste de líneas largas"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "No wrapear líneas largas"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
-msgstr "Conversión de las pulsaciones de tabulador a espacios"
+msgstr "Conversión de las pulsaciones de tabulador a espacios"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Respaldar ficheros"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
-msgstr "Múltiples búfers de ficheros"
+msgstr "Múltiples búfers de ficheros"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
-msgstr "Soporte para ratón"
+msgstr "Soporte para ratón"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "No convertir desde el formato DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 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:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Ajuste de líneas largas"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1081,17 +1116,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:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1099,13 +1134,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:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1116,16 +1151,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1139,15 +1174,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:253
 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"
@@ -1155,13 +1190,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:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1176,20 +1211,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:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1202,20 +1237,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:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1228,26 +1262,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:295
 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:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1263,14 +1297,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:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1283,20 +1317,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:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1307,15 +1340,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 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"
-" 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"
+"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:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1328,15 +1362,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1346,17 +1380,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:359
 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 "
@@ -1364,21 +1398,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:391 src/help.c:466
 msgid "enable/disable"
-msgstr "habilitar/deshabilitar"
+msgstr "activar/desactivar"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
-msgstr "Tecla ilegal en modo vistualización"
+msgstr "Tecla ilegal en modo vistualización"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1387,295 +1421,298 @@ msgstr ""
 "\n"
 "Buffer escrito en %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, 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:705
+#: src/nano.c:714
 #, 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:728
+#: src/nano.c:739
 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:821
+#: src/nano.c:832
 #, 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:824
+#: src/nano.c:835
 #, 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:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "Opción\t\tSignificado\n"
-
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Mostrar este mensaje"
+msgstr "Opción\t\tSignificado\n"
 
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
-msgstr "+LÍNEA,COLUMNA"
+msgstr "+L�NEA,COLUMNA"
 
-#: src/nano.c:831
+#. 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:843
 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:833
+#: src/nano.c:845
 msgid "Enable smart home key"
-msgstr "Habilitar tecla 'smart home'"
+msgstr "Habilitar tecla «smart home»"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Guardar respaldo de los ficheros existentes"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
-msgstr "Directorio donde guardar ficheros de respaldo únicos"
+msgstr "Directorio donde guardar ficheros de respaldo únicos"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Usar negrita en lugar de texto inverso"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Convertir tabulaciones a espacios al escribir"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
-msgstr "Habilitar múltiples búfer de ficheros"
+msgstr "Habilitar múltiples búfer de ficheros"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "Usar archivos de bloqueo (estilo vim)"
 
-#: src/nano.c:852
+#: src/nano.c:864
 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:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "No leer los ficheros nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 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:860
+#: src/nano.c:872
 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:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "No convertir los ficheros desde el formato DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 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:868
-#, fuzzy
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
-msgstr "Insertar un carácter de tabulación en la posición del cursor"
+msgstr "Guardar y leer la ubicación de la posición del cursor"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <cad>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<cad>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Marcador de cita"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Modo restringido"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Desplazarse línea a línea en lugar de media pantalla"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
-msgstr "-T <núm>"
+msgstr "-T <núm>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<núm>"
+msgstr "--tabsize=<núm>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 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úm columnas"
 
-#: src/nano.c:882
+#: src/nano.c:894
 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:885
+#: src/nano.c:897
 msgid "Print version information and exit"
-msgstr "Imprimir información sobre la versión y salir"
+msgstr "Imprimir información sobre la versión y salir"
 
-#: src/nano.c:888
+#: src/nano.c:900
 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:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <cad>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<cadena>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 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:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
-msgstr "Mostrar constantemente la posición del cursor"
+msgstr "Mostrar constantemente la posición del cursor"
 
-#: src/nano.c:896
+#: src/nano.c:908
 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:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Mostrar esta ayuda"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
-msgstr "Indentar automáticamente nuevas líneas"
+msgstr "Indentar automáticamente nuevas líneas"
 
-#: src/nano.c:900
+#: src/nano.c:913
 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:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
-msgstr "No seguir enlaces simbólicos, sobreescribirlos"
+msgstr "No seguir enlaces simbólicos, sobreescribirlos"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
-msgstr "Habilitar el uso del ratón"
+msgstr "Habilitar el uso del ratón"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
-msgstr "Establecer el directorio de operación"
+msgstr "Establecer el directorio de operación"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conservar teclas XON (^Q) y XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Ignorar silenciosamente problemas de inicio como errores rc de fichero"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
-msgstr "-r <núm>"
+msgstr "-r <núm>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
-msgstr "--fill=<núm>"
+msgstr "--fill=<núm>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
-msgstr "Fijar el límite de ajuste de líneas en núm columnas"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Fijar el límite de ajuste de líneas en núm columnas"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Habilitar corrector alternativo"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
-msgstr "Autosalvar al salir, no preguntar"
+msgstr "Guardar automáticamente al salir, no preguntar"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Permitir deshacer genérico [EXPERIMENTAL]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
-msgstr "Modo visualización (sólo lectura)"
+msgstr "Modo visualización (sólo lectura)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
-msgstr "No wrapear líneas largas"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
+msgstr "No wrapear líneas largas"
 
-#: src/nano.c:933
+#: src/nano.c:947
 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:934
+#: src/nano.c:948
 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:935
-#, 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:950
 msgid "Enable soft line wrapping"
-msgstr "Ajuste de líneas largas"
-
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(se ignora, está por compatibilidad con Pico)"
+msgstr "Activar ajuste de línea suave"
 
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versión %s (compilado %s, %s)\n"
+msgstr " GNU nano versión %s (compilado %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1684,166 +1721,171 @@ msgstr ""
 "\n"
 " Opciones compiladas:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 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:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr ""
-"¿ Salvar el búfer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS) ?"
+msgstr "¿Guardar el búfer modificado (RESPONDER \"No\" DESTRUIR� LOS CAMBIOS)?"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "No se pudo reabrir stdin desde el teclado\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Leyendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibido SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, 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:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Orden desconocida"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "Se ignora XON, mmh mmh"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "Se ignora XOFF, mmh mmh"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "El tamaño de tabulador \"%s\" no es válido"
+msgstr "El tamaño de tabulador «%s» no es válido"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "El tamaño de llenado \"%s\" no es válido"
+msgstr "El tamaño de llenado «%s» no es válido"
+
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
-msgstr "Sí"
+msgstr "Sí"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Todas"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, 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:189
+#: src/rcfile.c:193
 #, 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:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Regex \"%s\" incorrecta: %s"
+msgstr "Regex «%s» incorrecta: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Nombre de la sintaxis inexistente"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
-msgstr "La sintaxis \"none\" está reservada"
+msgstr "La sintaxis «none» está reservada"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 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:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
+#: src/rcfile.c:411
+msgid "Missing key name"
+msgstr "Falta el nombre de la combinación"
 
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Falta la cadena regex"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
 
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:441
 #, fuzzy
-msgid "Missing key name"
-msgstr "Nombre de la sintaxis inexistente"
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "las combinaciones de teclas deben comenzar por «^», «M» o «F»"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
+msgstr "Debe especificar una función a la que vincular la tecla"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "No se pudo mapear el nombre «%s» a una función"
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "No se pudo mapear el nombre «%s» a un menú"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr ""
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "La combinación «%s» es ilegal"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Error leyendo «%s»: %s"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1852,395 +1894,501 @@ 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:733
+#: src/rcfile.c:648
 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Nombre del color inexistente"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "El color de fondo \"%s\" no puede ser brillante"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Falta la cadena regex"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "«start=» requiere su «end=» correspondiente"
+msgstr "«start=» requiere su «end=» correspondiente"
 
-#: src/rcfile.c:890
-#, fuzzy
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "El color de fondo «%s» no puede ser brillante"
+
+#: src/rcfile.c:819
 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 cabecera de expreg sin un comando de sintaxis"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
+"No se puede añadir una cadena mágica de expreg sin un comando de sintaxis"
+
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "Falta el nombre de la cadena mágica"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "No se puede añadir una cabecera de expreg sin un comando de sintaxis"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Nombre del color inexistente"
 
-#: src/rcfile.c:962
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Error fatal: no existen teclas mapeadas para la función «%s»"
+
+#: src/rcfile.c:976
+#, 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 ""
+"Saliendo. Por favor, si es necesario use nano con la opción -I para ajustar "
+"su configuración nanorc.\n"
+
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "No se pudo mapear el nombre «%s» a un menú"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, 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:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, 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
+# en la línea. sv
 # el comando -> la orden.
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Orden \"%s\" no reconocida"
+msgstr "Orden «%s» no reconocida"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Falta la opción"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Nombre del color inexistente"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, 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:1101
+#: src/rcfile.c:1153
 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:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Se requieren caracteres que no sean blancos"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Se precisan dos caracteres de una sola columna"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "No se pudo desactivar la opción \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "No se pudo desactivar la opción «%s»"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Opción \"%s\" desconocida"
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "Opción «%s» desconocida"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 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."
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"Pulsa intro para continuar iniciando nano\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:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
-msgstr " (a reemplazar) en la selección"
+msgstr " (a reemplazar) en la selección"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (a reemplazar)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
-msgstr "¿Reemplazar esta instancia?"
+msgstr "¿Reemplazar esta instancia?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Ocurrencia %lu reemplazada"
 msgstr[1] "%lu ocurrencias reemplazadas"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1047
 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:1074
 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:1228
 msgid "Not a bracket"
 msgstr "No es una llave"
 
-#: src/search.c:1281
+#: src/search.c:1295
 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:434
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Nada para deshacer en el búfer"
 
-#: 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:440 src/text.c:578
+#, fuzzy, c-format
+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:451 src/text.c:588
 msgid "text add"
-msgstr ""
+msgstr "añadir texto"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
-msgstr "Fichero siguiente"
+msgstr "eliminar 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
+# 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:473 src/text.c:617
 msgid "line wrap"
-msgstr "Ajuste de líneas largas"
+msgstr "ajuste de líneas"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
-msgstr ""
+msgstr "combinar línea"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
-msgstr ""
+msgstr "cortar texto"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
-msgstr ""
+msgstr "pegar texto"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
-msgstr ""
+msgstr "salto de línea"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
-msgstr "Línea siguiente"
+msgstr "insertar texto"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:537 src/text.c:648
 msgid "text replace"
-msgstr " (a reemplazar)"
+msgstr "reemplazar texto"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Error interno: tipo desconocido. Guarde su trabajo."
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Acción deshecha (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Error interno: no se puede configurar pegar. Guarde su trabajo."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Acción rehecha (%s)"
 
 # Lo mismo. No se pudo cerrar. sv
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "No se pudo canalizar"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "No se pudo crear una tubería («pipe»)"
 
 # Lo mismo. No se pudo cerrar. sv
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "No se pudo crear otro proceso"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+#: src/text.c:945
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "Error interno: no se puede configurar pegar. Guarde su trabajo."
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, 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:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
-msgstr "¡Ahora se puede desjustificar!"
+msgstr "Ahora se puede desjustificar."
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Editar un reemplazo"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "No se pudo crear una tubería (\"pipe\")"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
-msgstr "Creando lista de palabras mal escritas. Espere, por favor..."
+msgstr "Creando lista de palabras mal escritas. Ppor favor, espere..."
 
-# Ídem de ídem. Te dejo que revises los que siguen.
-#: src/text.c:2652
+# �dem de ídem. Te dejo que revises los que siguen.
+#: src/text.c:2657 src/text.c:3101
 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:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
-msgstr "Error al invocar «spell»"
+msgstr "Error al invocar «spell»"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
-msgstr "Error al invocar «sort -f»"
+msgstr "Error al invocar «sort -f»"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
-msgstr "Error al invocar «uniq»"
+msgstr "Error al invocar «uniq»"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
-msgstr "Revisión de ortografía finalizada"
+msgstr "Revisión de ortografía finalizada"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Error al invocar \"%s\""
+msgstr "Error al invocar «%s»"
+
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: src/text.c:2970
+#: src/text.c:2979
 #, 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:2972
+#: src/text.c:2981
 #, 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:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "No añadir avances de línea al final de los ficheros"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
 
-#: src/text.c:3040
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Mostrar este mensaje"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Mostrar este mensaje"
+
+#: src/text.c:3372
 #, 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:3041
+#: src/text.c:3373
 msgid "In Selection:  "
-msgstr "En la selección:  "
+msgstr "En la selección: "
 
-# ¡memoria insuficiente! sv
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Entrada literal"
+
+# ¡memoria insuficiente! sv
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Entrada de Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fichero:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 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:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "El editor de textos GNU nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
-msgstr "versión"
+msgstr "versión"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
-msgstr "Por cortesía de:"
+msgstr "Por cortesía de:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Agradecimientos especiales para:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "y cualquiera del que nos hayamos olvidado..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
-msgstr "¡Gracias por usar nano!"
+msgstr "Gracias por usar nano."
+
+#~ 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 "(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."
+
+# Lo mismo. No se pudo cerrar. sv
+#~ msgid "Could not pipe"
+#~ msgstr "No se pudo canalizar"
 
 #~ 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 6356cb8b..1f47257f 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
diff --git a/po/eu.po b/po/eu.po
index 8e0769eb..d430613c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,15 +1,14 @@
 # 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: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -19,135 +18,132 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Joan direktorio honetara"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(aita dir.)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr "[Atzeruntza]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Hau da kointzidentzia bakarra"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Ez dago bilatzeko eredurik"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Ezin izan da aldi baterako fitxategia sortu: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ezin da artxiboa txertatu %s-tik kanpo"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Ez dago irekitako fitxategi buffer gehiagorik"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "%s-ra aldatua"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Bufer berria"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -158,14 +154,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:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -174,14 +170,14 @@ msgid_plural ""
 msgstr[0] "Lerro %lu irakurria (Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (Mac formatutik bihurtuak)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -190,101 +186,101 @@ msgid_plural ""
 msgstr[0] "Lerro %lu irakurria (DOS formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS formatutik bihurtuak)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Lerro %lu irakurria"
 msgstr[1] "%lu lerro irakurriak"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Fitxategia irakurtzen"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Fitxategi berria"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ezin aurkitu"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" direktorio bat da"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" fitxategia dispositibo-fitxategi bat da"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Buffer berrian exekutatzeko komandoa [%s-tik] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Exekutatutzeko komandoa [%s-(e)tik] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Buffer berrian txertatzeko fitxategia [%s-tik]"
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Txertatzeko fitxategia [%s-tik] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Baligabeko tekla ez-multibuffer moduan"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ezin da %staz kanpo idatzi"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Babes-kopia fitxategi gehiegi?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errorea %s idazten: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
@@ -340,15 +336,15 @@ msgstr "Fitxategia existitzen da dagoeneko, GAINIDATZI?"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Gorde fitxategia BESTE izen batekin?"
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(gehiago)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -357,28 +353,28 @@ msgstr ""
 "\n"
 "Nanorekin jarraitzeko return sakatu\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -386,675 +382,703 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Bertan behera utzi"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Ordezkatu"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Ez ordezkatu"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "May/Min"
+msgid "Exit"
+msgstr "Irten"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Atzeruntza"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regexp"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "Aurreko historikoa"
+msgid "Close"
+msgstr "Itxi"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Hurrengo historikoa"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Ezmoztu testua"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Joan testu hontara"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Justifikazioa ezeztatu"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Non dago Hur."
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Lehen fitxategia"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Azken Fitxategia"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Fitxategietara"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS formatua"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac formatua"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Gehitu"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Gehitu"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Babeskopia fitxategia"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Exekutatu komandoa"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Joan direktorio honetara"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Laguntza begiratu"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Irten"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Bilatu"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Aurreko orrialdea"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Hurrengo orrialdea"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Lehen lerroa"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Ordezkatu"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Azken lerroa"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Joan lerro hontara"
 
-#: src/global.c:538
-#, fuzzy
-msgid "Suspend"
-msgstr "Eseki"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Aurreko lerroa"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Par hasi"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Hurrengo lerroa"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Par amai"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Artxiboa irakurri"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Justifikatu"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Freskatu"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Txertatu fitxategia"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Joan lerro hontara"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Uneko funtzioa bertan behera utzi"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Erakutsi laguntza testu hau"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Unean kargatutako fitxategi bufferra itxi/Nanotik irten"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Nanotik irten"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Uneko artxiboa diskoan idatzi"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Uneko lerroan beste lerro bat txertatu"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:571
+#: src/global.c:520
 #, 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:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Hurrengo pantailara mugitu"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa moztu eta cutbufferean gorde"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Cutbufferekoa uneko lerroan txertatu"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Kurtsorearen posisioa erakutsi"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Ordezkatu kate bat edo expresio erregular bat"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Joan espezifikatutako lerro eta zutabera"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Markatu testua kurtsorearen uneko posizioan"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Errepikatu azken bilaketa"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa kopiatu eta cutbufferean gorde"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Koskatu uneko lerroa"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Koska kendu uneko lerroari"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:544
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Karaktere bat aurreruntz mugitu"
 
-#: src/global.c:595
+#: src/global.c:545
 #, fuzzy
 msgid "Go back one character"
 msgstr "Karaktere bat atzeruntz mugitu"
 
-#: src/global.c:597
+#: src/global.c:547
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Mugitu hitz bat atzera"
 
-#: src/global.c:598
+#: src/global.c:548
 #, fuzzy
 msgid "Go back one word"
 msgstr "Mugitu hitz bat atzeruntz"
 
-#: src/global.c:600
+#: src/global.c:550
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Aurreko lerrora mugitu"
 
-#: src/global.c:601
+#: src/global.c:551
 #, fuzzy
 msgid "Go to next line"
 msgstr "Mugitu hurrengo lerrora"
 
-#: src/global.c:602
+#: src/global.c:552
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Uneko lerroaren hasierara mugitu"
 
-#: src/global.c:603
+#: src/global.c:553
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Uneko lerroaren bukaerara mugitu"
 
-#: src/global.c:606
+#: src/global.c:556
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Mugitu uneko parrafoaren hasierara"
 
-#: src/global.c:608
+#: src/global.c:558
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Mugitu uneko parrafoaren amaierara"
 
-#: src/global.c:611
+#: src/global.c:560
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Mugitu fitxategiaren lehen lerrora"
 
-#: src/global.c:613
+#: src/global.c:561
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Mugitu fitxategiaren azken lerrora"
 
-#: src/global.c:615
+#: src/global.c:563
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Ez dago giltz egokirik"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Korritu gora lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Korritu behera lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Aldatu aurreko fitxategi buffer-era"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Aldatu hurrengo fitxategi buffer-era"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Hurrengo tekla-sakatzea literalki sartu"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 
-#: src/global.c:632
+#: src/global.c:575
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Orga-itzulera bat kurtsorearen posizioan txertatu"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Kurtsorearen azpiko karaterea ezabatu"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Kurtsorearen ezkerraldeko karaterea ezabatu"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Moztu kurtsoretik posiziotik lerro amaierara arte"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Justifikatu lerro osoa"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Zenbatu hitz, lerro eta karaktere kopurua"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Freskatu uneko pantaila"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:596
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "Mayuskula/minuskulaz egindako bilaketa"
 
-#: src/global.c:656
+#: src/global.c:598
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "kurtsorearen posisioa erakutsi"
 
-#: src/global.c:660
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Expresio erregularrak erabili"
 
-#: src/global.c:664
+#: src/global.c:606
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:666
+#: src/global.c:608
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Fitxategi nabigatzailera joan"
 
-#: src/global.c:672
+#: src/global.c:614
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dos formatoan fitxategia idazten"
 
-#: src/global.c:673
+#: src/global.c:615
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Idatzi fitxategia Mac formatuan"
 
-#: src/global.c:675
+#: src/global.c:616
 #, fuzzy
 msgid "Toggle appending"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:679
+#: src/global.c:618
 #, fuzzy
 msgid "Toggle backing up of the original file"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Exekutatu kanpo-komandoa"
 
-#: src/global.c:684
+#: src/global.c:622
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Irten fitxategi nabigatzailetik"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Joan zerrendako azken fitxategira"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Joan zerrendako azken fitxategira"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Joan direktorio honetara"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Itxi"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Deitu zuzentzaileari, eskuragarri badago"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Aurreko lerrora mugitu"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Mugitu hurrengo lerrora"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Laguntza begiratu"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Bertan behera utzi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Gorde"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Joan direktorio honetara"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Textua moztu"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Justifikatu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Artxiboa irakurri"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Textua moztu"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Joan lerro hontara"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Justifikazioa ezeztatu"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "May/Min"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Ezmoztu testua"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Atzeruntza"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Ez ordezkatu"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Uneko posizioa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Aurreko orrialdea"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Hurrengo orrialdea"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Lehen lerroa"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Azken lerroa"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ez da hori giltza"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Textua markatu"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopiatu testua"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Koskatu testua"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Ez koskatu testua"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Aurrean"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Atzean"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Hurrengo hitza"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Aurrean"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Aurreko hitza"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Aurreko lerroa"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Hurrengo lerroa"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Hurrengo hitza"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Etxea"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Bukaera"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Beste giltz bat bilatu"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Par hasi"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Par amai"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Korritu gora"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Korritu behera"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Aurreko fitxategia"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Hurrengo fitxategia"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Sarrera literala"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Sartu"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Atzera tekla"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "MoztuAmaieraraArte"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Hitz kopurua"
 
-#: src/global.c:1299
+#: src/global.c:898
+#, fuzzy
+msgid "Suspend"
+msgstr "Eseki"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Aurreko historikoa"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Hurrengo historikoa"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Joan testu hontara"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS formatua"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac formatua"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Gehitu"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Gehitu"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Babeskopia fitxategia"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Exekutatu komandoa"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Fitxategietara"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Lehen fitxategia"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Azken Fitxategia"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Aurreko lerroa"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "Laguntza modua"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Kurtzorearen posizioa bistaratu beti"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Erabili lerro bat edo gehiago editatzeko"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Korritze leuna"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ez doitu lerro luzeak"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Erakutsi txuriguneak"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Kolore sintaxi nabarmentzea"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "'Smart home' tekla"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Auto indentatu"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Lerroaren bukaeraraino ebaki"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Auto-doitu lerro luzeak"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ez doitu lerro luzeak"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabulazioak zuriuneetara"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Babeskopia fitxategiak"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Fitxategi anitzen buffer-a"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Xagu euskarria"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuak"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Eseki"
 
-#: src/global.c:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Auto-doitu lerro luzeak"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1075,7 +1099,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1089,7 +1113,7 @@ msgstr ""
 " Honako funtzio teklak daude Bilaketa moduan:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1108,7 +1132,7 @@ msgstr ""
 " Honako funtzio teklak daude joan lerrora moduan:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1131,7 +1155,7 @@ msgstr ""
 "beste buffer batean kargatzen du (erabili Meta-< edo > buffer-ez "
 "aldatzeko).  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1145,7 +1169,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi txertaketa moduan:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1171,7 +1195,7 @@ msgstr ""
 "Honako funtzio teklak daude eskuragarri fitxategia idatzi moduan:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1196,7 +1220,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1219,7 +1243,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1227,7 +1251,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri Bilaketa Nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1250,7 +1274,7 @@ msgstr ""
 "moduan:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1274,7 +1298,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri zuzenketa moduan:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1295,7 +1319,7 @@ msgstr ""
 " Honako teklak gaituak daude modu hontan:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1315,7 +1339,7 @@ msgstr ""
 "erakutsiz.  Egoera lerroa da hirugarrena eta informazio garrantzitsuak "
 "ematen ditu  "
 
-#: src/help.c:366
+#: src/help.c:350
 #, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
@@ -1332,7 +1356,7 @@ msgstr ""
 "agertzen dira, eta Esc, Alt edo Meta-tekla (zure teklatuaren araberakoa) "
 "sakatuz erabili daitezke.  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1346,15 +1370,15 @@ msgstr ""
 "parentesi artean erakusten dira:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "gaitu/ezgaitu"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Tekla baliogabea ikuskatze moduan"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1363,7 +1387,7 @@ msgstr ""
 "\n"
 "Bufferra hemen idatzia: %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1372,7 +1396,7 @@ msgstr ""
 "\n"
 "Bufferra ez da %s-(e)n idatzi: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1381,11 +1405,11 @@ msgstr ""
 "\n"
 "Bufferra ez da idatzi: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Leihoaren tamainua txikiegia da nano-rentzat...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1394,263 +1418,267 @@ msgstr ""
 "Erabilera: nano [AUKERAK] [[+LERROA,ZUTABEA] FITXATEGIA]\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Aukera\t\tGNU aukera luzea\t\tEsanahia\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Aukera\t\tEsanahia\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Mezu hau erakutsi"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+LERROA,ZUTABEA"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Hasi LERRO lerro zenbakian, ZUTABE zutabean"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Gaitu 'smart home' tekla"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Babeskopia fitxategiak idazteko direktorioa"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Erabili lodia alderantzizko testua beharrean"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabuladoreak zuriuneetara"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Gaitu fitxategi buffer ugari"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Idatzi eta irakurri bilaketa/aldaketa kateen historia"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Ez begiratu nanorc fitxategietan"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Konpondu zenbakizko teklatu nahaste arazoak"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuko fitxategiak"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Erabili lerro bat edo gehiago editatzeko"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Aipamen katea"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Mugatutako modua"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Ezarri fitxa baten zabalera #cols-era"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Egin egoera-barra garbiketa azkarra"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Bertsioaren informazioa inprimatu eta irten"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Aurkitu hitz amaierak zehatzago aurkitu"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Erabiltzeko sintaxi definizioa"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Erakutsi beti kurtsorearen posizioa"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Konpondu atzera tekla/ezabatu nahaste arazoak"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Erakutsi laguntza testu hau"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Automatikoki indentatu lerro berriak"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Moztu kurtsoretik lerro amaierara"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Ez jarraitu esteka sinbolikoak, gainidatzi"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Gaitu xaguaren erabilera"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Ezarri eragiketa direktorioa"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Mantendu XON (^Q) eta XOFF (^S) teklak"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:917
+#: src/nano.c:931
 #, 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:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Gahitu zuzentzaile alternatiboa"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Irteterakoan automatikoki gorde, ez galdetu"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Ikuskatze modua (irakurri bakarrik)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ez doitu lerro luzeak"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Ez erakutsi bi laguntza lerroak"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Gaitu esekitzea"
 
-#: src/nano.c:935
+#: src/nano.c:950
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoratua, Pico-rekin konpatibilitatea mantentzeko)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr "GNU nano %s bertsioa (%s %s konpilatua)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1659,165 +1687,170 @@ msgstr ""
 "\n"
 "Konpilazio aukerak:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Barkatu, funtzio horrentzat euskarria gaitu gabe dago"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Buffer aldatua gorde? (\"Ez\" ERANTZUTEKOTAN ALDAKETAK DEUZESTUEGINGO DIRA) ?"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP edo SIGTERM jaso da\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Erabili \"fg\" nano-ra itzultzeko.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "gaitua"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "ez gaitua"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Komando ezezaguna"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoratua, kaka zarra"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoratua, kaka zarra"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" tab tamainua baliogabea da"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" betetze tamainua baliogabea da"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Bb"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Ee"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Dd"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Bai"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Guztiak"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Ez"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Errorea %s-n %lu lerroan: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex kateak \" karaktearekin hasi eta amaitu behar dute"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" regex okerra: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" sintaxia erreserbaturik dago"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" sintaxiak ez du extentsiorik hartu behar"
 
-#: src/rcfile.c:393
-#, 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:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Regex katea falta da"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:512
-#, 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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Ezin izan da \"%s\"-i deitu"
+#: src/rcfile.c:467
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
+
+#: src/rcfile.c:474
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
 
-#: src/rcfile.c:540
+#: src/rcfile.c:497
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Errorea %s irakurtzen: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1833,94 +1866,120 @@ msgstr ""
 "\"black\", \"bright\" aukerazko aurrizkiarekin\n"
 "aurreplanoko koloreentzat."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Regex katea falta da"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\"-k \"end=\" behar du"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
+
+#: src/rcfile.c:819
 #, 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:960
+#: src/rcfile.c:875
+#, 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:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Regex katea falta da"
+
+#: src/rcfile.c:939
+#, 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:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Kolorearen izena falta da"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ezin izan zen %s ireki %s idazteko"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "\"%s\" komandoa ez dago baimendua fitxategia barne moduan"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "\"%s\" sintaxiak ez dauka kolore komandorik"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ez da \"%s\" komandoa ulertu"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Bandera falta da"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "\"%s\" aukerak argumentu bat behar du"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Aukera ez da baliodun multibyte katea"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Ez-hutsune karaktereak behar dira"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Bi zutabe-bakar karaktere behar dira"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Ezin da \"%s\" bandera kendu"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "\"%s\" bandera ezezaguna"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ezin dut nire etxe direktorioa aurkitu!  Outx!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1934,43 +1993,47 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ez da aurkitu"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (aldatzeko) aukeraketan"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr "(aldatzeko)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Instantsia hau aldatu?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Aldatu honekin"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1061
+#: src/search.c:1074
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ez da hori giltza"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Ez dago giltz egokirik"
 
@@ -1982,233 +2045,291 @@ msgstr "Marka aukeratua"
 msgid "Mark Unset"
 msgstr "Markatu ez hautatua"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 #, fuzzy
 msgid "text delete"
 msgstr "Hurrengo fitxategia"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 #, fuzzy
 msgid "line wrap"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 #, fuzzy
 msgid "text insert"
 msgstr "Hurrengo lerroa"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 #, 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Ezin da hoditik pasa"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Ezin izan da hodia sortu"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Ezin izan da bikoiztu"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "%s aipamen kate okerra: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Orain ez-justifikatu dezakezu!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Ordezkoa editatu"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Ezin izan da hodia sortu"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Gaizki idatzitako hiz zerrenda sortzen, itxaron mesedez..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Errorea \"spell\"-i deitzen"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Errorea \"sort -f\"-i deitzen"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Errorea \"uniq\"-i deitzen"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Zuzenketa ortografikoa bukatu da"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errorea \"%s\"-(e)ri deitzen"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Deitu zuzentzaileari, eskuragarri badago"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Mezu hau erakutsi"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Mezu hau erakutsi"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sHitzak: %lu  Lerroak: %ld  Karaktereak: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "Aukeraketan:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Sarrera literala"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Unicode sarrera"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Aldatua"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Ikusi"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fitxategia:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Nano textu editorea"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "bertsioa"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Zuretzako hauek egina:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Esker bereziak:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "ncurses-entzat:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "eta ahaztu dugun baten bat..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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"
 
@@ -2297,6 +2418,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"
 
@@ -2336,8 +2460,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"
diff --git a/po/fi.gmo b/po/fi.gmo
index 7437d7c7..56ded690 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index af221819..c7a85cfe 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,17 +1,17 @@
 # GNU nano Finnish Translation.
-# Copyright © 2000, 2001, 2003, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2003, 2009, 2010, 2011, 2013, 2014 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-2011, 2013
-#
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011, 2013-2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.2pre4\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2013-03-20 08:25+0200\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2014-05-14 19:45+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -20,137 +20,134 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Siirry hakemistoon"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Ei voi siirtyä pois hakemistosta %s rajoitetussa tilassa"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Virhe luettaessa kohdetta %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 msgid "Can't move up a directory"
 msgstr "Ei voi siirtyä ylähakemistoon"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(hakem.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(ylähakem.)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Taaksepäin]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Tämä on ainoa esiintymä"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Ei nykyistä etsintämallia"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 "Identiteettini määritteleminen lukitustiedostolle (getpwuid()-funktiolla) "
 "epäonnistui"
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Tietokonenimen määritteleminen lukitustiedostolle epäonnistui: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Virhe kirjoitettaessa lukitustiedostoa %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Virhe poistettaessa lukitustiedostoa %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Virhe avattaessa lukitustiedostoa %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr "Virhe luettaessa lukitustiedostoa %s: Dataa ei luettu riittävästi"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ei voi lisätä tiedostoa hakemiston %s ulkopuolelta"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Ei enää avoimia tiedostopuskureita"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Vaihdoin tiedostoon %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Uusi teksti"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -163,14 +160,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -181,14 +178,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -199,109 +196,109 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu DOS-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Luettu %lu rivi"
 msgstr[1] "Luettu %lu riviä"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Lukee tiedostoa"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Uusi tiedosto"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Ei löytynyt: �%s�"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "�%s� on hakemisto"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "�%s� on laitetiedosto"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Uudessa puskurissa suoritettava komento [kohteesta %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Suoritettava komento [kohteesta %s] "
 
 #  Toisaalla on "Ei voi lisätä tiedostoa hakemiston %s ulkopuolelta",
 #  joten täälläkin on "hakemistosta" eikä "hakemistossa".
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Uuteen puskuriin lisättävä tiedosto [hakemistosta %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, 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:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Virheellinen näppäin yhden puskurin tilassa"
 
-#: src/files.c:1594
+#: src/files.c:1591
 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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ei voi kirjoittaa hakemiston %s ulkopuolelle"
 
 #  "Prepend" ei ole englanti, oikea sana on "prefix"
 #  "Prepend" is not an English word, use "prefix"
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Liian monta varmuuskopiotiedostoa?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Virhe kirjoitettaessa %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Virhe kirjoitettaessa tilapäiseen tiedostoon: %s"
@@ -359,17 +356,17 @@ msgstr "Tiedosto olemassa, korvataanko ? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Tallennetaanko tiedosto eri nimellä ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(jatkuu)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -378,7 +375,7 @@ msgstr ""
 "\n"
 "Paina return-painiketta jatkaaksesi Nanon käynnistämistä\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -388,7 +385,7 @@ msgstr ""
 "Se on vaadittu kohdistinkoordinaatin etsintähistorian tallentamiseksi/"
 "lataamiseksi\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -398,7 +395,7 @@ msgstr ""
 "Nano ei kykene lataamaan tai tallentamaan etsintää tai "
 "kohdistinkoordinaattihistoriaa\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -407,7 +404,7 @@ msgstr ""
 "Havaittu perinteinen nano-historiatiedosto (%s), jota yritettiin siirtää\n"
 "parempana pidettyyn sijaintipaikkaan (%s), mutta kohdattiin virhe: %s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -418,666 +415,684 @@ msgstr ""
 "parempana pidettyyn sijaintipaikkaan (%s)\n"
 "(katso nano FAQ tästä muutoksesta)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Peru"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Korvaa"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Älä korvaa"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Kirj. koko"
+msgid "Exit"
+msgstr "Lopeta"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Taaksepäin"
-
-#  "Äiti, mikä on säännöke?" "Kai se joku pikku sääntö on."
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Säännöke"
-
-#  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:502
-msgid "PrevHstory"
-msgstr "EdHistoria"
+msgid "Close"
+msgstr "Sulje"
 
-#  Tämä on Etsi-valikossa.
-#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "SeurHistor."
+#: src/global.c:473
+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:504
-msgid "Go To Text"
-msgstr "Tekstiin"
+#  80 sarakkeen näytöllä mahtuu 10 merkkiä, mieluummin 9.
+#: src/global.c:475
+msgid "Unjustify"
+msgstr "Epätasaa"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "EtsiSeuraava"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Ensim. tiedosto"
-
-#: src/global.c:509
-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:511
-msgid "To Files"
-msgstr "Tiedostoselain"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS-muoto"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac-muoto"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Lisää loppuun"
-
-#  "Prepend" is not an English word, use "prefix"
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Lisää alkuun"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Varmuuskopio"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Suorita komento"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Siirry hakemistoon"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Ohjeita"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Lopeta"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Etsi"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Ed. sivu"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Seur. sivu"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Ensim. rivi"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Korvaa"
 
-#: src/global.c:537
-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:488
+msgid "Go To Line"
+msgstr "Rivinumero"
 
-#  Perään tulee "käytössä" tai "ei käytössä".
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Keskeytysnäppäin"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Ed. rivi"
 
-#  "Par" on "paragraph" ?
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Kappalealku"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Seuraava rivi"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Kappaleloppu"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Lue tied."
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "KokoTasaus"
 
 #  "Päivitä"?
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Piirrä uudelleen"
 
-#: src/global.c:546
-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:548
-msgid "Go To Line"
-msgstr "Rivinumero"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Näytä tämä ohjeteksti"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Sulje nykyinen tiedostopuskuri / Poistu Nanosta"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Poistu Nanosta"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Kirjoita nykyinen tiedosto levylle"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Lisää toinen tiedosto nykyiseen tiedostoon"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Etsi merkkijonoa tai säännöllistä lauseketta"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Siirry edelliseen ruutuun"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr "Etsi merkkijonoa"
 
-#: src/global.c:572
-msgid "Go to next screen"
-msgstr "Siirry seuraavaan ruutuun"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr "Siirry ruutu ylöspäin"
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr "Siirry ruutu alaspäin"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Liitä rivi leiketilasta nykyiselle riville"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Näytä kohdistimen sijainti"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Käynnistä oikoluin (jos saatavilla)"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Korvaa merkkijono tai säännöllinen lauseke"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Siirry riville ja sarakkeelle numero"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
-msgstr "Merkitse kohdistimen kohdalla oleva teksti"
+#: src/global.c:535
+msgid "Mark text starting from the cursor position"
+msgstr "Merkitse teksti alkaen kohdistimen kohdalta"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+msgid "Repeat the last search"
 msgstr "Toista viimeisin etsintä"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Sisennä nykyinen rivi"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Poista nykyisen rivin sisennys"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Peru viimeisin toiminto"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Tee uudelleen viimeisen toiminnon peruminen"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Siirry yksi merkki eteenpäin"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Siirry yksi merkki taaksepäin"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Siirry yksi sana eteenpäin"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Siirry yksi sana taaksepäin"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Siirry edelliselle riville"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Siirry seuraavalle riville"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Siirry nykyisen rivin alkuun"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Siirry nykyisen rivin loppuun"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Siirry kappaleen alkuun; sitten seuraavan kappaleen"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Siirry vain kappaleen loppuun; sitten seuraavan kappaleen"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Siirry tiedoston ensimmäiselle riville"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Siirry tiedoston viimeiselle riville"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Siirry vastaavalle sulkeelle"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Siirry rivi ylöspäin liikuttamatta kohdistinta"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Siirry rivi alaspäin liikuttamatta kohdistinta"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Vaihda edelliseen tiedostopuskuriin"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Vaihda seuraavaan tiedostopuskuriin"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Lisää seuraava näppäily kirjaimellisesti"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Lisää sarkain kohdistimen kohdalle"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Lisää rivinvaihto kohdistimen kohdalle"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Poista kohdistimen kohdalla oleva merkki"
 
 #  "Poista merkki kohdistimen vasemmalta puolelta"?
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Poista kohdistimesta vasemmalle oleva merkki"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Liitä teksti kohdistimesta tiedoston loppuun"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Tasaa nykyinen tiedosto"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Laske sanojen, rivien ja merkkien määrä"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Piirrä ruutu uudestaan"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Keskeytä editori (jos keskeytys on aktivoitu)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Vaihda merkkikoko etsinnässä"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Vaihda etsinnän suunta"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Vaihda säännöllisten lausekkeiden käyttö"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Kutsu takaisin edellinen haettu/korvattu merkkijono"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Kutsu takaisin seuraava haettu/korvattu merkkijono"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Siirry tiedostoselaimeen"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Vaihda DOS-muodon käyttö"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Vaihda Mac-muodon käyttö"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Vaihda liittäminen loppuun"
 
 #  "Prepend" is not an English word, use "prefix"
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Vaihda liittäminen alkuun"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Vaihda alkuperäisen tiedoston varmuuskopiointi"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Suorita ulkoinen komento"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Vaihda uuden puskurin käyttö"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Poistu tiedostoselaimesta"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Siirry luettelon ensimmäiseen tiedostoon"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Siirry luettelon viimeiseen tiedostoon"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Siirry luettelon seuraavaan tiedostoon"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Siirry luettelon edelliseen tiedostoon"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Siirry luettelon seuraavaan tiedostoon"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Siirry hakemistoon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Sulje"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "Käynnistä esikatselu (jos saatavilla)"
+
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr "Siirry edelliseen esikatseluun"
+
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr "Siirry seuraavaan esikatseluun"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Ohjeita"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Peru"
+
+#: src/global.c:671
+msgid "Write Out"
 msgstr "Kirjoita"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Siirry hakemistoon"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Leikkaa"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Tasaa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Lue tied."
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Oikolue"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-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:731
+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:769
-msgid "UnJustify"
-msgstr "Epätasaa"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Kirj. koko"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Liitä"
+#  "Äiti, mikä on säännöke?" "Kai se joku pikku sääntö on."
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Säännöke"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Taaksepäin"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Älä korvaa"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Sijainti"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Oikolue"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Ed. sivu"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Seur. sivu"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Ensim. rivi"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Viim. rivi"
+
+#  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "Sulkeeseen"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Merkitse tekstiä"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopioi"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Sisennä"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Poista sisennys"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Peru"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Eteenpäin"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Seuraava sana"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Eteenpäin"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Edellinen sana"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Ed. rivi"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Seuraava rivi"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Seuraava sana"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Koti"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Loppu"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Etsi toinen sulje"
+#  "Par" on "paragraph" ?
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Kappalealku"
 
-#: src/global.c:899
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Kappaleloppu"
+
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Vieritä ylös"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Vieritä alas"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+msgid "Prev File"
 msgstr "Edellinen tiedosto"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Seuraava tiedosto"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr "Merkintarkka syöte"
+#: src/global.c:862
+msgid "Verbatim"
+msgstr "Merkintarkka"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Sarkain"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Poista"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Askelpalautin"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "LeikLoppuun"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Sanaluku"
 
-#: src/global.c:1299
+#  Perään tulee "käytössä" tai "ei käytössä".
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Keskeytysnäppäin"
+
+#  Tämä on Etsi-valikossa.
+#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "EdHistoria"
+
+#  Tämä on Etsi-valikossa.
+#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
+#: src/global.c:907
+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:911
+msgid "Go To Text"
+msgstr "Tekstiin"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS-muoto"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac-muoto"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Lisää loppuun"
+
+#  "Prepend" is not an English word, use "prefix"
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Lisää alkuun"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Varmuuskopio"
+
+#: src/global.c:940
+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:955
+msgid "To Files"
+msgstr "Tiedostoselain"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Ensim. tiedosto"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Viim. tiedosto"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr "Ed. esikatselu"
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Ohjetila"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Näytä kohdistimen sijainti aina"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Käytä lisäriviä muokkaukseen"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Pehmeä vieritys"
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr "Pitkien rivien pehmeä rivitys"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Tyhjemerkkien näyttö"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Värillinen rakenteen merkintä"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Älykäs kotiavain"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automaattinen sisennys"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Leikkaa loppuun saakka"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Pitkän rivin jakaminen eri riveille"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
+msgstr "Pitkien rivien kova rivitys"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Kirjoitettujen sarkainmerkkien muunnos välilyönneiksi"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Varmuuskopiotiedostot"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Useat puskurit"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Hiirituki"
 
-#: src/global.c:1327
+#: src/global.c:1245
 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:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Keskeytysnäppäin"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Pehmeä rivin jakaminen usealle riville"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1098,7 +1113,7 @@ msgstr ""
 "vain enteriä antamatta mitään uutta tekstiä, Nano hakee edellistä "
 "hakutekstiä uudestaan.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1112,7 +1127,7 @@ msgstr ""
 " Seuraavat toimintonäppäimet ovat käytettävissä Etsintä-tilassa:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1131,7 +1146,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Etsi rivinumero -tilassa:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1155,7 +1170,7 @@ msgstr ""
 "puskuriin. (Tiedostopuskureita voit vaihtaa näppäinkomennoilla Meta-< ja "
 "Meta->).  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1170,7 +1185,7 @@ msgstr ""
 " Seuraavat toimintonäppäimet ovat käytössä Lisää tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1198,7 +1213,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Kirjoita tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1224,7 +1239,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä tiedostoselaimessa:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1247,7 +1262,7 @@ msgstr ""
 "hakutekstiä uudestaan.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1255,7 +1270,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä selaimen Etsi-tilassa:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1279,7 +1294,7 @@ msgstr ""
 "tilassa:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1303,7 +1318,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Oikolue-tilassa:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1323,7 +1338,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Suorita komento -tilassa:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1343,7 +1358,7 @@ msgstr ""
 "muokattava tiedosto. Tilarivi on kolmas rivi alhaalta lukien ja näyttää "
 "tärkeät viestit."
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1361,7 +1376,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:359
 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 "
@@ -1375,15 +1390,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:391 src/help.c:466
 msgid "enable/disable"
 msgstr "päälle/pois"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Virheellinen näppäin katselutilassa"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1392,7 +1407,7 @@ msgstr ""
 "\n"
 "Puskuri kirjoitettu tiedostoon �%s�\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1401,7 +1416,7 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu tiedostoon %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1410,11 +1425,11 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu tiedostoon: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Ikkuna on liian pieni Nanolle...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1423,260 +1438,262 @@ msgstr ""
 "Käyttö: nano [VALITSIMET] [[+RIVI,SARAKE] TIEDOSTO]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Valitsin\t\tPitkä valitsin\t\tMerkitys\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Valitsin\tMerkitys\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Näytä tämä ohje"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+RIVI,SARAKE"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Aloita rivillä RIVI, sarakkeessa SARAKE"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Ota käyttöön älykäs kotinäppäin"
 
 #  "tallennettaessa"?
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Tallenna olemassaolevien tiedostojen varmuuskopiot"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <hak>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<hak>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Hakemisto uniikkien varmuuskopitiedostojen tallentamiseen"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Käytä lihavoitua tekstiä käänteisen videotekstin sijasta"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Muunna näppäillyt sarkainlyönnit välilyönneiksi"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Mahdollista useiden puskureiden käyttö"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr "Käytä (vim-tyylisiä) lukitustiedostoja"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Muista viimeksi etsityt/korvatut merkkijonot"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Älä käytä nanorc-tiedostoja"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Korjaa numeerisen näppäistön näppäinten sekaantumispulma"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Älä lisää rivinvaihtoa tiedostojen loppuun"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Älä muunna tiedostoja DOS/Mac-muodosta"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Käytä yhtä lisäriviä muokkaukseen"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "Kirjaa lokiin ja lue kohdistinkoordinaatin sijainti"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <jono>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<jono>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Lainauksen merkintä"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Rajoitettu tila"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Vieritä rivi kerrallaan puoliruudun sijasta"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#saraketta>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#saraketta>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Aseta sarkaimen leveys #cols -sarakkeeksi"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Tyhjennä tilarivi pikaisesti"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Tulosta versiotiedot ja lopeta"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Havaitse sanarajat tarkemmin"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <jono>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<jono>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Väritykseen käytettävä syntaksimääritys"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Näytä kohdistimen sijainti jatkuvasti"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Korjaa Backspace/Delete -näppäinten sekaantumispulma"
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr "Näytä tämä ohjeteksti"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Sisennä uudet rivit automaattisesti"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Leikkaa rivin loppuun saakka"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Älä seuraa symbolisia linkkejä, vaan korvaa ne tiedostoilla."
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Käytä hiirtä"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr "Älä lue tiedostoa (vain kirjoita se)"
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <hak>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<hak>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Aseta toimintahakemisto"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Salli XON (^Q)- ja XOFF (^S) -näppäimet"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Älä ilmoita käynnistyspulmista kuten rc-tiedoston virheistä"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#sarakkeet>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#sarakkeet>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
-msgstr "Aseta rivityspiste sarakkeeseen #cols"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Aseta kova rivitys sarakkeeseen #cols"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <ohjelma>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<ohjelma>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Käytö vaihtoehtoista oikolukuohjelmaa"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Tallenna tiedosto kysymättä poistuttaessa"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Ota käyttöön yleinen perumistoiminto [KOKEELLINEN]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Katselutila (vain luku)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
-msgstr "Älä rivitä pitkiä rivejä"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
+msgstr "Älä kovarivitä pitkiä rivejä"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Älä näytä kahta avusteriviä"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Ota käyttöön keskeyttäminen"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Ota käyttöön pehmeä rivitys"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(eivät vaikuta Nanoon; Pico käyttäisi)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU Nano, versio %s (käännetty %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1685,164 +1702,172 @@ msgstr ""
 "\n"
 " Mukaan käännetyt valitsimet:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tämä ominaisuus ei ikävä kyllä ole käytössä"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat �ei�) ? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Vakiosyötteen avaaminen uudelleen näppäimistöstä epäonnistui\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Luetaan vakiosyötteestä, ^C lopettaa toiminnon\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Vastaanotettiin SIGHUP tai SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Palaa Nanoon komennolla �fg�.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "käytössä"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Tuntematon komento"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON:ia ei käytetä, mutinaa"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF:ia ei käytetä, mutinaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, 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:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Haluttu täydennyspituus �%s� ei kelpaa"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "KkYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "EeNn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "aA"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Kaikki"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Ei"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Virhe tiedostossa %s rivillä %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "parametri ’%s’ sisältää parittoman �-merkin"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Säännöllisten lausekkeiden on alettava ja loputtava �-merkillä"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Säännöllinen lauseke �%s� ei kelpaa: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Puuttuva syntaksin nimi"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Syntaksi �none� on varattu"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Syntaksi �default� ei saa ottaa laajennuksia"
 
-#: src/rcfile.c:393
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-"Ei voi lisätä maagista säännöllistä otsakelauseketta ilman syntaksikomentoa"
-
-#: src/rcfile.c:398
-msgid "Missing magic string name"
-msgstr "Puuttuva maaginen säännöllinen lausekemerkkijono"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Puuttuva näppäinnimi"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Näppäinsidontojen on alettava merkeillä �^�, �M�, tai �F�"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "Näppäinnimi on liian lyhyt"
+
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Näppäinnimien on alettava merkeillä �^�, �M�, tai �F�"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+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:504 src/rcfile.c:596
-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:460
+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:512
+#: src/rcfile.c:467
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Nimen �%s� kartoittaminen funktioon epäonnistui"
 
-#: src/rcfile.c:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nimen �%s� kartoittaminen valikkoon epäonnistui"
 
-#: src/rcfile.c:540
+#: src/rcfile.c:497
 #, 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:711
+#: src/rcfile.c:583
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Virhe laajennettaessa kohdetta %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1857,95 +1882,118 @@ msgstr ""
 "�black�, ja alussa voi olla �bright�\n"
 "edustaväreinä."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "En voi lisätä värikomentoa ilman syntaksikomentoa"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Puuttuva värin nimi"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Taustaväri �%s� ei voi olla �bright�"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Puuttuva säännöllinen lausekemerkkijono"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "�start=� vaatii vastaavan �end=�:n"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Taustaväri �%s� ei voi olla �bright�"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Ei voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Ei voi lisätä maagista säännöllistä otsakelauseketta ilman syntaksikomentoa"
+
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "Puuttuva maaginen säännöllinen lausekemerkkijono"
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr "Ei voi lisätä esikatselua ilman syntaksikomentoa"
+
+#: src/rcfile.c:944
+msgid "Missing linter command"
+msgstr "Puuttuva esikatselukomento"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Laajennettavan syntaksin �%s� löytäminen epäonnistui"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Komentoa �%s� ei sallita sisällytetyssä tiedostossa"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksissa �%s� ei ole värikomentoja"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komentoa �%s� ei ymmärretty"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Puuttuva lippu"
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Puuttuva valitsin"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "valitsin �%s� vaatii argumentin"
+msgstr "Valitsin �%s� vaatii argumentin"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Valitsin ei ole monitavuinen merkkijono"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Ei-tyhjemerkkejä vaadittu"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Kaksi yksisarakkeista merkkiä vaadittu"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Ei voi poistaa lippua �%s�"
+msgid "Cannot unset option \"%s\""
+msgstr "Ei voi poistaa valitsinta �%s�"
 
-#: src/rcfile.c:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Tuntematon lippu �%s�"
+msgid "Unknown option \"%s\""
+msgstr "Tuntematon valitsin �%s�"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kotihakemistoa ei löydy! Vää!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1959,44 +2007,48 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "�%.*s%s� ei löytynyt"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (korvattava) valinnassa"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (korvattava)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
 # Pitäisiköhän olla passiivi?
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Kirjoita rivin numero, sarakkeen numero"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Virheellinen rivi- tai sarakenumero"
 
 #  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ei ole suljemerkki"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Ei vastaavaa suljetta"
 
@@ -2008,153 +2060,188 @@ msgstr "Merkintä alkoi"
 msgid "Mark Unset"
 msgstr "Merkintä loppui"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Peruutuspuskurissa ei ole mitään!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr "teksti lisää"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "teksti poista"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "rivittäminen"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "rivin liittäminen"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "tekstileikkaus"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "testin leikkauksen peruutus"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "rivin katkaiseminen"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "teksti lisää"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Peruttu toiminto (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Toiminto tehtiin uudelleen (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Putki epäonnistui"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Putken luominen epäonnistui"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Lapsiprosessi epäonnistui"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr "Sisäinen virhe: komennon uncut asettaminen epäonnistui. Tallenna työsi"
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi."
+#: src/text.c:945
+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:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Lainausmerkintä %s ei kelpaa: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Tasaamisen voi perua nyt."
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Muokkaa korvausta"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Putken luominen epäonnistui"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Luodaan väärin kirjoitettujen sanojen lista, ole hyvä ja odota..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Putken puskurin kokoa ei saatu selville"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Virhe komennon �spell� aikana"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Virhe komennon �sort -f� aikana"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Virhe komennon �uniq� aikana"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Virhe kutsuttaessa kohdetta �%s�"
 
-#: src/text.c:2970
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr "Käynnistä oikoluin, odota hetki"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Oikoluku epäonnistui: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Oikoluku epäonnistui: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr "Esikatselua ei ole määritelty tämäntyyppiselle tiedostolle"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr "Tallennetaanko muokattu puskuri ennen esikatselua?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "Kutsutaan esikastelua, odota vähän"
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Saatiin 0 jäsenneltäviltä riveiltä komennosta: %s"
+
+#: src/text.c:3238
+#, 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:3286
+msgid "At last message"
+msgstr "Viimeisessä viestissä"
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr "Ensimmäisessä viestissä"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSanoja: %lu  riviä: %ld  merkkiä: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
-msgstr "Valinnassa:"
+msgstr "Valinnassa:    "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Merkintarkka syöte"
 
 #: src/utils.c:409 src/utils.c:421
 msgid "nano is out of memory!"
@@ -2162,71 +2249,106 @@ 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:1558
 msgid "Unicode Input"
 msgstr "Unikoodisyöte"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Muokattu"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Näkymä"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "HAKEMISTO:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 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:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Nano-editori"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versio"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Tehneet:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Erikoiskiitokset:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
 #  Special thanks to: (nimiä) For ncurses: (nimiä)
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Ncursesista:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "ja kaikille muille, jotka unohdimme..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Kiitos Nanon käyttämisestä!"
 
+#~ msgid "Insert File"
+#~ msgstr "Lisää tiedosto"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Siirry edelliseen ruutuun"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Etsi toinen sulje"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Pitkän rivin jakaminen eri riveille"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Pehmeä rivin jakaminen usealle riville"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(eivät vaikuta Nanoon; Pico käyttäisi)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "On määriteltävä valikko, johon näppäin sidotaan (tai �all�)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Puuttuva lippu"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Sisäinen virhe: Uudelleenteon asetukset epäonnistuivat. Tallenna työsi"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Putki epäonnistui"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
 #~ "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: Tiedoston "
diff --git a/po/fr.gmo b/po/fr.gmo
index 1aeff78c..cf78bd8a 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 4c28f9cd..5accc33e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,19 +1,19 @@
-# 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, 2011.
+# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2001-2010, 2011, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.2pre4\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2013-03-19 00:32+0100\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2014-05-14 23:45+0200\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
 "org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -21,12 +21,14 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Changer de répertoire"
 
@@ -47,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:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -58,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:267 src/browser.c:315
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "En mode restreint, sortir de %s est impossible"
@@ -92,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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erreur lors de la lecture de %s : %s"
@@ -103,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:304
 msgid "Can't move up a directory"
 msgstr "Impossible de passer au répertoire supérieur"
 
@@ -114,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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(rép.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(remonter)"
 
@@ -129,7 +131,8 @@ 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:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 msgid "Search"
 msgstr "Recherche"
 
@@ -138,9 +141,8 @@ msgstr "Recherche"
 # 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Resp. casse]"
 
@@ -149,9 +151,7 @@ msgstr " [Resp. casse]"
 # 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:194
+#: src/browser.c:806 src/search.c:192
 msgid " [Regexp]"
 msgstr " [Exp. ration.]"
 
@@ -160,9 +160,7 @@ msgstr " [Exp. ration.]"
 # 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Arrière]"
 
@@ -173,7 +171,7 @@ msgstr " [Arrière]"
 # 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:902 src/browser.c:910 src/search.c:392
 msgid "Search Wrapped"
 msgstr "La recherche a fait le tour"
 
@@ -190,8 +188,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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "C'est la seule occurrence"
 
@@ -200,18 +198,18 @@ 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:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Aucun motif de recherche défini"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr "Fichier verrou : compte actuel inconnu (échec de getpwuid())"
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr "Fichier verrou : nom d'hôte inconnu : %s"
+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
@@ -220,7 +218,7 @@ msgstr "Fichier verrou : nom d'hôte inconnu : %s"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Erreur d'écriture du fichier verrou %s : %s"
@@ -232,7 +230,7 @@ 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
-#: src/files.c:234
+#: src/files.c:232
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Erreur de suppression du fichier verrou %s : %s"
@@ -244,20 +242,20 @@ 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
-#: src/files.c:271
+#: src/files.c:266
 #, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Erreur d'ouverture du fichier verrou %s : %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr "Erreur de lecture du fichier verrou %s : pas assez de données lues"
 
 #
 # File: src/files.c, line: 119
 # File: src/files.c, line: 119
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossible d'insérer le fichier depuis l'extérieur de %s"
@@ -265,14 +263,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:437
+#: src/files.c:431
 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:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Basculement vers %s"
@@ -284,14 +282,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:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Nouvel espace"
 
 #
 # File: src/files.c, line: 559
 # File: src/files.c, line: 559
-#: src/files.c:840
+#: src/files.c:835
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -301,7 +299,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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -318,7 +316,7 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 564
 # File: src/files.c, line: 564
-#: src/files.c:851
+#: src/files.c:846
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -328,7 +326,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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -341,7 +339,7 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 569
 # File: src/files.c, line: 569
-#: src/files.c:861
+#: src/files.c:856
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -351,7 +349,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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -364,14 +362,14 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 574
 # File: src/files.c, line: 574
-#: src/files.c:871
+#: src/files.c:866
 #, 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:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -381,21 +379,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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Lecture du fichier"
 
 #
 # File: src/files.c, line: 594
 # File: src/files.c, line: 594
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Nouveau fichier"
 
 #
 # File: src/files.c, line: 597
 # File: src/files.c, line: 597
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "« %s » non trouvé"
@@ -409,7 +407,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:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "« %s » est un répertoire"
@@ -423,7 +421,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:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "« %s » est un périphérique"
@@ -431,7 +429,7 @@ msgstr "« %s » est un périphérique"
 #
 # File: src/files.c, line: 696
 # File: src/files.c, line: 696
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Commande à exécuter dans un nouvel espace [à partir de %s] "
@@ -439,7 +437,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:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Commande à exécuter [à partir de %s] "
@@ -447,7 +445,7 @@ msgstr "Commande à exécuter [à partir de %s] "
 #
 # File: src/files.c, line: 704
 # File: src/files.c, line: 704
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fichier à insérer dans un nouvel espace [à partir de %s] "
@@ -455,7 +453,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:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fichier à insérer [à partir de %s] "
@@ -463,20 +461,20 @@ msgstr "Fichier à insérer [à partir de %s] "
 #
 # File: src/files.c, line: 885
 # File: src/files.c, line: 885
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Touche illégale hors du mode multi-espace"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
-"Impossible d'écrire la copie de sécurité, sauvegarder quand même ? (Dites N "
-"en cas de doute) "
+"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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossible d'écrire à l'extérieur de %s"
@@ -484,7 +482,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:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Impossible d'ajouter pour un lien symbolique (option --nofollow)"
 
@@ -495,8 +493,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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erreur d'écriture de la copie de sécurité %s : %s"
@@ -506,7 +504,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:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Trop de copies de sécurité ?"
 
@@ -537,10 +535,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:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erreur lors de l'écriture de %s : %s"
@@ -552,7 +550,7 @@ 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:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erreur d'écriture du fichier temporaire : %s"
@@ -644,16 +642,14 @@ msgstr "Le fichier existe, VOULEZ-VOUS L'ÉCRASER ? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Écrire le fichier sous un NOM MODIFIÉ ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(suite)"
 
@@ -662,7 +658,7 @@ msgstr "(suite)"
 # File: src/rcfile.c, line: 848
 # File: src/files.c, line: 2379
 # File: src/rcfile.c, line: 848
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -671,7 +667,7 @@ msgstr ""
 "\n"
 "Appuyez sur « Entrée » pour continuer\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -681,7 +677,7 @@ msgstr ""
 "Il permet de conserver l'historique des recherches\n"
 "et la position du curseur\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -691,7 +687,7 @@ msgstr ""
 "Nano ne pourra pas conserver l'historique des recherches\n"
 "et la position du curseur\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -701,7 +697,7 @@ msgstr ""
 "tentative de déplacement vers le nouvel emplacement (%s)\n"
 "a rencontré une erreur : %s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -713,928 +709,855 @@ msgstr ""
 "(consultez la FAQ nano pour plus d'information)"
 
 #
-# 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:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annuler"
-
-#
-# File: src/global.c, line: 272
-# File: src/global.c, line: 272
-#: src/global.c:467
-msgid "Replace"
-msgstr "Remplacer"
-
-#
-# File: src/global.c, line: 828
-# File: src/global.c, line: 828
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Rechercher"
-
-#
-# File: src/global.c, line: 290
-# File: src/global.c, line: 290
+# 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:471
-msgid "Case Sens"
-msgstr "Resp.casse"
+msgid "Exit"
+msgstr "Quitter"
 
 #
-# File: src/global.c, line: 291
-# File: src/global.c, line: 291
+# File: src/global.c, line: 477
+# File: src/global.c, line: 477
 #: src/global.c:472
-msgid "Backwards"
-msgstr "->Arrière"
-
-#
-# File: src/global.c, line: 294
-# File: src/global.c, line: 294
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Exp. ratio."
-
-#
-# 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:502
-msgid "PrevHstory"
-msgstr "Précédente"
+msgid "Close"
+msgstr "Fermer"
 
 #
-# File: src/global.c, line: 299
-# File: src/global.c, line: 299
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Suivante"
+# File: src/global.c, line: 539
+# File: src/global.c, line: 539
+#: src/global.c:473
+msgid "Uncut Text"
+msgstr "Coller"
 
 #
-# File: src/global.c, line: 919
-# File: src/global.c, line: 919
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Rechercher"
+# File: src/global.c, line: 534
+# File: src/global.c, line: 534
+#: src/global.c:475
+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:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Cherch.suiv."
 
 #
-# File: src/global.c, line: 309
-# File: src/global.c, line: 309
-#: src/global.c:508
-msgid "First File"
-msgstr "Prem. fich."
-
-#
-# File: src/global.c, line: 311
-# File: src/global.c, line: 311
-#: src/global.c:509
-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:511
-msgid "To Files"
-msgstr "Parcourir"
-
-#
-# File: src/global.c, line: 958
-# File: src/global.c, line: 958
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#
-# File: src/global.c, line: 964
-# File: src/global.c, line: 964
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#
-# File: src/global.c, line: 971
-# File: src/global.c, line: 971
-#: src/global.c:515
-msgid "Append"
-msgstr "Ajout (à la fin)"
-
-#
-# File: src/global.c, line: 977
-# File: src/global.c, line: 977
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Ajout (au début)"
-
-#
-# File: src/global.c, line: 984
-# File: src/global.c, line: 984
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Copie de sécu."
-
-#
-# File: src/global.c, line: 1021
-# File: src/global.c, line: 1021
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Exécuter une commande"
-
-#
-# File: src/global.c, line: 1154
-# File: src/global.c, line: 1154
-#: src/global.c:522
-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:531
-msgid "Get Help"
-msgstr "Aide"
-
-#
-# File: src/global.c, line: 266
-# File: src/global.c, line: 266
-#: src/global.c:532
-msgid "Exit"
-msgstr "Quitter"
-
-#
 # File: src/global.c, line: 267
 # File: src/global.c, line: 267
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Chercher"
 
 #
-# File: src/global.c, line: 268
-# File: src/global.c, line: 268
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Page préc."
-
-#
-# File: src/global.c, line: 269
-# File: src/global.c, line: 269
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Page suiv."
-
-#
-# File: src/global.c, line: 278
-# File: src/global.c, line: 278
-#: src/global.c:536
-msgid "First Line"
-msgstr "Prem. lig."
+# File: src/global.c, line: 272
+# File: src/global.c, line: 272
+#: src/global.c:487
+msgid "Replace"
+msgstr "Remplacer"
 
 #
-# File: src/global.c, line: 279
-# File: src/global.c, line: 279
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Dern. Lig."
+# File: src/global.c, line: 270
+# File: src/global.c, line: 270
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Aller lig."
 
 #
-# File: src/global.c, line: 1360
-# File: src/global.c, line: 1360
-#: src/global.c:538
-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:489
+msgid "Prev Line"
+msgstr "Ligne préc."
 
 #
-# File: src/global.c, line: 284
-# File: src/global.c, line: 284
-#: src/global.c:540
-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:490
+msgid "Next Line"
+msgstr "Ligne suiv."
 
 #
-# File: src/global.c, line: 285
-# File: src/global.c, line: 285
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Fin para."
+# File: src/global.c, line: 505
+# File: src/global.c, line: 505
+#: src/global.c:491
+msgid "Read File"
+msgstr "Lire fich."
 
 #
 # File: src/global.c, line: 286
 # File: src/global.c, line: 286
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Justifier"
 
 #
 # File: src/global.c, line: 288
 # File: src/global.c, line: 288
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Rafraîchir"
 
 #
-# File: src/global.c, line: 1053
-# File: src/global.c, line: 1053
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Insérer un fichier"
-
-#
-# File: src/global.c, line: 270
-# File: src/global.c, line: 270
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Aller lig."
-
-#
 # File: src/global.c, line: 325
 # File: src/global.c, line: 325
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 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:557
+#: src/global.c:504
 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:560
+#: src/global.c:507
 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:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Quitter nano"
 
 #
 # File: src/global.c, line: 324
 # File: src/global.c, line: 324
-#: src/global.c:566
+#: src/global.c:513
 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:568
+#: src/global.c:515
 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:570
+#: src/global.c:517
 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:571
-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:520
+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:522
+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:572
-msgid "Go to next screen"
-msgstr "Aller à l'écran suivant"
+#: src/global.c:523
+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:574
+#: src/global.c:525
 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:576
+#: src/global.c:527
 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:578
+#: src/global.c:528
 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:580
+#: src/global.c:530
 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:582
+#: src/global.c:532
 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:583
+#: src/global.c:533
 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:585
-msgid "Mark text at the cursor position"
-msgstr "Marquer le texte à la position du curseur"
+#: src/global.c:535
+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:586
-msgid "Repeat last search"
+#: src/global.c:536
+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:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 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:590
+#: src/global.c:540
 msgid "Unindent the current line"
-msgstr "Annuler le retrait de la ligne courante"
+msgstr "Diminuer la marge de la ligne courante"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Annuler la dernière opération"
 
-#: src/global.c:592
+#: src/global.c:542
 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:594
+#: src/global.c:544
 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:595
+#: src/global.c:545
 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:597
+#: src/global.c:547
 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:598
+#: src/global.c:548
 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:600
+#: src/global.c:550
 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:601
+#: src/global.c:551
 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:602
+#: src/global.c:552
 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:603
+#: src/global.c:553
 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:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 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:613
+#: src/global.c:561
 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:615
+#: src/global.c:563
 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:617
+#: src/global.c:565
 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:619
+#: src/global.c:567
 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:623
+#: src/global.c:570
 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:625
+#: src/global.c:571
 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:628
+#: src/global.c:573
 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:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Insérer une tabulation à la position du curseur"
 
 #
 # File: src/global.c, line: 391
 # File: src/global.c, line: 391
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 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:634
+#: src/global.c:576
 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:636
+#: src/global.c:578
 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:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 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:646
+#: src/global.c:588
 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:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Rafraîchir (redessiner) l'écran courant"
 
-#: src/global.c:651
+#: src/global.c:593
 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:654
+#: src/global.c:596
 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:656
+#: src/global.c:598
 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:660
+#: src/global.c:602
 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:664
+#: src/global.c:606
 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:666
+#: src/global.c:608
 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:669
+#: src/global.c:611
 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:672
+#: src/global.c:614
 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:673
+#: src/global.c:615
 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:675
+#: src/global.c:616
 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:676
+#: src/global.c:617
 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:679
+#: src/global.c:618
 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:680
+#: src/global.c:619
 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:684
+#: src/global.c:622
 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:687
+#: src/global.c:625
 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:689
+#: src/global.c:626
 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:691
+#: src/global.c:627
 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:692
-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:693
+#: src/global.c:628
 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:629
+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:694
+#: src/global.c:630
 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:721
-msgid "Close"
-msgstr "Fermer"
+# File: src/global.c, line: 339
+# File: src/global.c, line: 339
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "Appeler l'analyse statique (si dispo.)"
+
+#
+# File: src/global.c, line: 357
+# File: src/global.c, line: 357
+#: src/global.c:634
+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:635
+msgid "Go to next linter msg"
+msgstr "Aller au message suivant de l'analyse statique"
+
+#
+# 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:655
+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:658 src/prompt.c:1276
+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:730
-msgid "WriteOut"
+#: src/global.c:671
+msgid "Write Out"
 msgstr "Écrire"
 
 #
+# File: src/global.c, line: 1154
+# File: src/global.c, line: 1154
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Aller -> rép."
+
+#
+# File: src/global.c, line: 528
+# File: src/global.c, line: 528
+#: src/global.c:712
+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:735
+#: src/global.c:721
 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:747
-msgid "Read File"
-msgstr "Lire fich."
+# File: src/global.c, line: 552
+# File: src/global.c, line: 552
+#: src/global.c:726
+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:764
-msgid "Cut Text"
-msgstr "Couper"
+# File: src/global.c, line: 270
+# File: src/global.c, line: 270
+#: src/global.c:731
+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:769
-msgid "UnJustify"
-msgstr "Dé-justif."
+# File: src/global.c, line: 290
+# File: src/global.c, line: 290
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Resp.casse"
 
 #
-# File: src/global.c, line: 539
-# File: src/global.c, line: 539
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Coller"
+# File: src/global.c, line: 294
+# File: src/global.c, line: 294
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Exp. ratio."
+
+#
+# File: src/global.c, line: 291
+# File: src/global.c, line: 291
+#: src/global.c:746
+msgid "Backwards"
+msgstr "->Arrière"
+
+#
+# File: src/global.c, line: 828
+# File: src/global.c, line: 828
+#: src/global.c:753
+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:779 src/global.c:806
+#: src/global.c:761
 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:788
-msgid "To Spell"
-msgstr "Orthograp."
+# File: src/global.c, line: 268
+# File: src/global.c, line: 268
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Page préc."
+
+#
+# File: src/global.c, line: 269
+# File: src/global.c, line: 269
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Page suiv."
+
+#
+# File: src/global.c, line: 278
+# File: src/global.c, line: 278
+#: src/global.c:776
+msgid "First Line"
+msgstr "Prem. lig."
+
+#
+# File: src/global.c, line: 279
+# File: src/global.c, line: 279
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Dern. Lig."
+
+#
+# File: src/search.c, line: 1167
+# File: src/search.c, line: 1167
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "Parenthèse corresp."
 
 #
 # File: src/global.c, line: 575
 # File: src/global.c, line: 575
-#: src/global.c:822
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Marquer"
 
 #
 # File: src/global.c, line: 583
 # File: src/global.c, line: 583
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Copier"
 
 #
 # File: src/global.c, line: 587
 # File: src/global.c, line: 587
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Indenter"
 
 #
 # File: src/global.c, line: 591
 # File: src/global.c, line: 591
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Supprimer l'indentation"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Refaire"
 
 #
-# File: src/global.c, line: 596
-# File: src/global.c, line: 596
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "En avant"
-
-#
 # File: src/global.c, line: 600
 # File: src/global.c, line: 600
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "En arrière"
 
 #
-# File: src/global.c, line: 605
-# File: src/global.c, line: 605
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Mot suivant"
+# File: src/global.c, line: 596
+# File: src/global.c, line: 596
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "En avant"
 
 #
 # File: src/global.c, line: 609
 # File: src/global.c, line: 609
-#: src/global.c:871
+#: src/global.c:820
 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:875
-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:878
-msgid "Next Line"
-msgstr "Ligne suiv."
+# File: src/global.c, line: 605
+# File: src/global.c, line: 605
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Mot suivant"
 
 #
 # File: src/global.c, line: 622
 # File: src/global.c, line: 622
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Début doc."
 
 #
 # File: src/global.c, line: 626
 # File: src/global.c, line: 626
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Fin"
 
 #
-# File: src/global.c, line: 649
-# File: src/global.c, line: 649
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Trouver l'autre crochet"
+# File: src/global.c, line: 284
+# File: src/global.c, line: 284
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Début para."
+
+#
+# File: src/global.c, line: 285
+# File: src/global.c, line: 285
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Fin para."
 
 #
 # File: src/global.c, line: 653
 # File: src/global.c, line: 653
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Remonter"
 
 #
 # File: src/global.c, line: 657
 # File: src/global.c, line: 657
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Descendre"
 
 #
 # File: src/global.c, line: 663
 # File: src/global.c, line: 663
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+msgid "Prev File"
 msgstr "Fichier précédent"
 
 #
 # File: src/global.c, line: 668
 # File: src/global.c, line: 668
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Fichier suivant"
 
@@ -1643,72 +1566,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:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+msgid "Verbatim"
 msgstr "Entrée telle quelle"
 
 #
 # File: src/global.c, line: 677
 # File: src/global.c, line: 677
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tabulation"
 
 #
 # File: src/global.c, line: 681
 # File: src/global.c, line: 681
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Entrée"
 
 #
 # File: src/global.c, line: 685
 # File: src/global.c, line: 685
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Supprimer"
 
 #
 # File: src/global.c, line: 689
 # File: src/global.c, line: 689
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "RetourArr."
 
 #
 # File: src/global.c, line: 281
 # File: src/global.c, line: 281
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "Coup.->Fin"
 
 #
 # File: src/global.c, line: 710
 # File: src/global.c, line: 710
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Nombre de mots "
 
 #
+# File: src/global.c, line: 1360
+# File: src/global.c, line: 1360
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Suspendre"
+
+#
+# File: src/global.c, line: 297
+# File: src/global.c, line: 297
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Précédente"
+
+#
+# File: src/global.c, line: 299
+# File: src/global.c, line: 299
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Suivante"
+
+#
+# File: src/global.c, line: 919
+# File: src/global.c, line: 919
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Rechercher"
+
+#
+# File: src/global.c, line: 958
+# File: src/global.c, line: 958
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#
+# File: src/global.c, line: 964
+# File: src/global.c, line: 964
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#
+# File: src/global.c, line: 971
+# File: src/global.c, line: 971
+#: src/global.c:928
+msgid "Append"
+msgstr "Ajout (à la fin)"
+
+#
+# File: src/global.c, line: 977
+# File: src/global.c, line: 977
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Ajout (au début)"
+
+#
+# File: src/global.c, line: 984
+# File: src/global.c, line: 984
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Copie de sécu."
+
+#
+# File: src/global.c, line: 1021
+# File: src/global.c, line: 1021
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Exécuter une commande"
+
+#
+# File: src/global.c, line: 307
+# File: src/global.c, line: 307
+#: src/global.c:955
+msgid "To Files"
+msgstr "Parcourir"
+
+#
+# File: src/global.c, line: 309
+# File: src/global.c, line: 309
+#: src/global.c:958
+msgid "First File"
+msgstr "Prem. fich."
+
+#
+# File: src/global.c, line: 311
+# File: src/global.c, line: 311
+#: src/global.c:960
+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:971
+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:973
+msgid "Next Lint Msg"
+msgstr "Analyse suiv."
+
+#
 # File: src/global.c, line: 1277
 # File: src/global.c, line: 1277
-#: src/global.c:1299
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mode aide"
 
 #
 # File: src/global.c, line: 1280
 # File: src/global.c, line: 1280
-#: src/global.c:1301
+#: src/global.c:1217
 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:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Utiliser 1 ligne de plus pour l'édition"
 
@@ -1717,105 +1749,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:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Défilement progressif"
 
 #
+# File: src/nano.c, line: 824
+# File: src/nano.c, line: 824
+#: src/global.c:1223
+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:1307
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Afficher les blancs"
 
 #
 # File: src/global.c, line: 1304
 # File: src/global.c, line: 1304
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Coloration syntaxique"
 
 #
 # File: src/global.c, line: 1308
 # File: src/global.c, line: 1308
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Touche « Début » intelligente"
 
 #
 # File: src/global.c, line: 1311
 # File: src/global.c, line: 1311
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Indenter automatiquement"
 
 #
 # File: src/global.c, line: 1314
 # File: src/global.c, line: 1314
-#: src/global.c:1315
+#: src/global.c:1233
 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:1317
-msgid "Long line wrapping"
+# File: src/nano.c, line: 824
+# File: src/nano.c, line: 824
+#: src/global.c:1235
+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:1319
+#: src/global.c:1237
 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:1321
+#: src/global.c:1239
 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:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Mode multi-espace"
 
 #
 # File: src/global.c, line: 1346
 # File: src/global.c, line: 1346
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Utiliser la souris"
 
 #
 # File: src/global.c, line: 1354
 # File: src/global.c, line: 1354
-#: src/global.c:1327
+#: src/global.c:1245
 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:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Autoriser à suspendre"
 
 #
-# File: src/global.c, line: 1318
-# File: src/global.c, line: 1318
-#: src/global.c:1331
-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:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1840,7 +1872,7 @@ msgstr ""
 #
 # File: src/help.c, line: 237
 # File: src/help.c, line: 237
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1858,7 +1890,7 @@ msgstr ""
 #
 # File: src/help.c, line: 243
 # File: src/help.c, line: 243
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1882,7 +1914,7 @@ msgstr ""
 #
 # File: src/help.c, line: 252
 # File: src/help.c, line: 252
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1909,7 +1941,7 @@ msgstr ""
 #
 # File: src/help.c, line: 261
 # File: src/help.c, line: 261
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1928,7 +1960,7 @@ msgstr ""
 #
 # File: src/help.c, line: 267
 # File: src/help.c, line: 267
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1946,13 +1978,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"
@@ -1961,7 +1993,7 @@ msgstr ""
 #
 # File: src/help.c, line: 281
 # File: src/help.c, line: 281
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1991,7 +2023,7 @@ msgstr ""
 #
 # File: src/help.c, line: 294
 # File: src/help.c, line: 294
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -2018,7 +2050,7 @@ msgstr ""
 #
 # File: src/help.c, line: 303
 # File: src/help.c, line: 303
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -2030,7 +2062,7 @@ msgstr ""
 #
 # File: src/help.c, line: 307
 # File: src/help.c, line: 307
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -2057,7 +2089,7 @@ msgstr ""
 #
 # File: src/help.c, line: 320
 # File: src/help.c, line: 320
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -2085,7 +2117,7 @@ msgstr ""
 #
 # File: src/help.c, line: 335
 # File: src/help.c, line: 335
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -2110,7 +2142,7 @@ msgstr ""
 #
 # File: src/help.c, line: 348
 # File: src/help.c, line: 348
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -2134,7 +2166,7 @@ msgstr ""
 #
 # File: src/help.c, line: 359
 # File: src/help.c, line: 359
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -2152,12 +2184,12 @@ msgstr ""
 "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:359
 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 "
@@ -2166,9 +2198,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"
 
@@ -2177,14 +2209,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:391 src/help.c:466
 msgid "enable/disable"
 msgstr "(commutateur)"
 
 #
 # File: src/nano.c, line: 522
 # File: src/nano.c, line: 522
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Touche illégale en mode visualisation"
 
@@ -2192,7 +2224,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:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -2205,7 +2237,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:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -2218,7 +2250,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:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -2230,14 +2262,14 @@ msgstr ""
 #
 # File: src/nano.c, line: 635
 # File: src/nano.c, line: 635
-#: src/nano.c:728
+#: src/nano.c:739
 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:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -2249,7 +2281,7 @@ msgstr ""
 #
 # File: src/nano.c, line: 730
 # File: src/nano.c, line: 730
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Option\t\tOption longue GNU\t\tDescription\n"
@@ -2257,409 +2289,408 @@ msgstr "Option\t\tOption longue GNU\t\tDescription\n"
 #
 # File: src/nano.c, line: 732
 # File: src/nano.c, line: 732
-#: src/nano.c:826
+#: src/nano.c:837
 #, 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:829
-msgid "Show this message"
-msgstr "Affiche ce message"
-
-#
 # File: src/nano.c, line: 736
 # File: src/nano.c, line: 736
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+LIGNE,COLONNE"
 
 #
 # File: src/nano.c, line: 737
 # File: src/nano.c, line: 737
-#: src/nano.c:831
+#. 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:843
 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:833
+#: src/nano.c:845
 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:834
+#: src/nano.c:846
 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:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <rép.>"
 
 #
 # File: src/nano.c, line: 741
 # File: src/nano.c, line: 741
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<rép.>"
 
 #
 # File: src/nano.c, line: 742
 # File: src/nano.c, line: 742
-#: src/nano.c:836
+#: src/nano.c:848
 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:839
+#: src/nano.c:851
 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:842
+#: src/nano.c:854
 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:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Mode multi-espace"
 
-#: src/nano.c:850
+#: src/nano.c:862
 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:852
+#: src/nano.c:864
 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:855
+#: src/nano.c:867
 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:858
+#: src/nano.c:870
 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:860
+#: src/nano.c:872
 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:863
+#: src/nano.c:875
 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:865
+#: src/nano.c:877
 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:868
+#: src/nano.c:880
 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:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <chaîne>"
 
 #
 # File: src/nano.c, line: 771
 # File: src/nano.c, line: 771
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<chaîne>"
 
 #
 # File: src/nano.c, line: 772
 # File: src/nano.c, line: 772
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Préfixe des citations"
 
 #
 # File: src/nano.c, line: 774
 # File: src/nano.c, line: 774
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Mode restreint"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Défilement ligne par ligne"
 
 #
 # File: src/nano.c, line: 778
 # File: src/nano.c, line: 778
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <nombre>"
 
 #
 # File: src/nano.c, line: 778
 # File: src/nano.c, line: 778
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<nombre>"
 
 #
 # File: src/nano.c, line: 779
 # File: src/nano.c, line: 779
-#: src/nano.c:880
+#: src/nano.c:892
 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:882
+#: src/nano.c:894
 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:885
+#: src/nano.c:897
 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:888
+#: src/nano.c:900
 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:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <chaîne>"
 
 #
 # File: src/nano.c, line: 790
 # File: src/nano.c, line: 790
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<chaîne>"
 
 #
 # File: src/nano.c, line: 791
 # File: src/nano.c, line: 791
-#: src/nano.c:892
+#: src/nano.c:904
 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:894
+#: src/nano.c:906
 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:896
+#: src/nano.c:908
 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:910
+msgid "Show this help text"
+msgstr "Affiche de message"
+
+#
 # File: src/nano.c, line: 798
 # File: src/nano.c, line: 798
-#: src/nano.c:899
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Indentation automatique"
 
 #
 # File: src/nano.c, line: 799
 # File: src/nano.c, line: 799
-#: src/nano.c:900
+#: src/nano.c:913
 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:903
+#: src/nano.c:916
 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:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Active l'utilisation de la souris"
 
+#: src/nano.c:920
+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:908
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <rép.>"
 
 #
 # File: src/nano.c, line: 807
 # File: src/nano.c, line: 807
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<rép.>"
 
 #
 # File: src/nano.c, line: 808
 # File: src/nano.c, line: 808
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Répertoire de fonctionnement"
 
 #
 # File: src/nano.c, line: 811
 # File: src/nano.c, line: 811
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Préserver ^Q (XON) & ^S (XOFF)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 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:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <numéro>"
 
 #
 # File: src/nano.c, line: 813
 # File: src/nano.c, line: 813
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<numéro>"
 
 #
 # File: src/nano.c, line: 779
 # File: src/nano.c, line: 779
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
-msgstr "Colonne de passage à la ligne"
+#: src/nano.c:931
+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:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
 #
 # File: src/nano.c, line: 817
 # File: src/nano.c, line: 817
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
 #
 # File: src/nano.c, line: 818
 # File: src/nano.c, line: 818
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Correcteur orthographique"
 
 #
 # File: src/nano.c, line: 821
 # File: src/nano.c, line: 821
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Sauver en quittant, sans question"
 
-#: src/nano.c:926
+#: src/nano.c:940
 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:929
+#: src/nano.c:943
 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:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+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:933
+#: src/nano.c:947
 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:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Autoriser à suspendre"
 
 #
 # File: src/global.c, line: 1318
 # File: src/global.c, line: 1318
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Affichage multiligne automatique"
 
 #
-# File: src/nano.c, line: 831
-# File: src/nano.c, line: 831
-#: src/nano.c:939
-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:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " nano GNU version %s (compilé à %s, le %s)\n"
@@ -2667,7 +2698,7 @@ msgstr " nano GNU version %s (compilé à %s, le %s)\n"
 #
 # File: src/nano.c, line: 844
 # File: src/nano.c, line: 844
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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/"
@@ -2675,7 +2706,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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -2687,22 +2718,22 @@ msgstr ""
 #
 # File: src/nano.c, line: 923
 # File: src/nano.c, line: 923
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Désolé, le support de cette fonction a été désactivé"
 
 #
 # File: src/nano.c, line: 940
 # File: src/nano.c, line: 940
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sauver l'espace modifié (RÉPONDRE « Non » EFFACERA LES CHANGEMENTS) ? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 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:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lecture depuis l'entrée standard, ^C pour abandonner\n"
@@ -2710,14 +2741,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:1203
+#: src/nano.c:1253
 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:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilisez « fg » pour revenir à nano.\n"
@@ -2725,14 +2756,14 @@ msgstr "Utilisez « fg » pour revenir à nano.\n"
 #
 # File: src/nano.c, line: 1186
 # File: src/nano.c, line: 1186
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "- marche"
 
 #
 # File: src/nano.c, line: 1187
 # File: src/nano.c, line: 1187
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "- arrêt"
 
@@ -2741,21 +2772,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:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Commande inconnue"
 
 #
 # File: src/nano.c, line: 1425
 # File: src/nano.c, line: 1425
-#: src/nano.c:1701
+#: src/nano.c:1732
 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:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoré, humm humm"
 
@@ -2764,7 +2795,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:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "taille de tabulation « %s » demandée non valide"
@@ -2774,60 +2805,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:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "la colonne maximale « %s » n'est pas valide"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Oo"
 
 #
 # File: src/prompt.c, line: 1253
 # File: src/prompt.c, line: 1253
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
 #
 # File: src/prompt.c, line: 1254
 # File: src/prompt.c, line: 1254
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Tt"
 
 #
 # File: src/prompt.c, line: 1268
 # File: src/prompt.c, line: 1268
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Oui"
 
 #
 # File: src/prompt.c, line: 1273
 # File: src/prompt.c, line: 1273
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Tous"
 
 #
 # File: src/prompt.c, line: 1278
 # File: src/prompt.c, line: 1278
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Non"
 
 #
 # File: src/rcfile.c, line: 120
 # File: src/rcfile.c, line: 120
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erreur dans %s (ligne %lu) : "
@@ -2835,7 +2871,7 @@ msgstr "Erreur dans %s (ligne %lu) : "
 #
 # File: src/rcfile.c, line: 174
 # File: src/rcfile.c, line: 174
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "l'argument %s contient un \" non fermé"
@@ -2849,8 +2885,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:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "les expr. rationnelles doivent être encadrées par des « \" »"
 
@@ -2859,7 +2895,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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "mauvaise expr. rationnelle « %s » : %s"
@@ -2867,79 +2903,103 @@ msgstr "mauvaise expr. rationnelle « %s » : %s"
 #
 # File: src/rcfile.c, line: 247
 # File: src/rcfile.c, line: 247
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "nom de syntaxe manquant"
 
 #
 # File: src/rcfile.c, line: 302
 # File: src/rcfile.c, line: 302
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 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:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "la syntaxe « default » ne doit être associée à aucune extension"
 
 #
-# File: src/rcfile.c, line: 460
-# File: src/rcfile.c, line: 460
-#: src/rcfile.c:393
-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:398
-msgid "Missing magic string name"
-msgstr "chaîne de motif Magic manquante"
-
-#
 # File: src/rcfile.c, line: 247
 # File: src/rcfile.c, line: 247
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
-msgstr "Nom de clef manquant"
+msgstr "Raccourci manquant"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Les combinaisons clavier doivent commencer par « ^ », « M » ou « F »"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "Raccourci trop court"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
-msgstr ""
-"vous devez indiquer la fonction à laquelle cette combinaison est associée"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Les raccourcis doivent commencer par « ^ », « M » ou « F »"
+
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
+msgstr "Vous devez indiquer la fonction à laquelle ce raccourci est associée"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+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:512
+#: src/rcfile.c:467
 #, 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:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, 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:540
+#: src/rcfile.c:497
+#, 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:583
 #, 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:711
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -2959,7 +3019,7 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 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 "
@@ -2968,53 +3028,87 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "nom de couleur manquant"
 
 #
-# File: src/rcfile.c, line: 485
-# File: src/rcfile.c, line: 485
-#: src/rcfile.c:758
-#, 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:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 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:848
+#: src/rcfile.c:739
 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:791
+#, 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:890
+#: src/rcfile.c:819
 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:960
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#: src/rcfile.c:875
+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:880
+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:939
+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:944
+msgid "Missing linter command"
+msgstr "Commande d'analyse statique manquante"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "impossible de trouver la syntaxe « %s » à étendre"
 
 #
 # File: src/rcfile.c, line: 646
@@ -3023,7 +3117,7 @@ msgstr ""
 # File: src/rcfile.c, line: 646
 # File: src/rcfile.c, line: 655
 # File: src/rcfile.c, line: 665
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "la commande « %s » est interdite dans un fichier inclus"
@@ -3033,7 +3127,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:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "la syntaxe « %s » ne contient aucune commande de coloration (color)"
@@ -3041,22 +3135,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:1055
+#: src/rcfile.c:1098
 #, 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:1061
-msgid "Missing flag"
-msgstr "nom de l'option manquant"
+# File: src/rcfile.c, line: 465
+# File: src/rcfile.c, line: 465
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Option manquante"
 
 #
 # File: src/rcfile.c, line: 708
 # File: src/rcfile.c, line: 708
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "l'option « %s » nécessite un argument"
@@ -3064,7 +3158,7 @@ msgstr "l'option « %s » nécessite un argument"
 #
 # File: src/rcfile.c, line: 726
 # File: src/rcfile.c, line: 726
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "l'option n'est pas une chaîne multioctet valide"
 
@@ -3075,37 +3169,37 @@ 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:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 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:1137
+#: src/rcfile.c:1200
 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:1203
+#: src/rcfile.c:1266
 #, 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:1212
+#: src/rcfile.c:1275
 #, 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:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "impossible de trouver mon répertoire personnel ! Ouah !"
 
@@ -3114,7 +3208,7 @@ msgstr "impossible de trouver mon répertoire personnel ! Ouah !"
 # File: src/rcfile.c, line: 848
 # File: src/files.c, line: 2379
 # File: src/rcfile.c, line: 848
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -3134,35 +3228,38 @@ msgstr "« %.*s%s » non trouvé"
 #
 # File: src/search.c, line: 199
 # File: src/search.c, line: 199
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 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:206
+#: src/search.c:203
 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:782
 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:961
 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:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -3172,28 +3269,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:1047
 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:1074
 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:1228
 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:1295
 msgid "No matching bracket"
 msgstr "Aucun crochet correspondant"
 
@@ -3211,48 +3309,48 @@ msgstr "Marque posée"
 msgid "Mark Unset"
 msgstr "Marque enlevée"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Aucune opération à annuler !"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 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:461 src/text.c:599
 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
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "passage à la ligne"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "fusion de lignes"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "texte coupé"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "texte restauré"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "nouvelle ligne"
 
@@ -3261,47 +3359,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:519 src/text.c:655
 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:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Erreur interne : type inconnu. Sauvez votre travail"
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Action annulée (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+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:666
 #, 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:771
-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:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Impossible de créer un tube"
 
 #
 # File: src/text.c, line: 468
@@ -3310,24 +3408,20 @@ 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:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Impossible de créer un nouveau processus"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+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:955
-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:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Mauvaise chaîne de citation %s : %s"
@@ -3335,78 +3429,78 @@ msgstr "Mauvaise chaîne de citation %s : %s"
 #
 # File: src/text.c, line: 1666
 # File: src/text.c, line: 1666
-#: src/text.c:2274
+#: src/text.c:2279
 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:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Entrez une correction"
 
 #
-# File: src/text.c, line: 1944
-# File: src/text.c, line: 1944
-#: src/text.c:2558
-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:2560
+#: src/text.c:2565
 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:2652
+#: src/text.c:2657 src/text.c:3101
 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:2703
+#: src/text.c:2708
 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:2706
+#: src/text.c:2711
 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:2709
+#: src/text.c:2714
 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:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 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:2825
+#: src/text.c:2830
 #, 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:2962
+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:2970
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Échec de la correction : %s"
@@ -3414,15 +3508,56 @@ msgstr "Échec de la correction : %s"
 #
 # File: src/text.c, line: 2348
 # File: src/text.c, line: 2348
-#: src/text.c:2972
+#: src/text.c:2981
 #, 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:3015
+msgid "No linter defined for this type of file!"
+msgstr "Aucun analyseur statique défini pour ce type de fichiers !"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr "Sauver l'espace modifié avant l'analyse statique ?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "Lancement de l'analyse statique, veuillez patienter"
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "La commande « %s » n'a produit aucune ligne analysable"
+
+#: src/text.c:3238
+#, 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:3286
+msgid "At last message"
+msgstr "Dernier message"
+
+#
+# File: src/nano.c, line: 735
+# File: src/nano.c, line: 735
+#: src/text.c:3293
+msgid "At first message"
+msgstr "Premier message"
+
+#
 # File: src/text.c, line: 2416
 # File: src/text.c, line: 2416
-#: src/text.c:3040
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s %lu mots,  %ld lignes, %lu caractères"
@@ -3430,11 +3565,22 @@ msgstr "%s %lu mots,  %ld lignes, %lu caractères"
 #
 # File: src/text.c, line: 2417
 # File: src/text.c, line: 2417
-#: src/text.c:3041
+#: src/text.c:3373
 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:3387
+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
@@ -3448,7 +3594,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:1558
 msgid "Unicode Input"
 msgstr "Entrée Unicode"
 
@@ -3457,7 +3603,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:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Modifié"
 
@@ -3467,25 +3613,26 @@ 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:2137
 msgid "View"
 msgstr "Voir"
 
 #
 # File: src/winio.c, line: 2018
 # File: src/winio.c, line: 2018
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "RÉP. :"
 
 #
 # File: src/winio.c, line: 2025
 # File: src/winio.c, line: 2025
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fichier :"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
@@ -3495,7 +3642,7 @@ msgstr ""
 #
 # File: src/winio.c, line: 3046
 # File: src/winio.c, line: 3046
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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%%)"
@@ -3503,69 +3650,55 @@ 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:3502
+#: src/winio.c:3484
 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:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "version"
 
 #
 # File: src/winio.c, line: 3168
 # File: src/winio.c, line: 3168
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Proposé par :"
 
 #
 # File: src/winio.c, line: 3169
 # File: src/winio.c, line: 3169
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Remerciements particuliers à :"
 
 #
 # File: src/winio.c, line: 3170
 # File: src/winio.c, line: 3170
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
 #
 # File: src/winio.c, line: 3171
 # File: src/winio.c, line: 3171
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Pour ncurses :"
 
 #
 # File: src/winio.c, line: 3172
 # File: src/winio.c, line: 3172
-#: src/winio.c:3508
+#: src/winio.c:3490
 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:3509
+#: src/winio.c:3491
 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"
-#~ msgstr ""
-#~ "Erreur d'écriture de la copie de sécurité %s : propriétaire différent"
-
-#~ msgid "line split"
-#~ msgstr "coupure de ligne"
diff --git a/po/ga.gmo b/po/ga.gmo
index 33c9d783..95484efd 100644
--- a/po/ga.gmo
+++ b/po/ga.gmo
diff --git a/po/ga.po b/po/ga.po
index 572e15e4..a9504831 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,13 +1,13 @@
 # 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: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -18,129 +18,126 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Téigh go Comhadlann"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Cealaithe"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Earráid agus %s á léamh: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "cmhdlnn"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "téigh suas"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Siar]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 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:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Níl patrún cuardaigh ann faoi láthair"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Níorbh fhéidir comhad sealadach a chruthú: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, 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:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Níl aon mhaoláin oscailte fágtha"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Athraithe go %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Maolán Nua"
 
-#: src/files.c:840
+#: src/files.c:835
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -150,7 +147,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:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -164,7 +161,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:851
+#: src/files.c:846
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -174,7 +171,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:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -186,7 +183,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:861
+#: src/files.c:856
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -196,7 +193,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:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -208,7 +205,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:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -218,7 +215,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:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -228,87 +225,87 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: src/files.c:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Comhad á Léamh"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Comhad Nua"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" gan aimsiú"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Is comhadlann é \"%s\""
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Is comhad gléis é \"%s\""
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Ordú le rith i maolán nua [ó %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ordú le rith [ó %s]"
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Comhad le hionsá i maolán nua [ó %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Comhad le hionsá [ó %s]"
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Eochair neamhcheadaithe mura bhfuiltear i mód ilmhaoláin"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ní féidir scríobh lasmuigh de %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "An iomarca comhad cúltaca?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Earráid agus %s á scríobh: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Earráid agus comhad sealadach á scríobh: %s"
@@ -367,15 +364,15 @@ msgstr "Tá an comhad ann; FORSCR�OBH ? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Sábháil an comhad le hAINM DIFRIÚIL ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(tuilleadh)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -384,28 +381,28 @@ msgstr ""
 "\n"
 "Brúigh \"Enter\" chun dul ar aghaidh le tosú nano.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -413,653 +410,685 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cealaigh"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Ionadaigh"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Gan Ionadú"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Cásíogair"
+msgid "Exit"
+msgstr "Scoir"
 
+# 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:472
-msgid "Backwards"
-msgstr "Siar"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Slonn"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "StairArAis"
+msgid "Close"
+msgstr "Dún"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "StairArAghaidh"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "DíGhearr Téacs"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Téigh Go Téacs"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "DíComhfhdú"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Cuardaigh Arís"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "An Chéad Chomhad"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Comhad Deiridh"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Go Comhaid"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Formáid DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Formáid Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Iarcheangail"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Réamhcheangail"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Comhad Cúltaca"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Rith Ordú"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Téigh i gComhadlann"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Cabhair"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Scoir"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Cuardach"
 
-# main menu - keep short?
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Ar Ais"
-
-# main menu - keep short?
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Ar Aghaidh"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "An Chéad Líne"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Ionadaigh"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Líne Dheiridh"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Téigh Go Líne"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Cuir ar Fionraí"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "An Líne Roimhe Seo"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Barr an Ailt"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "An Chéad Líne Eile"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Bun an Ailt"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Léigh"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "LánComhfhadú"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Athnuaigh"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Ionsáigh Comhad"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Téigh Go Líne"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Cealaigh an fheidhm reatha"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Taispeáin an chabhair seo"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Dún an maolán reatha / Scoir nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Scoir nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Scríobh an comhad reatha ar an diosca"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Ionsáigh comhad eile isteach sa cheann reatha"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Cuardach ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Téigh chuig an scáileán roimhe seo"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Cuardach ar theaghrán nó slonn ionadaíochta"
+
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Téigh chuig an chéad scáileán eile"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
 msgstr "Téigh chuig an chéad scáileán eile"
 
-#: src/global.c:574
+#: src/global.c:525
 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:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Greamaigh ón mhaolán gearrtha isteach sa líne reatha"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Taispeáin ionad an chúrsóra"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Ionadaigh teaghrán nó slonn ionadaíochta"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Téigh go dtí an líne agus an colún sonraithe"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Marcáil téacs ag ionad an chúrsóra"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "An cuardach céanna arís"
 
-#: src/global.c:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Eangaigh an líne reatha"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Dí-eangaigh an líne reatha"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Cealaigh an oibríocht is déanaí"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Athdhéan an oibríocht is déanaí a cealaíodh"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Ar aghaidh carachtar amháin"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Carachtar amháin siar"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Téigh ar aghaidh focal amháin"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Téigh siar focal amháin"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Téigh go dtí an líne roimhe seo"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Téigh go dtí an chéad líne eile"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Téigh go tosach na líne reatha"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Téigh go deireadh na líne reatha"
 
-#: src/global.c:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Téigh go dtí an chéad líne sa chomhad"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Téigh go dtí an líne dheiridh sa chomhad"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Téigh go dtí an lúibín comhoiriúnach"
 
-#: src/global.c:617
+#: src/global.c:565
 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:619
+#: src/global.c:567
 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:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Athraigh go dtí an maolán roimhe seo"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Athraigh go dtí an chéad mhaolán eile"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Ionsáigh an chéad charachtar eile go litriúil"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Ionsáigh táb ag an gcúrsóir"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Ionsáigh líne nua ag an gcúrsóir"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Scrios an carachtar faoin chúrsóir"
 
-#: src/global.c:636
+#: src/global.c:578
 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:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Comhfhadaigh an comhad iomlán"
 
-#: src/global.c:646
+#: src/global.c:588
 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:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Athnuaigh (ataispeáin) an scáileán reatha"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Cuir an t-eagarthóir ar fionraí (más féidir)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Scoránaigh cásíogaireacht"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Scoránaigh treo an chuardaigh"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Scoránaigh úsáid de shloinn ionadaíochta"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Athghair an teaghrán cuardaigh roimhe seo"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Athghair an chéad teaghrán cuardaigh eile"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Téigh go brabhsálaí na gcomhad"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Scoránaigh úsáid d'fhormáid DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Scoránaigh úsáid d'fhormáid Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Scoránaigh iarcheangal"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Scoránaigh réamhcheangal"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Scoránaigh cúltacaí"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Rith ordú seachtrach"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Scoránaigh úsáid de mhaolán nua"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Scoir brabhsálaí na gcomhad"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Téigh go dtí an chéad chomhad sa liosta"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Téigh go dtí an comhad deiridh sa liosta"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Téigh go dtí an comhad deiridh sa liosta"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Téigh go dtí an chéad chomhad sa liosta"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Téigh go dtí an comhad deiridh sa liosta"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Téigh go comhadlann"
 
-# 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:721
-msgid "Close"
-msgstr "Dún"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Téigh go dtí an líne roimhe seo"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Téigh go dtí an chéad líne eile"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Cabhair"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Scríobh"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Téigh i gComhadlann"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Gearr"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Comhfhadú"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Léigh"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Litreoir"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Gearr"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Téigh Go Líne"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "DíComhfhdú"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Cásíogair"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "DíGhearr Téacs"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Slonn"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Siar"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Gan Ionadú"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Cúrsóir"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Litreoir"
+# main menu - keep short?
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Ar Ais"
 
-#: src/global.c:822
+# main menu - keep short?
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Ar Aghaidh"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "An Chéad Líne"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Líne Dheiridh"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ní lúibín é"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Marcáil Téacs"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Cóipeáil Téacs"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Eangaigh Téacs"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Dí-eangaigh Téacs"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Cealaigh"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Athdhéan"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Ar Aghaidh"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Siar"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "An Chéad Fhocal Eile"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Ar Aghaidh"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "An Focal Roimhe Seo"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "An Líne Roimhe Seo"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "An Chéad Líne Eile"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "An Chéad Fhocal Eile"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Baile"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Deireadh"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Aimsigh an Lúibín Eile"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Barr an Ailt"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Bun an Ailt"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Scrollaigh Suas"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Scrollaigh Síos"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "An Comhad Roimhe Seo"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "An Chéad Chomhad Eile"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Ionchur Litriúil"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Táb"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Iontráil"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Scrios"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Cúlspás"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "GearrGoBun"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Líon na bhFocal"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Cuir ar Fionraí"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "StairArAis"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "StairArAghaidh"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Téigh Go Téacs"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Formáid DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Formáid Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Iarcheangail"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Réamhcheangail"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Comhad Cúltaca"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Rith Ordú"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Go Comhaid"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "An Chéad Chomhad"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Comhad Deiridh"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "An Líne Roimhe Seo"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "Mód cabhrach"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Mínscrollú"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ná timfhill línte fada"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Taispeáint spáis bháin"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Aibhsiú comhréire le dathanna"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Eochair bhaile chliste"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Uath-eangú"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Gearr go dtí an deireadh"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Timfhilleadh líne"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ná timfhill línte fada"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Comhaid chúltaca"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Maoláin iomadúla"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Tacaíocht luiche"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Ná tiontaigh ó fhormáid DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Cur ar Fionraí"
 
-#: src/global.c:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Timfhilleadh líne"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1081,7 +1110,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:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1095,7 +1124,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:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1115,7 +1144,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1138,7 +1167,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:253
 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"
@@ -1149,7 +1178,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:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1177,7 +1206,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:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1199,7 +1228,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:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1223,7 +1252,7 @@ msgstr ""
 "cuardach céanna arís.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1232,7 +1261,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1256,7 +1285,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1280,7 +1309,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:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1300,7 +1329,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:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1321,7 +1350,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1339,7 +1368,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:359
 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 "
@@ -1353,15 +1382,15 @@ msgstr ""
 "Taispeántar eochracha malartacha idir lúibíní:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "(cumasú/díchumasú)"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Eochair neamhcheadaithe sa mhód amhairc"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1370,7 +1399,7 @@ msgstr ""
 "\n"
 "Scríobhadh an maolán i %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1379,7 +1408,7 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán i %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1388,11 +1417,11 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Tá an fhuinneog róbheag le haghaidh nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1401,262 +1430,266 @@ msgstr ""
 "Úsáid: nano [ROGHANNA] [[+L�NE,COLÚN] COMHAD]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Rogha\t\tRogha fhada GNU\t\tMíniú\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Rogha\t\tMíniú\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Taispeáin an teachtaireacht seo"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+L�NE,COLÚN"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Tosaigh ag líne L�NE, colún COLÚN"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Cumasaigh eochair bhaile chliste"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Sábháil cúltacaí de chomhaid atá ann cheana"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <comhadlann>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<comhadlann>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Úsáid cló trom in ionad téacs aisiompaithe"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Cumasaigh maoláin iomadúla"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Logáil agus léigh stair na dteaghrán cuardaigh"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Ná húsáid comhaid nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Deisigh mearbhall maidir leis an eochaircheap uimhriúil"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ná tiontaigh comhaid ó fhormáid Dos/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Ionsáigh táb ag an gcúrsóir"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <teaghrán>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<teaghrán>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Teaghrán athfhriotail"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Mód teoranta"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Scrollaigh de réir línte in ionad leathscáileáin"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#colúin>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#colúin>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Socraigh leithead de tháib a bheith #colúin"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Bánaigh an barra stádais go gasta"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Taispeáin eolas faoin leagan agus scoir"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Braith teorainneacha idir focail i slí níos cruinne"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <teaghrán>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<teaghrán>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Sainmhíniú na comhréire le haghaidh dathaithe"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Deisigh mearbhall idir na heochracha \"Backspace\" agus \"Delete\""
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Taispeáin an chabhair seo"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Eangaigh línte nua go huathoibríoch"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Gearr ón chúrsóir go deireadh na líne"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Ná lean naisc shiombalacha; forscríobh"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Cumasaigh úsáid na luiche"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <comhadlann>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<comhadlann>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Socraigh an chomhadlann oibre"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Caomhnaigh eochracha XON (^Q) agus XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#colúin>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#colúin>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Socraigh timfhilleadh ag #colúin colún"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <clár>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<clár>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Cumasaigh litreoir malartach"
 
-#: src/nano.c:924
+#: src/nano.c:938
 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:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Mód amhairc (inléite amháin)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ná timfhill línte fada"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Ná taispeáin an dá líne chabhrach"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Cumasaigh cur ar fionraí"
 
-#: src/nano.c:935
+#: src/nano.c:950
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Timfhilleadh líne"
 
-# plural flags ignored in my version --kps
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(rinneadh neamhshuim orthu seo - comhoiriúnacht le Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano, leagan %s (tiomsaithe %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1665,170 +1698,171 @@ msgstr ""
 "\n"
 " Roghanna tiomsaithe:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tá brón orm, díchumasaíodh an fheidhm seo"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 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:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Fuarthas SIGHUP nó SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Úsáid \"fg\" chun dul ar ais go nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "cumasaithe"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "díchumasaithe"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Ordú Anaithnid"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XON :-("
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XOFF :-("
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid táib iarrtha \"%s\""
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid líonta iarrtha \"%s\""
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Ss"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Uu"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Sábháil"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Uile"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Ná Sábháil"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Earráid i %s ar líne %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Tá \" gan chríoch in argóint '%s'"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slonn ionadaíochta neamhbhailí \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Ainm comhréire ar iarraidh"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Comhréir \"none\" in áirithe"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Ní cheadaítear eisínteachtaí leis an gcomhréir \"default\""
 
-#: src/rcfile.c:393
-#, 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:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Slonn ionadaíochta ar iarraidh"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Ainm eochrach ar iarraidh"
 
-#: src/rcfile.c:484 src/rcfile.c:585
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
 #, 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:493
+#: src/rcfile.c:450
 #, 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:504 src/rcfile.c:596
-#, fuzzy
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+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:512
+#: src/rcfile.c:467
 #, 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:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, 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:540
+#: src/rcfile.c:497
 #, 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:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Earráid agus %s á léamh: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1843,96 +1877,124 @@ msgstr ""
 "\"black\", leis an réimír roghnach \"bright\"\n"
 "le haghaidh dathanna tulra."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Ní cheadaítear do dhath cúlra \"%s\" a bheith geal"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Slonn ionadaíochta ar iarraidh"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "Tá gá le \"end=\" in éineacht le gach \"start=\""
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Ní cheadaítear do dhath cúlra \"%s\" a bheith geal"
+
+#: src/rcfile.c:819
 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:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+#, 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:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Slonn ionadaíochta ar iarraidh"
+
+#: src/rcfile.c:939
+#, 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:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Ainm datha ar iarraidh"
+
+#: src/rcfile.c:974
+#, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, 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:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Ní cheadaítear ordú \"%s\" i gcomhad iniata"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Níl orduithe datha ag an gcomhréir \"%s\""
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Níor tuigeadh ordú \"%s\""
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Bratach ar iarraidh"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Caithfidh tú argóint a thabhairt le rogha \"%s\""
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Níl an rogha ina teaghrán bailí il-bhirt"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Carachtair neamhbhána de dhíth"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Dhá charachtar aoncholúin de dhíth"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Ní féidir bratach \"%s\" a dhíchumasú"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Bratach anaithnid \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ní féidir mo chomhadlann bhaile a aimsiú!  Ochón!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1946,23 +2008,26 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" gan aimsiú"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (le cur in ionad) i roghnúchán"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (le cur in ionad)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Ionadaigh an ceann seo?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Ionadaigh le"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1972,19 +2037,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:1047
 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:1074
 msgid "Invalid line or column number"
 msgstr "Uimhir líne nó uimhir cholúin neamhbhailí"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ní lúibín é"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Níl lúibín comhoiriúnach ann"
 
@@ -1996,229 +2062,299 @@ msgstr "Socraíodh Marc"
 msgid "Mark Unset"
 msgstr "Díshocraíodh Marc"
 
-#: src/text.c:443
+#: src/text.c:434
 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:440 src/text.c:578
+#, 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:451 src/text.c:588
 msgid "text add"
 msgstr "téacs a chur leis"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "téacs a scriosadh"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 #, fuzzy
 msgid "line wrap"
 msgstr "Timfhilleadh líne"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "líne a cheangal"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "téacs a ghearradh"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "téacs a dhíghearradh"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "téacs a ionsá"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Cealaíodh gníomh (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, 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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Athrinneadh gníomh (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Níorbh fhéidir píopa a dhéanamh"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Níorbh fhéidir píopa a chruthú"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Níorbh fhéidir forc a dhéanamh"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, 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:955
-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:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Drochtheaghrán athfhriotail %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Is féidir DíChomhfhadú anois!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Cuir ionadaí in eagar"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Níorbh fhéidir píopa a chruthú"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liosta d'fhocail mílitrithe á chruthú; fan go fóill, le do thoil..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 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:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Earráid agus \"spell\" á thosú"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Earráid agus \"sort -f\" á thosú"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Earráid agus \"uniq\" á thosú"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Chríochnaigh an litreoir"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Earráid agus \"%s\" á thosú"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Rith an litreoir, má tá sé ar fáil"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Theip ar an litreoir: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Theip ar an litreoir: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Taispeáin an teachtaireacht seo"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Taispeáin an teachtaireacht seo"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sFocail: %lu  Línte: %ld  Carachtair: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "Sa Roghnúchán:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Ionchur Litriúil"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Ionchur Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Athraithe"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Amharc"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "COMHADLANN:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Comhad:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Eagarthóir téacs nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "leagan"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Scríofa ag:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Táimid fíorbhuíoch de:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "As ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "agus de gach duine eile a ndearnamar dearmad orthu..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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"
 
diff --git a/po/gl.gmo b/po/gl.gmo
index b23ed38e..9347e48b 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index 8b927902..669058fa 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,13 +1,14 @@
 # Galician translation of nano
 # Copyright (C) 2001, 2002, 2003, 2006, 2008 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 Santín <tsao@enelparaiso.org>, 2006, 2008, 2011,2012.
+# Francisco Javier Tsao Santín <tsao@enelparaiso.org>, 2006, 2008, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
 "PO-Revision-Date: 2012-07-02 16:45+0200\n"
 "Last-Translator: Francisco Javier Tsao Santín <tsao@enelparaiso.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -17,135 +18,132 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Ir ó Directorio"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro lendo %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(dir pai)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Cara Atrás]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Esta é a única aparición"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Non hai patrón de busca"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Erro escribindo %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Erro escribindo %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Erro escribindo %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, 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:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Non hai máis ficheiros abertos"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Cambiouse a %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Novo buffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -160,14 +158,14 @@ msgstr[1] ""
 "Léronse %lu liñas (Convertidas dos formatos DOS e Mac - Advertencia: Non hai "
 "permiso de escritura)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -180,14 +178,14 @@ msgstr[1] ""
 "Léronse %lu liñas (Convertidas de formato Mac - Advertencia: Non hai permiso "
 "de escritura)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -200,103 +198,103 @@ msgstr[1] ""
 "Léronse %lu liñas (Convertidas do formato DOS - Advertencia: Non hai permiso "
 "de escritura)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, 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:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Lendo o Ficheiro"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Ficheiro Novo"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Non se atopou \"%s\""
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é un directorio"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é un ficheiro de dispositivo"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando a executar nun novo buffer [dende %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando a executar [dende %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Ficheiro a inserir nun novo buffer [dende %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Ficheiro a inserir [dende %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla non válida no modo sen multibuffer"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 "Faio ó escribir arquivo de respaldo, ¿continuar gravando? (Prema N se non "
 "está seguro)"
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Non se pode escribir fóra de %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erro escribindo %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "¿Demasiados ficheiros de copia de seguridade?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro writing %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro escribindo ficheiro temporal: %s"
@@ -352,15 +350,15 @@ msgstr "O ficheiro xa existe, ¿SOBREESCRIBIR? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "¿Gravar ficheiro baixo NOME DIFERENTE? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "O ficheiro foi modificado dende que o abriu, ¿continua grabando?"
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(máis)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -369,7 +367,7 @@ msgstr ""
 "\n"
 "Prema Enter para continuar.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -378,7 +376,7 @@ msgstr ""
 "Incapaz de crear directorio %s: %s\n"
 "Requírese para gravar/cargar o historial de busca ou posición do cursor\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -388,7 +386,7 @@ msgstr ""
 "Nano será incapaz de cargar ou gravar o historial de busca ou posición do "
 "cursor\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -397,7 +395,7 @@ msgstr ""
 "Detectouse un arquivo de historial anticuado (%s) que tentei mover\n"
 "á localización preferente (%s) pero topei cun erro: %s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -408,645 +406,678 @@ msgstr ""
 "á localización preferente (%s)\n"
 "(lea no FAQ de nano sobre este cambio)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Substituir"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Non Subst"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "SensMa/min"
+msgid "Exit"
+msgstr "Saír"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Cara atrás"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "ExpReg"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "HistPrevia"
+msgid "Close"
+msgstr "Pechar"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "HistSeguin"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "RepórTexto"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Ir a Text"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "DeXustif"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "U-lo Seguint"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Pri Ficheiro"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Derrad Fich"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "A Ficheiros"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Engadir ó Final"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Engadir ó Inicio"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Copia Seguridade"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Executar Comando"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Ir ó Directorio"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Obter Axud"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Saír"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "¿U-lo?"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Páxina ant"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Páxina seg"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Prim liña"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Substituir"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Ult liña"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Ir á liña"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Suspender"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Liña Ant"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Prin Parág"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Seg Liña"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Fin Parágr"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Ler Fich"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "XustComplt"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Recargar"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Inser Fich"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Ir á liña"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Cancela-la función actual"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Amosar este texto de axuda"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Pechar o ficheiro cargado actualmente / Saír de nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Saír de nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Grava-lo ficheiro actual no disco"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Inserir outro ficheiro no actual"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Buscar cadea ou experesión regular"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Pasar á pantalla anterior"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Buscar cadea ou experesión regular"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Pasar á seguinte pantalla"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Pasar á seguinte pantalla"
+
+#: src/global.c:525
 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:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Desfacer corte do buffer de cortado na liña actual"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Amosa-la posición do cursor"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Chamar ó corrector ortográfico, se hai un"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Substituir unha cadea ou expresión regular"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Ir á liña e columna número"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Marcar texto na posición do cursor"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Repeti-la última busca"
 
-#: src/global.c:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Sangra-la liña actual"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Elimina-la sangría da liña actual"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Desface-la última operación"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Reface-la última operación desfeita"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Avanzar un carácter"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Recuar un carácter"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Avanzar unha verba"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Recuar unha verba"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Pasar á liña previa"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Pasar á seguinte liña"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Pasar ó principio da liña actual"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Pasar ó final da liña actual"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Pasar ó principio do parágrafo, entón ó parágrafo previo"
 
-#: src/global.c:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Pasar á primeira liña do ficheiro"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Pasar á derradeira liña do ficheiro"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Pasar ó paréntese correspondente"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desprazar arriba unha liña sen despraza-lo cursor"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desprazar unha liña abaixo sen despraza-lo cursor"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Cambiar ó anterior ficheiro"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Cambiar ó seguinte ficheiro"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Inseri-la seguinte pulsación literal"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Inserir unha lingüeta na posición do cursor"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Inserir unha nova liña na posición do cursor"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Borra-lo carácter baixo do cursor"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Borra-lo caracter á esquerda do cursor"
 
-#: src/global.c:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Xustificar todo o ficheiro"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta-lo número de verbas, liñas e caracteres"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Actualiza-la pantalla actual"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspende-lo editor (se a suspensión está activada)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Selector de sensibilidade a maiúsculas/minúsculas na busca"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Reverti-la dirección da busca"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Selector de uso de expresións regulares"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Recupera-la anterior cadea de busca/sustitución"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Recupera-la seguinte cadea de busca/sustitución"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Ir ó navegador de ficheiros"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Selector de uso do formato DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Selector de uso do formato Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Selector de engadir ó final"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Selector de engadir previo"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Selector de copiado de seguridade do ficheiro orixinal"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Executar comando externo"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Selector de uso dun novo buffer"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Saír do navegador de ficheiros"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Pasar ó primeiro ficheiro da lista"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Pasar ó derradeiro ficheiro da lista"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Pasar ó seguinte ficheiro da lista"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Pasar ó anterior ficheiro da lista"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Pasar ó seguinte ficheiro da lista"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Pasar ó directorio"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Pechar"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Chamar ó corrector ortográfico, se hai un"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Pasar á liña previa"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Pasar á seguinte liña"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Obter Axud"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Gravar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Ir ó Directorio"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "CortarText"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Xustificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Ler Fich"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Ortografía"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "CortarText"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Ir á liña"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "DeXustif"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "SensMa/min"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "RepórTexto"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "ExpReg"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Cara atrás"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Non Subst"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "PosicAct"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Ortografía"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Páxina ant"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Páxina seg"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Prim liña"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Ult liña"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Non hai delimitador"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Marcar"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Copiar Texto"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Sangrar"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "De-Sangrar"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Desfacer"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Refacer"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Adiante"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Atrás"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Verba Seg"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Adiante"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Verba Ant"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Liña Ant"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Seg Liña"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Verba Seg"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Busca-la parella"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Prin Parág"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Fin Parágr"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Desprazar Arriba"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Desprazar Abaixo"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Ficheiro Anterior"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Ficheiro Seguinte"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Entrada Literal"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Lingüeta"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Entrar"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Retroceso"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "CortarAtaFin"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Conta Verbas"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "HistPrevia"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "HistSeguin"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Ir a Text"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Engadir ó Final"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Engadir ó Inicio"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Copia Seguridade"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Executar Comando"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "A Ficheiros"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Pri Ficheiro"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Derrad Fich"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Liña Ant"
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Seg Liña"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Modo de axuda"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Posición do cursor constante"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Uso dunha liña máis para editar"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Desprazar suavemente"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Non corta-las liñas longas"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Amosar espacios en branco"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Salientar sintaxe con cor"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Tecla de 'smart home'"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Autosangría"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Cortar ata o final"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Axuste de liñas longas"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Non corta-las liñas longas"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversión de lingüetas escritas a espacios"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Facer copia de seguridade de ficheiros"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Múltiples ficheiros"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "permitir rato"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Non facer conversión de formato DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Suspensión"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Axuste suave de liñas"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1068,7 +1099,7 @@ msgstr ""
 "Busca:. Premendo Intro sen introducir ningún texto executará a busca "
 "previa.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1082,7 +1113,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles en modo Busca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1102,7 +1133,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1125,7 +1156,7 @@ msgstr ""
 "se cargue nun buffer separado (empregue Meta-< e > para cambiar entre "
 "buffers de ficheiro).  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1141,7 +1172,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1170,7 +1201,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1196,7 +1227,7 @@ msgstr ""
 "ficheiros:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1219,7 +1250,7 @@ msgstr ""
 "Busca:. Ó premer Intro sen introducir ningún texto farase a busca anterior.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1228,7 +1259,7 @@ msgstr ""
 "Navegador:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1251,7 +1282,7 @@ msgstr ""
 "Navegador:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1275,7 +1306,7 @@ msgstr ""
 " Existen as seguintes funcións no modo Corrector Ortográfico:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1296,7 +1327,7 @@ msgstr ""
 "Externos:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1316,7 +1347,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1336,7 +1367,7 @@ msgstr ""
 "introducidas usando as teclas Esc, Alt ou Meta dependendo da configuración "
 "do seu teclado.  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1350,15 +1381,15 @@ msgstr ""
 "alternativas son amosadas entre parénteses\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "activar/desactivar"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Tecla non válida en modo ver"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1367,7 +1398,7 @@ msgstr ""
 "\n"
 "Gravouse o buffer en %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1376,7 +1407,7 @@ msgstr ""
 "\n"
 "Non se gravou o buffer en %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1385,11 +1416,11 @@ msgstr ""
 "\n"
 "Non se gravou o buffer: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "A fiestra é pequena de máis para nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1398,259 +1429,264 @@ msgstr ""
 "Uso: nano [OPCIÓNS] [[+LIÑA, COLUMNA] FICHEIRO]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, 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:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opción\t\tSignificado\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Amosar esta mensaxe"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+LIÑA, COLUMNA"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Empezar na liña LIÑA, columna COLUMNA"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Activar tecla 'smart home'"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Gravar copias de seguridade dos ficheiros existentes"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Directorio para gravar ficheiros de copia de seguridade únicos"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Usar texto groso na vez de texto de video reverso"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Convertir as lingüetas escritas a espacios"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Admitir varios buffers de ficheiros"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Gravar e le-la historia de cadeas a buscar/substituír"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Non mirar nos ficheiros nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Solucionar problema de confusión de teclado numérico"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Non engadir novas liñas ó final dos ficheiros"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Non converti-los ficheiros do formato DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Usar un ou máis liñas para editar"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "Rexistrar e ler a posición do cursor"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <cad>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<cad>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Cadea de citado"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Modo restrinxido"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Desprazar liña a liña en vez de media pantalla"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Establece-lo ancho de lingüeta a #cols columnas"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Facer baleirado rápido da barra de estado"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Amosar información sobre a versión e saír"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Detectar contornos das verbas máis axeitadamente"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <cad>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<cad>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Definición de sintaxe a empregar para corear"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Amosa-la posición do cursor constantemente"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arranxa-lo problema de confusión Retroceso/Borrar"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Amosar este texto de axuda"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Sangra-las novas liñas automáticamente"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Cut from cursor to end of line"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Non segui-las ligazóns simbólicas, sobreescribir"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Emprega-lo rato"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Establece-lo directorio de traballo"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conserva-las teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Iñorar silenciosamente cuestións de inicio como errores no ficherio rc"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Establecer punto de corte na columna #cols"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Usar un corrector ortográfico alternativo"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Gravar ó saíren, sen preguntar"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Permitir desfacer xenérico [EXPERIMENTAL]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Modo visualización (só lectura)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Non corta-las liñas longas"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Non amosa-las dúas liñas de axuda"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Permitir suspensión"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Activar axuste suave de liñas"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(iñorado, por compatibilidade con Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano versión %s (compilado %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1659,167 +1695,174 @@ msgstr ""
 "\n"
 "Opcións de compilación"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Sentímolo, desactivouse o soporte desta función"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "¿Grava-lo buffer modificado (SE RESPOSTA \"Non\" PERDERANSE OS CAMBIOS)?  "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Non se puido reabri-la stdin dende o teclado, síntoo\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lendo dende a stdin, ^C para abortar\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibiuse SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empregue \"fg\" para voltar a nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "activado"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "desactivado"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Comando Descoñecido"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "Iñórase XON, hmmmm..."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "Iñórase XOFF, hmmmm..."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "O tamaño de lingüeta solicitado \"%s\" non é válido"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "O tamaño de recheo solicitado \"%s\" non é válido"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Si"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Todo"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Non"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erro en %s na liña %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "O argumento '%s' ten un \" sen rematar"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expresión regular \"%s\" incorrecta: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Falla o nome da sintaxe"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" está reservada"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "A sintaxe \"default\" non debe tomar extensións"
 
-#: src/rcfile.c:393
-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:398
-msgid "Missing magic string name"
-msgstr "Perdeuse o nome de cadea máxica"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Falla o nome de tecla"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 "as asociacións a combinacións de teclas deben comenzar con \"^\",\"M\", ou "
 "\"F\""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Debe especifica-la función para asociar á tecla"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Debe especifica-lo menú de asociación de tecla (ou \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, fuzzy, 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:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Non se puido sinalar o nome \"%s\" para un menu"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Síntoo, keystr \"%s\" é una asociación ilegal"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Erro lendo %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1834,98 +1877,126 @@ msgstr ""
 "\"black\", co prefixo opcional \"bright\".\n"
 "\"para cores de fronte."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Falla o nome da cor"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "A cor de fondo \"%s\" non pode ser relucinte"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Perdeuse a cadea de expreg"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa dun \"end=\" correspondente"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "A cor de fondo \"%s\" non pode ser relucinte"
+
+#: src/rcfile.c:819
 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:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+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:880
+msgid "Missing magic string name"
+msgstr "Perdeuse o nome de cadea máxica"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+"Non se pode engadir unha cabeceira de expresión regular sen unha directiva "
+"de sintaxe"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Falla o nome da cor"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Erro fatal: non hai teclas sinaladas para a función \"%s\""
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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 ""
 "Saíndo. Por favor, use nano coa opción -I se precisa axeita-la súa "
 "configuración no nanorc\n"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Non se puido sinalar o nome \"%s\" para un menu"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "O comando \"%s\" non se permite no ficheiro incluído"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A sintaxe \"%s\" non ten directiva de cor"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Non se entende o comando \"%s\""
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Falla o indicador"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Falla o nome da cor"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A opción \"%s\" precisa dun argumento"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "A opción non é unha cadea multibyte válida"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Se requiren caracteres non baleiros"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Se requiren dous caracteres de columna simple"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Non se pode desactiva-lo indicador \"%s\""
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Indicador descoñecido \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "¡Non podo atopa-lo meu directorio de inicio! ¡Aaagh!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1939,42 +2010,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "non se atopou \"%.*s%s\""
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr "(para substituír) na selección"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr "(para substituír)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "¿Substituír?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Substituír por"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Introduza liña número, columna número"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Número de liña ou columna non válida"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Non hai delimitador"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Non hai parella do delimitador"
 
@@ -1986,226 +2061,300 @@ msgstr "Marca activada"
 msgid "Mark Unset"
 msgstr "Marca desactivada"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Buffer para desfacer baleiro"
 
-#: 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:440 src/text.c:578
+#, fuzzy, c-format
+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:451 src/text.c:588
 msgid "text add"
 msgstr "engadir texto"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "borrar texto"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "Axuste de liñas"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "unir liña"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "cortar texto"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "repór texto"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "ruptura de liña"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "inserir texto"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Desfíxose a acción (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, fuzzy
+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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "A Acción (%s) refíxose"
 
-#: src/text.c:771
-msgid "Could not pipe"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
 msgstr "Non se puido crear unha canle"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Non se puido iniciar outro proceso"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+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:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Cadea de cita %s incorrecta: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "¡Agora pode De-Xustificar!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Editar unha substitución"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Non se puido crear unha canle"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creando a lista de palabras mal escritas, por favor, espere..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Non se puido obte-lo tamaño do buffer da canle"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Erro ó chamar \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ó chamar \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Erro ó chamar \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Rematou a corrección ortográfica"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ó chamar \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Chamar ó corrector ortográfico, se hai un"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Fallou a revisión ortográfica: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Fallou a corrección ortográfica: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Non engadir novas liñas ó final dos ficheiros"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Amosar esta mensaxe"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Amosar esta mensaxe"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sVerbas: %lu  Liñas: %ld  Caracteres: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "In Selección:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Entrada Literal"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versión"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Gracias en especial a:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "e a todos os que esquencemos..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "¡Gracias por usar nano!"
 
+#~ msgid "Insert File"
+#~ msgstr "Inser Fich"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Pasar á pantalla anterior"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Busca-la parella"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Axuste de liñas longas"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Axuste suave de liñas"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(iñorado, por compatibilidade con Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Debe especifica-lo menú de asociación de tecla (ou \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Falla o indicador"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Erro interno: fallou a configuracion de refacer. Por favor, grave o seu "
+#~ "traballo "
+
+#~ msgid "Could not pipe"
+#~ msgstr "Non se puido crear unha canle"
+
 #~ msgid "line split"
 #~ msgstr "dividir liña"
diff --git a/po/hu.gmo b/po/hu.gmo
index 73ecc931..9b86b8ad 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index 0af50df9..e6f776f8 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,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.2.2pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -21,135 +21,132 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Könyvtárváltás"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Hiba %s olvasásakor: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(könyvtár)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(szülőkvt)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Vissza]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Ez az egyetlen előfordulás"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Nincs keresési minta"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, 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:234
+#: src/files.c:232
 #, 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:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, 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:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Nincs több nyitott fájlpuffer"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "�tváltva erre: %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Új puffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -164,14 +161,14 @@ msgstr[1] ""
 "%lu sor beolvasva (DOS és Mac formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -184,14 +181,14 @@ msgstr[1] ""
 "%lu sor beolvasva (Mac formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -204,101 +201,101 @@ msgstr[1] ""
 "%lu sor beolvasva (DOS formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu sor beolvasva"
 msgstr[1] "%lu sor beolvasva"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Fájl beolvasása"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Új fájl"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s� nem található"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s� egy könyvtár"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "A(z) „%s� egy eszközfájl"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Az új pufferben futtatandó parancs [ebből: %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Futtatandó parancs [ebből: %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, 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:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Beszúrandó fájl [ebből: %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "A billentyű illegális nem többpufferes módban"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nem lehet a következőn kívülre írni: %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Túl sok biztonsági mentés van?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Hiba „%s� írása közben: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Hiba az ideiglenes fájl írásakor: %s"
@@ -354,15 +351,15 @@ msgstr "A fájl már létezik, FELÜL�RJA? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Menti a fájlt M�S NÉVEN? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(tovább)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -371,28 +368,28 @@ msgstr ""
 "\n"
 "A nano indításának folytatásához nyomja le az Enter billentyűt.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -400,645 +397,678 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Csere"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Nincs csere"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Kis/Nagy"
+msgid "Exit"
+msgstr "Kilépés"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Vissza"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regkif"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "ElőzőElőzm"
+msgid "Close"
+msgstr "Bezárás"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "KövElőzm"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Beillesztés"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Ugrás szövegre"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Nem sork."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Következőre"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Első fájl"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Utolsó fájl"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Tallózás"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS formátum"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac formátum"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Hozzáfűz"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Elejére beszúrás"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Bizt. fájlmentés"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Parancs végrehajtása"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Könyvtárba"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Súgó"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Kilépés"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Keresés"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Előző old."
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Köv. old."
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Első sor"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Csere"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Utolsó sor"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Ugrás sorra"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Felfüggesztés"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Előző sor"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Bek. kezdete"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Köv. sor"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Bek. vége"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Beolvasás"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Sorkizár"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Frissít"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Fájl beszúrása"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Ugrás sorra"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Aktuális művelet megszakítása"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Ezen súgószöveg megjelenítése"
 
-#: src/global.c:560
+#: src/global.c:507
 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:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Kilépés a nanoból"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Az aktuális fájl lemezre mentése"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Másik fájl beszúrása"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés keresése"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Ugrás az előző oldalra"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Karakterlánc vagy reguláris kifejezés keresése"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Ugrás a következő oldalra"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Ugrás a következő oldalra"
+
+#: src/global.c:525
 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:576
+#: src/global.c:527
 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:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "A kurzor helyének megjelenítése"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés cseréje"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Ugrás megadott pozícióra"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "A kurzornál lévő szöveg kijelölése"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Az utolsó keresés megismétlése"
 
-#: src/global.c:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Aktuális sor behúzása"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Aktuális sor behúzásának megszüntetése"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Utolsó művelet visszavonása"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Az utoljára visszavont művelet ismétlése"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Egy karakterrel előre"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Egy karakterrel vissza"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Egy szóval előre"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Egy szóval vissza"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Az előző sorra"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "A következő sorra"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "A sor elejére"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "A sor végére"
 
-#: src/global.c:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "A fájl első sorára"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "A fájl utolsó sorára"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Az illeszkedő zárójelre"
 
-#: src/global.c:617
+#: src/global.c:565
 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:619
+#: src/global.c:567
 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:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Váltás az előző fájlpufferre"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Váltás a következő fájlpufferre"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "A következő billentyűleütés szó szerinti beszúrása"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Tabulátor beszúrása a kurzor helyére"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Új sor beszúrása a kurzor helyére"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "A kurzor helyén lévő karakter törlése"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "A kurzor előtt álló karakter törlése"
 
-#: src/global.c:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Az egész fájl sorkizárttá rendezése"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "A szavak, sorok és karakterek megszámolása"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "A képernyő frissítése"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "A szerkesztő felfüggesztése (ha engedélyezett)"
 
-#: src/global.c:654
+#: src/global.c:596
 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:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "A keresés irányának megfordítása"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Reguláris kifejezések használatának átváltása"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Az előző kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "A következő kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Tallózás"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "DOS formátum használatának átváltása"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Mac formátum használatának átváltása"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Hozzáfűzés átváltása"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Elejére beszúrás átváltása"
 
-#: src/global.c:679
+#: src/global.c:618
 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:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Külső parancs végrehajtása"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Új puffer használatának átváltása"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Kilépés a fájlböngészőből"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Ugrás a lista első fájljára"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Ugrás a lista utolsó fájljára"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Ugrás a lista következő fájljára"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Ugrás a lista előző fájljára"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Ugrás a lista következő fájljára"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Könyvtárváltás"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Bezárás"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Az előző sorra"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "A következő sorra"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Súgó"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Mégsem"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Mentés"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Könyvtárba"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Kivágás"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Sorkizárás"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Beolvasás"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Helyes-e?"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Kivágás"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Ugrás sorra"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Nem sork."
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Kis/Nagy"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Beillesztés"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regkif"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Vissza"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Nincs csere"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Pozíció"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Helyes-e?"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Előző old."
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Köv. old."
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Első sor"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Utolsó sor"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Nem zárójel"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Kijelöl"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Szöveg másolása"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Szövegbehúzás"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Szövegbehúzás megsz."
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Vissza"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Újra"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Előre"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Vissza"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Köv. szó"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Előre"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Előző szó"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Előző sor"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Köv. sor"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Köv. szó"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Eleje"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Vége"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Másik zárójel megkeresése"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Bek. kezdete"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Bek. vége"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Görgetés fel"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Görgetés le"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Előző fájl"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Következő fájl"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Szó szerinti bevitel"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tabulátor"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Visszalép"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "KivágAVégéig"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Szavak száma"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Felfüggesztés"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "ElőzőElőzm"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "KövElőzm"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Ugrás szövegre"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS formátum"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac formátum"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Hozzáfűz"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Elejére beszúrás"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Bizt. fájlmentés"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Parancs végrehajtása"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Tallózás"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Első fájl"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Utolsó fájl"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Előző sor"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "Súgó mód"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Kurzor pozíciójának állandó mutatása"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Eggyel több sor használata a szerkesztéshez"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Egyenletes görgetés"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ne tördelje a hosszú sorokat"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Üreshely karakterek megjelenítése"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Színes szintaxiskiemelés"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Intelligens home billentyű"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automatikus igazítás"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Kivágás a végéig"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Hosszú sorok tördelése"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ne tördelje a hosszú sorokat"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bevitt tabulátorok szóközzé alakítása"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Fájlok biztonsági mentése"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Több fájlpuffer"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Egér támogatása"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Ne legyen átalakítás DOS/Mac formátumból"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Felfüggesztés"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Laza sortördelés"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1059,7 +1089,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:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1073,7 +1103,7 @@ msgstr ""
 " Kereső módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1093,7 +1123,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1116,7 +1146,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:253
 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"
@@ -1130,7 +1160,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:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1159,7 +1189,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:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1184,7 +1214,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:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1208,7 +1238,7 @@ msgstr ""
 "kerül megismétlésre.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1216,7 +1246,7 @@ msgstr ""
 " A következő funkcióbillentyűk állnak rendelkezésre keresés módban:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1239,7 +1269,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1264,7 +1294,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1285,7 +1315,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:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1305,7 +1335,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1324,7 +1354,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:359
 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 "
@@ -1338,15 +1368,15 @@ msgstr ""
 "billentyűk zárójelben vannak megjelenítve:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "be/kikapcsolása"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "A billentyű illegális megjelenítés módban"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1355,7 +1385,7 @@ msgstr ""
 "\n"
 "A puffer a(z) %s fájlba írva\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1364,7 +1394,7 @@ msgstr ""
 "\n"
 "A puffer nem lett a(z) %s fájlba írva: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1373,11 +1403,11 @@ msgstr ""
 "\n"
 "A puffer nem került mentésre: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Az ablak mérete túl kicsi a nanonak…\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1386,288 +1416,291 @@ msgstr ""
 "Használat: nano [KAPCSOLÓK] [[+SOR,OSZLOP] F�JL]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Kapcsoló\t\tGNU hosszú kapcsoló\t\tJelentés\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Kapcsoló\t\tJelentés\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Ezen üzenet kiírása"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+SOR,OSZLOP"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "A SOR. sorban és OSZLOP. oszlopban kezd"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Okos home billentyű engedélyezése"
 
-#: src/nano.c:834
+#: src/nano.c:846
 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:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <könyvtár>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<könyvtár>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 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:839
+#: src/nano.c:851
 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:842
+#: src/nano.c:854
 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:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Több fájlpuffer engedélyezése"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 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:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "nanorc fájlok keresésének kihagyása"
 
-#: src/nano.c:858
+#: src/nano.c:870
 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:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Ne adjon új sorokat a fájlok végéhez"
 
-#: src/nano.c:863
+#: src/nano.c:875
 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:865
+#: src/nano.c:877
 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:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Tabulátor beszúrása a kurzor helyére"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <szöveg>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<szöveg>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Idézetszöveg"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Korlátozott mód"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Görgetés soronként fél képernyő helyett"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#oszlop>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#oszlop>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 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:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Törölje gyorsan az állapotsort"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Verziószám kiírása és kilépés"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Szóhatárok pontosabb észlelése"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <szöveg>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<szöveg>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 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:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Kurzor pozíciójának állandó mutatása"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Visszatörlés/törlés zavarainak javítása"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Ezen súgószöveg megjelenítése"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Új sorok automatikus behúzása"
 
-#: src/nano.c:900
+#: src/nano.c:913
 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:903
+#: src/nano.c:916
 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:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Egér használatának engedélyezése"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <könyvtár>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<könyvtár>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Munkakönyvtár beállítása"
 
-#: src/nano.c:912
+#: src/nano.c:926
 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:914
+#: src/nano.c:928
 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:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#oszlop>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#oszlop>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Töréspont beállítása a #oszlop oszlopnál"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr ""
 "Alternatív helyesírás-ellenőrző\n"
 "\t\t\t\t\t  használata"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Automatikus mentés kilépéskor"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "�ltalános visszavonás engedélyezése [K�SÉRLETI]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Megjelenítés mód (csak olvasható)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ne tördelje a hosszú sorokat"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "A két súgósor elrejtése"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Felfüggesztés engedélyezése"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Laza sortördelés engedélyezése"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-"(A Pico kompatibilitás érdekében\n"
-"\t\t\t\t\t mellőzve)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano %s verzió. (fordítva: %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1676,167 +1709,172 @@ msgstr ""
 "\n"
 " Fordítási kapcsolók:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Elnézést, a funkció támogatása ki van kapcsolva"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 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:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Az stdin nem nyitható újra a billentyűzetről.\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Olvasás stdinről, ^C megszakítja\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP vagy SIGTERM érkezett\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Az „fg� kiadásával visszatérhet a nanohoz.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "engedélyezve"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Ismeretlen parancs"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON kihagyva, ej-ej"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF kihagyva, ej-ej"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "A kért „%s� tabméret érvénytelen"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "A kért „%s� kitöltésméret érvénytelen"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "IiYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "MmAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Igen"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Mindet"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nem"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Hiba a(z) %s %lu. sorában: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "A(z) „%s� argumentum lezáratlan \" jellel rendelkezik"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Hibás regex: „%s�: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Hiányzó szintaxisnév"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "A „nincs� szintaxis fenn van tartva"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Az „alapértelmezett� szintaxis nem vehet fel kiterjesztéseket"
 
-#: src/rcfile.c:393
-#, 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:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Hiányzó regex karaktersorozat"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Hiányzó kulcsnév"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, 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:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, 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:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+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:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, 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:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, 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:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, 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:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Hiba %s olvasásakor: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1850,95 +1888,121 @@ msgstr ""
 "„white�, „yellow�, „cyan�, „magenta� és \n"
 "„black�, opcionális „bright� előtaggal az előtérszínekhez."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nem adható meg színparancs szintaxissor nélkül"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "A(z) „%s� háttérszín nem lehet világos"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Hiányzó regex karaktersorozat"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=� -hoz kell egy megfelelő „end=�"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "A(z) „%s� háttérszín nem lehet világos"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+#, 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:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Hiányzó regex karaktersorozat"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Hiányzik a szín neve"
+
+#: src/rcfile.c:974
+#, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, 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:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, 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:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A(z) „%s� szintaxis nem rendelkezik színparancsokkal"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "A(z) „%s� parancs nem értelmezhető"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Hiányzik a jelző"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A(z) „%s� kapcsoló egy paramétert igényel"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "A kapcsoló nem érvényes több bájtos karaktersorozat"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Nem üres karakterek szükségesek"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Két egyoszlopos karakter szükséges"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "A(z) „%s� jelző nem állítható vissza"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Ismeretlen jelző: „%s�"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nincs meg a saját könyvtár! Hopp!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1952,42 +2016,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "A(z) „%.*s%s� nem található"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (cseréhez) a kijelölésben"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (cseréhez)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Lecseréli ezt a találatot?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Csere ezzel"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Kérem a sor, oszlop számát"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Érvénytelen sor- vagy oszlopszám"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Nem zárójel"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Nincs illeszkedő zárójel"
 
@@ -1999,219 +2067,296 @@ msgstr "Kijelölés kezdete"
 msgid "Mark Unset"
 msgstr "Kijelölés vége"
 
-#: src/text.c:443
+#: src/text.c:434
 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:440 src/text.c:578
+#, 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:451 src/text.c:588
 msgid "text add"
 msgstr "szöveg hozzáadása"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "szöveg törlése"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "sorok körbefuttatása"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "sorok egyesítése"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "szöveg kivágása"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "kivágás visszavonása"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "sortörés"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "szöveg beszúrása"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Művelet visszavonva (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, 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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Művelet megismételve (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Nem küldhető tovább"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Nem hozható létre a cső"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Nem forkolható"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, 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:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Belső hiba: ismeretlen típus. Mentse a munkáját."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Hibás idézetszöveg: %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Most már lehet nem sorkizárttá tenni!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "A helyettesítő érték módosítása"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Nem hozható létre a cső"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Elgépelt szavak listájának létrehozása, kis türelmet..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Nem kérhető le a csőpuffer mérete"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Hiba a „spell� meghívásakor"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Hiba a „sort -f� meghívásakor"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Hiba a „uniq� meghívásakor"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "A helyesírás-ellenőrzés befejeződött"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Hiba a(z) „%s� meghívásakor"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ne adjon új sorokat a fájlok végéhez"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Ezen üzenet kiírása"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Ezen üzenet kiírása"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSzavak: %lu  Sorok: %ld  Karakterek: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "A kiválasztásban:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Szó szerinti bevitel"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Unicode bevitel"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Módosítva"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Nézet"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "Könyvtár:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fájl:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "A nano szövegszerkesztő"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "verzió"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Fejlesztők:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Külön köszönet:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Az ncurses számára:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "és mindenkinek, akit kifelejtettünk volna..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 "(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 "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 1aca4236..a5f9ae13 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index 744f32c6..8e9cc995 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,12 +1,12 @@
-# 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: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -17,136 +17,133 @@ msgstr ""
 "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:221
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Ke Direktori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Backwards]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Hanya ini adanya"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
-#, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr ""
+#: src/files.c:144
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Tidak dapat menset permisi %o pada %s: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tidak dapat menyisipkan file dari luar %s"
 
-#: src/files.c:437
+#: src/files.c:431
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Tidak ada file yang terbuka lagi"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Beralih ke %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Buffer baru"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -156,13 +153,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -170,13 +167,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:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -184,101 +181,101 @@ 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:871
+#: src/files.c:866
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Membaca %d baris"
 
-#: src/files.c:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Membaca File"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "File Baru"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "File \"%s\" adalah sebuah file device"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, 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:1033
+#: src/files.c:1028
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Perintah untuk dieksekusi "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "File yang akan disisipkan ke buffer baru [dari %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "File yang akan disisipkan [dari %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Kunci ilegal dalam mode non-multibuffer"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis di luar %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "No %s ditulis (terlalu banyak file backup?)\n"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
@@ -334,43 +331,43 @@ msgstr "File ada, DITIMPA ?"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr "Tekan return untuk lanjut\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -378,699 +375,719 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Ganti"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Tiada Replace"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Case Sens"
+msgid "Exit"
+msgstr "Keluar"
 
 #: src/global.c:472
-#, fuzzy
-msgid "Backwards"
-msgstr " [Backwards]"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regexp"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Sejarah"
+msgid "Close"
+msgstr "Tutup"
 
-#: src/global.c:503
+#: src/global.c:473
 #, fuzzy
-msgid "NextHstory"
-msgstr "Sejarah"
+msgid "Uncut Text"
+msgstr "UnCut Teks"
 
-#: src/global.c:504
+#: src/global.c:475
 #, 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:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Di mana"
 
-#: src/global.c:508
-#, fuzzy
-msgid "First File"
-msgstr "Baris pertama"
-
-#: src/global.c:509
-#, fuzzy
-msgid "Last File"
-msgstr "Baris terakhir"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Ke File"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Tambah"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Tambah"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Backup File"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Eksekusi Perintah"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Ke Direktori"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Bantuan"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Keluar"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Hlm sebelumnya"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Hlm berikutnya"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Baris pertama"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Ganti"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Baris terakhir"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Ke baris"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Tunda"
+#: src/global.c:489
+#, fuzzy
+msgid "Prev Line"
+msgstr "Hlm sebelumnya"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:490
+#, fuzzy
+msgid "Next Line"
+msgstr "File Sesudahnya"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr ""
+#: src/global.c:491
+msgid "Read File"
+msgstr "Baca File"
 
-#: src/global.c:542
+#: src/global.c:493
 #, fuzzy
 msgid "FullJstify"
 msgstr "Justifikasi"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Refresh"
 
-#: src/global.c:546
-#, fuzzy
-msgid "Insert File"
-msgstr "File Sesudahnya"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Ke baris"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:507
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup file yang sedang dimuat/Keluar dari nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Tulis file sekarang ke disk"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Sertakan file lain ke file saat ini"
 
-#: src/global.c:570
+#: src/global.c:517
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:571
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Pindah ke layar sebelumnya"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Pindah ke layar berikutnya"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:578
+#: src/global.c:528
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:582
+#: src/global.c:532
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:583
+#: src/global.c:533
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Ke nomor baris tertentu"
 
-#: src/global.c:585
+#: src/global.c:535
 #, 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:586
-msgid "Repeat last search"
+#: src/global.c:536
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:588
+#: src/global.c:538
 #, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:589
+#: src/global.c:539
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Tambahkan ke file saat ini"
 
-#: src/global.c:590
+#: src/global.c:540
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Tambahkan ke file saat ini"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:544
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Pindah satu karakter ke depan"
 
-#: src/global.c:595
+#: src/global.c:545
 #, fuzzy
 msgid "Go back one character"
 msgstr "Pindah satu karakter ke belakang"
 
-#: src/global.c:597
+#: src/global.c:547
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Ke depan satu kata"
 
-#: src/global.c:598
+#: src/global.c:548
 #, fuzzy
 msgid "Go back one word"
 msgstr "Ke belakang satu kata"
 
-#: src/global.c:600
+#: src/global.c:550
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:601
+#: src/global.c:551
 #, fuzzy
 msgid "Go to next line"
 msgstr "Turun satu baris"
 
-#: src/global.c:602
+#: src/global.c:552
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Pindah ke awal baris ini"
 
-#: src/global.c:603
+#: src/global.c:553
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Pindah ke akhir baris ini"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:615
+#: src/global.c:563
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:623
+#: src/global.c:570
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:630
+#: src/global.c:574
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: src/global.c:632
+#: src/global.c:575
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Hapus karakter pada kursor"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Hapus satu karakter di kiri kursor"
 
-#: src/global.c:639
+#: src/global.c:581
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:642
+#: src/global.c:584
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Justifikasi paragraf saat ini"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Refresh (redraw) layar saat ini"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:656
+#: src/global.c:598
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:660
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:664
+#: src/global.c:606
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:666
+#: src/global.c:608
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:672
+#: src/global.c:614
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Tulis file dalam format DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Tulis file dalam format Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Eksekusi perintah eksternal"
 
-#: src/global.c:684
+#: src/global.c:622
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Pilih insert ke buffer baru"
 
-#: src/global.c:687
+#: src/global.c:625
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:689
+#: src/global.c:626
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:691
+#: src/global.c:627
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Ke baris terakhir file"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Ke baris terakhir file"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Ke Direktori"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Tutup"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Panggil spell checker (jika ada)"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Ke nomor baris tertentu"
+
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr ""
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Bantuan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Batal"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Tulis"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Ke Direktori"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Ptng Teks"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Justifikasi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Baca File"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Mengeja"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Ptng Teks"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Ke baris"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "UnJustifikasi"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Case Sens"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:746
 #, fuzzy
-msgid "UnCut Text"
-msgstr "UnCut Teks"
+msgid "Backwards"
+msgstr " [Backwards]"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Tiada Replace"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Mengeja"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Hlm sebelumnya"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Hlm berikutnya"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Baris pertama"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Baris terakhir"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Bukan tanda kurung"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Tandai Teks"
 
-#: src/global.c:828
+#: src/global.c:791
 #, fuzzy
 msgid "Copy Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:831
+#: src/global.c:794
 #, fuzzy
 msgid "Indent Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Depan"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Belakang"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Kata Berikut"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Depan"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Kata Sebelum"
 
-#: src/global.c:875
-#, fuzzy
-msgid "Prev Line"
-msgstr "Hlm sebelumnya"
-
-#: src/global.c:878
-#, fuzzy
-msgid "Next Line"
-msgstr "File Sesudahnya"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Kata Berikut"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Awal"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Cari Kurung Lain"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr ""
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr ""
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "File Sebelumnya"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "File Sesudahnya"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Tunda"
+
+#: src/global.c:903
+#, fuzzy
+msgid "PrevHstory"
+msgstr "Sejarah"
+
+#: src/global.c:907
+#, fuzzy
+msgid "NextHstory"
+msgstr "Sejarah"
+
+#: src/global.c:911
+#, fuzzy
+msgid "Go To Text"
+msgstr "Ke baris"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Tambah"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Tambah"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Backup File"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Eksekusi Perintah"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Ke File"
+
+#: src/global.c:958
+#, fuzzy
+msgid "First File"
+msgstr "Baris pertama"
+
+#: src/global.c:960
+#, fuzzy
+msgid "Last File"
+msgstr "Baris terakhir"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Mode bantuan"
 
-#: src/global.c:1301
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Posisi kursor konstan"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Scrolling halus"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Jangan wrap baris panjang"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Pewarnaan sintaks"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Inden otomatis"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Cut hingga akhir"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Jangan wrap baris panjang"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1321
+#: src/global.c:1239
 #, fuzzy
 msgid "Backup files"
 msgstr "Backup File"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Buffer file multi"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Dukungan mouse"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Tidak ada konversi dari format DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 #, fuzzy
 msgid "Suspension"
 msgstr "Tunda"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:220
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1095,7 +1112,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1104,7 +1121,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1124,7 +1141,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Goto Line:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1155,7 +1172,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Insert File:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1164,7 +1181,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:259
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1193,7 +1210,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Write File:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1217,7 +1234,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam file browser:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1243,13 +1260,13 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:299
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1272,7 +1289,7 @@ msgstr ""
 "  Kunci-kunci fungsi berikut tersedia di dalam mode Browser GotoDir :\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1297,7 +1314,7 @@ msgstr ""
 "Check:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1317,7 +1334,7 @@ msgstr ""
 " Kunci-kunci berikut tersedia dalam mode ini:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1347,7 +1364,7 @@ msgstr ""
 "ditunjukkan dalam tanda kurung:\n"
 "\n"
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1358,7 +1375,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1367,16 +1384,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "enable/disable"
 
-#: src/nano.c:588
+#: src/nano.c:597
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "Kunci ilegal dalam mode VIEW"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1385,7 +1402,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1394,7 +1411,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1403,291 +1420,295 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Ukuran window terlalu kecil bagi nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opsi\t\tOpsi Panjang\t\tArti\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsi\t\tArti\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Tampilkan pesan ini"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:831
+#. 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:843
 #, fuzzy
 msgid "Start at line LINE, column COLUMN"
 msgstr "Mulai pada nomor baris LINE"
 
-#: src/nano.c:833
+#: src/nano.c:845
 #, fuzzy
 msgid "Enable smart home key"
 msgstr "Aktifkan mouse"
 
-#: src/nano.c:834
+#: src/nano.c:846
 #, fuzzy
 msgid "Save backups of existing files"
 msgstr "Backup file yang ada ketika menyimpan"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Aktifkan multiple file buffer"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Log dan baca sejarah pencarian/penggantian string"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Jangan lihat file nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Jangan konversi file dari format DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Posisi kursor konstan"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:883
 #, fuzzy
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[str]"
 
-#: src/nano.c:872
+#: src/nano.c:884
 #, fuzzy
 msgid "Quoting string"
 msgstr "String kuote, default \"> \""
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 #, fuzzy
 msgid "-T <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:879
+#: src/nano.c:891
 #, fuzzy
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[num]"
 
-#: src/nano.c:880
+#: src/nano.c:892
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr "Set lebar tab ke num"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Cetak informasi versi dan keluar"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 #, fuzzy
 msgid "--syntax=<str>"
 msgstr "--syntax [str]"
 
-#: src/nano.c:892
+#: src/nano.c:904
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Definisi sintaks untuk digunakan"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Menampilkan posisi kursor secara konstan"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Tampilkan pesan ini"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Inden baris baru secara otomatis"
 
-#: src/nano.c:900
+#: src/nano.c:913
 #, fuzzy
 msgid "Cut from cursor to end of line"
 msgstr "Biarkan ^K memotong dari kursor hingga akhir baris"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Jangan ikuti link simbolik, timpa"
 
-#: src/nano.c:905
+#: src/nano.c:918
 #, fuzzy
 msgid "Enable the use of the mouse"
 msgstr "Aktifkan mouse"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:908
+#: src/nano.c:922
 #, fuzzy
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[dir]"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Set direktori operasi"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserve kunci XON (^Q) dan XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 #, fuzzy
 msgid "-r <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:916
+#: src/nano.c:930
 #, fuzzy
 msgid "--fill=<#cols>"
 msgstr "--fill=[#cols]"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:920
+#: src/nano.c:934
 #, fuzzy
 msgid "-s <prog>"
 msgstr "-s [prog]"
 
-#: src/nano.c:920
+#: src/nano.c:934
 #, fuzzy
 msgid "--speller=<prog>"
 msgstr "--speller=[prog]"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Aktifkan speller alternatif"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Auto save saat keluar, jangan tanya"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr "Mode view (hanya baca)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Jangan wrap baris panjang"
 
-#: src/nano.c:933
+#: src/nano.c:947
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr "Jangan tampilkan jendela bantuan"
 
-#: src/nano.c:934
+#: src/nano.c:948
 #, fuzzy
 msgid "Enable suspension"
 msgstr "Aktifkan suspend"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(abaikan, untuk kompatibilitas dengan Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr "GNU nano versi %s (dikompilasi %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1696,167 +1717,172 @@ msgstr ""
 "\n"
 " Option kompilasi:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Maaf, dukungan untuk fungsi ini telah ditiadakan"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Menerima SIGHUP atau SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gunakan \"fg\" untuk kembali ke nano"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "adakan"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "tiadakan"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "ukuran tab yang diminta %d tidak valid"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "ukuran fill yang diminta %d tidak valid"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Semua"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Tidak"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "argumen %s telah selesai.\""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 #, 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex jelek \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Nama warna tidak ada"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Missing key name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:512
-#, 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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Tidak dapat memanggil \"%s\""
+#: src/rcfile.c:467
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
+
+#: src/rcfile.c:474
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
+
+#: src/rcfile.c:497
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
 
-#: src/rcfile.c:540
+#: src/rcfile.c:583
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:711
+#: src/rcfile.c:626
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1870,96 +1896,121 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" dan \n"
 "\"black\", dengan prefiks opsional \"bright\".\n"
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 #, fuzzy
 msgid "Cannot add a color command without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" membutuhkan \"end=\" yang sesuai"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:819
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Nama warna tidak ada"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Nama warna tidak ada"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Tidak dapat membuka %s untuk menulis: %s"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Perintah %s tidak dipahami"
 
-#: src/rcfile.c:1061
+#: src/rcfile.c:1113
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsi %s membutuhkan sebuah argumen"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, 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:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat menemukan direktori home!  Wah!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1973,43 +2024,47 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (ganti)"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (ganti)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Masukkan nomor baris"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Bukan tanda kurung"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
@@ -2022,228 +2077,264 @@ msgstr "Set Tanda"
 msgid "Mark Unset"
 msgstr "Unset Tanda"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 #, fuzzy
 msgid "text delete"
 msgstr "File Sesudahnya"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr ""
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 #, fuzzy
 msgid "text insert"
 msgstr "File Sesudahnya"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 #, 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Tidak dapat mem-pipe"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Tidak dapat membuat pipe"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Tidak dapat mem-fork"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Sekarang dapat melakukan UnJustify"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Edit pengganti"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Tidak dapat membuat pipe"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Membuat daftar kata yang misspelled, silakan tunggu..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat menentukan ukuran buffer pipe"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Gagal memanggil \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Gagal memanggil \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Panggil spell checker (jika ada)"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Tampilkan pesan ini"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Tampilkan pesan ini"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3041
+#: src/text.c:3373
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Menambahkan Pilihan ke File"
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr ""
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 #, fuzzy
 msgid "Modified"
 msgstr " Dimodifikasi "
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 #, fuzzy
 msgid "View"
 msgstr " View "
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 #, fuzzy
 msgid "DIR:"
 msgstr " DIR: "
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 #, fuzzy
 msgid "File:"
 msgstr "File: "
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Nano teks editor"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 #, fuzzy
 msgid "version"
 msgstr "versi "
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Dibuat untuk anda oleh:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Ucapan terima kasih khusus kepada:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "dan orang lain yang kami lupa...."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Terima kasih telah menggunakan nano!\n"
@@ -2299,12 +2390,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"
 
@@ -2341,6 +2429,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"
 
@@ -2380,6 +2471,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Down"
 #~ msgstr "Turun"
 
+#~ msgid "Find Other Bracket"
+#~ msgstr "Cari Kurung Lain"
+
 #~ msgid "Direction"
 #~ msgstr "Arah"
 
@@ -2424,21 +2518,27 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ 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"
 
@@ -2513,6 +2613,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"
 
diff --git a/po/it.gmo b/po/it.gmo
index 02408079..38eacc1b 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 52be7c49..cbe428fc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,15 +1,14 @@
 # Italian messages for nano.
 # 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-2011.
-# $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.3.0\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2012-09-25 10:33+0100\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2014-05-25 17:37+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -18,136 +17,136 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Vai alla directory"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errore durante la lettura di %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(dir super)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [All'indietro]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Questa è l'unica occorrenza"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Nessun pattern di ricerca attivo"
 
-#: src/files.c:137
+#: src/files.c:138
 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:143
-#, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr "Impossibile creare file temporaneo: %s"
+#: src/files.c:144
+#, 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:169 src/files.c:207 src/files.c:217
-#, fuzzy, c-format
+#: src/files.c:170 src/files.c:207 src/files.c:217
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Errore durante la scrittura del file di backup %s: %s"
+msgstr "Errore durante la scrittura del file di lock %s: %s"
 
-#: src/files.c:234
-#, fuzzy, c-format
+#: src/files.c:232
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Errore durante la scrittura del file di backup %s: %s"
+msgstr "Errore durante l'eliminazione del file di lock %s: %s"
 
-#: src/files.c:271
-#, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "Errore durante la scrittura del file di backup %s: %s"
+#: src/files.c:266
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Errore durante l'apertura del file di lock %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
+"Errore durante la lettura del file di lock %s: letti non abbastanza dati"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossibile inserire il file dall'esterno di %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Nessun altro buffer aperto"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Passato a %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Nuovo buffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -162,14 +161,14 @@ msgstr[1] ""
 "Lette %lu righe (Convertite dal formato DOS e Mac - Senza permesso di "
 "scrittura)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -180,14 +179,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Lette %lu righe (Convertite dal formato Mac - Senza permesso di scrittura)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -198,101 +197,101 @@ msgstr[0] ""
 msgstr[1] ""
 "Lette %lu righe (Convertite dal formato DOS - Senza permesso di scrittura)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Letta %lu riga"
 msgstr[1] "Lette %lu righe"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Lettura file"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Nuovo file"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" è una directory"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" è un file di device"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando da eseguire in un nuovo buffer [da %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando da eseguire [da %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "File da inserire in un nuovo buffer [da %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "File da inserire [da %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Chiave non valida in modalità non multibuffer"
 
-#: src/files.c:1594
+#: src/files.c:1591
 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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossibile salvare fuori da %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errore durante la scrittura del file di backup %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Troppi file di backup?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errore durante la scrittura di %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errore durante la scrittura del file temporaneo: %s"
@@ -348,15 +347,15 @@ msgstr "Il file esiste, SOVRASCRIVERE?"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Salvare il file con un NOME DIFFERENTE?"
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Il file è stato modificato dall'apertura. Continuare a salvare? "
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(ancora)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -365,7 +364,7 @@ msgstr ""
 "\n"
 "Premere Invio per continuare\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -374,7 +373,7 @@ msgstr ""
 "Impossibile creare la directory %s: %s\n"
 "È richiesta per salvare/caricare le ricerche o la posizione del cursore\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -384,7 +383,7 @@ msgstr ""
 "Nano non sarà in grado di caricare o salvare le ricerche o la posizione del "
 "cursore\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -393,7 +392,7 @@ msgstr ""
 "Riscontrato un file di nano obsoleto (%s): si è cercato di spostarlo\n"
 "al percorso preferito (%s) ma si è verificato un errore: %s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -404,660 +403,673 @@ msgstr ""
 "preferito (%s)\n"
 "(vedere la FAQ di nano a proposito di questo cambiamento)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Sostituisci"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Non sost."
-
-# FIXME
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Maius/Minus"
+msgid "Exit"
+msgstr "Esci"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Indietro"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Espr.Reg."
-
-# FIXME
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "Precedente"
+msgid "Close"
+msgstr "Chiudi"
 
-# FIXME
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Successivo"
+#: src/global.c:473
+msgid "Uncut Text"
+msgstr "Incolla"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Vai al testo"
+#: src/global.c:475
+msgid "Unjustify"
+msgstr "Degiustif."
 
 # FIXME
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Successivo"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Primo file"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Ultimo file"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Sfoglia"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Accoda"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Scrivi in testa"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "File di backup"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Esegui comando"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Vai alla directory"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Guida"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Esci"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Pag Prec."
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Pag Succ."
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Prima riga"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Sostituisci"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Ultima riga"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Vai a riga"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Sospendi"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Riga prec."
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Iniz.Par."
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Riga succ."
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Fine Par."
+#: src/global.c:491
+msgid "Read File"
+msgstr "Inserisci"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Giust.File"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Inserisci file"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Vai a riga"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Annulla la funzione corrente"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Chiude il file corrente / Esce da nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Esce da nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Salva il file corrente su disco"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Inserisce un altro file nel corrente"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Cerca una stringa o un'espressione regolare"
 
-#: src/global.c:571
-msgid "Go to previous screen"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr "Cerca una stringa"
+
+#: src/global.c:522
+msgid "Go one screenful up"
 msgstr "Va alla schermata precedente"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:523
+msgid "Go one screenful down"
 msgstr "Va alla schermata successiva"
 
-#: src/global.c:574
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Taglia la riga corrente e la memorizza nel cutbuffer"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Incolla dal cutbuffer nella riga corrente"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Mostra la posizione del cursore"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Esegue il correttore ortografico, se disponibile"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Sostituisce una stringa o un'espressione regolare"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Va a un numero di riga e di colonna specifico"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
-msgstr "Marca testo alla posizione del cursore"
+#: src/global.c:535
+msgid "Mark text starting from the cursor position"
+msgstr "Marca testo partendo dalla posizione del cursore"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+msgid "Repeat the last search"
 msgstr "Ripete l'ultima ricerca"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia la riga corrente e la memorizza nel cutbuffer"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Applica indentazione alla riga corrente"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Toglie indentazione dalla riga corrente"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Annulla l'ultima operazione"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Ripete l'ultima operazione"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Avanza di un carattere"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Arretra di un carattere"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Avanza di una parola"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Arretra di una parola"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Va alla riga precedente"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Va alla riga successiva"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Va all'inizio della riga corrente"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Va alla fine della riga corrente"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Va all'inizio del paragrafo; poi al paragrafo precedente"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Va alla fine del paragrafo; poi al paragrafo successivo"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Va alla prima riga del file"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Va all'ultima riga del file"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Va alla parentesi corrispondente"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Scorre in alto di una riga senza muovere il cursore"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Scorre in basso di una riga senza muovere il cursore"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Va al buffer precedente"
 
-#: src/global.c:625
+#: src/global.c:571
 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:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserisce un carattere letteralmente"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Inserisce una tabulazione alla posizione del cursore"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Inserisce un ritorno a capo alla posizione del cursore"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Elimina il carattere sotto il cursore"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina il carattere a sinistra del cursore"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Taglia dal cursore alla fine del file"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Giustifica l'intero file"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta il numero di parole, righe e caratteri"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Aggiorna la schermata corrente"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Sospende l'editor (se la sospensione è abilitata)"
 
 # FIXME
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Considera maiuscole/minuscole nella ricerca"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Inverte la direzione di ricerca"
 
 # FIXME
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Attiva/disattiva uso di espressioni regolari"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione precedente"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione successiva"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Va al browser di file"
 
 # FIXME
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Usa il formato DOS"
 
 # FIXME
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Usa il formato Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Attiva/disattiva scrittura in coda al file"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Attiva/disattiva scrittura in testa al file"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Attiva/disattiva creazione copia di backup del file originale"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Esegue un comando esterno"
 
 # FIXME
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Usa un nuovo buffer"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Esce dal browser di file"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Va al primo file dell'elenco"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Va all'ultimo file dell'elenco"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Va al prossimo file dell'elenco"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Va al precedente file dell'elenco"
 
+#: src/global.c:629
+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:694
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Va alla directory"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Chiudi"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "Esegue il linter, se disponibile"
+
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr "Va alla messaggio precedente del linter"
+
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr "Va al messaggio successivo del linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Guida"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/global.c:671
+msgid "Write Out"
 msgstr "Salva"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Vai alla directory"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Taglia"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Giustifica"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Inserisci"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Taglia"
+#: src/global.c:731
+msgid "To Linter"
+msgstr "Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "DeGiustif."
+# FIXME
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Maius/Minus"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Incolla"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Espr.Reg."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Indietro"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Non sost."
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Posizione"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Pag Prec."
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Pag Succ."
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Prima riga"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Ultima riga"
+
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "Parentesi"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Marca testo"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Copia"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Indenta"
 
 # FIXME
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Deindenta"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Ripeti"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Avanti"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Indietro"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Parola succ."
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Avanti"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Parola prec."
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Riga prec."
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Riga succ."
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Parola succ."
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Inizio"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Fine"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Trova la parentesi corrispondente"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Iniz.Par."
 
-#: src/global.c:899
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Fine Par."
+
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Scorri su"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Scorri giù"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+msgid "Prev File"
 msgstr "File prec."
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "File succ."
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr "Input letterale"
+#: src/global.c:862
+msgid "Verbatim"
+msgstr "Letterale"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Invio"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backspace"
 
 # FIXME
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "TagliaAFine"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Conta parole"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Sospendi"
+
+# FIXME
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Precedente"
+
+# FIXME
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Successivo"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Vai al testo"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Accoda"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Scrivi in testa"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "File di backup"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Esegui comando"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Sfoglia"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Primo file"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Ultimo file"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr "Msg lint prec."
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Barra dei comandi"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Mostra sempre la posizione del cursore"
 
 # FIXME
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Usa una riga in più per le modifiche"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Scorrimento continuo"
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr "A capo automatico morbido delle righe lunghe"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Mostra spazi bianchi"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Sintassi colorata"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Tasto Inizio intelligente"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Indentazione automatica"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Taglia fino a fine riga"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "A capo automatico"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
+msgstr "A capo automatico delle righe lunghe"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversione delle tabulazioni in spazi"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "File di backup"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "File multipli"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Supporto per il mouse"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Nessuna conversione dai formati DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Sospensione"
 
-# FIXME
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "A capo morbido"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1079,7 +1091,7 @@ msgstr ""
 "prompt di ricerca. Premendo Invio senza inserire nulla, verrà eseguita la "
 "ricerca precedente. "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1093,7 +1105,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1113,7 +1125,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai a Riga:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1136,7 +1148,7 @@ msgstr ""
 "provocherà il caricamento in un buffer separato (usare Meta-< e > per "
 "muoversi tra i buffer). "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1150,7 +1162,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Inserisci:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1177,7 +1189,7 @@ msgstr ""
 "\n"
 " Le seguenti funzioni sono disponibili in modalità Salva:\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1201,7 +1213,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili nel file browser\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1226,7 +1238,7 @@ msgstr ""
 "\n"
 
 # FIXME
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1234,7 +1246,7 @@ msgstr ""
 "Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1256,7 +1268,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai alla Directory:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1280,7 +1292,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Ortografia:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1300,7 +1312,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Esegui comando:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1320,7 +1332,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1339,7 +1351,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:359
 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 "
@@ -1353,15 +1365,15 @@ msgstr ""
 "sequenze alternative sono mostrate tra parentesi:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "abilita/disabilita"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Chiave non valida in modalità Visualizza"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1370,7 +1382,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1379,7 +1391,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1388,11 +1400,11 @@ msgstr ""
 "\n"
 "Buffer scritto: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "La finestra è troppo piccola per nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1401,269 +1413,270 @@ msgstr ""
 "Uso: nano [OPZIONI] [[+RIGA,COLONNA] FILE]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opzione\t\tOpzione lunga\t\tSignificato\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opzione\t\tSignificato\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Mostra questo messaggio"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+RIGA,COLONNA"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Inizia alla riga numero RIGA, colonna numero COLONNA"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Abilita il tasto Inizio intelligente"
 
 # Questo messaggio è stato tradotto come uno simile più in alto.
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Crea una copia di backup dei file esistenti"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Directory in cui salvare i file di backup"
 
 # FIXME
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Usa grassetto invece di testo inverso"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Converte le tabulazioni in spazi"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Abilita buffer multipli"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "Usa file di lock come vim"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Salva e leggi le stringhe di ricerca/sostituzione"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Non considera i file nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Risolve il problema di confusione del tastierino numerico"
 
 # FIXME
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Non aggiunge caratteri newline in fondo ai file"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Non converte i file dai formati DOS/Mac"
 
 # FIXME
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Usa una riga in più per le modifiche"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "Salva e legge la posizione del cursore"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Stringa di quoting"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Modalità ristretta"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Scorrimento a ogni riga invece che a ogni metà schermata"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Imposta la lunghezza della tabulazione a #cols"
 
 # FIXME
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Svuota la barra di stato velocemente"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Stampa informazioni sulla versione ed esce"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Rileva più precisamente i limiti delle parole"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Definizione di sintassi da usare per la colorazione"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Mostra sempre la posizione del cursore"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Risolve il problema Backspace/Canc"
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr "Mostra questo messaggio di aiuto"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Indenta automaticamente le nuove righe"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Taglia dal cursore a fine riga"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Non segue i collegamenti simbolici, sovrascrive"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Abilita l'uso del mouse"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr "Non legge il file (solo scrittura)"
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Imposta la directory operativa"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Rispetta XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Ignora i problemi all'avvio come gli errori nel file rc"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
 # FIXME
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Imposta l'interruzione delle righe a #cols"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Attiva correttore ortografico alternativo"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Salvataggio automatico in uscita senza conferma"
 
 # FIXME
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Abilita annullamento generico (SPERIMENTALE)"
 
 # "Visualizza" è il nome della modalità. Appare in alto a destra.
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Visualizza (sola lettura)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
 msgstr "Non interrompe le righe lunghe"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Non mostra la barra dei comandi"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Abilita sospensione"
 
 # FIXME
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Abilita interruzione morbida delle righe"
 
-# NdT: Più di un'opzione viene ignorata.
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorate, per compatibilità con Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano versione %s (compilato %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1672,166 +1685,169 @@ msgstr ""
 "\n"
 " Opzioni di compilazione:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Il supporto per questa funzionalità è stato disabilitato"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salvare il buffer modificato? (RISPONDERE \"No\" PER ANNULLARE LE MODIFICHE) "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossibile riaprire stdin da tastiera\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lettura dallo stdin, ^C per interrompere\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevuto SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Usare \"fg\" per tornare a nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "abilitato"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "disabilitato"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Comando sconosciuto"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorato, mmm..."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorato, mmm..."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Lunghezza della tabulazione \"%s\" non valida"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Lunghezza del riempimento \"%s\" non valida"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Sì"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Tutti"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Errore in %s alla riga %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argomento \"%s\" ha un \" non terminato"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "L'espressione regolare deve iniziare e finire con il carattere \""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Espressione regolare non corretta \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Nome di sintassi mancante"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintassi \"none\" è riservata"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "La sintassi \"default\" non accetta estensioni"
 
-# FIXME
-#: src/rcfile.c:393
-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:398
-msgid "Missing magic string name"
-msgstr "Stringa di intestazione mancante"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Nome di chiave mancante"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "le chiavi devono cominciare con \"^\", \"M\", o \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "Il nome di chiave è troppo corto"
+
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "I nomi di chiavi devono cominciare con \"^\", \"M\", o \"F\""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr "Occorre specificare una funzione a cui associare la chiave"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-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:460
+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:512
+#: src/rcfile.c:467
 #, 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:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, 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:540
+#: src/rcfile.c:497
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "La chiave \"%s\" è un binding non consentito"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "La chiave \"%s\" non può essere reimpostata"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Errore durante l'espansione di %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1846,99 +1862,124 @@ msgstr ""
 "\"black\", con il prefisso opzionale \"bright\"\n"
 "per i colori di primo piano."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Nome del colore mancante"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Il colore di sfondo \"%s\" non può essere \"bright\""
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Stringa di espressione regolare mancante"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" richiede un \"end=\" corrispondente"
 
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Il colore di sfondo \"%s\" non può essere \"bright\""
+
 # FIXME
-#: src/rcfile.c:890
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
 
-#: src/rcfile.c:960
+# FIXME
+#: src/rcfile.c:875
+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:880
+msgid "Missing magic string name"
+msgstr "Stringa di intestazione mancante"
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr "Impossibile aggiungere un linter senza una riga di sintassi"
+
+#: src/rcfile.c:944
+msgid "Missing linter command"
+msgstr "Comando linter mancante"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Impossibile trovare sintassi \"%s\" da estendere"
 
 # FIXME
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" non permesso nel file incluso"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintassi \"%s\" non ha direttive di colore"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" non riconosciuto"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Flag mancante"
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Opzione mancante"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opzione \"%s\" richiede un argomento"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "L'opzione non è una stringa multibyte valida"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Sono richiesti caratteri non di spaziatura"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Sono richiesti due caratteri a colonna singola"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, 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:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Flag \"%s\" sconosciuto"
+msgid "Unknown option \"%s\""
+msgstr "Opzione \"%s\" sconosciuta"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Impossibile trovare la directory home."
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1952,42 +1993,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" non trovato"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (sostituisci) nella selezione"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (sostituisci)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Sostituire questa occorrenza?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Sostituire con"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Inserire il numero di riga, numero di colonna"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Numero di riga o di colonna non valido"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Non è una parentesi"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Parentesi corrispondente non trovata"
 
@@ -1999,271 +2044,276 @@ msgstr "Marcatura impostata"
 msgid "Mark Unset"
 msgstr "Marcatura disattivata"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Buffer di annullamento vuoto."
 
 # FIXME
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr "aggiunta testo"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "rimozione testo"
 
 # FIXME
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "a capo riga"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "unione riga"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "taglio testo"
 
 # FIXME
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "incolla testo"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "interruzione riga"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "inserimento testo"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro."
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Azione annullata (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ripetuta azione (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Impossibile effettuare una pipe"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Impossibile creare la pipe"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Impossibile effettuare un fork"
 
-# FIXME
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "Errore interno: impossibile incollare. Salvare il lavoro."
 
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Stringa di quoting non corretta %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "È ora possibile togliere la giustificazione."
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Modifica sostituzione"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Impossibile creare la pipe"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creazione della lista delle parole non corrette, attendere..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Impossibile ottenere la dimensione del buffer della pipe"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Errore nel chiamare \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Errore nel chiamare \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Errore nel chiamare \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errore nel chiamare \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr "Esecuzione del correttore ortografico, attendere"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Controllo ortografico non riuscito: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Controllo ortografico non riuscito: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr "Nessun linter definito per questo tipo di file!"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr "Salvare il buffer prima dell'esecuzione del linter?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "Esecuzione del linter, attendere"
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Ricevute 0 righe dal comando: %s"
+
+#: src/text.c:3238
+#, 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:3286
+msgid "At last message"
+msgstr "Ultimo messaggio"
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr "Primo messaggio"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParole: %lu  Righe: %ld  Caratteri: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "Nella selezione:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Input letterale"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Input Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Modificato"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Visualizza"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "Dir:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "File:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 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:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "L'editor di testi nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versione"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Creato per voi da:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Ringraziamenti speciali a:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "e chiunque altro abbiamo dimenticato..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Grazie di usare nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ 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 "Find Other Bracket"
+#~ msgstr "Trova la parentesi corrispondente"
 
-#~ msgid "Search for text within the editor"
-#~ msgstr "Cerca testo all'interno dell'editor"
+#~ msgid "Long line wrapping"
+#~ msgstr "A capo automatico"
 
-#~ msgid "Replace text within the editor"
-#~ msgstr "Sostituisce testo all'interno dell'editor"
+# FIXME
+#~ msgid "Soft line wrapping"
+#~ msgstr "A capo morbido"
 
-#~ msgid "Find matching bracket"
-#~ msgstr "Trova la parentesi corrispondente"
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr ""
+#~ "Occorre specificare un menù a cui associare la chiave (oppure \"all\")"
 
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Nome della sintassi %s duplicato"
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro"
diff --git a/po/ja.gmo b/po/ja.gmo
index 91272395..91e5b268 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 0a90c3fc..977d6799 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,13 +1,13 @@
 # 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.
 #
+# Yasuaki Taniguchi <yasuakit@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -17,134 +17,131 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
 msgstr "ディレクトリ�移動"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "�り消����"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "%s: %s �読�込��失敗����"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(parent dir)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [戻る]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "他�見��り��ん"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "検索語�指定�れ����ん"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "�ックアップファイル %s �書�込�エラー: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "�ックアップファイル %s �書�込�エラー: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "�ックアップファイル %s �書�込�エラー: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "%s �外部�らファイルを挿入����ん"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "ファイルを開�����ッファ��り��ん"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "%s �切り替���"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "新���ッファ"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -156,13 +153,13 @@ msgstr[0] ""
 "%lu 行を読�込���（DOS ��� Mac �フォーマットを変� - 警告: 書�込�権"
 "���り��ん）"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -172,13 +169,13 @@ msgstr[0] ""
 "%lu 行を読�込���（Mac フォーマットを変� - 警告: 書�込�権���り��"
 "ん）"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -188,99 +185,99 @@ msgstr[0] ""
 "%lu 行を読�込���（DOS フォーマットを変� - 警告: 書�込�権���り��"
 "ん）"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu 行を読�込���"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "ファイルを読�込ん����"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "新��ファイル"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" �見��り��ん"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" �ディレクトリ��"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" �デ�イスファイル��"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "新���ッファ�コマンドを実行 [from %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "コマンドを実行 [from %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "新���ッファ�ファイルを読�込� [from %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "�在��ッファ�ファイルを読�込� [from %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "マル��ッファモード��無効キー"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 "�ックアップファイル�書�込��失敗����。�存を継続����? (分�ら��"
 "場�� N �������) "
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "%s �外部�ら書�込���ん"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow �設定�れ��る状態��リンク先を変更����ん"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "�ックアップファイル %s �書�込�エラー: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "�ックアップファイル�多����ん�?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "%s �書�込�エラー: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "テン�ラリファイル�書�込�エラー: %s"
@@ -335,15 +332,15 @@ msgstr "ファイルを上書���よ����？ "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "������存����？ "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "ファイルを開��後�修正�入り�����存����？ "
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(続�)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +349,7 @@ msgstr ""
 "\n"
 "継続�る��� Enter を押������\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -361,7 +358,7 @@ msgstr ""
 "ディレクトリ %s �作��失敗����: %s\n"
 "�れ�検索履歴�よ�カーソル�置��存�必��ディレクトリ��。\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -370,14 +367,14 @@ msgstr ""
 "パス %s �ディレクトリ��る必���り����ディレクトリ���り��ん\n"
 "Nano �検索�よ�カーソル�置履歴�読�込���存�����ん。\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -385,646 +382,679 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "�消"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "置�"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "置����"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "大/�文字"
+msgid "Exit"
+msgstr "終了"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "後方�"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "正�表�"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "��履歴"
+msgid "Close"
+msgstr "閉�る"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "次�履歴"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "貼り付�"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "検索"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "両端��"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "次�移動"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "先頭�"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "末尾�"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "ファイラ"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS フォーマット"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac フォーマット"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "末尾�追加"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "先頭�追加"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "�ックアップ"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "コマンドを実行"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "ディレクトリ�移動"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "ヘルプ"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "終了"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "移動"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "��ページ"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "次�ページ"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "先頭行"
+#: src/global.c:487
+msgid "Replace"
+msgstr "置�"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "最終行"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "行を指定"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr ""
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "��行"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "段��始点"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "次�行"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "段��終点"
+#: src/global.c:491
+msgid "Read File"
+msgstr "読�込�"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "全��等化"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "æ›´æ–°"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "ファイルを挿入"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "行を指定"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "動作を�り消���"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "ヘルプを表示"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "�在�ファイルを閉�� nano を終了"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "nano を終了"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "�在�ファイルをディスク�書�込�"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "ファイル�ら読�込�"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "正�表��文字列を検索"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "��ページ�移動"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "正�表��文字列を検索"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "次�ページ�移動"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "次�ページ�移動"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "行�切り�り"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "貼り付�"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "カーソル�置を表示"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "スペル�ェッカを起動 (利用�能�場�)"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "正�表�置�"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "指定�置�移動"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "�在�置をマーク"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "次を検索"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "行�コピー"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "行�インデント"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "インデント�削除"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "直���作を�り消� (undo)"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "�り消��直���作をやり直� (redo)"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "次�文字�進む"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "��文字�戻る"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "次��語�進む"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "���語�戻る"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "��行�移動�る"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "次�行�移動�る"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "�在行�先頭�移動"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "�在行�末尾�移動"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "段��先頭�移動�カーソル����置��る場�����段��移動"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "段��末尾�次��置�移動�カーソル����置��る場���次�段��移動"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "ファイル�先頭行�移動"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "ファイル�最終行�移動"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "対応�る括弧�移動"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "カーソル�置を変����ッファを一行逆スクロール��る"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "カーソル�置を変����ッファを一行スクロール��る"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "���ッファ�切替�"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "次��ッファ�切替�"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "次�キーを�語的�入力"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "タブ文字�挿入"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "行�挿入"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "カーソル�置�文字を削除"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "カーソル���文字を削除"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "カーソル�置�らファイル終端��を切り�り"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "ファイル全体を�等化"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "�語数�行数�文字数を表示"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "画��更新"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "編集を一時中断�る (有効�場�)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "検索時�大文字�文字を区別を�る�����を切り替�る"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "検索方��順逆を切り替�る"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "正�表�を使用�る�����を切り替�る"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "��検索文字 / 置�文字列を呼�出�"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "次�検索文字 / 置�文字列を呼�出�"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "ファイルブラウザ�起動"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "DOS フォーマット�切替�"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Mac フォーマット�切替�"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "ファイル末尾�追加�る動作�切り替�る"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "ファイル先頭�追加�る動作�切り替�る"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "元ファイル��ックアップを作��る動作�切り替�る"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "外部コマンド�実行"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "新���ッファ�切替�"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "ファイルブラウザ�終了"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "リスト�先頭�移動"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "リスト�末尾�移動"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "リスト�次�ファイル�移動"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "リスト���ファイル�移動"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "リスト�次�ファイル�移動"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "ディレクトリ�移動"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "閉�る"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "スペル�ェッカを起動 (利用�能�場�)"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "��行�移動�る"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "次�行�移動�る"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "ヘルプ"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "�消"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "�存"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "ディレクトリ�移動"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "切り�り"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "両端��"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "読�込�"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "スペル確�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "切り�り"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "行を指定"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr ""
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "大/�文字"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "貼り付�"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "正�表�"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "後方�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:753
+msgid "No Replace"
+msgstr "置����"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "�置"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "スペル確�"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "��ページ"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "次�ページ"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "先頭行"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "最終行"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "大括弧���り��ん"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "マーク"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "コピー"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "インデント"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "インデント削除"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Undo"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Redo"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "進む"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "戻る"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "次��語"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "進む"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "���語"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "��行"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "次�行"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "次��語"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "先頭"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "末尾"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "対応�る括弧を探�"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "段��始点"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "段��終点"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "上�スクロール"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "下�スクロール"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "��ファイル"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "次�ファイル"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "�次入力"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "タブ"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "削除"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "�ックスペース"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "末尾��切り�り"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "�語��計数"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr ""
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "��履歴"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "次�履歴"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "検索"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS フォーマット"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac フォーマット"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "末尾�追加"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "先頭�追加"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "�ックアップ"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "コマンドを実行"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "ファイラ"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "先頭�"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "末尾�"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "��行"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "ヘルプ"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "常�カーソル�置を表示"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "編集用�一行余分�使用�る"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "スムーズ�スクロール"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "長�行�折り返�を�止"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "空白を表示"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "�語�強調"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "スマートホームキー"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "自動インデント"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "改行����削除"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "長�行を折り返�"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "長�行�折り返�を�止"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "タブをスペース�変�"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "�ックアップファイル"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "複数��ッファ"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "マウス�サ�ート"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "DOS/Mac フォーマットを変����"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "一時中断"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1045,7 +1075,7 @@ msgstr ""
 " テキストを検索�る方��検索プロンプト�表示�見分�る�������。検索語"
 "を何も入力���エンターを押����回�検索語�使用�れ��。  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1059,7 +1089,7 @@ msgstr ""
 " 検索モード��以下�ファンクションキー�使用����。\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1078,7 +1108,7 @@ msgstr ""
 " 指定行�移動�るモード��以下�ファンクションキー�使用����。\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1100,7 +1130,7 @@ msgstr ""
 "ファ�読�込�れ��(Meta-<�Meta->キー��ッファを切り替�る������"
 "�)。  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1114,7 +1144,7 @@ msgstr ""
 " ファイル�ら�読�込�モード��以下�ファンクションキー�使用����。\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1140,7 +1170,7 @@ msgstr ""
 " ファイル��書�込�モード��以下�ファンクションキー�使用����。\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1163,7 +1193,7 @@ msgstr ""
 " ファイルブラウザ��以下�ファンクションキー�使用����。\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1186,7 +1216,7 @@ msgstr ""
 "検索語を入力���エンターキーを押����度��語�検索を行���。\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1194,7 +1224,7 @@ msgstr ""
 " ファイルブラウザ�検索コマンド��以下�ファンクションキー�使用����。\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1217,7 +1247,7 @@ msgstr ""
 "用����。\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1241,7 +1271,7 @@ msgstr ""
 " スペル�ェック��以下�ファンクションキー�使用����。\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1261,7 +1291,7 @@ msgstr ""
 " コマンド実行モード��以下�ファンクションキー�使用����。\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1280,7 +1310,7 @@ msgstr ""
 "れ����。次�ファイルを編集�る領域��り��。下�ら三行目�ステータス行"
 "�����メッセージ�表示�れ��。  "
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1297,7 +1327,7 @@ msgstr ""
 "��るショートカット�Altキー�Escキー���メタキーを押���を表����"
 "�。  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1310,15 +1340,15 @@ msgstr ""
 "ウィンドウ�使用����。代替�キーストローク�括弧�囲��表記�れ��。\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "有効/無効"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "ビューモード���キー入力�無効��"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1327,7 +1357,7 @@ msgstr ""
 "\n"
 "�ッファを %s �書�込����\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1336,7 +1366,7 @@ msgstr ""
 "\n"
 "�ッファを書�込���ん %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1345,11 +1375,11 @@ msgstr ""
 "\n"
 "�ッファを %s �書�込���ん\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "ウィンドウ�サイズ�������\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1358,259 +1388,264 @@ msgstr ""
 "使用法: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "オプション\t\tGNU�長�形��オプション\t\t説明\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "オプション\t\t説明\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "��メッセージを表示"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+行,列"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "起動時�カーソル�置 (行,列)"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "スマートホームキー有効"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "既存ファイル��ックアップを�存�る"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "�ックアップファイルを作��るディレクトリ"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "�転文字を太字�表示"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "タブをスペース�変�"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "複数ファイル�ッファ有効"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "検索/置���文字列�履歴を記録�よ�読��り"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "nanorc ファイルを�照���"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "テンキーパッド�混乱��題を修正�る"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "ファイル末尾�空行を追加���"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "DOS/Mac フォーマットを変����"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "編集エリアを一行広��る"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "カーソル�置を記録・読�込��る"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "制�モード"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "�画�������1行��スクロール�る"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "タブ幅を #cols �指定"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "ステータス�ー�表示を早�消�"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "�ージョン情報を表示��終了�る"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "�語�境界を正確�抽出�る"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "表示色を決�る���構文定義"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "常�カーソル�置を表示"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Del キーを�ックスペース���扱�"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "ヘルプを表示"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "改行�自動インデント"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "行削除時�改行文字を削除���"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "上書�時�シンボリックリンクを辿ら��"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "マウスを有効��る"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "作業ディレクトリを指定"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON (^Q) �よ� XOFF (^S) キーを維��る"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "rcファイルエラー��起動時��題を無視�る"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "折り返��数を指定�る"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "別�スペル�ェッカを指定�る"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "終了時�破棄������を���"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "一般的� undo を許��る [実験的]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "ビューモード(読�込�専用)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "長�行�折り返�を�止"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "キー�ガイドを表示���"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "一時中断を有効化�る"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "�や��行�折り返�を有効��る"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(Pico ��互�性����オプション。無視�れ��)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano �ージョン %s (コンパイル日時: %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1619,163 +1654,172 @@ msgstr ""
 "\n"
 " コンパイルオプション:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "��機能�無効��"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "変更�れ��ッファを�存���� (�存����変更�破棄�れ��)？ "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "申�訳�り��ん��キーボード�ら�標準入力を�オープン����ん。\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "標準入力�ら読�込ん����。中止�る場�� ^C を入力������\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ��� SIGTERM を�信����\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "\"fg\" �タイプ�る��� nano を�開����。\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "使用�る"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "使用���"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "�明�コマンド"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON �効���よ・・・����"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF �効���よ・・・����"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "�求�れ�タブ�サイズ \"%s\" ��正��"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "�求�れ�サイズ \"%s\" ��正��"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "��"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "全�"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "���"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "エラー検出 %s � %lu 行目: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "引数 '%s' � \" �終端�����ん"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正�表�文字列� \" �括������"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "�正�正�表� \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "構文���り��ん"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 構文�予約語��"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:393
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:398
-msgid "Missing magic string name"
-msgstr ""
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "キー�����り��ん"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "キー�インド� \"^\", \"M\" ��� \"F\" �始������"
-
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "キー�インド� \"^\", \"M\" ��� \"F\" �始������"
+
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr ""
 "キー�インドを有効��るメニューを指定������ (も��� \"all\" を指定�"
 "�����)"
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "\"%s\" �対応�る機能��り��ん"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "\"%s\" �対応�るメニュー��り��ん"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "申�訳�り��ん��キー \"%s\" �無効��インディング��"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "%s: %s �読�込��失敗����"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1790,95 +1834,118 @@ msgstr ""
 "\"magenta\"�\"black\"���れ�れ�任��\n"
 "接頭語\"bright\"を��る���出���。"
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "色�����り��ん"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "背景色 \"%s\" �明る�色���り��ん"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "正�表�文字列����り��ん"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" ��対応�る \"end=\" �必���"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色 \"%s\" �明る�色���り��ん"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr ""
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "色�����り��ん"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "致命的�エラー: \"%s\" �機能�対応�るキー��り��ん"
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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 �設定を調整�る必���る場��� -I オプションを指定�"
 "� nano を使用������。\n"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "\"%s\" �対応�るメニュー��り��ん"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "コマンド \"%s\" �インクルードファイル内��許��れ����ん"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "構文 \"%s\" �色�コマンド���り��ん"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "コマンド \"%s\" を解釈����ん"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "フラグ����り��ん"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "色�����り��ん"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "オプション \"%s\" ��引数�必���"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "オプション�有効�マル��イト文字���り��ん"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "�空白類文字�必���"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "\"%s\" フラグを解除����ん"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "未知�フラグ \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "ホームディレクトリ�見��り��ん"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1892,41 +1959,45 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" �見��り��ん"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr ""
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr ""
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr ""
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "置�候補"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "行番��列番�を入力"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "無効�行���列番���"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "大括弧���り��ん"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "大括弧�一致���ん"
 
@@ -1938,218 +2009,285 @@ msgstr "マークセット"
 msgid "Mark Unset"
 msgstr "マーク解除"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "undo �ッファ�何も�り��ん!"
 
-#: 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:440 src/text.c:578
+#, 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:451 src/text.c:588
 msgid "text add"
 msgstr "テキスト�追加"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "テキスト�削除"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "行�折り返�"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "行���"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "テキスト�切り�り"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "テキスト�貼り付�"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "改行"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "テキスト挿入"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "内部エラー: �明�型��。作業を�存������。"
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "�作 (%s) を�り消����"
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr "やり直��作��り��ん!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "内部エラー: redo �セットアップ�失敗����。作業を�存������"
+#: src/text.c:572
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "内部エラー: uncut �セットアップ�失敗����。作業を�存������"
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "�作 (%s) をやり直����"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "pipe ����ん"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "pipe を作�����ん"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "fork����ん"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "内部エラー: uncut �セットアップ�失敗����。作業を�存������"
 
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "内部エラー: �明�型��。作業を�存������。"
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr ""
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "pipe を作�����ん"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "スペルミス��る�語リストを作������。��ら��待�����..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "pipe �ッファ�サイズを�得����ん���"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "\"spell\" �呼�出��失敗"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "\"sort -f\" �呼�出��失敗"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" �呼�出��失敗"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "スペル�ェック完了"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"%s\" �呼�出��失敗"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "スペル�ェッカを起動 (利用�能�場�)"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "スペル�ェック失敗: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "スペル�ェック失敗: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "ファイル末尾�空行を追加���"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "��メッセージを表示"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "��メッセージを表示"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s�語数: %lu  行数: %ld  文字数: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "�択範囲内:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "�次入力"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "ユニコード入力"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "変更済�"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "表示"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "ディレクトリ:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "ファイル:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "nano テキストエディタ"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "�ージョン"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "貢献���れ�方々:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "スペシャルサンクス:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "ncurses �関��:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "�よ�他�����方々..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 "(ignored, for Pico compatibility)"
+#~ msgstr "(Pico ��互�性����オプション。無視�れ��)"
+
+#~ 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 ""
+#~ "内部エラー: redo �セットアップ�失敗����。作業を�存������"
+
+#~ msgid "Could not pipe"
+#~ msgstr "pipe ����ん"
diff --git a/po/ms.gmo b/po/ms.gmo
index f525b6c7..5dfce5bb 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
diff --git a/po/ms.po b/po/ms.po
index 2b098986..ad33f822 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -1,13 +1,13 @@
 # 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: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -18,134 +18,131 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Pergi Ke Direktori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ralat membaca %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(dir induk)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Undur]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Hanya inilah sahaja yang dijumpai"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Tiada corak carian semasa"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tidak dapat memasukkan fail luar daripada %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Tiada lagi buffer fail terbuka"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Ditukar kepada %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Buffer Baru"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -155,13 +152,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac dan DOS)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -169,13 +166,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:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -183,97 +180,97 @@ 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:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu baris dibaca"
 
-#: src/files.c:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Membaca fail"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Fail Baru"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak dijumpai"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" adalah sebuah fail peranti"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Arahan untuk dilaksanakan dalam buffer baru [daripada %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Arahan untuk dilaksanakan [dari %s]"
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fail untuk dimasukkan kedalam buffer baru [daripada %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fail untuk dimasukkan [daripada %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Kekunci tidak sah dalam mod bukan multibuffer"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis diluar daripada %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Terlalu banyak fail salinan?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ralat menulis %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ralat menulis fail sementara: %s"
@@ -328,15 +325,15 @@ msgstr "Fail telah wujud, TINDIH ? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Simpan fail dengan NAMA BERLAINAN ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Fail telah diubahsuai semenjak anda membukanya, teruskan menyimpan ?"
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -345,28 +342,28 @@ msgstr ""
 "\n"
 "Tekan Enter untuk meneruskan memulakan nano.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -374,650 +371,682 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Ganti"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Jangan Ganti"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Case Sens"
+msgid "Exit"
+msgstr "Keluar"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Kebelakang"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regexp"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "SjrhUndur"
+msgid "Close"
+msgstr "Tutup"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "SjrhMaju"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Nyahpotong Teks"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Ke Teks"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "UnJustifikasi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Dimana Seterusnya"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Fail Pertama"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Fail Terakhir"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Ke Fail"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Tambah"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Tambahan awalan"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Fail Salinan"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Laksanakan Arahan"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Pergi Ke Dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Bantuan"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Keluar"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Terdahulu"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Berikut"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Brs Awal"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Ganti"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Brs Akhir"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Ke Baris"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Gantung"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Baris Terdahulu"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Minta untuk Par"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Baris Berikut"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Pengakhir Par"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Baca Fail"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "JustifiPenuh"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Segarkan"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Selit Fail"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Ke Baris"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Batal fungsi semasa"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Papar teks bantuan ini"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup fail penimbal semasa / Keluar dari nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Tulis fail semasa ke cakera"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Masukkan fail lain ke file semasa"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Cari rentetan atau regular expression"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Pergi ke skrin terdahulu"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Cari rentetan atau regular expression"
+
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Pergi ke skrin berikutnya"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
 msgstr "Pergi ke skrin berikutnya"
 
-#: src/global.c:574
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Potong baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris semasa"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Papar posisi kursor"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Ganti rentetan atau regular expression"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Tanda teks pada lokasi kursor"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Ulang carian terakhir"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Salin baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Inden baris semasa"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Nyahindent baris semasa"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Nyahbuat tindakan terakhir"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Buat semula tindakan nyahbuat terakhir"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Maju ke depan satu aksara"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Undur ke belakang satu aksara"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Maju ke depan satu perkataan"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Undur belakang satu perkataan"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Pergi ke baris terdahulu"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Pergi ke baris berikutnya"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Pergi ke permulaan baris semasa"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Pergi ke penghujung baris semasa"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Pergi hingga ke permulaan perenggan semasa; kemudian ke perenggan sebelumnya"
 
-#: src/global.c:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Pergi ke baris pertama fail"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Pergi ke baris terakhir fail"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Pergi ke braket sepadan"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Skrol atas satu baris tanpa skrol kursor"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Skrol bawah satu baris tanpa skrol kursor"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Tukar ke buffer fail terdahulu"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Tukar ke buffer fail berikut"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Selit kekunci seterusnya setiap satu"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Masukkan tab di kedudukan kursor"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Masukkan baris baru di kedudukan kursor"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Padam aksara dibawah kursor"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Padam aksara di kiri kursor"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Potong dari kedudukan kursor hingga ke akhir fail"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Justifi keseluruhan fail"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Kira jumlah perkataan, baris, dan aksara"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Segarkan (lukis semula) skrin semasa"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Gantung penyunting (jika gantung dihidupkan)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Toggle pencarian case sensitif"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Terbalikkan arah carian"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Toggle penggunaan ungkapan nalar"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Panggil semula rentetan cari/ganti terdahulu"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Panggil semula rentetan cari/ganti seterusnya"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Pergi ke pelayar fail"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Toggle penggunaan format DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Toggle penggunaan format Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Toggle tambahan akhiran"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Toggle tambahan awalan"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Toggle salinan fail asal"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Laksanakan arahan luaran"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Toggle kegunaan buffer baru"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Keluar dari pelayar fail"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Pergi ke fail terakhir dalam senarai"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Pergi ke fail terakhir dalam senarai"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Pergi ke direktori"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Tutup"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Panggil penyemak ejaan, jika ada"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Pergi ke baris terdahulu"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Pergi ke baris berikutnya"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Bantuan"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Batal"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Tulis"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Pergi Ke Dir"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Kerat Teks"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Justifikasi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Baca Fail"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Ke Pengeja"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Kerat Teks"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Ke Baris"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "UnJustifikasi"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Case Sens"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Nyahpotong Teks"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Kebelakang"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Jangan Ganti"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Ke Pengeja"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Terdahulu"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Berikut"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Brs Awal"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Brs Akhir"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Bukan kurungan"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Tanda Teks"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Salin Teks"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Teks Indent"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Teks Tidak Indent"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Nyahbuat"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Buat semula"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Maju"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Undur"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Perkataan Selepas"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Maju"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Perkataan Terdahulu"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Baris Terdahulu"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Baris Berikut"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Perkataan Selepas"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Asal"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Cari Lain-lain Tanda Kurungan"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Minta untuk Par"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Pengakhir Par"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Skrol Atas"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Skrol Bawah"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Fail Sebelum"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Fail Selepas"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Masukan Verbatim"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Padam"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "PtngHnggAkhr"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Kiraan Perkataan"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Gantung"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "SjrhUndur"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "SjrhMaju"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Ke Teks"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Tambah"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Tambahan awalan"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Fail Salinan"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Laksanakan Arahan"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Ke Fail"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Fail Pertama"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Fail Terakhir"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Baris Terdahulu"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "Mod bantuan"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Paparan posisi tetap kursor"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Guna satu lagi baris untuk menyunting"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Gulungan lancar"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Jangan lilit baris panjang"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Papar ruangputih"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Sorotan warna sintaks"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Kekunci Home pintar"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Auto indent"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Potong hingga akhir"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Lilit baris panjang"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Jangan lilit baris panjang"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Penukaran tab ditaip kepada ruang"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Salinan fail"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Buffer fail berganda"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Sokongan tetikus"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Tiada pertukaran dari format DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Gantungan"
 
-#: src/global.c:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Lilit baris panjang"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1039,7 +1068,7 @@ msgstr ""
 "carian.  Menekan Enter tanpa memasukkan sebarang teks akan melaksanakan "
 "carian terdahulu."
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1053,7 +1082,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Cari:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1073,7 +1102,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Pergi Ke Baris:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1096,7 +1125,7 @@ msgstr ""
 "menyebabkannya dimuatkan ke dalam buffer berlainan (guna Meta-< dan > untuk "
 "menukar diantara buffer fail)."
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1110,7 +1139,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Sisipan Fail:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1138,7 +1167,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Menulis Fail:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1162,7 +1191,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam pelayar fail:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1186,7 +1215,7 @@ msgstr ""
 "carian terdahulu.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1194,7 +1223,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat dalam mod Pencarian Pelayar:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1217,7 +1246,7 @@ msgstr ""
 "  Kekunci fungsi berikut terdapat didalam mod Pelayar Pergi ke Direktori:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1241,7 +1270,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Penyemak Ejaan:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1262,7 +1291,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Laksana Arahan:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1282,7 +1311,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1302,7 +1331,7 @@ msgstr ""
 "menggunakan kekunci Esc, Alt atau Meta bergantung pada tetapan papan kekunci "
 "anda."
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1316,15 +1345,15 @@ msgstr ""
 "dalam kurungan:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "enable/disable"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Kekunci tidak sah dalam mod lihat"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1333,7 +1362,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1342,7 +1371,7 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis ke %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1351,11 +1380,11 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Saiz tetingkap terlalu kecil bagi nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1364,261 +1393,266 @@ msgstr ""
 "Penggunaan: nano [PILIHAN] [[+BARIS[,LAJUR]] FAIL]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Pilihan\t\tPilihan panjang GNU\t\tMaksud\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Pilihan\t\tMakna\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Papar mesej ini"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+BARIS,LAJUR"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Mula pada baris BARIS, lajur LAJUR"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Aktifkan kekunci home pintar"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Simpan salinan fail sediawujud"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Direktori untuk menyimpan fail salinan unik"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Guna tebal berbanding teks video terbalik"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Tukar tab ditaip kepada ruang"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Benarkan beberapa buffer fail"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Tulis & baca sejarah carian/gantian rentetan"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Jangan lihat pada fail nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Betulkan masalah kekeliruan pad kekunci bernombor"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Jangan tambah baris baru pada penghujung fail"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Jangan tukar fail dari format DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Guna satu lagi baris untuk menyunting"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Masukkan tab di kedudukan kursor"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Rentetan petikan"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Mod terhad"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Gulung mengikut baris berbanding separuh skrin"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Tetapkan lebar tab dalam ke #lajur lajur"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Laksana pengosongan bar status pantas"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Papar maklumat versi dan keluar"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Kesan sempadan perkataan lebih tepat"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Takrifan sintaks untuk digunakan bagi mewarna"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Sentiasa papar kedudukan kursor"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Betulkan masalah kekeliruan Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Papar teks bantuan ini"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Indent baris baru secara automatik"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Potong dari kursor hingga ke akhir baris"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Jangan ikut pautan simbolik, tulisemula"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Aktifkan penggunaan tetikus"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Tetapkan direktori operasi"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Pelihara kekunci XON (^Q) dan XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Tetapkan titik gulungan pada lajur #lajur"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Aktifkan pengeja lain"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Auto simpan ketika keluar, jangan maklum"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Mod lihat (baca sahaja)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Jangan lilit baris panjang"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Jangan papar dua baris bantuan"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Aktifkan gantungan"
 
-#: src/nano.c:935
+#: src/nano.c:950
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Lilit baris panjang"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(diabaikan, untuk kesesuaian Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano versi %s (compiled %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1627,167 +1661,171 @@ msgstr ""
 "\n"
 " Pilihan kompilasi:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Maaf, sokongan untuk fungsi ini telah dimatikan"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP atau SIGTERM diterima\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Guna \"fg\" untuk kembali ke nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "dihidupkan"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "dimatikan"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Arahan Tidak Diketahui"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Saiz tab \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Saiz isian \"%s\" yang diminta tidak sah"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Ss"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Semua"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Tidak"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Ralat dalam %s pada baris %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Hujah '%s' tiada pengakhiran \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Rentetan regex mesti bermula dan tamat dengan aksara \""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex tidak sah \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaks \"none\" adalah dikhaskan"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Sintaks \"default\" mesti tidak mempunyai sambungan"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Rentetan regex hilang"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Nama kekunci hilang"
 
-#: src/rcfile.c:484 src/rcfile.c:585
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
 #, 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:493
+#: src/rcfile.c:450
 #, 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:504 src/rcfile.c:596
-#, 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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
+#: src/rcfile.c:467
 #, 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:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, 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:540
+#: src/rcfile.c:497
 #, 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:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Ralat membaca %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1802,95 +1840,121 @@ msgstr ""
 "\"black\", dengan prefiks pilihan \"bright\"\n"
 "untuk warna latar hadapan."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Nama warna tiada"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Rentetan regex hilang"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" memerlukan padanan \"end=\""
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Rentetan regex hilang"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Nama warna tiada"
+
+#: src/rcfile.c:974
+#, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Arahan \"%s\" tidak dibenarkan dalam fail diselitkan"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaks \"%s\" tidak mempunyai arahan warna"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Arahan \"%s\" tidak difahami"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Penanda hilang"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Nama warna tiada"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Pilihan \"%s\" memerlukan hujah"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Pilihan bukan rentetan pelbagai byte yang sah"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Aksara bukan-kosong diperlukan"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Dua aksara satu-lajur diperlukan"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Tidak dapat nyahtetap penanda \"%s\""
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Penanda \"%s\" tidak diketahui"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat mencari direktori utama!  Wah!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1904,41 +1968,45 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" tidak dijumpai"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (untuk mengganti) dalam pilihan"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (untuk mengganti)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Ganti dikedudukan ini?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Masukkan nombor baris, nombor lajur"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Nombor baris atau lajur tidak sah"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Bukan kurungan"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Tiada padanan kurungan"
 
@@ -1950,223 +2018,290 @@ msgstr "Tetapkan Tanda"
 msgid "Mark Unset"
 msgstr "Nyahtetap Tanda"
 
-#: src/text.c:443
+#: src/text.c:434
 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:440 src/text.c:578
+#, 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:451 src/text.c:588
 msgid "text add"
 msgstr "tambah teks"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "padam teks"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 #, fuzzy
 msgid "line wrap"
 msgstr "Lilit baris panjang"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "gabung baris"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "potong teks"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "nyahpotong teks"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "selit teks"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Nyahbuat tindakan (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, 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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ulangbuat tindakan (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Tidak dapat menyalurkan"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Tidak dapat mencipta paip"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Tidak dapat mencabang"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, 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:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Petikan rentetan tidak sesuai %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Sekarang boleh UnJustify!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Ubah penggantian"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Tidak dapat mencipta paip"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat memperoleh saiz buffer paip"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Ralat melaksanakan \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Ralat melaksanakan \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Ralat melaksanakan \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ralat melaksanakan \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Panggil penyemak ejaan, jika ada"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Semakan ejaan gagal: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Semakan ejaan gagal: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Jangan tambah baris baru pada penghujung fail"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Papar mesej ini"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Papar mesej ini"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPerkataan: %lu  Baris: %ld  Aksara: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "Dalam Pilihan:"
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Masukan Verbatim"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Masukan Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Diubahsuai"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Lihat"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fail:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Penyunting teks nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versi"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Dibawakan kepada anda oleh:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Terima kasih khas kepada:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "dan sesiapa yang kami lupa...."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 b8fc4199..59d94ed9 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -18,135 +18,132 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
 msgstr ""
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr ""
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr ""
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr ""
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr ""
 
-#: src/files.c:234
+#: src/files.c:232
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr ""
 
-#: src/files.c:271
+#: src/files.c:266
 #, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr ""
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr ""
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr ""
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr ""
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr ""
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -157,14 +154,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -173,14 +170,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -189,99 +186,99 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr ""
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr ""
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr ""
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr ""
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr ""
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr ""
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr ""
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr ""
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
@@ -337,43 +334,43 @@ msgstr ""
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr ""
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -381,645 +378,659 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr ""
-
-#: src/global.c:467
-msgid "Replace"
-msgstr ""
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr ""
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
+msgid "Exit"
 msgstr ""
 
 #: src/global.c:472
-msgid "Backwards"
+msgid "Close"
 msgstr ""
 
-#: src/global.c:476
-msgid "Regexp"
+#: src/global.c:473
+msgid "Uncut Text"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
+#: src/global.c:475
+msgid "Unjustify"
 msgstr ""
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr ""
-
-#: src/global.c:504
-msgid "Go To Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr ""
 
-#: src/global.c:508
-msgid "First File"
-msgstr ""
-
-#: src/global.c:509
-msgid "Last File"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr ""
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr ""
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr ""
-
-#: src/global.c:515
-msgid "Append"
-msgstr ""
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr ""
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr ""
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr ""
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr ""
-
-#: src/global.c:532
-msgid "Exit"
-msgstr ""
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr ""
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr ""
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr ""
-
-#: src/global.c:536
-msgid "First Line"
+#: src/global.c:487
+msgid "Replace"
 msgstr ""
 
-#: src/global.c:537
-msgid "Last Line"
+#: src/global.c:488
+msgid "Go To Line"
 msgstr ""
 
-#: src/global.c:538
-msgid "Suspend"
+#: src/global.c:489
+msgid "Prev Line"
 msgstr ""
 
-#: src/global.c:540
-msgid "Beg of Par"
+#: src/global.c:490
+msgid "Next Line"
 msgstr ""
 
-#: src/global.c:541
-msgid "End of Par"
+#: src/global.c:491
+msgid "Read File"
 msgstr ""
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr ""
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr ""
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr ""
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr ""
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr ""
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr ""
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:571
-msgid "Go to previous screen"
+#: src/global.c:520
+msgid "Search for a string"
 msgstr ""
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr ""
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr ""
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr ""
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr ""
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr ""
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr ""
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+msgid "Mark text starting from the cursor position"
 msgstr ""
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr ""
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr ""
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr ""
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr ""
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr ""
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr ""
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr ""
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr ""
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr ""
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr ""
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr ""
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr ""
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr ""
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr ""
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr ""
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr ""
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr ""
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr ""
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr ""
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr ""
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr ""
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr ""
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr ""
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr ""
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr ""
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr ""
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr ""
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
+#: src/global.c:628
+msgid "Go to the previous file in the list"
 msgstr ""
 
-#: src/global.c:693
-msgid "Go to the previous file in the list"
+#: src/global.c:629
+msgid "Go to the next file in the list"
 msgstr ""
 
-#: src/global.c:694
+#: src/global.c:630
 msgid "Go to directory"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:634
+msgid "Go to previous linter msg"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
-msgid "Justify"
+#: src/global.c:635
+msgid "Go to next linter msg"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr ""
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
+#: src/global.c:671
+msgid "Write Out"
+msgstr ""
+
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr ""
+
+#: src/global.c:712
 msgid "Cut Text"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
+#: src/global.c:721
+msgid "Justify"
+msgstr ""
+
+#: src/global.c:726
+msgid "To Spell"
+msgstr ""
+
+#: src/global.c:731
+msgid "To Linter"
+msgstr ""
+
+#: src/global.c:736
+msgid "Case Sens"
+msgstr ""
+
+#: src/global.c:741
+msgid "Regexp"
+msgstr ""
+
+#: src/global.c:746
+msgid "Backwards"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
+#: src/global.c:753
+msgid "No Replace"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
+#: src/global.c:771
+msgid "Prev Page"
 msgstr ""
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr ""
+
+#: src/global.c:776
+msgid "First Line"
+msgstr ""
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr ""
+
+#: src/global.c:785
+msgid "To Bracket"
+msgstr ""
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr ""
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr ""
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr ""
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr ""
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr ""
 
-#: src/global.c:868
-msgid "Next Word"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
 msgstr ""
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr ""
-
-#: src/global.c:878
-msgid "Next Line"
+#: src/global.c:822
+msgid "Next Word"
 msgstr ""
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr ""
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr ""
 
-#: src/global.c:896
-msgid "Find Other Bracket"
+#: src/global.c:837
+msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:899
+#: src/global.c:839
+msgid "End of Par"
+msgstr ""
+
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+msgid "Prev File"
 msgstr ""
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr ""
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr ""
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr ""
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr ""
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr ""
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr ""
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr ""
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr ""
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr ""
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr ""
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr ""
+
+#: src/global.c:928
+msgid "Append"
+msgstr ""
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr ""
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr ""
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr ""
+
+#: src/global.c:955
+msgid "To Files"
+msgstr ""
+
+#: src/global.c:958
+msgid "First File"
+msgstr ""
+
+#: src/global.c:960
+msgid "Last File"
+msgstr ""
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr ""
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr ""
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr ""
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr ""
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr ""
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr ""
 
-#: src/global.c:1317
-msgid "Long line wrapping"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr ""
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr ""
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr ""
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr ""
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1032,7 +1043,7 @@ msgid ""
 "search.  "
 msgstr ""
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1041,7 +1052,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1053,7 +1064,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1066,7 +1077,7 @@ msgid ""
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1075,7 +1086,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1091,7 +1102,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1105,7 +1116,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1119,13 +1130,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1138,7 +1149,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1152,7 +1163,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1164,7 +1175,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1176,7 +1187,7 @@ msgid ""
 "bottom and shows important messages.  "
 msgstr ""
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1187,7 +1198,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1196,460 +1207,469 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr ""
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr ""
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr ""
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr ""
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr ""
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr ""
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr ""
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr ""
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr ""
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr ""
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr ""
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr ""
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr ""
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr ""
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr ""
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr ""
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr ""
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr ""
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr ""
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr ""
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr ""
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr ""
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr ""
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr ""
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr ""
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr ""
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
 msgstr ""
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr ""
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr ""
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr ""
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 
-#: src/nano.c:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr ""
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr ""
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr ""
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr ""
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr ""
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr ""
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr ""
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr ""
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr ""
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr ""
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr ""
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr ""
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr ""
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:393
-msgid "Cannot add a magic string regex without a syntax command"
+#: src/rcfile.c:411
+msgid "Missing key name"
 msgstr ""
 
-#: src/rcfile.c:398
-msgid "Missing magic string name"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:472 src/rcfile.c:569
-msgid "Missing key name"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:467
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:512
+#: src/rcfile.c:474
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
+#: src/rcfile.c:497
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:540
+#: src/rcfile.c:583
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:711
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1659,93 +1679,114 @@ msgid ""
 "for foreground colors."
 msgstr ""
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr ""
 
-#: src/rcfile.c:758
+#: src/rcfile.c:663 src/rcfile.c:824
+msgid "Missing regex string"
+msgstr ""
+
+#: src/rcfile.c:739
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr ""
+
+#: src/rcfile.c:791
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:776 src/rcfile.c:895
-msgid "Missing regex string"
+#: src/rcfile.c:819
+msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:848
-msgid "\"start=\" requires a corresponding \"end=\""
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:890
-msgid "Cannot add a header regex without a syntax command"
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr ""
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:960
+#: src/rcfile.c:944
+msgid "Missing linter command"
+msgstr ""
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr ""
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
+#: src/rcfile.c:1113
+msgid "Missing option"
 msgstr ""
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr ""
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, c-format
-msgid "Cannot unset flag \"%s\""
+msgid "Cannot unset option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1757,42 +1798,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr ""
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr ""
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr ""
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr ""
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr ""
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr ""
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr ""
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr ""
 
@@ -1804,218 +1849,251 @@ msgstr ""
 msgid "Mark Unset"
 msgstr ""
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr ""
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr ""
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr ""
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 msgid "text replace"
 msgstr ""
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:771
-msgid "Could not pipe"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
 msgstr ""
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr ""
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr ""
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr ""
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr ""
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr ""
 
-#: src/text.c:2970
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr ""
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr ""
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr ""
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+msgid "At last message"
+msgstr ""
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr ""
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr ""
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr ""
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr ""
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr ""
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr ""
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 
-#: src/winio.c:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr ""
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr ""
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr ""
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr ""
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr ""
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
index 14167c92..f76bc1bb 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 6d9b3bb4..1a046f69 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,290 +1,298 @@
-# 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.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2006-10-16 23:09+0200\n"
-"Last-Translator: Geir Helland <pjallabais@users.sourceforge.net>\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2013-04-21 15:05+0100\n"
+"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
-"Language: \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:221
 msgid "Go To Directory"
-msgstr "Gå til katalog"
+msgstr "GÃ¥ til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Lesefeil på %s: %s"
+msgstr "Lesefeil på %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(foreldrekatalog)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 msgid " [Case Sensitive]"
-msgstr " [Ta hensyn til store/små bokstaver]"
+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:194
+#: src/browser.c:806 src/search.c:192
 msgid " [Regexp]"
-msgstr " [Regulært uttrykk]"
+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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Bakover]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Dette er eneste forekomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
-msgstr "Tomt søkemønster"
+msgstr "Tomt søkemønster"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr ""
+msgstr "Kan ikke fastslå identiteten min for låsefil (getpwuid() mislyktes)"
 
-#: src/files.c:143
+#: src/files.c:144
 #, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr "Kunne ikke oprette midlertidig fil: %s"
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Finner ikke ut vertsnavnet for låsefil: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
-#, fuzzy, c-format
+#: src/files.c:170 src/files.c:207 src/files.c:217
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Feil ved skriving til midlertidlig fil: %s"
+msgstr "Feil ved skriving til låssfil %s: %s"
 
-#: src/files.c:234
-#, fuzzy, c-format
+#: src/files.c:232
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Feil ved skriving til midlertidlig fil: %s"
+msgstr "Feil ved sletting av låsefil %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "Lesefeil på %s: %s"
+msgid "Error opening lock file %s: %s"
+msgstr "Feil ved åpning av låsefil %s: %s"
 
-#: src/files.c:281
-#, c-format
-msgid "Error reading lockfile %s: Not enough data read"
-msgstr ""
+#: src/files.c:276
+#, fuzzy, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Feil ved lesing av låsefil %s: Ikke nok data lest"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikke sette inn fil fra utsiden av %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
-msgstr "Ikke flere åpne filbuffer"
+msgstr "Ikke flere åpne filbuffer"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Byttet til %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
-#, fuzzy, c-format
+#: src/files.c:840
+#, 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:851
+#: src/files.c:846
 #, 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:855
-#, fuzzy, c-format
+#: src/files.c:850
+#, 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:861
+#: src/files.c:856
 #, 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:865
-#, fuzzy, c-format
+#: src/files.c:860
+#, 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:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Leste %lu linje"
 msgstr[1] "Leste %lu linjer"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Leser fil"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" ikke funnet"
+msgstr "«%s» ikke funnet"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, 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:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "\"%s\" er en enhetsfil (device)"
+msgstr "«%s» er en enhetsfil (device)"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, 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:1033
+#: src/files.c:1028
 #, 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:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil som skal settes inn [fra %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil som skal settes inn [fra %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten er ugyldig utenfor multibuffer-modus"
 
-#: src/files.c:1594
+#: src/files.c:1591
 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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive utenfor %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
-#, fuzzy, c-format
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
+#, 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:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "For mange sikkerhetskopier?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Skrivefeil %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Feil ved skriving til midlertidlig fil: %s"
@@ -302,7 +310,7 @@ msgstr " [DOS Format]"
 
 #: src/files.c:2246
 msgid " [Mac Format]"
-msgstr " {Mac Format]"
+msgstr " [Mac Format]"
 
 #: src/files.c:2248
 msgid " [Backup]"
@@ -310,23 +318,23 @@ msgstr " [Sikkerhetskopi]"
 
 #: src/files.c:2256
 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:2257
 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:2258
 msgid "Write Selection to File"
-msgstr "Skriv valgt område til fil"
+msgstr "Skriv valgt område til fil"
 
 #: src/files.c:2261
 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:2262
 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:2263
 msgid "File Name to Write"
@@ -340,710 +348,734 @@ msgstr "Filen finnes, SKRIVE OVER ? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Lagre filen under et ANNET NAVN ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:2942
-#, fuzzy, c-format
+#: src/files.c:2939
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"Trykk linjeskift for å fortsette oppstarten av nano\n"
+"Trykk linjeskift for å fortsette\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
+"Kan ikke opprette mappe %s: %s\n"
+"Det er nødvendig for lagring / lasting søkehistorikk eller markørposisjonen\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\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/files.c:2980
+#: src/files.c:2975
 #, 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/files.c:2983
+#: src/files.c:2978
 #, 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)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Erstatt"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Ikke erstatt"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Følsomt for store/små bokstavar"
+msgid "Exit"
+msgstr "Avslutt"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Bakover"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regulært uttrykk"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "ForrigeHistorie"
+msgid "Close"
+msgstr "Lukk"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "NesteHistorie"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Angre «klipp ut»"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Gå til tekst"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Avjuster"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Finn neste"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Første fil"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Siste fil"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Til filer"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS Format"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac Format"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Legg til etter"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Legg til før"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Sikkerhetskopi"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Eksekver kommando"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Gå til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Hjelp"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Avslutt"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Forrige side"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Erstatt"
 
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Neste side"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "GÃ¥ til linje"
 
-#: src/global.c:536
-msgid "First Line"
-msgstr "Første linje"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Forrige side"
 
-#: src/global.c:537
-msgid "Last Line"
+#: src/global.c:490
+msgid "Next Line"
 msgstr "Siste linje"
 
-#: src/global.c:538
-#, fuzzy
-msgid "Suspend"
-msgstr "Legg i bakgrunnen"
-
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Avsn. start"
-
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Avsn. slutt"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Les fil"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "JusterAlt"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Oppfrisk"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Sett inn fil"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Gå til linje"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldende funksjon"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Vis denne hjelpeteksten"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldende filbuffer/ Avslutt nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
-msgstr "Lagre nåværende fil"
+msgstr "Lagre nåværende fil"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Sett inn en annen fil i denne"
 
-#: src/global.c:570
+#: src/global.c:517
 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:571
+#: src/global.c:520
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Gå til forrige skjerm"
+msgid "Search for a string"
+msgstr "Søk etter streng eller regulært uttrykk"
 
-#: src/global.c:572
+#: src/global.c:522
 #, fuzzy
-msgid "Go to next screen"
-msgstr "Gå til neste skjerm"
+msgid "Go one screenful up"
+msgstr "GÃ¥ til neste skjerm"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "GÃ¥ til neste skjerm"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp denne linjen og lagre den i klippebufferet"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Sett inn klippebufferet her"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Vis pekerposisjon"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavesjekk, dersom tilgjengelig"
 
-#: src/global.c:582
+#: src/global.c:532
 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:583
+#: src/global.c:533
 msgid "Go to line and column number"
-msgstr "Gå til linje- og kolonnenummer"
+msgstr "GÃ¥ til linje- og kolonnenummer"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
-msgstr "Marker teksten ved markøren"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
+msgstr "Marker teksten ved markøren"
 
-#: src/global.c:586
-msgid "Repeat last search"
-msgstr "Gjenta siste søk"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
+msgstr "Gjenta siste søk"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopier gjeldende linje og lagre i utklippstavlen"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Indenter gjeldende linje"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Fjern indentering fra gjeldende linje"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Angre siste handling"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Gjør om siste angre-operasjon"
 
-#: src/global.c:594
-#, fuzzy
+#: src/global.c:544
 msgid "Go forward one character"
-msgstr "Ett tegn frem"
+msgstr "GÃ¥ tett tegn frem"
 
-#: src/global.c:595
-#, fuzzy
+#: src/global.c:545
 msgid "Go back one character"
-msgstr "Ett tegn tilbake"
+msgstr "GÃ¥ ett tegn tilbake"
 
-#: src/global.c:597
-#, fuzzy
+#: src/global.c:547
 msgid "Go forward one word"
-msgstr "Til neste ord"
+msgstr "GÃ¥ til neste ord"
 
-#: src/global.c:598
-#, fuzzy
+#: src/global.c:548
 msgid "Go back one word"
-msgstr "Til forrige ord"
+msgstr "GÃ¥ til forrige ord"
 
-#: src/global.c:600
-#, fuzzy
+#: src/global.c:550
 msgid "Go to previous line"
-msgstr "Til forrige linje"
+msgstr "GÃ¥ til forrige linje"
 
-#: src/global.c:601
-#, fuzzy
+#: src/global.c:551
 msgid "Go to next line"
-msgstr "Til neste linje"
+msgstr "GÃ¥ til neste linje"
 
-#: src/global.c:602
-#, fuzzy
+#: src/global.c:552
 msgid "Go to beginning of current line"
-msgstr "Til begynnelsen av linjen"
+msgstr "GÃ¥ til begynnelsen av linjen"
 
-#: src/global.c:603
-#, fuzzy
+#: src/global.c:553
 msgid "Go to end of current line"
-msgstr "Flytt til slutten av linjen"
+msgstr "GÃ¥ til slutten av linjen"
 
-#: src/global.c:606
-#, fuzzy
+#: src/global.c:556
 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:608
-#, fuzzy
+#: src/global.c:558
 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:611
-#, fuzzy
+#: src/global.c:560
 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:613
-#, fuzzy
+#: src/global.c:561
 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:615
-#, fuzzy
+#: src/global.c:563
 msgid "Go to the matching bracket"
-msgstr "Til samsvarende klamme"
+msgstr "GÃ¥ til matchende brakett"
 
-#: src/global.c:617
+#: src/global.c:565
 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:619
+#: src/global.c:567
 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:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Bytt til forrige buffer"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Bytt til neste buffer"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Sett inn ett og ett tegn"
 
-#: src/global.c:630
+#: src/global.c:574
 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:632
+#: src/global.c:575
 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:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Slett tegnet under peker"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett tegnet til venstre for peker"
 
-#: src/global.c:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Juster hele filen"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Tell antall ord, linjer og tegn"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
-msgstr "Tegn skjermen på nytt"
+msgstr "Tegn skjermen på nytt"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspender editoren (hvis suspender er aktivert)"
 
-#: src/global.c:654
+#: src/global.c:596
 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:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
-msgstr "Reverser søkeretning"
+msgstr "Reverser søkeretning"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
-msgstr "Regulære uttrykk av/på"
+msgstr "Regulære uttrykk av/på"
 
-#: src/global.c:664
+#: src/global.c:606
 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:666
+#: src/global.c:608
 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:669
+#: src/global.c:611
 msgid "Go to file browser"
-msgstr "Gå til fil-leser"
+msgstr "GÃ¥ til fil-leser"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
-msgstr "DOS filformat av/på"
+msgstr "DOS filformat av/på"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
-msgstr "Mac filformat av/på"
+msgstr "Mac filformat av/på"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Inverter valg for appendering"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Inverter valg for prependering"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Inverter valg for sikkerhetskopi av orginalfil"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Eksekver ekstern kommando"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
-msgstr "Bruk nytt buffer av/på"
+msgstr "Bruk nytt buffer av/på"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
-msgstr "Gå ut av fil-leser"
+msgstr "GÃ¥ ut av fil-leser"
 
-#: src/global.c:689
+#: src/global.c:626
 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:691
+#: src/global.c:627
 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:692
-#, fuzzy
+#: src/global.c:628
+msgid "Go to the previous file in the list"
+msgstr "GÃ¥ til forrige fil i listen"
+
+#: src/global.c:629
 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:693
+#: src/global.c:630
+msgid "Go to directory"
+msgstr "GÃ¥ til katalog"
+
+#: src/global.c:633
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Gå til første linje i listen"
+msgid "Invoke the linter, if available"
+msgstr "Start stavesjekk, dersom tilgjengelig"
 
-#: src/global.c:694
-msgid "Go to directory"
-msgstr "Gå til katalog"
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "GÃ¥ til forrige linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Lukk"
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "GÃ¥ til neste linje"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Hjelp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Lagre"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "GÃ¥ til katalog"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Klipp ut"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Juster"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Les fil"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Staving"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Klipp ut"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "GÃ¥ til linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Avjuster"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Følsomt for store/små bokstavar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Angre \"klipp ut\""
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regulært uttrykk"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Bakover"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Ikke erstatt"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Staving"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Forrige side"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Neste side"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Første linje"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Siste linje"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ikke en klamme"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Marker tekst"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopier tekst"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
-msgstr "Indenter"
+msgstr "Rykk inn tekst"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
-msgstr "Angre \"indenter\""
+msgstr "Angre «innrykk»"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
-msgstr ""
+msgstr "Angre"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Fremover"
+msgstr "Gjør om"
 
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Neste ord"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Fremover"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Forrige side"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Siste linje"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Neste ord"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Bunn"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Finn den andre klammen"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Avsn. start"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Avsn. slutt"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Rull opp"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Rull ned"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Forrige fil"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Neste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Legg inn ord for ord"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Slett"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Slettetast"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "Kutt Til Slutt"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Antall ord"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "ForrigeHistorie"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "NesteHistorie"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "GÃ¥ til tekst"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS Format"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac Format"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Legg til etter"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Legg til før"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Sikkerhetskopi"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Eksekver kommando"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Første fil"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Siste fil"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Forrige side"
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Siste linje"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Hjelp-modus"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
-msgstr "Lås markørposisjon"
+msgstr "Lås markørposisjon"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Bruk mer plass til editering"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Jevn tekstrulling"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ikke bryt lange linjer"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Vis usynlige tegn (mellomrom, tab, linjeskift osv.)"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Fremhev syntaks ved hjelp av farger"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Smart home tast"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automatisk indentering"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Automatisk linjeskift"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ikke bryt lange linjer"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konverter tabulator til mellomslag"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Sikkerhetskopier"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Flere filbuffere"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
-msgstr "Musestøtte"
+msgstr "Musestøtte"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac format"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Automatisk linjeskift"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1055,16 +1087,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:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1072,12 +1104,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:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1088,16 +1120,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1111,15 +1143,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:253
 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"
@@ -1127,13 +1159,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:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1150,16 +1182,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:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1176,14 +1208,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:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1196,24 +1228,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:295
 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:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1225,16 +1257,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:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1249,17 +1281,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:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1270,18 +1301,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:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1294,17 +1323,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1318,12 +1347,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:359
 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 "
@@ -1331,20 +1360,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:391 src/help.c:466
 msgid "enable/disable"
-msgstr "skru på/av"
+msgstr "skru på/av"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Tasten er ikke gyldig i visninsmodus"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1353,7 +1382,7 @@ msgstr ""
 "\n"
 "Buffer lagret til %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1362,7 +1391,7 @@ msgstr ""
 "\n"
 "Buffer ble ikke lagret til %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1371,11 +1400,11 @@ msgstr ""
 "\n"
 "Buffer ikkr lagret: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Vinduet er for lite for Nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1384,261 +1413,264 @@ msgstr ""
 "Bruk: nano [valg] [[+LINJE,KOLONNE] FIL]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Valg\t\tGNU lang brukervalg\t\tBetydning\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsjon\t\tBetydning\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Vis denne meldingen"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+LINJE,KOLONNE"
 
-#: src/nano.c:831
+#. 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:843
 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:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Aktiver smart home tast"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Ta sikkerhetskopier av eksisterende filer"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Katalog for lagring av unike sikkerhetskopier"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Bruk fet, ikke invertert tekst"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Konverter skrevne tabulatorer til mellomslag"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
-msgstr "Muliggjør flere filbuffere"
+msgstr "Muliggjør flere filbuffere"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "Bruk (vim-stil) låsefiler"
 
-#: src/nano.c:852
+#: src/nano.c:864
 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:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
-msgstr "Ikke se på nanorc filer"
+msgstr "Ikke se på nanorc filer"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Fiks forvirringen rundt numerisk tastatus"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Legg ikke til linjeskift sist i filer"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ikke konverter filer fra DOS/Mac format"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Bruk en ekstra linje til tekstbehandling"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
-msgstr "Sett inn tabulatortegn ved markøren"
+msgstr "Logg og les plasseringen av markøren"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <tekst>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<tekst>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Kvoteringtekst"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Begrenset modus"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Bla etter linje i stedet for halvskjerm"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#kolonner>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kolonner>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 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:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Bruk hurtig blanking av statuslinjen"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Skriv versjonsnummeret og avslutt"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
-msgstr "Detekter ordskille mer nøyektig"
+msgstr "Detekter ordskille mer nøyektig"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <tekst>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<tekst>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaksdefinisjon for fargekoding"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
-msgstr "Vis alltid markørposisjonen"
+msgstr "Vis alltid markørposisjonen"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fiks forvirringen rundt Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Vis denne hjelpeteksten"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Indenter nye linjer automatisk"
 
-#: src/nano.c:900
+#: src/nano.c:913
 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:903
+#: src/nano.c:916
 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:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
-msgstr "Aktiver musstøtte"
+msgstr "Aktiver musstøtte"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatiingdir=<kat>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Sett gjeldende katalog"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Behold XON (^Q) og XOFF (^S) tegn"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Stille ignorere oppstartsproblemer som rc-filfeil"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#kolonner>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kolonner>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
-msgstr "Sett linjebryting på kolonne # kolonner"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Sett linjebryting på kolonne # kolonner"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Bruk alternativt program for stavekontroll"
 
-#: src/nano.c:924
+#: src/nano.c:938
 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:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Tillat generell angre [EKSPERIMENTELL]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Visninsgmodus (kun lesetilgang)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ikke bryt lange linjer"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Ikke vis hjelpelinjene"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Tillat suspendering"
 
-#: src/nano.c:935
-#, fuzzy
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
-msgstr "Automatisk linjeskift"
-
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorert, for kompatibilitet med Pico)"
+msgstr "Aktiver myk linjebryting"
 
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1647,164 +1679,170 @@ msgstr ""
 "\n"
 " Kompilerte opsjoner:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 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:1055
+#: src/nano.c:1110
 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:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Kunne ikke gjenåpne standard inn fra tastaturet, beklager\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Leser fra standard inn, ^C for å avbryte\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, 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:1407
+#: src/nano.c:1457
 msgid "enabled"
-msgstr "på"
+msgstr "på"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Ukjent kommando"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorert, mumle mumle."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorert, mumle mumle."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, 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:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, 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:2384
+#, 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:1247
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nei"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, 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:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Atrument '%s' har uterminert \""
+msgstr "Argument '%s' har en uterminert \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 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:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
-msgstr "Syntaksen \"none\" (ingen) er reservert"
+msgstr "Syntaksen «none» (ingen) er reservert"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 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:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
+#: src/rcfile.c:411
+msgid "Missing key name"
+msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Regulært uttrykk mangler"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
 
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:441
 #, fuzzy
-msgid "Missing key name"
-msgstr "Mangler syntaksnavn"
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Tastebindinger må begynne med «^», «M», eller «F»"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
+msgstr "Må spesifisere menyen å binde tasten til"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Kunne ikke tilordne navn «%s» til en funksjon"
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Kunne ikke tilordne navn «%s» til en meny"
 
-#: src/rcfile.c:518 src/rcfile.c:603
+#: src/rcfile.c:497
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Kunne ikke starte \"%s\""
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Beklager, tastekombinasjonen «%s» er en ulovlig binding"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Lesefeil på %s: %s"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1813,151 +1851,179 @@ 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:733
+"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:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:758
+#: src/rcfile.c:663 src/rcfile.c:824
+msgid "Missing regex string"
+msgstr "Regulært uttrykk mangler"
+
+#: src/rcfile.c:739
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "«start=» forutsetter et korresponderende «end=»"
+
+#: src/rcfile.c:791
 #, 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:776 src/rcfile.c:895
-msgid "Missing regex string"
-msgstr "Regulært uttrykk mangler"
+#: src/rcfile.c:819
+msgid "Cannot add a header regex without a syntax command"
+msgstr "Kan ikke legge til topptekst-regex uten syntakskommando"
 
-#: src/rcfile.c:848
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start= forutsetter et korresponderende \"end=\""
+#: src/rcfile.c:875
+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:890
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "Mangler magisk strengnavn"
+
+#: src/rcfile.c:939
 #, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan ikke legge til topptekst-regex uten syntakskommando"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:962
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Fatal feil: ingen taster kartlagt for funksjon «%s»"
+
+#: src/rcfile.c:976
+#, 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 ""
+"Avslutter. Vennligst bruk nano med -I alternativ hvis det trengs å justere "
+"nanorc-innstillinger\n"
+
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunne ikke tilordne navn «%s» til en meny"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, 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:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
+msgstr "Syntaksen «%s» har ingen fargekommandoer"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "kommando \"%s\" ikke forstått"
+msgstr "kommando «%s» ikke forstått"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Mangler flagg"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Valg \"%s\" krever et argument"
+msgstr "Valg «%s» krever et argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Brukervalget er ikke gyldig for flerbyte strenger"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 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:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "To enkelt-tegn kreves"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Kan ikke skru av flagget \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Kan ikke skru av flagget «%s»"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Ukjent flagg \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "Ukjent flagg «%s»"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Finner ikke hjemmekatalogen! Buhu!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"Trykk linjeskift for å fortsette oppstarten av nano\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"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
-msgstr " (å erstatte) i seksjon"
+msgstr " (Ã¥ erstatte) i seksjon"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
-msgstr " (å erstatte)"
+msgstr " (Ã¥ erstatte)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Erstatt dette tilfellet?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer, kolonnenummer"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1074
 msgid "Invalid line or column number"
-msgstr "Skriv linjenummer, kolonnenummer"
+msgstr "Ugyldig linje eller kolonnenummer"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Ingen matchende klamme"
 
@@ -1969,232 +2035,305 @@ msgstr "Merke satt"
 msgid "Mark Unset"
 msgstr "Fjern merke"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Ingenting i angrebuffer!"
 
-#: 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:440 src/text.c:578
+#, fuzzy, c-format
+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:451 src/text.c:588
 msgid "text add"
-msgstr ""
+msgstr "Legg til tekst"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
-msgstr "Neste fil"
+msgstr "slett tekst"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
-msgstr "Automatisk linjeskift"
+msgstr "linjebryting"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
-msgstr ""
+msgstr "linjesammenføy"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
-msgstr ""
+msgstr "klipp tekst"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
-msgstr ""
+msgstr "Angre «klipp ut»"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
-msgstr ""
+msgstr "linjeskift"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
-msgstr "Siste linje"
+msgstr "sett inn tekst"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Angret handling (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Intern feil: kan ikke sette opp «angre klipp ut». Vennligst lagre arbeidet "
+"ditt."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Kunne ikke pipe"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Kunne ikke opprette pipe"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Kunne ikke forke"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+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:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ugyldig kvoteringstekst %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
-msgstr "Du kan nå avjustere!"
+msgstr "Du kan nå avjustere!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Kunne ikke opprette pipe"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Oppretter ordliste for feilstavelser, vennligst vent..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 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:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
-msgstr "Feil ved start av \"ispell\""
+msgstr "Feil ved start av «ispell»"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
-msgstr "Feil ved start av \"sort -f\""
+msgstr "Feil ved start av zsort -f»"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
-msgstr "Feil ved start av \"uniq\""
+msgstr "Feil ved start av «uniq»"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
-msgstr "Stavekontroll fullført"
+msgstr "Stavekontroll fullført"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Feil ved start av \"%s\""
+msgstr "Feil ved start av «%s»"
+
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavesjekk, dersom tilgjengelig"
 
-#: src/text.c:2970
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feilet: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feilet: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Legg ikke til linjeskift sist i filer"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Vis denne meldingen"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Vis denne meldingen"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu Linjer: %ld Tegn: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "I seksjon:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Legg inn ord for ord"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Unikode inndata"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Endret"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Vis"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "KAT: "
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
-msgstr ""
+msgstr "Advarsel: Endrer en fil som ikke er låst, sjekk katalogtillatelse?"
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Tekstbehandleren nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versjon"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Brakt til deg av:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Mange takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
-msgstr "The Free Sofware Foundation"
+msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "og alle de andre vi glemte..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Takk for at du bruker nano!"
 
+#~ 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 "(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"
@@ -2203,7 +2342,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"
@@ -2212,13 +2351,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"
@@ -2257,7 +2396,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"
diff --git a/po/nl.gmo b/po/nl.gmo
index ff2966f1..df0121da 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index b002c071..1b8e8650 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,20 +1,20 @@
 # Dutch translations for GNU nano.
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # "Geluk komt niet vanzelf,
 # je moet erheen lopen."
 #
-# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2011, 2013.
+# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2011, 2013, 2014.
 # Erwin Poeze <erwin.poeze@gmail.com>, 2009.
 # Reinout van Schouwen <reinout@cs.vu.nl>, 2005.
 # Guus Sliepen <guus@sliepen.eu.org>, 2003.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-2.3.2pre4\n"
+"Project-Id-Version: nano-2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2013-03-18 20:35+0100\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2014-05-28 21:44+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -24,138 +24,135 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Naar map"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fout tijdens lezen van %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(map)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(oudermap)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Achterwaarts]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Dit is de enige overeenkomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Nog geen zoekpatroon bekend"
 
-#: src/files.c:137
+#: src/files.c:138
 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:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Kan hostnaam voor vergrendelingsbestand niet bepalen: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Fout tijdens schrijven van vergrendelingsbestand %s: %s"
+msgstr "Fout bij schrijven van vergrendelingsbestand %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Fout tijdens verwijderen van vergrendelingsbestand %s: %s"
+msgstr "Fout bij verwijderen van vergrendelingsbestand %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "Fout tijdens openen van vergrendelingsbestand %s: %s"
+msgid "Error opening lock file %s: %s"
+msgstr "Fout bij openen van vergrendelingsbestand %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 "Fout tijdens lezen van vergrendelingsbestand %s: niet genoeg gegevens gelezen"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan bestand van buiten %s niet invoegen"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Geen andere open buffers"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Overgeschakeld naar %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Nieuwe buffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -170,14 +167,14 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit DOS- en Mac-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -190,14 +187,14 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit Mac-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -210,99 +207,99 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit DOS-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu regel gelezen"
 msgstr[1] "%lu regels gelezen"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Inlezen van bestand"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Nieuw bestand"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "'%s' is niet gevonden"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "'%s' is een map"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "'%s' is een apparaat"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "In nieuwe buffer uit te voeren opdracht [vanuit %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Uit te voeren opdracht [vanuit %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "In nieuwe buffer in te voegen bestand [vanuit %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "In te voegen bestand [vanuit %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "In Kijkmodus is deze toets alleen geldig in multibuffermodus"
 
-#: src/files.c:1594
+#: src/files.c:1591
 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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan buiten %s niets opslaan"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Kan met '--nofollow' niet aan een symbolische koppeling toevoegen"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, 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:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Te veel reservekopieën?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fout tijdens schrijven van %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fout tijdens schrijven van tijdelijk bestand: %s"
@@ -358,15 +355,15 @@ msgstr "Bestand bestaat al; OVERSCHRIJVEN? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Bestand opslaan onder een ANDERE NAAM? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Bestand is gewijzigd na opening; doorgaan met opslaan? "
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(meer)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -375,7 +372,7 @@ msgstr ""
 "\n"
 "Druk op Enter om verder te gaan.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -385,7 +382,7 @@ msgstr ""
 "Deze is vereist voor opslaan en inlezen van zoekgeschiedenis en "
 "cursorpositie.\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -394,7 +391,7 @@ msgstr ""
 "Pad %s is geen map maar moet dit zijn.\n"
 "Nano kan nu de zoekgeschiedenis en cursorpositie niet opslaan noch inlezen.\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -404,7 +401,7 @@ msgstr ""
 "maar bij het verplaatsen ervan naar de voorkeurslocatie (%s)\n"
 "trad er een fout op: %s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -415,645 +412,659 @@ msgstr ""
 "deze is nu naar de voorkeurslocatie (%s) verplaatst.\n"
 "(Zie de nano-FAQ voor uitleg over deze verandering.)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Vervangen"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Zoeken"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Hfdlgevoelig"
+msgid "Exit"
+msgstr "Afsluiten"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Achterwaarts"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Reg.exp."
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "Vorige"
+msgid "Close"
+msgstr "Sluiten"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Volgende"
+#: src/global.c:473
+msgid "Uncut Text"
+msgstr "Plakken"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Zoeken"
+#: src/global.c:475
+msgid "Unjustify"
+msgstr "onUitvullen"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Verderzoeken"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Naar top"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Naar eind"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Bestandenlijst"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS-indeling"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac-indeling"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Achtertoevoegen"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Voortoevoegen"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Reservekopie"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Opdracht uitvoeren"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Naar map..."
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Hulp"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Afsluiten"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Zoeken"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Blad terug"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Blad verder"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Naar top"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Vervangen"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Naar eind"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Naar regel..."
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Pauzeren"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Regel terug"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Beg.v.alinea"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Regel verder"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Eind v.alinea"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Inlezen"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "VolUitvullen"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Bestand invoegen"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Naar regel..."
-
-#: src/global.c:551
-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:556
+#: src/global.c:501
+msgid "Justify the current paragraph"
+msgstr "huidige alinea uitvullen"
+
+#: src/global.c:503
 msgid "Cancel the current function"
-msgstr "Huidige functie annuleren"
+msgstr "huidige functie annuleren"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
-msgstr "Deze hulptekst tonen"
+msgstr "deze hulptekst tonen"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Huidige buffer sluiten / Nano afsluiten"
+msgstr "huidige buffer sluiten / nano afsluiten"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
-msgstr "Nano afsluiten"
+msgstr "nano afsluiten"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
-msgstr "Huidige buffer op schijf opslaan"
+msgstr "huidige buffer op schijf opslaan"
 
-#: src/global.c:568
+#: src/global.c:515
 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:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
-msgstr "Tekst zoeken"
+msgstr "tekst zoeken (of een reguliere expressie)"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Een schermvol terugscrollen"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr "deel van naam zoeken"
 
-#: src/global.c:572
-msgid "Go to next screen"
-msgstr "Een schermvol verderscrollen"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr "een schermvol terugscrollen"
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr "een schermvol verderscrollen"
+
+#: src/global.c:525
 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:576
+#: src/global.c:527
 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:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
-msgstr "Huidige cursorpositie tonen"
+msgstr "huidige cursorpositie tonen"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
-msgstr "Spellingscontrole oproepen (indien beschikbaar)"
+msgstr "spellingscontrole oproepen (indien beschikbaar)"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
-msgstr "Tekst vervangen"
+msgstr "tekst vervangen (of een reguliere expressie)"
 
-#: src/global.c:583
+#: src/global.c:533
 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:585
-msgid "Mark text at the cursor position"
-msgstr "Tekst markeren vanaf huidige cursorpositie"
+#: src/global.c:535
+msgid "Mark text starting from the cursor position"
+msgstr "tekst markeren vanaf huidige cursorpositie"
 
-#: src/global.c:586
-msgid "Repeat last search"
-msgstr "Laatste zoekactie herhalen"
+#: src/global.c:536
+msgid "Repeat the last search"
+msgstr "laatste zoekactie herhalen"
 
-#: src/global.c:588
+#: src/global.c:538
 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:589
+#: src/global.c:539
 msgid "Indent the current line"
-msgstr "Huidige regel laten inspringen"
+msgstr "huidige regel laten inspringen"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
-msgstr "Huidige regel laten terugspringen"
+msgstr "huidige regel laten terugspringen"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
-msgstr "De laatste bewerking ongedaan maken"
+msgstr "de laatste bewerking ongedaan maken"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
-msgstr "De laatst ongedaangemaakte bewerking herdoen"
+msgstr "de laatst ongedaangemaakte bewerking herdoen"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
-msgstr "Eén teken vooruit"
+msgstr "één teken vooruit"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
-msgstr "Eén teken achteruit"
+msgstr "één teken achteruit"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
-msgstr "Eén woord vooruit"
+msgstr "één woord vooruit"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
-msgstr "Eén woord achteruit"
+msgstr "één woord achteruit"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
-msgstr "Naar de voorgaande regel"
+msgstr "naar de voorgaande regel"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
-msgstr "Naar de volgende regel"
+msgstr "naar de volgende regel"
 
-#: src/global.c:602
+#: src/global.c:552
 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:603
+#: src/global.c:553
 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:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 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:613
+#: src/global.c:561
 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:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
-msgstr "Naar bijbehorend haakje gaan"
+msgstr "naar bijbehorend haakje gaan"
 
-#: src/global.c:617
+#: src/global.c:565
 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:619
+#: src/global.c:567
 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:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
-msgstr "Naar voorgaande bestandsbuffer schakelen"
+msgstr "overschakelen naar voorgaande bestandsbuffer"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
-msgstr "Naar volgende bestandsbuffer schakelen"
+msgstr "overschakelen naar volgende bestandsbuffer"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
-msgstr "Eerstvolgende toetsaanslag verbatim invoegen"
+msgstr "eerstvolgende toetsaanslag verbatim invoegen"
 
-#: src/global.c:630
+#: src/global.c:574
 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:632
+#: src/global.c:575
 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:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
-msgstr "Het teken onder de cursor verwijderen"
+msgstr "het teken onder de cursor verwijderen"
 
-#: src/global.c:636
+#: src/global.c:578
 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:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
-msgstr "Het gehele bestand uitvullen"
+msgstr "het gehele bestand uitvullen"
 
-#: src/global.c:646
+#: src/global.c:588
 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:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
-msgstr "Het scherm verversen (opnieuw tekenen)"
+msgstr "het scherm verversen (opnieuw tekenen)"
 
-#: src/global.c:651
+#: src/global.c:593
 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:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
-msgstr "Hoofdlettergevoeligheid aan-/uitzetten"
+msgstr "hoofdlettergevoeligheid aan-/uitzetten"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
-msgstr "De zoekrichting omdraaien"
+msgstr "de zoekrichting omdraaien"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
-msgstr "Gebruik van reguliere expressies aan-/uitzetten"
+msgstr "gebruik van reguliere expressies aan-/uitzetten"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
-msgstr "Vorige zoek-/vervangtekst oproepen"
+msgstr "eerdere zoek-/vervangtekst oproepen"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
-msgstr "Volgende zoek-/vervangtekst oproepen"
+msgstr "latere zoek-/vervangtekst oproepen"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
-msgstr "Bestandenlijst oproepen"
+msgstr "bestandenlijst oproepen"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "DOS-indeling aan-/uitzetten"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Mac-indeling aan-/uitzetten"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
-msgstr "Achteraantoevoegen aan-/uitzetten"
+msgstr "achteraantoevoegen aan-/uitzetten"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
-msgstr "Vooraantoevoegen aan-/uitzetten"
+msgstr "vooraantoevoegen aan-/uitzetten"
 
-#: src/global.c:679
+#: src/global.c:618
 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:680
+#: src/global.c:619
 msgid "Execute external command"
-msgstr "Externe opdracht uitvoeren"
+msgstr "externe opdracht uitvoeren"
 
-#: src/global.c:684
+#: src/global.c:622
 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:687
+#: src/global.c:625
 msgid "Exit from the file browser"
-msgstr "Bestandenlijst verlaten"
+msgstr "bestandenlijst verlaten"
 
-#: src/global.c:689
+#: src/global.c:626
 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:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
-msgstr "Naar het laatste bestand in de lijst gaan"
-
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Naar het volgende bestand in de lijst gaan"
+msgstr "naar het laatste bestand in de lijst gaan"
 
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
-msgstr "Naar het vorige bestand in de lijst gaan"
+msgstr "naar het vorige bestand in de lijst gaan"
+
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "naar het volgende bestand in de lijst gaan"
 
-#: src/global.c:694
+#: src/global.c:630
 msgid "Go to directory"
-msgstr "Naar een op te geven map gaan"
+msgstr "naar een op te geven map gaan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Sluiten"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "een linter oproepen (syntaxcontrole, indien beschikbaar)"
+
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr "naar de voorgaande lintermelding springen"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr "naar de volgende lintermelding springen"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Hulp"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: src/global.c:671
+msgid "Write Out"
 msgstr "Opslaan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Naar map..."
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Knippen"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Uitvullen"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Inlezen"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Spelling"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Knippen"
+#: src/global.c:731
+msgid "To Linter"
+msgstr "Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "onUitvullen"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Hfdlgevoelig"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Plakken"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Reg.exp."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Achterwaarts"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Zoeken"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Positie"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Spelling"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Blad terug"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Blad verder"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Naar top"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Naar eind"
+
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "Naar haakje"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Markeren"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopiëren"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Inspringen"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Terugspringen"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Herdoen"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Vooruit"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Terug"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Woord verder"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Vooruit"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Woord terug"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Regel terug"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Regel verder"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Woord verder"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Begin"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Eind"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Naar bijbehorend haakje"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Beg.v.alinea"
 
-#: src/global.c:899
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Eind v.alinea"
+
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Omhoog scrollen"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Omlaag scrollen"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+msgid "Prev File"
 msgstr "Vorig bestand"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Volgend bestand"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr "Verbatim invoer"
+#: src/global.c:862
+msgid "Verbatim"
+msgstr "Verbatim"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
-msgstr "Verwijderen"
+msgstr "Delete"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "RestKnippen"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Woordentelling"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Pauzeren"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Eerdere"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Latere"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Zoeken"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS-indeling"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac-indeling"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Achtertoevoegen"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Voortoevoegen"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Reservekopie"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Opdracht uitvoeren"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Bestandenlijst"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Naar top"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Naar eind"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr "Vorige Lint"
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Hulpregels"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Voortdurende cursorpositieweergave"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Extra regel voor bewerkingsvenster"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Per regel scrollen"
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr "Zachte terugloop van te lange regels"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Weergave van witruimte"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Syntaxaanduiding met kleuren"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Slimme Home-toets"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automatisch inspringen"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
-msgstr "Knippen vanaf cursor"
+msgstr "Knippen vanaf cursor tot regeleinde"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Terugloop van lange regels"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
+msgstr "Afbreking van lange regels"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Omzetting van getypte tabs naar spaties"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Reservekopieën maken"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Meerdere bestandsbuffers"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Muisondersteuning"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Geen omzetting uit DOS/Mac-indeling"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Proces-pauzering"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Zachte terugloop van lange regels"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1075,7 +1086,7 @@ msgstr ""
 "getoond: op Enter drukken zonder tekst in te voeren herhaalt deze vorige "
 "zoekopdracht.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1089,7 +1100,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Zoek/vervang'-modus:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1109,7 +1120,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar regel'-modus:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1132,7 +1143,7 @@ msgstr ""
 "aparte buffer geladen.  Gebruik dan Meta-< en > om tussen bestandsbuffers te "
 "schakelen.  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1146,7 +1157,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand invoegen'-modus:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1174,7 +1185,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand opslaan'-modus:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1199,7 +1210,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestandenlijst'-modus:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1223,7 +1234,7 @@ msgstr ""
 "zoekopdracht.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1231,7 +1242,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand zoeken'-modus:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1253,7 +1264,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar map'-modus:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1278,7 +1289,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Spellingscontrole'-modus:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1298,7 +1309,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Externe opdracht'-modus:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1319,7 +1330,7 @@ msgstr ""
 "wordt.  De derde regel van onderen is de statusregel en toont belangrijke "
 "berichten.  "
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1338,7 +1349,7 @@ msgstr ""
 "worden ingevoerd met Esc of Alt of Meta, afhankelijk van uw "
 "toetsenbordinstelling.  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1353,15 +1364,15 @@ msgstr ""
 "(alternatieve toetscombinaties staan tussen haakjes):\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "aan-/uitzetten"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Toets is ongeldig in Kijkmodus"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1370,7 +1381,7 @@ msgstr ""
 "\n"
 "Buffer is geschreven naar %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1379,7 +1390,7 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven naar %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1388,11 +1399,11 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Schermformaat is te klein voor nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1401,261 +1412,263 @@ msgstr ""
 "Gebruik:  nano [OPTIES] [[+REGEL[,KOLOM]] BESTAND]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Optie\t\tLange optie\t\t  Betekenis\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Optie\t\t  Betekenis\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "deze hulptekst tonen en stoppen"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+REGEL[,KOLOM]"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "op deze regel (en deze kolom) beginnen"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "slimme Home-toets inschakelen"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "van bestaand bestand reservekopie maken"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <map>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<map>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "map voor opslaan van reservekopieën"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "vet in plaats van invers gebruiken"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "getypte tabs omzetten naar spaties"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "meerdere bestandsbuffers aanzetten"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr "vergrendelingsbestanden gebruiken (à la vim)"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "zoek/vervangteksten bewaren en gebruiken"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "eventuele nanorc-bestanden negeren"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "toetsverwarring numeriek bordje oplossen"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "geen regeleindeteken toevoegen aan slot"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "bestand niet omzetten uit DOS/Mac-opmaak"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "bewerkingsvenster een beetje vergroten"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "cursorpositie opslaan en later herstellen"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <tekens>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<tekens>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "te herkennen aanhaaltekens"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "beperkte modus"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "per regel scrollen i.p.v. half scherm"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
-msgstr "-T <#kolommen>"
+msgstr "-T <getal>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<#kolommen>"
+msgstr "--tabsize=<getal>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "te gebruiken tabbreedte"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "de statusregel snel wissen"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "programmaversie tonen en stoppen"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "woordgrenzen nauwkeuriger bepalen"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <naam>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<naam>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "te gebruiken syntax (voor kleuring)"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "cursorpositie voortdurend tonen"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Backspace/Delete-verwarring oplossen"
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr "deze hulptekst tonen"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "automatisch inspringen van nieuwe regels"
 
-#: src/nano.c:900
+#: src/nano.c:913
 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:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "symbolische koppelingen overschrijven"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "gebruik van de muis mogelijk maken"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr "bestand niet lezen (alleen schrijven)"
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <map>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<map>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "deze werkmap gebruiken"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON- en XOFF-toetsen behouden (^Q en ^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "opstartproblemen zoals rc-fouten negeren"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
-msgstr "-r <#kolommen>"
+msgstr "-r <getal>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
-msgstr "--fill=<#kolommen>"
+msgstr "--fill=<getal>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
 msgstr "te gebruiken afbreek-/uitvulbreedte"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <programma>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<programma>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "deze spellingscontroleur gebruiken"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "automatisch opslaan bij afsluiten"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "ongedaanmaken toestaan (EXPERIMENTEEL)"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "kijkmodus (alleen lezen, geen bewerking)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
 msgstr "lange regels niet afbreken"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "niet de twee hulpregels tonen"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "pauzeren van editor toestaan"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
-msgstr "rest van lange regels tonen op volgende"
-
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(genegeerd, maar herkend wegens Pico)"
+msgstr "rest van te lange regels tonen op volgende"
 
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano  versie %s  (gecompileerd %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1664,166 +1677,171 @@ msgstr ""
 "\n"
 " Compilatie-opties:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Ondersteuning voor deze functie is uitgeschakeld"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Gewijzigde buffer opslaan? (bij \"Nee\" gaan ALLE WIJZIGINGEN VERLOREN) "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kan standaardinvoer vanaf toetsenbord niet heropenen\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lezen van standaardinvoer; ^C om af te breken\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP of SIGTERM ontvangen\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gebruik 'fg' om terug te keren naar nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
-msgstr "is aangezet"
+msgstr " (aangezet)"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "is uitgezet"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Onbekend commando"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON genegeerd; mmm-mmm"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF genegeerd; mmm-mmm"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Gevraagde tabgrootte '%s' is ongeldig"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Gevraagde uitvulbreedte '%s' is ongeldig"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "NnNn"
 
 # Accepteert ook de "O" van "Overal":
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "AaOo"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nee"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fout in %s op regel %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' heeft een ongepaarde \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Reg.exp.-reeksen moeten beginnen en eindigen met een \"-teken"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Onjuiste reguliere expressie '%s': %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Ontbrekende syntaxnaam"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Het woordje 'none' is gereserveerd"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Bij het woordje 'default' horen geen extensies"
 
-#: src/rcfile.c:393
-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:398
-msgid "Missing magic string name"
-msgstr "Ontbrekende naam van magische tekenreeks"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Ontbrekende toetsnaam"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Toetsbindingen moeten beginnen met \"^\", \"M\", of \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "Toetsnaam is te kort"
+
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Toetsnaam moet beginnen met \"^\", \"M\", of \"F\""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr "Functie waaraan de toets gebonden moet worden ontbreekt"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+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:512
+#: src/rcfile.c:467
 #, 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:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, 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:540
+#: src/rcfile.c:497
 #, 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:711
+#: src/rcfile.c:583
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fout bij expanderen van %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1837,94 +1855,117 @@ msgstr ""
 "'magenta', 'yellow', 'cyan', 'black' en 'white',\n"
 "met voor voorgrondkleuren het optionele voorvoegsel 'bright'."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan geen 'color'-commando verwerken zonder een 'syntax'-commando"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Ontbrekende kleurnaam"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Achtergrondkleur '%s' kan niet 'bright' zijn"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Ontbrekende reg.exp.-tekenreeks"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "'start=' vereist een bijbehorende 'end='"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Achtergrondkleur '%s' kan niet 'bright' zijn"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan geen topregel-expressie verwerken zonder een 'syntax'-commando"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+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:880
+msgid "Missing magic string name"
+msgstr "Ontbrekende naam van magische tekenreeks"
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan geen linter toevoegen zonder een 'syntax'-commando"
+
+#: src/rcfile.c:944
+msgid "Missing linter command"
+msgstr "Ontbrekend commando bij 'linter'"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kan geen syntax '%s' vinden om aan toe te voegen"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Commando '%s' is niet toegestaan in 'include'-bestand"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Bij syntax '%s' ontbreken 'color'-commando's"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Commando '%s' is onbekend"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Ontbrekende vlag"
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Ontbrekende optie"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Optie '%s' vereist een argument"
 
-#: src/rcfile.c:1101
+# FIXME: option *argument* is meant
+#: src/rcfile.c:1153
 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:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
-msgstr "Niet-blanco tekens vereist"
+msgstr "Niet-blanco tekens zijn vereist"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
-msgstr "Twee enkelkoloms-tekens vereist"
+msgstr "Twee enkelkoloms-tekens zijn vereist"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, 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:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Onbekende vlag '%s'"
+msgid "Unknown option \"%s\""
+msgstr "Onbekende optie '%s'"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kan de thuismap niet vinden!  Boehoe!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1938,42 +1979,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "'%.*s%s' niet gevonden"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (om te vervangen) in selectie"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (om te vervangen)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Deze overeenkomst vervangen?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Vervangen door"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Geef regelnummer, kolomnummer"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Ongeldig regel- of kolomnummer"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Is geen haakje"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Geen overeenkomend haakje"
 
@@ -1985,224 +2030,292 @@ msgstr "Markering is aangezet"
 msgid "Mark Unset"
 msgstr "Uitgezet"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Er is niets om ongedaan te maken"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr "teksttoevoeging"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "tekstverwijdering"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "regelterugloop"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "regelsamenvoeging"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "tekstwegneming"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "tekstterugplaatsing"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "regeleinde"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "tekstinvoeging"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Bewerking (%s) is ongedaan gemaakt"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bewerking (%s) is opnieuw gedaan"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Kan niet doorsluizen"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Kan geen pijp aanmaken"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Kan geen nieuw proces starten"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+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:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ongeldige aanhaaltekens-tekenreeks '%s': %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
-msgstr "Kan nu ON^Uitvullen!"
+msgstr "Kan nu onuitvullen!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Vervanging bewerken"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Kan geen pijp aanmaken"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Aanmaken van lijst van verkeerd gespelde woorden, even geduld..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Kan grootte van doorsluisbuffer niet bepalen"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
-msgstr "Fout tijdens aanroepen van 'spell'"
+msgstr "Fout bij aanroepen van 'spell'"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
-msgstr "Fout tijdens aanroepen van 'sort -f'"
+msgstr "Fout bij aanroepen van 'sort -f'"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
-msgstr "Fout tijdens aanroepen van 'uniq'"
+msgstr "Fout bij aanroepen van 'uniq'"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Spellingscontrole is voltooid"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Fout tijdens aanroepen van '%s'"
+msgstr "Fout bij aanroepen van '%s'"
+
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr "Oproepen van spellingscontrole, even geduld"
 
-#: src/text.c:2970
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spellingscontrole is mislukt: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spellingscontrole is mislukt: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr "Er is geen linter gedefinieerd voor dit type bestand"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr "Gewijzigd buffer opslaan alvorens te linten?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "Oproepen van de linter, even geduld"
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Kreeg nul ontleedbare regels terug van commando '%s'"
+
+#: src/text.c:3238
+#, 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:3286
+msgid "At last message"
+msgstr "Dit is de laatste melding"
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr "Dit is de eerste melding"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%swoorden: %lu  regels: %ld  tekens: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "In de selectie:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Verbatim invoer"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Invoer van Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Gewijzigd"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Kijken"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "Map:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Bestand:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 "Waarschuwing: wijzigen van onvergrendeld bestand; maptoegangsrechten "
 "controleren?"
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "De nano-teksteditor"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versie"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "U bezorgd door:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Met speciale dank aan:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "de Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Voor ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "en iedereen die we vergeten zijn..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Dank u voor het gebruiken van nano!"
 
+#~ 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 "Internal error: unknown type.  Please save your work"
+#~ msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "*Interne fout*: kan herdoening niet voorbereiden.  Sla uw werk op."
+
+#~ 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 dc825748..5057a65f 100644
--- a/po/nn.gmo
+++ b/po/nn.gmo
diff --git a/po/nn.po b/po/nn.po
index 2389ac6d..017760f3 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,14 +1,14 @@
 # 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: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -17,137 +17,134 @@ msgstr ""
 "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:221
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Gå til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Avbrote"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Bakover]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Dette er einaste forekomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
-#, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr ""
+#: src/files.c:144
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Kunne ikkje setja tilgangsnivå %o på %s: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Feil i %s på linje %d: "
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Feil i %s på linje %d: "
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Feil i %s på linje %d: "
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikkje setja inn fil frå utanfor %s"
 
-#: src/files.c:437
+#: src/files.c:431
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Ingen fleire opne filer"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Bytta til %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -158,14 +155,14 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (på Mac-format)"
 msgstr[1] "Leste %d linjer (på Mac-format)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -174,14 +171,14 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (på Mac-format)"
 msgstr[1] "Leste %d linjer (på Mac-format)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -190,104 +187,104 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (på DOS-format)"
 msgstr[1] "Leste %d linjer (på DOS-format)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, 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:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Les fil"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "«%s» ikkje funne"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, 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:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Fila «%s» er ikkje ei vanleg fil"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, fuzzy, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten er ugyldig utan fleire buffer"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikkje skriva utanfor %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s vart ikkje lagra (for mange sikringskopiar?)\n"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
@@ -348,15 +345,15 @@ msgstr "Fila eksisterer, SKRIV OVER?"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(meir)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -365,28 +362,28 @@ msgstr ""
 "\n"
 "Trykk Enter for å halda fram lastinga av nano\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -394,699 +391,717 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Erstatt"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Inga erstatting"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Store/små"
+msgid "Exit"
+msgstr "Avslutt"
 
 #: src/global.c:472
-#, fuzzy
-msgid "Backwards"
-msgstr " [Bakover]"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Reguttrykk"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr ""
-
-#: src/global.c:503
-msgid "NextHstory"
-msgstr ""
-
-#: src/global.c:504
-msgid "Go To Text"
-msgstr ""
+msgid "Close"
+msgstr "Lukk"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#: src/global.c:473
 #, fuzzy
-msgid "WhereIs Next"
-msgstr "Finn"
+msgid "Uncut Text"
+msgstr "U-klipp"
 
-#: src/global.c:508
+#: src/global.c:475
 #, fuzzy
-msgid "First File"
-msgstr "Første linje"
+msgid "Unjustify"
+msgstr "U-ombrekk"
 
-#: src/global.c:509
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 #, fuzzy
-msgid "Last File"
-msgstr "Siste linje"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Til filer"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS-format"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac-format"
+msgid "WhereIs Next"
+msgstr "Finn"
 
-#: src/global.c:515
-msgid "Append"
-msgstr "Legg til"
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
+msgid "Where Is"
+msgstr "Finn"
 
-#: src/global.c:516
-#, fuzzy
-msgid "Prepend"
-msgstr "Legg til"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Erstatt"
 
-#: src/global.c:517
+#: src/global.c:488
 #, fuzzy
-msgid "Backup File"
-msgstr "Les fil"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr ""
+msgid "Go To Line"
+msgstr "Gå til linje"
 
-#: src/global.c:522
+#: src/global.c:489
 #, fuzzy
-msgid "Go To Dir"
-msgstr "Gå til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Hjelp"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Avslutt"
-
-#: src/global.c:533
-msgid "Where Is"
-msgstr "Finn"
-
-#: src/global.c:534
-msgid "Prev Page"
+msgid "Prev Line"
 msgstr "Førre side"
 
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Neste side"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Første linje"
-
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Siste linje"
-
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Legg i bakgrunnen"
-
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:490
+#, fuzzy
+msgid "Next Line"
+msgstr "Neste fil"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr ""
+#: src/global.c:491
+msgid "Read File"
+msgstr "Les fil"
 
-#: src/global.c:542
+#: src/global.c:493
 #, fuzzy
 msgid "FullJstify"
 msgstr "Brekk om"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Frisk opp"
 
-#: src/global.c:546
-#, fuzzy
-msgid "Insert File"
-msgstr "Neste fil"
-
-#: src/global.c:548
-#, fuzzy
-msgid "Go To Line"
-msgstr "Gå til linje"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldande funksjon"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:507
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldande fil/Avslutt nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Lagra gjeldande fil"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Sett inn ei anna fil i denne"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:571
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Gå til førre skjerm"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Gå til neste skjerm"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp ut denne linja og lagra ho i utklippsbufferet"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:578
+#: src/global.c:528
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Vis markørposisjonen"
 
-#: src/global.c:580
+#: src/global.c:530
 #, fuzzy
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/global.c:582
+#: src/global.c:532
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Erstatt feila: ukjent deluttrykk!"
 
-#: src/global.c:583
+#: src/global.c:533
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Hopp til eit linjenummer"
 
-#: src/global.c:585
+#: src/global.c:535
 #, 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:586
-msgid "Repeat last search"
+#: src/global.c:536
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:588
+#: src/global.c:538
 #, 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:589
+#: src/global.c:539
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Legg til noverande fil"
 
-#: src/global.c:590
+#: src/global.c:540
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Legg til noverande fil"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:544
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Gå ein bokstav fram"
 
-#: src/global.c:595
+#: src/global.c:545
 #, fuzzy
 msgid "Go back one character"
 msgstr "Gå ein bokstav attende"
 
-#: src/global.c:597
+#: src/global.c:547
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Gå ein bokstav fram"
 
-#: src/global.c:598
+#: src/global.c:548
 #, fuzzy
 msgid "Go back one word"
 msgstr "Gå ein bokstav attende"
 
-#: src/global.c:600
+#: src/global.c:550
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:601
+#: src/global.c:551
 #, fuzzy
 msgid "Go to next line"
 msgstr "Gå ei linje ned"
 
-#: src/global.c:602
+#: src/global.c:552
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Gå til starten av linja"
 
-#: src/global.c:603
+#: src/global.c:553
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Gå til slutten av linja"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Gå til siste linje i fila"
 
-#: src/global.c:615
+#: src/global.c:563
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Inga motsvarande klamme"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:623
+#: src/global.c:570
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:630
+#: src/global.c:574
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sett inn eit linjeskift"
 
-#: src/global.c:632
+#: src/global.c:575
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "Sett inn eit linjeskift"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Slett bokstaven under markøren"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett bokstaven til venstre for markøren"
 
-#: src/global.c:639
+#: src/global.c:581
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:642
+#: src/global.c:584
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Brekk om avsnittet"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Teikn skjermen på nytt"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:596
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "Søk (skil mellom store og små bokstavar)"
 
-#: src/global.c:656
+#: src/global.c:598
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Vis markørposisjonen"
 
-#: src/global.c:660
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Bruk regulære uttrykk"
 
-#: src/global.c:664
+#: src/global.c:606
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Gå til fillesar"
 
-#: src/global.c:672
+#: src/global.c:614
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Skriv fila på DOS-format"
 
-#: src/global.c:673
+#: src/global.c:615
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Skriv fila på Mac-format"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:687
+#: src/global.c:625
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Gå til fillesar"
 
-#: src/global.c:689
+#: src/global.c:626
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:691
+#: src/global.c:627
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Gå til siste linje i fila"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Gå til siste linje i fila"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Gå til siste linje i fila"
+
+#: src/global.c:630
 #, fuzzy
 msgid "Go to directory"
 msgstr "Gå til katalog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Lukk"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Start stavekontroll (om tilgjengeleg)"
+
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr ""
+
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr ""
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Hjelp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Lagra"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+#, fuzzy
+msgid "Go To Dir"
+msgstr "Gå til katalog"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Klipp"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Brekk om"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Les fil"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Staving"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Klipp"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Gå til linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "U-ombrekk"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Store/små"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Reguttrykk"
+
+#: src/global.c:746
 #, fuzzy
-msgid "UnCut Text"
-msgstr "U-klipp"
+msgid "Backwards"
+msgstr " [Bakover]"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Inga erstatting"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Staving"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Førre side"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Neste side"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Første linje"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Siste linje"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ikkje ei klamme"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Merk tekst"
 
-#: src/global.c:828
+#: src/global.c:791
 #, fuzzy
 msgid "Copy Text"
 msgstr "Klipp"
 
-#: src/global.c:831
+#: src/global.c:794
 #, fuzzy
 msgid "Indent Text"
 msgstr "Klipp"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Framover"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr ""
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Framover"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:875
-#, fuzzy
-msgid "Prev Line"
-msgstr "Førre side"
-
-#: src/global.c:878
-#, fuzzy
-msgid "Next Line"
-msgstr "Neste fil"
+#: src/global.c:822
+msgid "Next Word"
+msgstr ""
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "End"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Finn den andre klamma"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr ""
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr ""
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Førre fil"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Neste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Legg i bakgrunnen"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr ""
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr ""
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr ""
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS-format"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac-format"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Legg til"
+
+#: src/global.c:930
+#, fuzzy
+msgid "Prepend"
+msgstr "Legg til"
+
+#: src/global.c:933
+#, fuzzy
+msgid "Backup File"
+msgstr "Les fil"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr ""
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:958
+#, fuzzy
+msgid "First File"
+msgstr "Første linje"
+
+#: src/global.c:960
+#, fuzzy
+msgid "Last File"
+msgstr "Siste linje"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Hjelpetekst"
 
-#: src/global.c:1301
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Fast markørposisjon"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Jamn linjerulling"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr " -w \t\tIkkje bryt lange linjer\n"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automatisk innrykk"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Mange filbuffer"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Musestøtte"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Inga omsetjing frå DOS/Mac-format"
 
-#: src/global.c:1329
+#: src/global.c:1247
 #, fuzzy
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:220
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1114,7 +1129,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i søkjemodus:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1123,7 +1138,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:235
 #, fuzzy
 msgid ""
 "Go To Line Help Text\n"
@@ -1144,7 +1159,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Gå til linje-modus:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1172,7 +1187,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Set inn fil-modus:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1181,7 +1196,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:259
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1209,7 +1224,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Lagre fil-modus:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 #, fuzzy
 msgid ""
 "File Browser Help Text\n"
@@ -1234,7 +1249,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i filutforskaren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1263,13 +1278,13 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i søkjemodus:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:299
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1292,7 +1307,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Gå til katalog-modus:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1315,7 +1330,7 @@ msgstr ""
 " Følgjande andre funksjonar er tilgjengelege i stavesjekkingsmodus:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1327,7 +1342,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:356
+#: src/help.c:340
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1354,7 +1369,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1365,7 +1380,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1374,17 +1389,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 #, fuzzy
 msgid "enable/disable"
 msgstr "%s skru på/av"
 
-#: src/nano.c:588
+#: src/nano.c:597
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "Tasten er ulovleg i VIS-modus"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1393,7 +1408,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1402,7 +1417,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1411,288 +1426,289 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 #, fuzzy
 msgid "Window size is too small for nano...\n"
 msgstr "Vindauget er for lite for Nano..."
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opsjon\t\tLang opsjon\t\tTyding\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsjon\t\tTyding\n"
 
-#: src/nano.c:829
-#, fuzzy
-msgid "Show this message"
-msgstr " -h \t\tVis denne meldinga\n"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr ""
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:857
 #, fuzzy
 msgid "Enable multiple file buffers"
 msgstr " -F \t\tSkru på fleire filbuffer\n"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr ""
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:875
 #, fuzzy
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Inga omsetjing frå DOS/Mac-format"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Fast markørposisjon"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr ""
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:892
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr " -T [TAL]\tSet breidda på tabulator til TAL\n"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:885
+#: src/nano.c:897
 #, fuzzy
 msgid "Print version information and exit"
 msgstr " -V \t\tSkriv ut versjonsnummer og avslutt\n"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr ""
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr ""
 
-#: src/nano.c:894
+#: src/nano.c:906
 #, fuzzy
 msgid "Constantly show cursor position"
 msgstr " -c \t\tFast markørposisjon\n"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr ""
+
+#: src/nano.c:912
 #, fuzzy
 msgid "Automatically indent new lines"
 msgstr " -i \t\tAutomatisk linjeinnrykk\n"
 
-#: src/nano.c:900
+#: src/nano.c:913
 #, 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:903
+#: src/nano.c:916
 #, fuzzy
 msgid "Don't follow symbolic links, overwrite"
 msgstr " -l \t\tFølg ikkje symbolske lenker, skriv over\n"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr ""
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:923
 #, fuzzy
 msgid "Set operating directory"
 msgstr " -o [kat] \tSet aktiv filkatalog\n"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr ""
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr ""
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr ""
 
-#: src/nano.c:921
+#: src/nano.c:935
 #, fuzzy
 msgid "Enable alternate speller"
 msgstr " -s [PROG]  \tBruk PROG til stavesjekk\n"
 
-#: src/nano.c:924
+#: src/nano.c:938
 #, fuzzy
 msgid "Auto save on exit, don't prompt"
 msgstr " -t \t\tLagra utan å spørja ved avslutning\n"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr " -v \t\tVis-modus (berre lesing)\n"
 
-#: src/nano.c:931
+#: src/nano.c:945
 #, 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:933
+#: src/nano.c:947
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr " -x \t\tIkkje vis hjelpevindu\n"
 
-#: src/nano.c:934
+#: src/nano.c:948
 #, fuzzy
 msgid "Enable suspension"
 msgstr " -z \t\tTillat å leggja programmet i bakgrunnen\n"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1701,166 +1717,172 @@ msgstr ""
 "\n"
 " Kompilerte tillegg:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Lagra endra buffer (\"No\" VIL MISSA ENDRINGANE)? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 #, fuzzy
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "på"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "tab-breidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "fyllbreidda du foreslo (%d) er for smal"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nei"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Feil i %s på linje %d: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "reguttrykk må starte og slutte med eit \"-teikn\n"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, fuzzy, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Kan ikkje opna «%s»: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 #, fuzzy
 msgid "Missing syntax name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:393
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr ""
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Fargenamnet manglar"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Missing key name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:512
-#, 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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
+#: src/rcfile.c:467
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:540
+#: src/rcfile.c:474
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:711
+#: src/rcfile.c:497
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:583
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr ""
+
+#: src/rcfile.c:626
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1874,97 +1896,120 @@ 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:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 #, fuzzy
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 "\n"
 "\tfor kvar «start=» må der vera ein «end=»"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Fargenamnet manglar"
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Fargenamnet manglar"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommandoen %s er ikkje forståeleg"
 
-#: src/rcfile.c:1061
+#: src/rcfile.c:1113
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsjonen %s krev eit argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, 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:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1978,44 +2023,48 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "«%s» ikkje funne"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (å erstatta)"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (å erstatta)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Erstatta dette tilfellet?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ikkje ei klamme"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Inga motsvarande klamme"
 
@@ -2028,161 +2077,193 @@ msgstr "Merke sett"
 msgid "Mark Unset"
 msgstr "Merke fjerna"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 #, fuzzy
 msgid "text delete"
 msgstr "Neste fil"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr ""
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 #, fuzzy
 msgid "text insert"
 msgstr "Neste fil"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 #, 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:771
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
 #, 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:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 #, fuzzy
 msgid "Could not fork"
 msgstr "Kunne ikkje lukka %s: %s"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Du kan no gjera om ombrekkinga!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
-#: src/text.c:2558
-#, fuzzy
-msgid "Could not create pipe"
-msgstr "Kunne ikkje oppretta mellombels fil: %s"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullført"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil i %s på linje %d: "
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavekontroll (om tilgjengeleg)"
+
+#: src/text.c:2979
 #, fuzzy, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+msgid "At last message"
+msgstr ""
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr ""
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3041
+#: src/text.c:3373
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Legg til valt område på slutten av fil"
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr ""
+
 #: src/utils.c:409 src/utils.c:421
 #, fuzzy
 msgid "nano is out of memory!"
@@ -2190,69 +2271,70 @@ 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:1558
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Endra"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 #, fuzzy
 msgid "DIR:"
 msgstr " KAT: "
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 #, fuzzy
 msgid "File:"
 msgstr "Fil: "
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Teksteditoren nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 #, fuzzy
 msgid "version"
 msgstr "versjon "
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Gjeve til deg av:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Spesiell takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "Free Sofware Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "og alle dei andre vi gløymde..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Takk for at du brukar nano!\n"
@@ -2278,8 +2360,8 @@ msgstr "Takk for at du brukar nano!\n"
 #~ 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"
@@ -2317,6 +2399,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"
 
@@ -2344,6 +2429,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"
 
@@ -2463,6 +2551,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"
 
@@ -2487,9 +2578,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"
 
@@ -2542,6 +2630,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 d4cfa2ec..51333f62 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 49be375c..0b32e12d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,17 +1,15 @@
 # Polish translations for the nano editor messages
-# This file is distributed under the same license as the nano package.
 # Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
 #
-# 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.2.4pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
 "PO-Revision-Date: 2010-04-21 19:16+0300\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -22,128 +20,125 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Przejd¼ do katalogu"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "B³±d odczytu %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 msgid "Can't move up a directory"
 msgstr "Nie mo¿na przej¶æ katalog wy¿ej"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(kat nad)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Wstecz]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "To jedyne wyst±pienie"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Brak wzorca wyszukiwania"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "B³±d zapisu kopii zapasowej %s: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "B³±d zapisu kopii zapasowej %s: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "B³±d zapisu kopii zapasowej %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nie mo¿na wstawiæ pliku spoza %s "
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Nie ma wiêcej otwartych buforów"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Prze³±czono na %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Nowy bufor"
 
-#: src/files.c:840
+#: src/files.c:835
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -151,7 +146,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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -169,7 +164,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu DOS i Mac - Ostrze¿enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -177,7 +172,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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -193,7 +188,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu Mac - Ostrze¿enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -201,7 +196,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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -217,7 +212,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu DOS - Ostrze¿enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -225,7 +220,7 @@ msgstr[0] "Wczytano %lu liniê"
 msgstr[1] "Wczytano %lu linie"
 msgstr[2] "Wczytano %lu linii"
 
-#: src/files.c:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -233,86 +228,86 @@ 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Wczytywanie pliku"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Nowy plik"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Nie znaleziono \"%s\""
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" jest katalogiem"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" jest plikiem urz±dzenia"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Polecenie do wykonania w nowym buforze [z %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Polecenie do wykonania [z %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Plik do wstawienia do nowego bufora [z %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Plik do wstawienia [z %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Klawisz niedozwolony w trybie innym ni¿ wielu buforów"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nie mo¿na zapisaæ poza %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "B³±d zapisu kopii zapasowej %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Za wiele kopii zapasowych?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "B³±d zapisu %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "B³±d zapisu pliku tymczasowego: %s"
@@ -369,15 +364,15 @@ msgstr "Plik istnieje, ZAMAZAÆ ? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Zapisaæ plik pod INN¡ NAZW¡ ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Plik zosta³ zmodyfikowany po otworzeniu, kontynuowaæ zapis ? "
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(wiêcej)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -386,28 +381,28 @@ msgstr ""
 "\n"
 "Naci¶nij return aby kontynuowaæ rozruch nano.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -415,645 +410,678 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Zast±p"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Nie zast."
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Wielk.liter"
+msgid "Exit"
+msgstr "Wyjd¼"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Wstecz"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Wyr.reg."
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "Poprz.Hist"
+msgid "Close"
+msgstr "Zamknij"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Nast.Hist"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Wklej"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Przejd¼ do tekstu"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Cofnij just."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Szukaj Znów"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Pierw.Plik"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Ost.Plik"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Pliki"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Dopisz"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Wpisz"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Kopia zapas."
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Wywo³aj polecenie"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Przejd¼ do katalogu"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Pomoc"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Wyjd¼"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Wyszukaj"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Poprz.str."
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Nast.str."
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Pierw.lin."
+#: src/global.c:487
+msgid "Replace"
+msgstr "Zast±p"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Ost.lin."
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Przejd¼ do linii"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Zawie¶"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Poprz.lin."
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "PoczAkapit"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Nast. lin."
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "KonAkapit"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Wczyt.plik"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Wyjustuj"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Od¶wie¿"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Wstaw plik"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Przejd¼ do linii"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Anuluj bie¿±c± funkcjê"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Wy¶wietla ten tekst pomocy"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zamknij bie¿±cy bufor / Wyjd¼ z nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Wyjd¼ z nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Zapisz bie¿±cy plik na dysku"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Wstaw do bie¿±cego pliku zawarto¶æ innego pliku"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Szukaj ³añcucha lub wyra¿enia regularnego"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Przejd¼ do poprzedniego ekranu"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Szukaj ³añcucha lub wyra¿enia regularnego"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Przejd¼ do nastêpnego ekranu"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Przejd¼ do nastêpnego ekranu"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Wytnij bie¿±c± liniê i przechowaj w buforze wycinania"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Wklej zawarto¶æ bufora wycinania w bie¿±cej linii"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Poka¿ informacjê o pozycji kursora"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Wywo³aj sprawdzanie pisowni, je¶li dostêpne"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Zamieñ ³añcuch lub wyra¿enie regularne"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Przejd¼ do linii i kolumny"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Ustaw znacznik w bie¿±cym po³o¿eniu kursora"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Powtórz ostatnie wyszukiwanie"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Wytnij bie¿±c± liniê i przechowaj w buforze wycinania"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Wyrównaj bie¿±c± liniê"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Usuñ wciêcia z bie¿±cej linii"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Odwo³aj ostatni± operacjê"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Odtwórz ostatni± operacjê"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Przejd¼ o znak do przodu"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Przejd¼ o znak wstecz"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Przejd¼ o s³owo do przodu"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Przejd¼ o s³owo wstecz"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Przejd¼ do poprzedniej linii"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Przejd¼ do nastêpnej linii"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Przejd¼ na pocz±tek bie¿±cej linii"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Przejd¼ na koniec bie¿±cej linii"
 
-#: src/global.c:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Przejd¼ do pierwszej linii pliku"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Przejd¼ do ostatniej linii pliku"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Przejd¼ do parzystego nawiasu"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Przewiñ na jedn± liniê w górê bez przesuniêcia kursora"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Przewiñ na jedn± liniê w dó³ bez przesuniêcia kursora"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Przejd¼ do poprzedniego bufora"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Przejd¼ do nastêpnego bufora"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Wstaw nastêpne naci¶niêcie klawisza dos³ownie"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Wstaw znak tabulacji na pozycji kursora"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Wstaw znak nowej linii na pozycji kursora"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Usuñ znak na pozycji kursora"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Usuñ znak na lewo od kursora"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Wytnij wszystko z pozycji kursora po koniec pliku"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Wyjustuj ca³y plik"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Policz ilo¶æ s³ów, linii i znaków"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Od¶wie¿ (ponownie wy¶wietl) bie¿±cy ekran"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Zawie¶ edytor (je¿eli zawieszenie jest w³±czone)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Prze³±cz uwzglêdnienie rozmiaru znaków pod czas wyszukiwania"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Odwróæ kierunek wyszukiwania"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Prze³±cz u¿ycie wyra¿eñ regularnych"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Przywróæ poprzednie ³añcuchy wyszukiwania/zamiany"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Przywróæ nastêpne ³añcuchy wyszukiwania/zamiany"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Poka¿ przegl±darkê plików"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Prze³±cz u¿ycie formatu DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Prze³±cz u¿ycie formatu Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Prze³±cz dopisywanie w koniec"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Prze³±cz dopisywanie na pocz±tek"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Prze³±cz utworzenie kopii zapasowych oryginalnego pliku"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Wywo³aj polecenie zewnêtrzne"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Prze³±cz u¿ycie nowego bufora"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Wyjd¼ z przegl±darki plików"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Przejd¼ do pierwszego pliku na li¶cie"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Przejd¼ do ostatniego pliku na li¶cie"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Przejd¼ do nastêpnego pliku na li¶cie"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Przejd¼ do poprzedniego pliku na li¶cie"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Przejd¼ do nastêpnego pliku na li¶cie"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Przejd¼ do katalogu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Zamknij"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Wywo³aj sprawdzanie pisowni, je¶li dostêpne"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Przejd¼ do poprzedniej linii"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Przejd¼ do nastêpnej linii"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Pomoc"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Anuluj"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Zapisz"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Przejd¼ do katalogu"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Wytnij"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Wyjustuj"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Wczyt.plik"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Pisownia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Wytnij"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Przejd¼ do linii"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Cofnij just."
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Wielk.liter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Wklej"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Wyr.reg."
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Wstecz"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Nie zast."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Bie¿.poz."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Pisownia"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Poprz.str."
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Nast.str."
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Pierw.lin."
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Ost.lin."
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "To nie nawias"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Zaznacz"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopiuj"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Wciêcie"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Usuñ Wciêcia"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Odwo³aj"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Odtwórz"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "W przód"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Wstecz"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Nast.s³owo"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "W przód"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Poprz.s³owo"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Poprz.lin."
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Nast. lin."
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Nast.s³owo"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Pocz±tek"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Koniec"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Znajd¼ nawias do pary"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "PoczAkapit"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "KonAkapit"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Przewiñ w górê"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Przewiñ w dó³"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Poprzedni plik"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Nastêpny plik"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "wprowadzanie dos³owne"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Usuñ"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "WytnDoKonc"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Ilo¶æ s³ów"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Zawie¶"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Poprz.Hist"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Nast.Hist"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Przejd¼ do tekstu"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Dopisz"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Wpisz"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Kopia zapas."
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Wywo³aj polecenie"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Pliki"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Pierw.Plik"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Ost.Plik"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Poprz.lin."
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "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:1215
 msgid "Help mode"
 msgstr "Tryb pomocy"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Sta³e po³o¿enie kursora"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "U¿ycie dodatkowej linii do redagowania"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "P³ynne przewijanie"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Bez ³amania d³ugich linii"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Wy¶wietlanie bia³ych znaków"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Kolorowanie sk³adni"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Rozumny klawisz \"w pocz±tek\""
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Auto wciêcia"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Wytnij do koñca"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Zawijanie d³ugich linii"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Bez ³amania d³ugich linii"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Przetworzenie tabulacji na spacji"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Kopie zapasowe"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Wiele buforów plikowych"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Obs³uga myszy"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Zawie¶"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Miêkkie zawijanie linii"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1075,7 +1103,7 @@ msgstr ""
 "szukany ³añcuch. Naci¶niêcie Enter bez wprowadzania tekstu spowoduje "
 "wykonanie poprzedniego szukania.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1089,7 +1117,7 @@ msgstr ""
 " W trybie szukania dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1109,7 +1137,7 @@ msgstr ""
 "funkcyjne:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1131,7 +1159,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:253
 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"
@@ -1145,7 +1173,7 @@ msgstr ""
 "W trybie wstawiania pliku dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1172,7 +1200,7 @@ msgstr ""
 " W trybie zapisu pliku dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1197,7 +1225,7 @@ msgstr ""
 " W przegl±darce plików dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1221,7 +1249,7 @@ msgstr ""
 "wykonanie poprzedniego szukania.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1229,7 +1257,7 @@ msgstr ""
 " W trybie wyszukiwania dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1253,7 +1281,7 @@ msgstr ""
 "klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1277,7 +1305,7 @@ msgstr ""
 " W trybie sprawdzania pisowni dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1298,7 +1326,7 @@ msgstr ""
 " W tym trybie dostêpne s± nastêpuj±ce klawisze:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1318,7 +1346,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1336,7 +1364,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:359
 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 "
@@ -1351,15 +1379,15 @@ msgstr ""
 "Klawisze alternatywne ujêto w nawiasy:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "w³±cz/wy³±cz"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Klawisz niedozwolony w trybie przegl±dania"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1368,7 +1396,7 @@ msgstr ""
 "\n"
 "Bufor zapisany w %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1377,7 +1405,7 @@ msgstr ""
 "\n"
 "Bufor nie zosta³ zapisany w %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1386,271 +1414,276 @@ msgstr ""
 "\n"
 "Bufor nie zosta³ zapisany w %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Rozmiar okna za ma³y dla nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr "Sk³adnia: nano [OPCJE] [[+LINIA,KOLUMNA] PLIK]...\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opcja\t\tD³uga opcja GNU\t\tZnaczenie\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opcja\t\tZnaczenie\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Pokazanie tej informacji"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+LINIA,KOLUMNA"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Rozpoczêcie w linii i kolumnie o podanych numerach"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "W³±cza rozumny przycisk \"w pocz±tek\""
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Tworzenie kopii zapasowych istniej±cych plików"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <katalog>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<katalog>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Katalog przechowywania unikatowych kopii zapasowych"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "U¿ywa tekstu pogrubionego zamiast negacji obrazu"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Przetwarza tabulacje na spacje"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "W³±czenie wielu buforów plikowych"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Rejestrowanie i odczyt historii wyszukiwania/zamiany ³añcuchów"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Bez korzystania z plików nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Naprawia problem pomylenia klawiszy klawiatury numerycznej"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Wy³±cza dodanie znaku nowej linii na koñcu pliku"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "U¿ycie dodatkowej linii do redagowania"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Wstaw znak tabulacji na pozycji kursora"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <³añcuch>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<³añcuch>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Znacznik cytowania"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Tryb zastrze¿ony"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Przewija po liniach zamiast po pó³-ekranu"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#kol>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kol>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Ustawienie szeroko¶ci tabulacji na podan± ilo¶æ kolumn"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Szybkie oczyszczenie linii stanu"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Wypisanie wersji i zakoñczenie pracy"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "U¶ci¶la okre¶lenie granic s³ów"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <³añc>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<³añc>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "U¿ycie zadanej definicji sk³adni do pod¶wietlania"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Sta³e pokazywanie po³o¿enia kursora"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Naprawia problem pomylenia klawiszy Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Wy¶wietla ten tekst pomocy"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Automatyczne wciêcia nowych linii"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Wycina od kursora do koñca linii"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Bez pod±¿ania za dowi±zaniami symbolicznymi, nadpisywanie"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "W³±czenie myszy"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Ustawienie katalogu pracy"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Zachowanie dzia³ania klawiszy XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 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:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#kol>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kol>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Ustawia granice przewijania w podanej kolumnie"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Alternatywny program sprawdzania pisowni"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Automatyczny zapis przy koñczeniu pracy, bez pytania"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "W³±cza odwo³anie ogólne [EKSPERYMENTALNE]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Tryb przegl±dania (tylko odczyt)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Bez ³amania d³ugich linii"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Bez pokazywania linii pomocy"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "W³±czenie zawieszania"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "W³±cza miêkkie przewijanie linii"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorowane, dla zgodno¶ci z Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano wersja %s (skompilowana %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1659,165 +1692,172 @@ msgstr ""
 "\n"
 " Skompilowane opcje:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Przepraszamy, obs³uga tej funkcji zosta³a wy³±czona"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Zapisaæ zmieniony bufor (ODPOWIED¬ \"Nie\" SPOWODUJE UTRATÊ ZMIAN) ? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 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:1135
+#: src/nano.c:1187
 #, 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:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Otrzymano SIGHUP lub SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Aby powróciæ do nano, u¿yj \"fg\".\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "w³±czony(e)"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "wy³±czony(e)"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Nieznane polecenie"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "Zignorowano XON, hmm, hmm."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "Zignorowano XOFF, hmm, hmm."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "¯±dana wielko¶æ tabulacji \"%s\" nie jest poprawna"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "¯±dana pozycja ³amania linii \"%s\" nie jest poprawna"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Tt"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Ww"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Tak"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Wszystko"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nie"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "B³±d w %s w linii %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument %s ma niedomkniêty \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Wyra¿enia regularne musz± zaczynaæ siê i koñczyæ znakiem \""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "B³êdne wyra¿enie regularne \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Brak nazwy sk³adni"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Sk³adnia \"none\" jest zarezerwowana"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Sk³adnia \"default\" nie przyjmuje rozszerzeñ"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Nie mo¿na dodaæ regularnego wyra¿enia nag³ówka bez polecenia sk³adni"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Brak wyra¿enia regularnego"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Brak nazwy klawisza"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "przypisania klawiszy musz± zaczynaæ siê z \"^\", \"M\", lub \"F\""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Podaj funkcje do jakiej przypisuje siê klawisz"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Nie mo¿na odwzorowaæ \"%s\" na funkcje"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Nie mo¿na odwzorowaæ \"%s\" na menu"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Przepraszam, \"%s\" nie jest prawid³owym przypisaniem"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "B³±d odczytu %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1832,93 +1872,119 @@ msgstr ""
 "\"black\", z opcjonalnym przedrostkiem \"bright\"\n"
 "dla kolorów pierwszoplanowych."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nie mo¿na dodaæ polecenia koloru bez polecenia sk³adni"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Brak nazwy koloru"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Kolor t³a \"%s\" nie mo¿e byæ jaskrawy"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Brak wyra¿enia regularnego"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" wymaga odpowiadaj±cego mu \"end=\""
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Kolor t³a \"%s\" nie mo¿e byæ jaskrawy"
+
+#: src/rcfile.c:819
 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:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Nie mo¿na dodaæ regularnego wyra¿enia nag³ówka bez polecenia sk³adni"
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Brak wyra¿enia regularnego"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Nie mo¿na dodaæ regularnego wyra¿enia nag³ówka bez polecenia sk³adni"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Brak nazwy koloru"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "B³±d krytyczny: brak przypisanego klawisza dla funkcji \"%s\""
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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 "Zakoñczenie. Uruchom nano z opcj± -I aby dopasowaæ ustawienia\n"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Nie mo¿na odwzorowaæ \"%s\" na menu"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Poliecenie \"%s\" nie jest dozwolone w pliku do³±czonym"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sk³adnia \"%s\" nie ma ustawieñ kolorów"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Niezrozumia³e polecenie \"%s\""
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Brak znacznika"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Brak nazwy koloru"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcja \"%s\" wymaga argumentu"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Opcja nie jest poprawnym ³añcuchem wielobajtowym"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Wymagane s± nie-bia³e znaki"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Wymagane s± dwa jednobajtowych znaki"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Nie mo¿na zerowaæ znacznika \"%s\""
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Nieznany znacznik \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nie mogê znale¼æ swojego katalogu domowego!  Aj!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1932,23 +1998,26 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "Nie znaleziono \"%.*s%s\""
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (i zast±p) w zaznaczeniu"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (i zast±p)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Czy zast±piæ to wyst±pienie?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Zast±p przez"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1956,19 +2025,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:1047
 msgid "Enter line number, column number"
 msgstr "Wprowad¼ numer linii, numer kolumny"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Niepoprawny numer linii lub kolumny"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "To nie nawias"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Brak nawiasu do pary"
 
@@ -1980,226 +2050,300 @@ msgstr "Znacznik ustawiony"
 msgid "Mark Unset"
 msgstr "Znacznik skasowany"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Nie ma nic w buforze odwo³ania"
 
-#: 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:440 src/text.c:578
+#, fuzzy, c-format
+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ê"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:451 src/text.c:588
 msgid "text add"
 msgstr "tekst dodany"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "tekst usuniêty"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "przewijanie linii"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "po³±czenie linii"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "wyciêcie tekstu"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "wklejanie tekstu"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "³amanie linii"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "tekst wprowadzony"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Odwo³ano operacjê (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, fuzzy
+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 wklejania nie powiod³o siê. Proszê zapisaæ swoj± "
+"pracê."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Powtórzono operacjê (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
 msgstr "Nie mo¿na utworzyæ potoku"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Nie mo¿na rozwidliæ procesu"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+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:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "B³±d wewnêtrzny: nieznany typ. Proszê zapisaæ swoj± pracê."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Nieprawid³owy znacznik cytowania %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Mo¿na teraz cofn±æ justowanie!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Edytuj zast±pienie"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Nie mo¿na utworzyæ potoku"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Tworzenie listy b³êdnie napisanych s³ów, proszê czekaæ..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Nie mo¿na uzyskaæ wielko¶ci bufora potoku"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "B³±d podczas wywo³ywania \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "B³±d podczas wywo³ywania \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "B³±d podczas wywo³ywania \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Zakoñczono sprawdzanie pisowni"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "B³±d podczas wywo³ywania \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Wywo³aj sprawdzanie pisowni, je¶li dostêpne"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Wy³±cza dodanie znaku nowej linii na koñcu pliku"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Pokazanie tej informacji"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Pokazanie tej informacji"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sS³owa: %lu  Linii: %ld  Znaki: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "W zaznaczeniu:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "wprowadzanie dos³owne"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Wej¶cie Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Zmieniony "
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Przegl."
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Plik:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Edytor tekstu nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "wersja"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Stworzony przez:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Specjalne podziêkowania otrzymuj±:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation (Fundacja Wolnego Oprogramowania)"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "oraz wszyscy pozostali, o których zapomnieli¶my..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 "Insert File"
+#~ msgstr "Wstaw plik"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Przejd¼ do poprzedniego ekranu"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Znajd¼ nawias do pary"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Zawijanie d³ugich linii"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Miêkkie zawijanie linii"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorowane, dla zgodno¶ci z Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Podaj menu do jakiego przypisuje siê klawisz (lub \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Brak znacznika"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "B³±d wewnêtrzny: nieznany typ. Proszê zapisaæ swoj± pracê"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "B³±d wewnêtrzny: Ustawianie powtórzenia nie powiod³o siê. Proszê zapisaæ "
+#~ "swoj± pracê"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Nie mo¿na utworzyæ potoku"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 39b1cdd3..5f772ea2 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bc3b0eff..55fa4e07 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,13 +1,13 @@
 # Portugueses Translation for the nano textual domain
 # Copyright (C) 2009 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.
 #
+# João Victor Duarte Martins <jvdm@sdf.lonestar.org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.2.4pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\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"
@@ -17,135 +17,132 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Ir para o Diretório"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Impossível mover-se fora de %s no modo restrito"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro na leitura %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 msgid "Can't move up a directory"
 msgstr "Impossí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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(dir acima)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr "[Retroceder]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 msgid "Search Wrapped"
 msgstr "Busca 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Está é única ocorrência"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Nenhum padrão de busca atualmente"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Erro ao escrever o arquivo reserva %s : %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Erro ao escrever o arquivo reserva %s : %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Erro ao escrever o arquivo reserva %s : %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossível inserir a linha de fora do %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Não há mais nenhum buffer de arquivos aberto"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Alternado para %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Novo Buffer"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -160,14 +157,14 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato DOS e Mac - Atenção: Sem permissão "
 "de escrita)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -180,14 +177,14 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato Mac - Atenção: Sem permissão de "
 "escrita)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -200,99 +197,99 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato DOS - Atenção: Sem permissão de "
 "escrita)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu linha lida"
 msgstr[1] "%lu linhas lidas"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Lendo o arquivo"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Novo Arquivo"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" não encontrado"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é um diretório"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é um arquivo dispositivo"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando para execução no novo buffer [de %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando para execução [de %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Arquivo para inserção no novo buffer [de %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Arquivo para inserção [de %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla ilegal em modo não-multibuffer"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossível escrever fora de %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erro ao escrever o arquivo reserva %s : %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Muitos arquivos reserva?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro ao escrever %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro ao escrever o arquivo temporário: %s"
@@ -348,17 +345,17 @@ msgstr "Arquivo já existe, SOBRESCREVER ?"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Salvar o Arquivo com um NOME DIFERENTE ?"
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(mais)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -367,28 +364,28 @@ msgstr ""
 "\n"
 "Pressione Enter para continuar a inicialização do nano\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -396,648 +393,681 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Substituir"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Sem Substituição"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Sens de Caixa"
+msgid "Exit"
+msgstr "Sair"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "[Contrário]"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Expressão Regular"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "RegisAnt"
+msgid "Close"
+msgstr "Fechar"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "PróxRegis"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Colar Txt"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Ir para o Próximo"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "DesJustifi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "OndeTá o Próx."
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Primeira Linha"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Última Linha"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Para Arquivos"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Anexar"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Pre-anexar"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Arquivo Reserva"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Executar Comando"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Ir P/ o Dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Ajuda"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Sair"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Onde está?"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Pág Anter"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Próx Pág"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Prim Linha"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Substituir"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Últ Linha"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Ir P/ Linha"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Suspender"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Linha Ant"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Ini de Par"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Prox Linha"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Fim de Par"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Ler o Arq"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "JstifiCmpl"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Atualiz"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Inserir Arq"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Ir P/ Linha"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Cancelar a função atual"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Abrir texto de ajuda"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Fechar o buffer do arquivo atual / Sair do nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Sair do nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Escrever o arquivo atual no disco"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Inserir outro arquivo no atual"
 
 # 'string' precisa de um referência direta no português
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Procurar por uma string ou um expressão regular"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Ir para a tela anterior"
+# 'string' precisa de um referência direta no português
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Procurar por uma string ou um expressão regular"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Ir para a próxima tela"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Ir para a próxima tela"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Recortar a linha atual e guardá-la no buffer-de-transferência"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Colar do buffer-de-transferência para a linha atual"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Mostrar a posição do cursor"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Chamar pelo verificador ortográfico, se disponível"
 
 # 'string' precisa de um referência direta no português
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Substituir uma string ou expressão regular"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Ir para linha e coluna número"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Marcar o texto na posicação do cursor"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Repetir a última busca"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copiar a linha atual e guardá-la no buffer-de-transferência"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Avançar o recuo da linha atual"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Recuar a linha atual"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Desfazer a última operação"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Refazer a última operação desfeita"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Avançar em um caractere"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Voltar em um caractere"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Avançar em uma palavra"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Retroceder em uma palavra"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Ir para a última linha"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Ir para a próxima linha"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Ir para o início da linha atual"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Ir para o fim da linha atual"
 
-#: src/global.c:606
+#: src/global.c:556
 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"
 
-#: src/global.c:608
+#: src/global.c:558
 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"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Ir para a primeira linha do arquivo"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Ir para a última linha do arquivo"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Ir para o fechamento do parenteses/colchetes/chaves"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rolar uma linha acima sem o cursor"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rolar uma linha abaixo sem o cursor"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Trocar para o buffer de arquivo anterior"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Trocar para o próximo buffer de arquivo"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserir caractere(s) literalmente"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Inserir um caractere tabular na posição do cursor"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Inserir quebra de linha na posição do cursor"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Apagar o caractere sob o cursor"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Apagar o caractere a esquerda do cursor"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Recortar do cursor até o fim da linha"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Justificar o arquivo inteiro"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Contar o número de palavras, linhas e caracteres"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Atualizar (re-desenhar) a tela atual"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspender o editor (se a suspensão estiver habilitada)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Ativar sensibilidade de caixa na busca"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Inverter a direção da busca"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Ativar o uso de expressões regulares"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Lembrar a última string de busca/substituição"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Lembrar a ultima string de busca/substituição"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Ir para o navegador de arquivo"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Ativar o uso do formato DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Ativar o uso do formato Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Ativar ajutamento"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Ativar pré-ajuntamento"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Ativar cópia de segurança do arquivo original"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Executar um comando externo"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Ativar o uso de um novo buffer"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Sair do navegador de arquivos"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Ir para o primeiro arquivo na lista"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Ir para o último arquivo na lista"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Ir para o próximo arquivo na lista"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Ir para o prévio arquivo na lista"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Ir para o próximo arquivo na lista"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Ir para o diretório"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Fechar"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Chamar pelo verificador ortográfico, se disponível"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Ir para a última linha"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Ir para a próxima linha"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Ajuda"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Gravar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Ir P/ o Dir"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Recort Txt"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Justificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Ler o Arq"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Para Spell"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Recort Txt"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Ir P/ Linha"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "DesJustifi"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Sens de Caixa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Colar Txt"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Expressão Regular"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "[Contrário]"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Sem Substituição"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Pos Atual"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Para Spell"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Pág Anter"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Próx Pág"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Prim Linha"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Últ Linha"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Não é um parenteses"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Marcar Txt"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Copiar Txt"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Alinhar Txt"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Desalinhar Txt"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Avançar"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Voltar"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Prx Palvr"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Avançar"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Palvr Ant"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Linha Ant"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Prox Linha"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Prx Palvr"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Local"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Fim"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Encontrar Outro Parenteses"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Ini de Par"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Fim de Par"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Rolar para cima"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Rolar para baixo"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Próximo Arquivo"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Arquivo Anterior"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Entrada Literal"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Tecla BACKSPACE"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "RecortarAtéOFim"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Contagem de palavras"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "RegisAnt"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "PróxRegis"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Ir para o Próximo"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Anexar"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Pre-anexar"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Arquivo Reserva"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Executar Comando"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Para Arquivos"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Primeira Linha"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Última Linha"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Linha Ant"
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Prox Linha"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Modo Ajuda"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Mostra da posição do cursor constante"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Uso de mais de uma linha para edição"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Rolagem Macia"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Não ajuste linhas compridas"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Mostrar espaços-vazios"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Marcação Colorida de Sintaxe"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Tecla HOME inteligente"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Indentação Automática"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Recortar até o fim"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Ajuste de linhas longas"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Não ajuste linhas compridas"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversão de tabulações para espaços"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Reservar os Arquivos"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Múltiplos buffers de arquivos"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Suporte ao Rato"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Sem conversões do formato DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Suspenção"
 
-# Soft line wrapping?
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Ajuste de linhas longas"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1060,7 +1090,7 @@ msgstr ""
 "busca. Pressionando Enter sem inserir nenhum texto irá fazer a busca "
 "anterior.   "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1074,7 +1104,7 @@ msgstr ""
 "As seguintes teclas de função vão estar disponíveis no modo de Busca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1094,7 +1124,7 @@ msgstr ""
 " As seguintes teclas de funções estão disponíveis no modo Ir Para Linha:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1117,7 +1147,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:253
 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"
@@ -1134,7 +1164,7 @@ msgstr ""
 
 # Talvez a tradução de 'prompted' não está correta.
 # Foi notificado na lista do ldp-br.
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1163,7 +1193,7 @@ msgstr ""
 "Arquivo:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1189,7 +1219,7 @@ msgstr ""
 "\n"
 " As seguintes teclas de funções estão disponíveis no Navegador de Arquivos:\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1214,7 +1244,7 @@ msgstr ""
 "com esta string anterior.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1222,7 +1252,7 @@ msgstr ""
 " As seguintes teclas de função estão disponíveis no modo de Navegação de "
 "Busca:\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1246,7 +1276,7 @@ msgstr ""
 "Navegador de Ida à Diretórios:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1271,7 +1301,7 @@ msgstr ""
 "Ortografia:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1292,7 +1322,7 @@ msgstr ""
 " As seguintes teclas de funções estão disponíveis neste modo:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1312,7 +1342,7 @@ msgstr ""
 "principal de edição exibindo o arquivo que está sendo editado.  A linha de "
 "estado é a terceira, mostrando mensagens importantes.  "
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1331,7 +1361,7 @@ msgstr ""
 "executadas com as teclas Esc, Alt ou Meta, dependendo da sua configuração de "
 "teclado.   "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1345,15 +1375,15 @@ msgstr ""
 "Teclas alternativas são mostradas em parenteses:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "habilitado/desabilitado"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Tecla ilegal no modo de visualização"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1362,7 +1392,7 @@ msgstr ""
 "\n"
 "Buffer escrito em %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1371,7 +1401,7 @@ msgstr ""
 "\n"
 "Buffer não foi escrito em %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1380,11 +1410,11 @@ msgstr ""
 "\n"
 "Buffer não foi escrito: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Tamanho da tela muito pequeno para o nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1393,265 +1423,270 @@ msgstr ""
 "Uso: nano [OPÇÕES] [[+LINHA, COLUNA] ARQUIVO]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opção\t\tOpção Longa GNU\t\tSignificado\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opção\t\tSignificado\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Mostrar essa mensagem"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+LINHA,COLUNA"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Começar na linha numero LINHA, coluna COLUNA"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Habilitar tecla <HOME> inteligente"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Salvar cópias reserva de arquivos que existem"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-E <dir>"
 
 # uma alternativa melhor para backup aqui?
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Diretório para salvar arquivos únicos de reserva"
 
 # É necessário melhorar aqui.
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Usa negrito ao invés de texto em video inverso"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Converte tabulações digitadas em espaços"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Permitir múltiplos buffers de arquivos"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Gravar e ler histórico das strings de busca/substituição"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Não olhar o arquivo nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Corrigir a confusão com o teclado numérico"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Não adicionar retorno de carro nos finais das linhas"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Não converter arquivos do formato DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Utiliza um ou duas linhas para edição"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Inserir um caractere tabular na posição do cursor"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Citando strings"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Modo restrito"
 
 # revisar: meia tela
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Rolar linhas ao invés de meia tela"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Modificar o tamanho da tabulação para #cols"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Remoção rápida da barra de estado"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Imprime informação de versão e fecha"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Detecção mais precisa dos limites das palavras"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax <str>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Definição de sintaxe para inserção de cores"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Mostrar a posição do cursos constantemente"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Corrige o problema de confusão entre a tecla Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Abrir texto de ajuda"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Indentar automaticamente nova linhas"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Recortar do cursor até o fim da linha"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Não seguir atalhos simbólicos, sobrescrever"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Habilitar o uso do mouse"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Indicar o diretório de trabalho"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preservar as teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 "Ignorar silenciosamente problemas na inicialização como erros no arquivo rc"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#colun>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#colun>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Modificar o ponto de agrupamento na coluna #cols"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Habilitar um verificador ortográfico alternativo"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Salvar automaticamente ao sair, não perguntar"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Permitir desfazer genérico [EXPERIMENTAL]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Modo Visualização (somente leitura)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Não ajuste linhas compridas"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Não as duas linhas de ajuda"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Permitir suspenção"
 
 # Soft line wrapping?
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Habilita ajuste de linhas longas"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorado, para compatibilidade com o Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr "GNU nano versão %s (compilado %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1660,166 +1695,172 @@ msgstr ""
 "\n"
 " Opções de compilação:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Desculpe, suporte para essa função foi desabilitado"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salvar o buffer modificado (RESPONDER \"Não\" IR� DESTRUIR MODIFICAÇÕES) ?"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Não foi possível reabrir a stdin do teclado, desculpe\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recebi SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilize \"fg\" para retornar ao nano\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "desabilitado"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Comando desconhecido"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorado, mumble mumble."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorado, mumble mumble"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Tamanho \"%s\" de tabulação é inválido"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Pedido de tamanho \"%s\" inválido"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Ss"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Sim"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Todos"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Não"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erro no %s na linha %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumento '%s' possui inderterminado \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expressão regular errônea \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Falta o nome da sintaxe"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" é reservada"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "A sintaxe padrão não deve conter extensões"
 
-# TODO analisar no programa se isso faz sentido
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Impossível adicionar um cabeçalho regex sem um comando de sintaxe"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Falta a expressão regular"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Falta o nome da chave"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "vínculos de teclas devem começar com \"^\", \"M\" ou \"F\""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, fuzzy
+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:504 src/rcfile.c:596
-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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Não foi possível mapear o nome \"%s\" com uma função"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Não foi possível mapear o nome \"%s\" com um menu"
 
 # TODO keystr pode ser traduzido?
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Desculpe, keystr \"%s\" é um vínculo ilegal"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Erro na leitura %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1834,97 +1875,125 @@ msgstr ""
 "\"magente\" (maguenta) e \"black\" (preto), com o prefixo \n"
 "opcional \"bright\" (claro) para cores de fundo."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Impossível adicionar um diretiva de cor sem um diretiva de sintaxe"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Falta o nome da cor"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Cor do fundo \"%s\" não pode ser clara"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Falta a expressão regular"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\\\"start=\\\" precisa de um correspondende \\\"end=\\\""
 
+#: src/rcfile.c:791
+#, 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:890
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Impossível adicionar um cabeçalho regex sem um comando de sintaxe"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+# TODO analisar no programa se isso faz sentido
+#: src/rcfile.c:875
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Impossível adicionar um cabeçalho regex sem um comando de sintaxe"
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Falta a expressão regular"
+
+# TODO analisar no programa se isso faz sentido
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Impossível adicionar um cabeçalho regex sem um comando de sintaxe"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Falta o nome da cor"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Erro fatal: nenhuma tecla mapeada para a função \"%s\""
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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 ""
 "Saindo.  Por favor utilize o nano com a opção -I se for preciso para\n"
 "ajustar as configurações do seu nanorc\n"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Não foi possível mapear o nome \"%s\" com um menu"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Não é permitido o comando \"%s\" em arquivo incluido"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxe \"%s\" não possui comandos de cor"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" desconhecido"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Falta sinalizador"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Falta o nome da cor"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opção \"%s\" precisa de um argumento"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Opção não é uma string multibyte válida"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Caracteres imprimíveis são necessário"
 
 # Tradução para single-column?
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "É necessário dois caracteres single-column"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Impossível desativar sinalizador \"%s\""
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Sinalizador \"%s\" desconhecido"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Impossível encontrar o meu diretório pessoal!  Putz!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1938,42 +2007,46 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\\\"%.*s%s\\\" não foi encontrado"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (para subtituir) na seleção"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (para substituir) na seleção"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Substituir esse termo?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Subtituir por"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Insira o número da linha, número da coluna"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Linha ou número de coluna inválido"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Não é um parenteses"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Nenhum parenteses encontrado"
 
@@ -1986,226 +2059,301 @@ msgid "Mark Unset"
 msgstr "Marcação desativada"
 
 # revisão: como traduzir undo buffer? 'desfazer' como um adjetivo?
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Não há nada para desfazer!"
 
-#: 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:440 src/text.c:578
+#, fuzzy, c-format
+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"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:451 src/text.c:588
 msgid "text add"
 msgstr "adic txt"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "remover txt"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "quebra de linha"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "juntar linha"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "recortar txt"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "colar txt"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "quebra de linha"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "inserir txt"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 msgid "text replace"
 msgstr "substituir txt"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Ação desfeita (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, fuzzy
+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 "
+"Erro interno: não consegui configurar colagem.  Por favor salve o seu "
 "trabalho"
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ação repetida (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Impossível fazer o duto"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Impossível criar o duto"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Impossível bifurcar"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+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"
 
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho"
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "String de citação ruim: %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "É possível DesJustificar!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Editar uma substituição"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Impossível criar o duto"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Criando a lista de palavra com erros ortográficos, por favor espere..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Impossível descobrir o tamanho do buffer do duto"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Erro ao clamar o \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ao clamar o \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Erro ao clamar o \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Checagem ortográfica finalizada"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ao clamar o \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Chamar pelo verificador ortográfico, se disponível"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Falha na checagem ortográfica: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Falha na checagem ortográfica: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Não adicionar retorno de carro nos finais das linhas"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Mostrar essa mensagem"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Mostrar essa mensagem"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPalav: %lu  Linhs: %ld  Carac: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "Na seleção:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Entrada Literal"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Olhar"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Arquivo:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versão"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Trazido para você por:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Agradecimentos especiais para:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "A Fundação Software Livre"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Para o ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "e qualquer outro que nós esquecemos..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Obrigado por usar o nano!"
 
 #~ 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 Parenteses"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ajuste de linhas longas"
+
+# Soft line wrapping?
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ajuste de linhas longas"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorado, para compatibilidade com o Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "É preciso especificar um menu para o vínculo da tecla (ou \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Falta sinalizador"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Erro interno: Falha na configuração de restauração.  Por favor salve o "
+#~ "seu trabalho"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Impossível fazer o duto"
diff --git a/po/ro.gmo b/po/ro.gmo
index 45b33ded..d210ff6c 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 97db9ce2..1b25fc20 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,14 +1,13 @@
 # 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.
-#
 #
+# Laurentiu Buzdugan <lbuz@rolix.org>, 2003, 2004, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.3.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
 "PO-Revision-Date: 2005-04-18 07:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -18,135 +17,132 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Mergi la Director"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Am renunþat"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Eroare citind %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 msgid "Can't move up a directory"
 msgstr "Nu pot schimba în sus un director"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Înapoi]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 msgid "Search Wrapped"
 msgstr "Cãutare 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Aceasta este singura apariþie"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Nici un pattern de cãutare curent"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Nu am putut crea fiºier temporar: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Eroare la scrierea fiºierului temporar: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Eroare la scrierea fiºierului temporar: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Eroare citind %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nu pot insera fiºier din afara lui %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Nici un alt bufere deschis"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Am schimbat la %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Bufer nou"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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)"
 
-#: src/files.c:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -157,14 +153,14 @@ msgid_plural ""
 msgstr[0] "Am citit %lu linie (convertitã din formatul DOS ºi Mac)"
 msgstr[1] "Am citit %lu linii (convertite din formatul DOS ºi Mac)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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)"
 
-#: src/files.c:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -173,14 +169,14 @@ msgid_plural ""
 msgstr[0] "Am citit %lu linie (convertitã din formatul Mac)"
 msgstr[1] "Am citit %lu linii (convertite din formatul Mac)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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)"
 
-#: src/files.c:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -189,101 +185,101 @@ msgid_plural ""
 msgstr[0] "Am citit %lu linie (convertitã din formatul DOS)"
 msgstr[1] "Am citit %lu linii (convertite din formatul DOS)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Am citit %lu linie"
 msgstr[1] "Am citit %lu linii"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Citesc Fiºier"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Fiºier nou"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nu a fost gãsit"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" este un director"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Fiºierul \"%s\" este un fiºier dispozitiv (device)"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comandã de executat în bufer nou [din %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comandã de executat [din %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fiºier de inserat în bufer nou [din %s]"
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fiºier de inserat [din %s]"
 
-#: src/files.c:1291
+#: src/files.c:1289
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tastã ilegalã în modul non-multibufer"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nu pot scrie în afarã de %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Eroare la scrierea fiºierului temporar: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 #, fuzzy
 msgid "Too many backup files?"
 msgstr "Fiºiere copie de siguranþã (backup)"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Eroare scriind %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Eroare la scrierea fiºierului temporar: %s"
@@ -339,15 +335,15 @@ msgstr "Fiºierul existã, SUPRASCRIE ? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Salveazã fiºierul sun UN NUME DIFERIT ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(suplimentar)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -356,28 +352,28 @@ msgstr ""
 "\n"
 "Apãsaþi Return/Enter pentru a continua lansarea nano\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -385,695 +381,720 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Renunþã"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Înlocuieºte"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Nici o înlocuire"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Cu majuscule semnificative"
+msgid "Exit"
+msgstr "Terminã"
 
 #: src/global.c:472
-#, fuzzy
-msgid "Backwards"
-msgstr " [Înapoi]"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Regexp"
+msgid "Close"
+msgstr "Închide"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
+#: src/global.c:473
 #, fuzzy
-msgid "PrevHstory"
-msgstr "Istorie"
+msgid "Uncut Text"
+msgstr "Anuleazã tãiere text"
 
-#: src/global.c:503
+#: src/global.c:475
 #, fuzzy
-msgid "NextHstory"
-msgstr "Istorie"
-
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Du-te la text"
+msgid "Unjustify"
+msgstr "De-aliniazã"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Unde este Urmãtor"
 
-#: src/global.c:508
-#, fuzzy
-msgid "First File"
-msgstr "Prima linie"
-
-#: src/global.c:509
-#, fuzzy
-msgid "Last File"
-msgstr "Ultima linie"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "În fiºiere"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Adaugã"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Pre-adaugã"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Fiºier copie de siguranþã (backup)"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Executã comandã"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Du-te la Director"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Cere ajutor"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Terminã"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Unde este"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Pagina precedentã"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Pagina urmãtoare"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Prima linie"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Înlocuieºte"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Ultima linie"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Du-te la linia"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Suspendã"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Linia precedentã"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Început Par"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Linia urmãtoare"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Sfârºit Par"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Citeºte fiºier"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "AliniazãTotal"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Împrospãteazã"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Insereazã fiºier"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Du-te la linia"
-
-#: src/global.c:551
+#. 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:501
 msgid "Justify the current paragraph"
 msgstr "Aliniazã paragraful curent"
 
-#. 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Anuleazã funcþia curentã"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:507
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Închide fiºierul încãrcat curent/Ieºi din nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Ieºire din nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Scrie fiºierul curent pe disc"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Insereazã alt fiºier în fiºierul curent"
 
-#: src/global.c:570
+#: src/global.c:517
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Foloseºte expresii regulare (regular expressions)"
 
-#: src/global.c:571
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Du-te la ecranul precedent"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Du-te la ecraul urmãtor"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Taie linia curentã ºi pãstreazã-o în cutbufer"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Copiazã din cutbufer în linia curentã"
 
-#: src/global.c:578
+#: src/global.c:528
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Aratã poziþia cursorului"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Invocã corectorul ortografic, dacã e disponibil"
 
-#: src/global.c:582
+#: src/global.c:532
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Foloseºte expresii regulare (regular expressions)"
 
-#: src/global.c:583
+#: src/global.c:533
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Du-te la o anumitã linie"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Marcheazã textul la poziþia curentã a cursorului"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Repetã ultima cãutare"
 
-#: src/global.c:588
+#: src/global.c:538
 #, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Taie linia curentã ºi pãstreazã-o în cutbufer"
 
-#: src/global.c:589
+#: src/global.c:539
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Adaugã la fiºierul curent"
 
-#: src/global.c:590
+#: src/global.c:540
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Adaugã la fiºierul curent"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:544
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Du-te înainte un caracter"
 
-#: src/global.c:595
+#: src/global.c:545
 #, fuzzy
 msgid "Go back one character"
 msgstr "Du-te înapoi un caracter"
 
-#: src/global.c:597
+#: src/global.c:547
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Du-te înainte un cuvânt"
 
-#: src/global.c:598
+#: src/global.c:548
 #, fuzzy
 msgid "Go back one word"
 msgstr "Du-te înapoi un cuvânt"
 
-#: src/global.c:600
+#: src/global.c:550
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Du-te la linia precedentã"
 
-#: src/global.c:601
+#: src/global.c:551
 #, fuzzy
 msgid "Go to next line"
 msgstr "Du-te la linia urmãtoare"
 
-#: src/global.c:602
+#: src/global.c:552
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Du-te la începutul liniei"
 
-#: src/global.c:603
+#: src/global.c:553
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Du-te la sfârºitul liniei"
 
-#: src/global.c:606
+#: src/global.c:556
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Du-te la începutul paragrafului curent"
 
-#: src/global.c:608
+#: src/global.c:558
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Du-te la sfârºitul paragrafului curent"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Du-te la prima linie din fiºier"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Du-te la ultima linie din fiºier"
 
-#: src/global.c:615
+#: src/global.c:563
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Nici o parantezã pereche"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Du-te la buferul de fiºier precedent"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Schimbã la urmãtorul bufer de fiºier"
 
-#: src/global.c:628
+#: src/global.c:573
 #, fuzzy
 msgid "Insert the next keystroke verbatim"
 msgstr "Insereazã caracter(e) identic"
 
-#: src/global.c:630
+#: src/global.c:574
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Insereazã un caracter tab la poziþia curentã a cursorului"
 
-#: src/global.c:632
+#: src/global.c:575
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr ""
 "Insereazã un caracter \"carriage return\" la poziþia curentã a cursorului"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "ªterge caracterul de sub cursor"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "ªterge caracterul de la stânga cursorului"
 
-#: src/global.c:639
+#: src/global.c:581
 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"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Aliniazã întregul fiºier"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Reîmprospãteazã zona de ecran curentã"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:656
+#: src/global.c:598
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Aratã poziþia cursorului"
 
-#: src/global.c:660
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Foloseºte expresii regulare (regular expressions)"
 
-#: src/global.c:664
+#: src/global.c:606
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Editeazã ºirurile precedente de cãutare/înlocuire"
 
-#: src/global.c:666
+#: src/global.c:608
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Editeazã ºirurile precedente de cãutare/înlocuire"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Du-te la navigatorul de fiºiere"
 
-#: src/global.c:672
+#: src/global.c:614
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Scrie fiºierul ieºire în format DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Scrie fiºierul ieºire în format Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Executã comandã externã"
 
-#: src/global.c:684
+#: src/global.c:622
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Nu am putut obþine dimensiune bufer pentru pipe"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Ieºi din navigatorul de fiºiere"
 
-#: src/global.c:689
+#: src/global.c:626
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Du-te la prima linie din fiºier"
 
-#: src/global.c:691
+#: src/global.c:627
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Du-te la ultima linie din fiºier"
 
-#: src/global.c:692
+#: src/global.c:628
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Du-te la linia precedentã"
+
+#: src/global.c:629
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Du-te la linia urmãtoare"
 
-#: src/global.c:693
+#: src/global.c:630
+msgid "Go to directory"
+msgstr "Du-te la director"
+
+#: src/global.c:633
 #, fuzzy
-msgid "Go to the previous file in the list"
+msgid "Invoke the linter, if available"
+msgstr "Invocã corectorul ortografic, dacã e disponibil"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
 msgstr "Du-te la linia precedentã"
 
-#: src/global.c:694
-msgid "Go to directory"
-msgstr "Du-te la director"
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Du-te la linia urmãtoare"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Închide"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Cere ajutor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Renunþã"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Scrie ieºire"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Du-te la Director"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Taie text"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Aliniazã"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Citeºte fiºier"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "De ortografiat"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Taie text"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Du-te la linia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "De-aliniazã"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Cu majuscule semnificative"
+
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Regexp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
+#: src/global.c:746
 #, fuzzy
-msgid "UnCut Text"
-msgstr "Anuleazã tãiere text"
+msgid "Backwards"
+msgstr " [Înapoi]"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Nici o înlocuire"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Poz. Crt."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "De ortografiat"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Pagina precedentã"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Pagina urmãtoare"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Prima linie"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Ultima linie"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Nu este o parantezã"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Marcheazã text"
 
-#: src/global.c:828
+#: src/global.c:791
 #, fuzzy
 msgid "Copy Text"
 msgstr "Taie text"
 
-#: src/global.c:831
+#: src/global.c:794
 #, fuzzy
 msgid "Indent Text"
 msgstr "Taie text"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Înainte"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Înapoi"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Cuvânt urmãtor"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Înainte"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Cuvânt precedent"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Linia precedentã"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Linia urmãtoare"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Cuvânt urmãtor"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Acasã"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Sfârºit"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Gãseºte cealaltã parantezã"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Început Par"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Sfârºit Par"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Fiºier precedent"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Fiºier urmãtor"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Intrare identicã"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "ªterge"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "ªterge înapoi (backspace)"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "TaiePânãLaSfârºit"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Suspendã"
+
+#: src/global.c:903
+#, fuzzy
+msgid "PrevHstory"
+msgstr "Istorie"
+
+#: src/global.c:907
+#, fuzzy
+msgid "NextHstory"
+msgstr "Istorie"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Du-te la text"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Adaugã"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Pre-adaugã"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Fiºier copie de siguranþã (backup)"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Executã comandã"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "În fiºiere"
+
+#: src/global.c:958
+#, fuzzy
+msgid "First File"
+msgstr "Prima linie"
+
+#: src/global.c:960
+#, fuzzy
+msgid "Last File"
+msgstr "Ultima linie"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Linia precedentã"
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Linia urmãtoare"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Mod Ajutor"
 
-#: src/global.c:1301
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Poziþie cursor neschimbatã"
 
-#: src/global.c:1303
+#: src/global.c:1219
 #, fuzzy
 msgid "Use of one more line for editing"
 msgstr "Foloseºte mai mult spaþiu pentru editare"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Rulare (scrolling) finã"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Nu sparge (wrap) liniile lungi"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Afiºeazã spaþiu-alb"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Evidenþiere sintaxã color"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Tastã acasã inteligentã"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Auto paragraf"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Taie pânã la sfârºit"
 
-#: src/global.c:1317
+#: src/global.c:1235
 #, fuzzy
-msgid "Long line wrapping"
-msgstr "Trecere automatã (wrap) la linie nouã"
+msgid "Hard wrapping of overlong lines"
+msgstr "Nu sparge (wrap) liniile lungi"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Fiºiere copie de siguranþã (backup)"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Multiple bufere fiºiere"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Suport maus"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Nici o conversie de format DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 #, fuzzy
 msgid "Suspension"
 msgstr "Suspendã"
 
-#: src/global.c:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Trecere automatã (wrap) la linie nouã"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1095,7 +1116,7 @@ msgstr ""
 " ª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:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1108,7 +1129,7 @@ msgstr ""
 "\n"
 "Urmãtoarele taste de funcþii sunt disponibile în modul \"Cautã\":\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1127,7 +1148,7 @@ msgstr ""
 "\n"
 " Urmãtoarele taste de funcþii sunt disponibile în modul \"Du-te la linia\":\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1150,7 +1171,7 @@ msgstr ""
 "acesta sã fie încãrcat într-un alt bufer (folosiþi Meta-< ºi > pentru a "
 "comuta între bufere). "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1164,7 +1185,7 @@ msgstr ""
 " Urmãtoarele taste de funcþii sunt disponibile în modul \"Insereazã fiºier"
 "\":\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1192,7 +1213,7 @@ msgstr ""
 " Urmãtoarele taste de funcþii sunt disponibile în modul \"Scrie fiºier\"\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1217,7 +1238,7 @@ msgstr ""
 " Urmãtoarele taste de funcþii sunt disponibile în \"Navigator fiºiere\":\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1241,13 +1262,13 @@ msgstr ""
 " ª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:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1270,7 +1291,7 @@ msgstr ""
 "Directorul\":\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1296,7 +1317,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1317,7 +1338,7 @@ msgstr ""
 " Urmãtoarele taste sunt disponibile în acest mod:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1342,7 +1363,7 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:366
+#: src/help.c:350
 #, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
@@ -1359,7 +1380,7 @@ msgstr ""
 "simbolul Meta (M) ºi pot fi introduse folosind oricare din tastele Esc, Alt "
 "sau Meta, în funcþie de setarea tastaturii d-voastrã.  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1374,16 +1395,16 @@ msgstr ""
 "paranteze:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "activeazã/deactiveazã"
 
-#: src/nano.c:588
+#: src/nano.c:597
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "Tastã ilegalã în modul VIZUALIZARE"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1392,7 +1413,7 @@ msgstr ""
 "\n"
 "Bufer scris în %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1401,7 +1422,7 @@ msgstr ""
 "\n"
 "Bufer scris în %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1410,294 +1431,297 @@ msgstr ""
 "\n"
 "Bufer scris în %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Dimensiunea ferestrei prea micã pentru nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opþiune\t\tOpþiune lungã\t\tÎnþeles\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opþiune\t\tÎnþeles\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Aratã acest mesaj"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:831
+#. 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:843
 #, fuzzy
 msgid "Start at line LINE, column COLUMN"
 msgstr "Începe la linia cu numãrul LINIE"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Permite tasta acasã inteligentã"
 
-#: src/nano.c:834
+#: src/nano.c:846
 #, fuzzy
 msgid "Save backups of existing files"
 msgstr "Creazã copii de siguranþã (backup) la salvare"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:847
 #, fuzzy
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=[dir]"
 
-#: src/nano.c:836
+#: src/nano.c:848
 #, fuzzy
 msgid "Directory for saving unique backup files"
 msgstr "Director pentru scrierea fiºierelor copie-de-siguranþã (backup)"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Activeazã bufere fiºier multiple"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Scrie în jurnal ºi citeºte istoria ºirurilor de cãutare/înlocuire"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Nu te uita la fiºierele nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 #, fuzzy
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Reparã confuzia cu tastele Backspace/Delete"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Nu converti fiºierele din formatul DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 #, fuzzy
 msgid "Use one more line for editing"
 msgstr "Foloseºte mai mult spaþiu pentru editare"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Marcheazã textul la poziþia curentã a cursorului"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:883
 #, fuzzy
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[ºir]"
 
-#: src/nano.c:872
+#: src/nano.c:884
 #, fuzzy
 msgid "Quoting string"
 msgstr "ªir citate. implicit \"> \""
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Mod restricþionat"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 #, fuzzy
 msgid "-T <#cols>"
 msgstr "-T [#coloane]"
 
-#: src/nano.c:879
+#: src/nano.c:891
 #, fuzzy
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[#coloane]"
 
-#: src/nano.c:880
+#: src/nano.c:892
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr "Seteazã lãþimea unui tab în coloane ca #coloane"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Afiºeazã informaþii despre versiune ºi terminã"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 #, fuzzy
 msgid "--syntax=<str>"
 msgstr "--syntax=[ºir]"
 
-#: src/nano.c:892
+#: src/nano.c:904
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Definiþie sintaxã de folosit"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Aratã continuu poziþia cursorului"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Reparã confuzia cu tastele Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Aratã acest mesaj"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Indent-eazã automatic liniile noi"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Taie de la cursor la sfârºitul liniei"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Nu urma link-urile simbolice, scrie peste"
 
-#: src/nano.c:905
+#: src/nano.c:918
 #, fuzzy
 msgid "Enable the use of the mouse"
 msgstr "Permite maus"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:908
+#: src/nano.c:922
 #, fuzzy
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[dir]"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Seteazã directorul de operare"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conservã tastele XON (^Q) ºi XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 #, fuzzy
 msgid "-r <#cols>"
 msgstr "-r [#coloane]"
 
-#: src/nano.c:916
+#: src/nano.c:930
 #, fuzzy
 msgid "--fill=<#cols>"
 msgstr "--fill=[#coloane]"
 
-#: src/nano.c:917
-#, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "Seteazã lãþimea unui tab în coloane ca #coloane"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
+msgstr ""
 
-#: src/nano.c:920
+#: src/nano.c:934
 #, fuzzy
 msgid "-s <prog>"
 msgstr "-s [prog]"
 
-#: src/nano.c:920
+#: src/nano.c:934
 #, fuzzy
 msgid "--speller=<prog>"
 msgstr "--speller=[prog]"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Permite corector ortografic alternativ"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Salveazã automat la ieºire, nu întreba"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr "Mod vedere (numai citire)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Nu sparge (wrap) liniile lungi"
 
-#: src/nano.c:933
+#: src/nano.c:947
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr "Nu arãta fereastra de ajutor"
 
-#: src/nano.c:934
+#: src/nano.c:948
 #, fuzzy
 msgid "Enable suspension"
 msgstr "Permite suspendarea"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorat, pentru compatibilitate cu Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano versiunea %s (compilat %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1706,168 +1730,173 @@ msgstr ""
 "\n"
 " Opþiuni compilare:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Ne pare rãu, suportul pentru aceastã funcþie a fost deactivat"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Salvez buferul modificat (RÃSPUNSUL \"Nu\" VA DISTRUGE SCHIMBÃRILE) ?"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Am recepþionat SIGHUP sau SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Folosiþi \"fg\" pentru a vã întoarce la nano"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "activat"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "deactivat"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 #, fuzzy
 msgid "Unknown Command"
 msgstr "Indicator (flag) necunoscut %s"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorat, murmur, murmur."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorat, murmur, murmur."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Dimensiune tab cerutã %s invalidã"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Dimensiune umplere cerutã %s invalidã"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Tot"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nu"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Eroare în %s pe linia %d: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentul %s are \" neterminat"
 
 #
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "ªirurile regex trebuie sã înceapã ºi sfârºeascã cu un caracter \""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex incorect \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Lipseºte nume sintaxã"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Lipseºte nume culoare"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Missing key name"
 msgstr "Lipseºte nume sintaxã"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:512
+#: src/rcfile.c:467
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Nu am putut invoca \"%s\""
+#: src/rcfile.c:474
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
 
-#: src/rcfile.c:540
+#: src/rcfile.c:497
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Eroare citind %s: %s"
+
+#: src/rcfile.c:626
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1882,96 +1911,122 @@ msgstr ""
 "\"black\"(negru), cu prefixul opþional \"bright\"(strãlucitor) \n"
 "pentru culorile de scriere."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 #, fuzzy
 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ã"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Lipseºte nume culoare"
 
-#: src/rcfile.c:758
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Culoarea de fundal %s nu poate fi strãlucitoare"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" necesitã un \"end=\" corespunzãtor"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, fuzzy, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Culoarea de fundal %s nu poate fi strãlucitoare"
+
+#: src/rcfile.c:819
 #, fuzzy
 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ã"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Lipseºte nume culoare"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Lipseºte nume culoare"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comanda %s nu a fost înþeleasã"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Lipseºte indicator (flag)"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Lipseºte nume culoare"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opþiunea %s necesitã un argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 #, fuzzy
 msgid "Non-blank characters required"
 msgstr "Sunt necesare douã caractere non-tab ºi non-spaþiu"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Sunt necesare douã caractere de o singurã coloanã"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
+msgid "Cannot unset option \"%s\""
 msgstr "Nu pot de-seta indicatorul (flag) %s"
 
-#: src/rcfile.c:1212
+#: src/rcfile.c:1275
 #, fuzzy, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr "Indicator (flag) necunoscut %s"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nu pot gãsi directorul meu home!  Uãu!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1986,43 +2041,47 @@ msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" nu a fost gãsit"
 
 #
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (de înlocuit) în selecþie"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (de înlocuit)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Înlocuieºte în acest caz?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Înlocuieºte cu"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, fuzzy, 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"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1047
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Introduceþi numãrul liniei"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Nu este o parantezã"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Nici o parantezã pereche"
 
@@ -2035,227 +2094,263 @@ msgstr "Marcaj Setare"
 msgid "Mark Unset"
 msgstr "Marcaj DEsetare"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 #, fuzzy
 msgid "text delete"
 msgstr "Fiºier urmãtor"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 #, fuzzy
 msgid "line wrap"
 msgstr "Trecere automatã (wrap) la linie nouã"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 #, fuzzy
 msgid "text insert"
 msgstr "Linia urmãtoare"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 #, fuzzy
 msgid "text replace"
 msgstr " (de înlocuit)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Nu am putut pipe"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Nu am putut crea pipe"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Nu am putut fork"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "ªir greºit pentru ghilimele %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Nu pot De-Alinia!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Editeazã o înlocuire"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Nu am putut crea pipe"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creez listã cuvinte ortografiate greºit, vã rog aºteptaþi..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Nu am putut obþine dimensiune bufer pentru pipe"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Eroare invocare \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Eroare invocare \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Eroare invocare \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Am terminat verificarea ortografiei"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Eroare invocare \"spell\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Invocã corectorul ortografic, dacã e disponibil"
+
+#: src/text.c:2979
 #, fuzzy, c-format
 msgid "Spell checking failed: %s"
 msgstr "Verificarea ortografiei a eºuat: %s: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Verificarea ortografiei a eºuat: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Aratã acest mesaj"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Aratã acest mesaj"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3041
+#: src/text.c:3373
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Adaugã Selecþie la fiºier"
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Intrare identicã"
+
 #: src/utils.c:409 src/utils.c:421
 msgid "nano is out of memory!"
 msgstr "nano a epuizat memoria!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1558
 msgid "Unicode Input"
 msgstr ""
 
 #
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Modificat"
 
 #
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Vedere"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fiºier:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, fuzzy, 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%%)"
 
-#: src/winio.c:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Editorul de texte nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "versiune"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Adus pentru d-voastrã de:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Mulþumiri speciale lui:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Pentru ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "ºi oricine altcineva a fost uitat..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Vã mulþumim cã folosiþi nano!"
 
@@ -2268,6 +2363,12 @@ msgstr "Vã mulþumim cã folosiþi nano!"
 #~ msgid "Search for text within the editor"
 #~ msgstr "Cautã un anumit text în editor"
 
+#~ msgid "Move to the previous screen"
+#~ msgstr "Du-te la ecranul precedent"
+
+#~ msgid "Move to the next screen"
+#~ msgstr "Du-te la ecraul urmãtor"
+
 #~ msgid "Replace text within the editor"
 #~ msgstr "Înlocuieºte textul din editor"
 
@@ -2292,6 +2393,12 @@ msgstr "Vã mulþumim cã folosiþi nano!"
 #~ msgid "Insert into new buffer"
 #~ msgstr "Insereazã în bufer nou"
 
+#~ msgid "Find Other Bracket"
+#~ msgstr "Gãseºte cealaltã parantezã"
+
+#~ msgid "Insert File"
+#~ msgstr "Insereazã fiºier"
+
 #~ msgid ""
 #~ "\n"
 #~ "Buffer not written to %s (too many backup files?)\n"
@@ -2344,9 +2451,21 @@ msgstr "Vã mulþumim cã folosiþi nano!"
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Seteazã coloane de umplere (sparge/wrap linii la) #coloane"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorat, pentru compatibilitate cu Pico)"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Nu am putut pipe"
+
 #~ msgid "Verbatim input"
 #~ msgstr "Intrare identicã"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Nu am putut invoca \"%s\""
+
+#~ msgid "Missing flag"
+#~ msgstr "Lipseºte indicator (flag)"
+
 #~ msgid "Come on, be reasonable"
 #~ msgstr "Haideþi, fiþi rezonabil"
 
diff --git a/po/ru.gmo b/po/ru.gmo
index b5b12353..0b6037b5 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 81cb054c..d5c16246 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,15 +3,15 @@
 # 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: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2010-11-08 13:17+0200\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -20,129 +20,129 @@ msgstr ""
 "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"
+"X-Generator: Poedit 1.6.5\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
 msgstr "К каталогу"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ошибка чтени� %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(каталог)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(вверх)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [�азад]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Это един�твенное �овпадение"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "�ечего и�кать"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
+"�е удало�ь получить мой идентификатор пользовател� дл� файла блокировки "
+"(ошибка getpwuid())"
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr ""
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "�е удало�ь определить им� компьютера дл� файла блокировки: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
-#, fuzzy, c-format
+#: src/files.c:170 src/files.c:207 src/files.c:217
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Ошибка запи�и файла резервной копии %s: %s"
+msgstr "Ошибка запи�и файла блокировки %s: %s"
 
-#: src/files.c:234
-#, fuzzy, c-format
+#: src/files.c:232
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Ошибка запи�и файла резервной копии %s: %s"
+msgstr "Ошибка удалени� файла блокировки %s: %s"
 
-#: src/files.c:271
-#, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "Ошибка запи�и файла резервной копии %s: %s"
+#: src/files.c:266
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Ошибка открыти� файла блокировки %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
-msgstr ""
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Ошибка чтени� файла блокировки %s: �едо�таточно данных прочитано"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "�е удаёт�� в�тавить файл �наружи %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "�ет больше открытых файловых буферов"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Переключено в %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "�овый буфер"
 
-#: src/files.c:840
+#: src/files.c:835
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -150,7 +150,7 @@ msgstr[0] "Прочитана %lu �трока (преобразовано из
 msgstr[1] "Прочитано %lu �троки (преобразовано из формата Mac и DOS)"
 msgstr[2] "Прочитано %lu �трок (преобразовано из формата Mac и DOS)"
 
-#: src/files.c:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -168,7 +168,7 @@ msgstr[2] ""
 "Прочитано %lu �трок (преобразовано из формата Mac и DOS; предупреждение: нет "
 "до�тупа на запи�ь)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -176,7 +176,7 @@ msgstr[0] "Прочитана %lu �трока (преобразовано из
 msgstr[1] "Прочитано %lu �троки (преобразовано из формата Mac)"
 msgstr[2] "Прочитано %lu �трок (преобразовано из формата Mac)"
 
-#: src/files.c:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -192,7 +192,7 @@ msgstr[2] ""
 "Прочитано %lu �трок (преобразовано из формата Mac; предупреждение: нет "
 "до�тупа на запи�ь)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -200,7 +200,7 @@ msgstr[0] "Прочитана %lu �трока (преобразовано из
 msgstr[1] "Прочитано %lu �троки (преобразовано из формата DOS)"
 msgstr[2] "Прочитано %lu �трок (преобразовано из формата DOS)"
 
-#: src/files.c:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -216,7 +216,7 @@ msgstr[2] ""
 "Прочитано %lu �трок (преобразовано из формата DOS; предупреждение: нет "
 "до�тупа на запи�ь)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -224,7 +224,7 @@ msgstr[0] "Прочитана %lu �трока"
 msgstr[1] "Прочитано %lu �троки"
 msgstr[2] "Прочитано %lu �трок"
 
-#: src/files.c:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -232,85 +232,87 @@ msgstr[0] "Прочитана %lu �трока (предупреждение: н
 msgstr[1] "Прочитаны %lu �троки (предупреждение: нет до�тупа на запи�ь)"
 msgstr[2] "Прочитано %lu �трок (предупреждение: нет до�тупа на запи�ь)"
 
-#: src/files.c:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Чтение файла"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "�овый файл"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Файл «%s» не найден"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Файл «%s» �вл�ет�� каталогом"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Файл «%s» �вл�ет�� файлом у�трой�тва"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда дл� выполнени� в новом буфере [от %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда дл� выполнени� [от %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл дл� в�тавки в новый буфер [от %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл дл� в�тавки [от %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "�едопу�тима� клавиша в немногобуферном режиме"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
+"�е удало�ь запи�ать файл резервной копии, продолжить �охранение? (Ответьте � "
+"- е�ли не уверены)"
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "�е удаёт�� запи�ать за пределами %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "�е удаёт�� допи�ать в начале или в конце � параметром --nofollow"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ошибка запи�и файла резервной копии %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Слишком много резервных файлов?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ошибка запи�и %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ошибка запи�и временного файла: %s"
@@ -367,691 +369,714 @@ msgstr "Файл �уще�твует. ПЕРЕЗ�ПИС�ТЬ? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Запи�ать файл под ДРУГИМ ИМЕ�ЕМ?"
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Файл был изменён по�ле открыти�. Продолжить �охранение?"
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(ещё)"
 
-#: src/files.c:2942
-#, fuzzy, c-format
+#: src/files.c:2939
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"�ажмите ВВОД дл� продолжени� запу�ка nano.\n"
+"�ажмите ВВОД дл� продолжени�.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
+"�е удало�ь �оздать каталог %s: %s\n"
+"Он требует�� дл� �охранени�/загрузки и�тории пои�ка или позиции кур�ора\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
+"Путь %s - не �вл�ет�� каталогом, но должен им быть.\n"
+"Nano не �может загрузить или �охранить и�торию пои�ка или позицию кур�ора\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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/files.c:2983
+#: src/files.c:2978
 #, 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 об �том изменении)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Замена"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "�е замен�ть"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Уч.реги�тр"
+msgid "Exit"
+msgstr "Выход"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "�азад"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Рег.выраж."
+msgid "Close"
+msgstr "Закрыть"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "ПредИ�тор"
+#: src/global.c:473
+msgid "Uncut Text"
+msgstr "Отмен. вырезку"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "СледИ�тор"
+#: src/global.c:475
+msgid "Unjustify"
+msgstr "Отмен. ра�т�ж."
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "К �троке"
-
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "�айти далее"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "ПервыйФайл"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "По�леднФайл"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "К файлам"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "Формат DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Формат Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Доп. в начало"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Доп. в конец"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Резерв. копи�"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Выполнить команду"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Перейти к"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Помощь"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Выход"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Пои�к"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "ПредCтр"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "СледCтр"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "ПервСтрока"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Замена"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "По�лСтрока"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "К �троке"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Прио�тановка"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Пред. �трока"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "�ачПар"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "След. �трока"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "КонПар"
+#: src/global.c:491
+msgid "Read File"
+msgstr "ЧитФайл"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Выровн�ть"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "В�тавить файл"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "К �троке"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Отменить текущую функцию"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Показать �ту �правку"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Закрыть текущий буфер / Выйти из nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Выход из nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Запи�ать текущий файл на ди�к"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "В�тавить другой файл в текущий"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "И�кать тек�т или регул�рное выражение"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Перейти на предыдущий �кран"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr "И�кать тек�т"
 
-#: src/global.c:572
-msgid "Go to next screen"
-msgstr "Перейти на �ледующий �кран"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr "Перейти на �кран вверх"
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr "Перейти на �кран вниз"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Вырезать текущую �троку и �охранить её в буфере обмена"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "В�тавить �одержимое буфера обмена в текущую �троку"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Показать положение кур�ора"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Проверить орфографию, е�ли до�тупно"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Заменить тек�т или регул�рное выражение"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Перейти на указанный номер �троки и �толбца"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
-msgstr "Отметить тек�т в текущей позиции кур�ора"
+#: src/global.c:535
+msgid "Mark text starting from the cursor position"
+msgstr "Отметить тек�т от текущей позиции кур�ора"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+msgid "Repeat the last search"
 msgstr "Повторить по�ледний пои�к"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Копировать текущую �троку и �охранить ее в буфере обмена"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Увеличить от�туп �троки"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Уменьшить от�туп �троки"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Отменить по�леднее дей�твие"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Повторить по�леднее отменённое дей�твие"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Вперёд на один �имвол"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "�азад на один �имвол"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Вперёд на одно �лово"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "�азад на одно �лово"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "�а предыдущую �троку"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "�а �ледующую �троку"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "�а начало текущей �троки"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "В конец текущей �троки"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "�а начало текущего абзаца; потом �ледующего абзаца"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "В конец текущего абзаца; потом �ледующего абзаца"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "�а первую �троку файла"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "�а по�леднюю �троку файла"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "�а �оответ�твующую �кобку"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Прокрутить одну �троку вверх, не перемеща� кур�ор"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Прокрутить одну �троку вниз, не перемеща� кур�ор"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Перейти в предыдущий буфер"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Перейти в �ледующий буфер"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "В�тавить �ледующую комбинацию клавиш как е�ть"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "В�тавить табул�цию в позиции кур�ора"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "В�тавить �троку в позиции кур�ора"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Удалить �имвол под кур�ором"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Удалить �имвол �лева от кур�ора"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Вырезать от позиции кур�ора до конца файла"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Выровн�ть по ширине текущий абзац"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Под�читать количе�тво �лов, �трок и �имволов"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Обновить текущий �кран"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Прио�тановить редактор (е�ли включено)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "И�кать � учётом реги�тра"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Изменить направление пои�ка"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "И�пользовать регул�рные выражени�"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Сбро�ить предыдущую �троку пои�ка/замены"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Сбро�ить �ледующую �троку пои�ка/замены"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Перейти в файловый браузер"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "И�пользовать формат DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "И�пользовать формат Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Добавл�ть в конец"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Добавл�ть в начало"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Делать резервные копии оригинала"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Выполнить внешнюю команду"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "И�пользовать новый буфер"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Выйти из файлового браузера"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Перейти к первому файлу в �пи�ке"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Перейти к по�леднему файлу в �пи�ке"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Перейти к �ледующему файлу в �пи�ке"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Перейти к предыдущему файлу в �пи�ке"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Перейти к �ледующему файлу в �пи�ке"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Перейти к каталогу"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Закрыть"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "Проверить �интак�и� кода, е�ли до�тупно"
+
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr "�а предыдущее �ообщение"
+
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr "�а �ледующее �ообщение"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Помощь"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/global.c:671
+msgid "Write Out"
 msgstr "Запи�ать"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Перейти к"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Вырезать"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Выровн�ть"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "ЧитФайл"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Словарь"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Вырезать"
+#: src/global.c:731
+msgid "To Linter"
+msgstr "Пров. �интак."
+
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Уч.реги�тр"
+
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Рег.выраж."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "ОтмВыравн"
+#: src/global.c:746
+msgid "Backwards"
+msgstr "�азад"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "ОтмВырезк"
+#: src/global.c:753
+msgid "No Replace"
+msgstr "�е замен�ть"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "ТекПозиц"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Словарь"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "ПредCтр"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "СледCтр"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "ПервСтрока"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "По�лСтрока"
+
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "�а �кобку"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Отметить"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Копировать"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "От�туп"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "ОтмОт�тупа"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Отмена"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Повтор"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Вперёд"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "�азад"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "След. �лово"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Вперёд"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Пред. �лово"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Пред. �трока"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "След. �трока"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "След. �лово"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "�ачало"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Конец"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "�айти другую �кобку"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "�ачПар"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "КонПар"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Прокрутить вверх"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Прокрутить вниз"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+msgid "Prev File"
 msgstr "Предыдущий файл"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Следующий файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr "Ввод «как е�ть»"
+#: src/global.c:862
+msgid "Verbatim"
+msgstr "Подробный"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Табул�ци�"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Ввод"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Возврат каретки"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "Обрез. до конца"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Счётчик �лов"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Прио�тановка"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "ПредИ�тор"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "СледИ�тор"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "К �троке"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "Формат DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Формат Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Доп. в начало"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Доп. в конец"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Резерв. копи�"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Выполнить команду"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "К файлам"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "ПервыйФайл"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "По�леднФайл"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr "Пред. �ообщ. пров."
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Режим �правки"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Отображение по�то�нного положени� кур�ора"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "И�пользование дополнительной �троки дл� редактировани�"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Плавна� прокрутка"
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr "М�гкий перено� длинных �трок"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Отображение пробелов"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Под�ветка �интак�и�а"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Умна� клавиша HOME"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "�втоот�тупы"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Вырезать до конца"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Перено� длинных �трок"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
+msgstr "Же�ткий перено� длинных �трок"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Конвертаци� табул�ций в пробелы"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Резервные файлы"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "�е�колько файловых буферов"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Поддержка мыши"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Без преобразовани� из формата DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Прио�тановка"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "М�гкий перено� �трок"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1073,7 +1098,7 @@ msgstr ""
 "пои�ка. Е�ли нажать клаишу ВВОД без редактировани� тек�та, будет продолжен "
 "предыдущий пои�к.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1087,7 +1112,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме пои�ка:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1107,7 +1132,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме Перейти к �троке:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1130,7 +1155,7 @@ msgstr ""
 "файла в отдельный буфер (и�пользуйте Meta-< and > дл� переключени� между "
 "файловыми буферами).  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1144,7 +1169,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме В�тавка файла:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1171,7 +1196,7 @@ msgstr ""
 " Следующие клавиши до�тупны в режиме запи�и файла:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1191,12 +1216,12 @@ msgstr ""
 "Пользуйте�ь клавишами �о �трелками или PageUp/PageDown дл� перехода по "
 "�одержимому каталога, и клавишами S или ВВОД дл� выбора нужного файла или "
 "входа в выбранный каталог. Дл� перемещени� вверх на одну директорию, "
-"выберите директорию, названную \"..\" в �амом верху �пи�ка файлов.\n"
+"выберите директорию, названную «..» в �амом верху �пи�ка файлов.\n"
 "\n"
 " Следующие функциональные клавиши до�тупны в про�мотрщике файлов:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1222,16 +1247,15 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме пои�ка:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 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:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1254,7 +1278,7 @@ msgstr ""
 "Про�мотрщика:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1278,7 +1302,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме проверки правопи�ани�:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1299,7 +1323,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме Внешн�� Команда:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1310,7 +1334,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 о�новные "
@@ -1319,7 +1343,7 @@ msgstr ""
 "�то главное окно редактировани�, в котором отображен редактируемый файл. "
 "Строка �о�то�ни� - 3 �трока �низу - показывает разные важные �ообщени�.  "
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1337,7 +1361,7 @@ msgstr ""
 "и могут быть введены при помощи кнопок Esc, Alt или Meta, в зави�имо�ти от "
 "и�пользуемой клавиатуры.  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1351,15 +1375,15 @@ msgstr ""
 "возра�танию:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "разрешить/запретить"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "�еверна� клавиша в режиме про�мотра"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1368,7 +1392,7 @@ msgstr ""
 "\n"
 "Буфер запи�ан в %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1377,7 +1401,7 @@ msgstr ""
 "\n"
 "Буфер не запи�ан в %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1386,11 +1410,11 @@ msgstr ""
 "\n"
 "Буфер не запи�ан в %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Размер окна �лишком мал дл� Nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1399,260 +1423,261 @@ msgstr ""
 "И�пользование: nano [ОПЦИИ] [[+СТРОК�,СТОЛБЕЦ] Ф�ЙЛ]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опци�\t\tДлинна� форма\t\tЗначение\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опци�\t\tЗначение\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Показывать �то �ообщение"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+СТРОК�,СТОЛБЕЦ"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "�ачать �о �троки СТРОК�, �толбца СТОЛБЕЦ"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Включить умную клавишу home"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Делать резервные копии �уще�твующих файлов при �охранении"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <дир>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<дир>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Каталог дл� �охранени� уникальных резервных файлов"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "И�пользовать жирный шрифт вме�то обычного"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Конвертировать табул�ции в пробелы"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Разрешить не�колько файловых буферов"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "И�пользовать файлы блокировки (vim-�тиль)"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Сохран�ть и читать и�торию пои�ка/замены �трок"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "�е и�пользовать на файлы nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Решить проблему зави�ани� цифровой клавиатуры"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "�е добавл�ть пу�тые �троки в конце файла"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "�е преобразовывать из DOS/Mac формата"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "И�пользование дополнительной �троки дл� редактировани�"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
-msgstr "В�тавить табул�цию в позиции кур�ора"
+msgstr "Сохран�ть и загружать позицию кур�ора"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <�тр>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<�тр>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Строка цитировани�"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Запрещенный режим"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "По�трочна� прокрутка вме�то полу-�кранной"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#чи�>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#чи�>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "У�тановить ширину табул�ции в #чи� �толбцов"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Делать бы�трую очи�тку �троки �о�то�ни�"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Показать вер�ию и выйти"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Определ�ть границы �лов более точно"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <�тр>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<�тр>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "И�пользовать опи�ание �интак�и�а дл� под�ветки"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "По�то�нно показывать позицию кур�ора"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Решить проблему Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr "Показать �ту �правку"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "�втоматиче�кий от�туп на новых �троках"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Вырезать от кур�ора до конца �троки"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "�е �ледовать по �имвольным ��ылкам, перепи�ывать"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Разрешить и�пользование мыши"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr "�е читать файл (только пи�ать его)"
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <дир>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<дир>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "У�тановить рабочий каталог"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Зарезервировать кнопки XON (^Q) и XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Молча игнорировать ошибки запу�ка, например rc-файла"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#�толбцы>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#�толбцы>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
-msgstr "У�тановить точку перено�а �троки на #�толбцы"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
+msgstr "У�тановить точку же�ткого перено�а �троки на #�толбцы"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <программа>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<программа>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "И�пользовать альтернативную программу проверки орфографии"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "�втозапи�ь при выходе, без лишних вопро�ов"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Разрешить функцию отмены дей�твий [ЭКСПЕРИМЕ�Т�ЛЬ��Я]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Режим про�мотра (только чтение)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
-msgstr "�е перено�ить длинные �троки"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
+msgstr "�е делать же�ткий перено� длинных �трок"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "�е показывать две �троки помощи внизу"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Разрешить прио�тановку"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Включить м�гкий перено� �трок"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(игнорирует��, дл� �овме�тимо�ти � Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano вер�и� %s (�обрано %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1661,164 +1686,171 @@ msgstr ""
 "\n"
 " Параметры �борки:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Поддержка �той функции была отключена"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Сохранить изменённый буфер? (И��ЧЕ ВСЕ ИЗМЕ�Е�ИЯ БУДУТ ПОТЕРЯ�Ы)"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "�е удало�ь повторно открыть �тандартный ввод � клавиатуры\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Чтение из �тандартного ввода. ^C дл� прерывани�\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получен SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "И�пользуйте «fg» дл� возврата в nano\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "включено"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "отключено"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "�еизве�тна� команда"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON проигнорирован, мр-бр-бр"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF проигнорирован, мр-бр-бр"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запрошенный размер табул�ции «%s» не подходит"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Запрошенный размер заполнени� «%s» не подходит"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn�н"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "В�е"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "�ет"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Ошибка в позиции %s �троки %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "�ргумент %s имеет незакрытую \""
+msgstr "�ргумент «%s» имеет незакрытую \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Строки регул�рных выражений должны начинать�� и заканчивать�� �имволом \""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Плохое регул�рное выражение «%s»: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "От�ут�твует название �интак�и�а"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтак�и� «none» зарезервирован"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Синтак�и� «default» не должен иметь ра�ширений"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "�е удаёт�� добавить рег. выражение заголовка без команды �интак�и�а"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "От�ут�твует регул�рное выражение"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "От�ут�твует название клавиши"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "прив�зки клавиш должны начинать�� � «^», «M» или «F»"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "�азвание ключа �лишком короткое"
+
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Прив�зки клавиш должны начинать�� � «^», «M» или «F»"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr "Укажите функцию, которой назначает�� клавиша"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Укажите меню, которому назначает�� клавиша (или «all»)"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"Вы должны указать им� меню (или «в�е») на которое нужно назначить/убрать "
+"назначение клавиши"
+
+#: src/rcfile.c:467
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "�е удало�ь �опо�тавить им� «%s» к функции"
 
-#: src/rcfile.c:512
+#: src/rcfile.c:474
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "�е удало�ь �опо�тавить им� «%s» функции"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "�е удало�ь �опо�тавить им� «%s» к меню"
 
-#: src/rcfile.c:518 src/rcfile.c:603
+#: src/rcfile.c:497
 #, 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:540
+#: src/rcfile.c:583
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Прив�зка «%s» не �вл�ет�� допу�тимой"
+msgid "Error expanding %s: %s"
+msgstr "Ошибка ра�ширени� %s: %s"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1833,95 +1865,116 @@ msgstr ""
 "«black», � необ�зательным префик�ом «bright»\n"
 "дл� цвета фона."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "�е удаёт�� добавить команду цвета без команды �интак�и�а"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "От�ут�твует название цвета"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Цвет фона \"%s\" не может быть �ветлым"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "От�ут�твует регул�рное выражение"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" требует �оответ�твующего \"end=\""
+msgstr "«start=» требует �оответ�твующего «end=»"
+
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Цвет фона «%s» не может быть �ветлым"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr "�е удаёт�� добавить рег. выражение заголовка без команды �интак�и�а"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "�е удаёт�� добавить магиче�кое рег. выражение без команды �интак�и�а"
+
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "От�ут�твует магиче�ка� �трока"
+
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr "�е удаёт�� добавить анализатор �интак�и�а без команды �интак�и�а"
+
+#: src/rcfile.c:944
+msgid "Missing linter command"
+msgstr "От�ут�твует команда анализатора �интак�и�а"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "�е удало�ь �опо�тавить им� «%s» к ра�ширению"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Команда \"%s\" не разрешена во включенном файле"
+msgstr "Команда «%s» не разрешена во включенном файле"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Синтак�и� \"%s\" не имеет цветовых команд"
+msgstr "Синтак�и� «%s» не имеет цветовых команд"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "�е пон�тна� команда \"%s\""
+msgstr "�епон�тна� команда «%s»"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "От�ут�твует опци�"
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Параметр от�ут�твует "
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Опци� \"%s\" требует аргумент"
+msgstr "Опци� «%s» требует аргумент"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Опци� не правильна� многобайтова� �трока"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Требует�� не пу�той �имвол"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Требует�� два одно�трочных �имвола"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "�е удаёт�� �н�ть флаг  \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "�е удало�ь �н�ть опцию «%s»"
 
-#: src/rcfile.c:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "�еизве�тный флаг \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "�еизве�тна� опци� «%s»"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "�е могу найти �об�твенную домашнюю директорию! Йой!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1933,25 +1986,28 @@ msgstr ""
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" не найден"
+msgstr "«%.*s%s» не найден"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (что мен�ть) в выделении"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (что мен�ть)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Заменить �то вхождение?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Заменить на"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1959,19 +2015,20 @@ msgstr[0] "Замененное %lu вхождение"
 msgstr[1] "Замененные %lu вхождени�"
 msgstr[2] "Заменено %lu вхождений"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1047
 msgid "Enter line number, column number"
 msgstr "Введите номер �троки и �толбца"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "�еправильный номер �троки или �толбца"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "�е �кобка"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "�ет �оответ�твующей �кобки"
 
@@ -1983,223 +2040,292 @@ msgstr "Метка у�тановлена"
 msgid "Mark Unset"
 msgstr "Метка �н�та"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Буфер отмены дей�твий пу�т!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr "добавление тек�та"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "удаление тек�та"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "перено� �троки"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "объединение �трок"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "обрезка тек�та"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "отмена обрезки тек�та"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "нова� �трока"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "в�тавка тек�та"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 msgid "text replace"
 msgstr "замена тек�та"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "Внутренн�� ошибка: неизве�тный тип. Сохраните �вою работу"
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Отменённое дей�твие (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr "�ечего повтор�ть!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Внутренн�� ошибка: ошибка на�тройки повтора. Сохраните �вою работу"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr ""
+"Внутренн�� ошибка: ошибка на�тройки повторени� изменени�. Сохраните �вою "
+"работу."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Повторённое дей�твие (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "�е удало�ь перенаправить в конвейер"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "�е удало�ь �оздать конвейер"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "�е удало�ь �оздать дочерний проце��"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Внутренн�� ошибка: ошибка на�тройки отмены образки. Сохраните �вою работу"
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Внутренн�� ошибка: неизве�тный тип. Сохраните �вою работу"
+"Внутренн�� ошибка: ошибка на�тройки отмены обрезки. Сохраните �вою работу."
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "�едопу�тима� �трока цитировани� %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Сейча� можно отменить выравнивание!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Редактировать замену"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "�е удало�ь �оздать конвейер"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Идёт �оздание �пи�ка ошибочных �лов. Подождите..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "�е удало�ь получить размер буфера конвейера"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
-msgstr "Ошибка выполнени� \"spell\""
+msgstr "Ошибка выполнени� «spell»"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
-msgstr "Ошибка выполнени� \"sort -f\""
+msgstr "Ошибка выполнени� «sort -f»"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
-msgstr "Ошибка выполнени� \"uniq\""
+msgstr "Ошибка выполнени� «uniq»"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Проверка правопи�ани� завершена"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Ошибка выполнени� \"%s\""
+msgstr "Ошибка выполнени� «%s»"
+
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr "Запу�к проверки орфографии, подождите"
 
-#: src/text.c:2970
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Проверка правопи�ани� не удала�ь: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Проверка правопи�ани� не удала�ь: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr "Дл� данного типа файла не на�троена программа проверки �интак�и�а!"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr "Сохранить измененный буфер перед проверкой?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "Запу�к проверки, подождите"
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Получено 0 ра�познанных �трок от комманды: %s"
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Это �ообщение о не открытом файле %s, открыть его в новом буфере?"
+
+#: src/text.c:3286
+msgid "At last message"
+msgstr "По�леднее �ообщение"
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr "Первое �ообщение"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sСлов: %lu  Строк: %ld  Символов: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "В выделении:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Ввод «как е�ть»"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Юникод код"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Изменён"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Смотр"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "Дир:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
+"Предупреждение: Измен�� не заблокированный файл, провер�ть до�туп к каталогу?"
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Тек�товый редактор nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "вер�и�"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Предо�тавлен вам:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "О�оба� благодарно�ть:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr ""
 "The Free Software Foundation (фонд �вободного программного обе�печени�)"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Дл� ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr ""
 "Дмитрию Р�занцеву за помощь в переводе и в�ем о�тальным, кого мы забыли "
 "упом�нуть..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 "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 9b11f56d..00000000
--- a/po/rw.gmo
+++ /dev/null
diff --git a/po/rw.po b/po/rw.po
deleted file mode 100644
index a4cb9f40..00000000
--- a/po/rw.po
+++ /dev/null
@@ -1,2551 +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: 2013-03-22 10:09-0400\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"
-"Language: rw\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:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
-#, 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:184
-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:188
-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:194
-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:200
-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:137
-msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr ""
-
-#: src/files.c:143
-#, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr "OYA Kurema IDOSIYE"
-
-#: src/files.c:169 src/files.c:207 src/files.c:217
-#, fuzzy, c-format
-msgid "Error writing lock file %s: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:234
-#, fuzzy, c-format
-msgid "Error deleting lock file %s: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:271
-#, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:281
-#, c-format
-msgid "Error reading lockfile %s: Not enough data read"
-msgstr ""
-
-#: src/files.c:328
-#, fuzzy, c-format
-msgid "Can't insert file from outside of %s"
-msgstr "Kongeramo IDOSIYE Bivuye Hanze Bya"
-
-#: src/files.c:437
-#, fuzzy
-msgid "No more open file buffers"
-msgstr "Birenzeho Gufungura IDOSIYE"
-
-#: src/files.c:453
-#, fuzzy, c-format
-msgid "Switched to %s"
-msgstr "Kuri"
-
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
-msgid "New Buffer"
-msgstr ""
-
-#: src/files.c:840
-#, 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:845
-#, 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:851
-#, 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:855
-#, 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:861
-#, 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:865
-#, 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:871
-#, fuzzy, c-format
-msgid "Read %lu line"
-msgid_plural "Read %lu lines"
-msgstr[0] "Umurongo"
-
-#: src/files.c:874
-#, 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:914 src/files.c:950
-#, fuzzy
-msgid "Reading File"
-msgstr "Idosiye"
-
-#: src/files.c:920
-#, 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:923
-#, fuzzy, c-format
-msgid "\"%s\" not found"
-msgstr "\"%s\"ntibyabonetse"
-
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
-#, fuzzy, c-format
-msgid "\"%s\" is a directory"
-msgstr "\"%s\"ni a bushyinguro"
-
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
-#, fuzzy, c-format
-msgid "\"%s\" is a device file"
-msgstr "Idosiye ni a APAREYE IDOSIYE"
-
-#: src/files.c:1031
-#, fuzzy, c-format
-msgid "Command to execute in new buffer [from %s] "
-msgstr "Kuri Gukora in Gishya Bivuye"
-
-#: src/files.c:1033
-#, fuzzy, c-format
-msgid "Command to execute [from %s] "
-msgstr "Kuri Gukora Bivuye"
-
-#: src/files.c:1039
-#, fuzzy, c-format
-msgid "File to insert into new buffer [from %s] "
-msgstr "Idosiye Kuri Kongeramo Gishya Bivuye"
-
-#: src/files.c:1041
-#, fuzzy, c-format
-msgid "File to insert [from %s] "
-msgstr "Idosiye Kuri Kongeramo Bivuye"
-
-#: src/files.c:1291
-#, fuzzy
-msgid "Key invalid in non-multibuffer mode"
-msgstr "in Ubwoko"
-
-#: src/files.c:1594
-msgid "Failed to write backup file, continue saving? (Say N if unsure) "
-msgstr ""
-
-#: src/files.c:1716
-#, fuzzy, c-format
-msgid "Can't write outside of %s"
-msgstr "Kwandika Hanze Bya"
-
-#: src/files.c:1731
-#, fuzzy
-msgid "Cannot prepend or append to a symlink with --nofollow set"
-msgstr "Cyangwa Kongeraho... Kuri a Na: Gushyiraho"
-
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
-#, fuzzy, c-format
-msgid "Error writing backup file %s: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:1813 src/nano.c:706
-#, fuzzy
-msgid "Too many backup files?"
-msgstr "Idosiye"
-
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
-#, c-format
-msgid "Error writing %s: %s"
-msgstr ""
-
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
-#, fuzzy, c-format
-msgid "Error writing temp file: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:2140
-#, fuzzy, c-format
-msgid "Wrote %lu line"
-msgid_plural "Wrote %lu lines"
-msgstr[0] "Umurongo"
-
-#: src/files.c:2245
-msgid " [DOS Format]"
-msgstr ""
-
-#: src/files.c:2246
-msgid " [Mac Format]"
-msgstr ""
-
-#: src/files.c:2248
-msgid " [Backup]"
-msgstr ""
-
-#: src/files.c:2256
-#, fuzzy
-msgid "Prepend Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2257
-#, fuzzy
-msgid "Append Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2258
-#, fuzzy
-msgid "Write Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2261
-#, fuzzy
-msgid "File Name to Prepend to"
-msgstr "Idosiye Kuri Kuri"
-
-#: src/files.c:2262
-#, fuzzy
-msgid "File Name to Append to"
-msgstr "Idosiye Kuri Kuri"
-
-#: src/files.c:2263
-#, fuzzy
-msgid "File Name to Write"
-msgstr "Idosiye Kuri"
-
-#: src/files.c:2394
-#, fuzzy
-msgid "File exists, OVERWRITE ? "
-msgstr "Idosiye"
-
-#: src/files.c:2403
-#, fuzzy
-msgid "Save file under DIFFERENT NAME ? "
-msgstr "Kubika IDOSIYE"
-
-#: src/files.c:2414
-msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
-
-#: src/files.c:2846
-#, fuzzy
-msgid "(more)"
-msgstr "(Birenzeho"
-
-#: src/files.c:2942
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Press Enter to continue\n"
-msgstr "Kuri urifuzagukomeza"
-
-#: src/files.c:2959
-#, c-format
-msgid ""
-"Unable to create directory %s: %s\n"
-"It is required for saving/loading search history or cursor position\n"
-msgstr ""
-
-#: src/files.c:2964
-#, c-format
-msgid ""
-"Path %s is not a directory and needs to be.\n"
-"Nano will be unable to load or save search or cursor position history\n"
-msgstr ""
-
-#: src/files.c:2980
-#, 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:2983
-#, 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 ""
-
-# crashrep/source\all\crashrep.lng:%CANCEL_BUTTON%.text
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 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:467
-msgid "Replace"
-msgstr "Gusimbura"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr ""
-
-#: src/global.c:471
-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:472
-#, fuzzy
-msgid "Backwards"
-msgstr "Inyuma"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Urutonde"
-
-#: src/global.c:503
-#, fuzzy
-msgid "NextHstory"
-msgstr "Urutonde"
-
-#: src/global.c:504
-msgid "Go To Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
-msgid "WhereIs Next"
-msgstr ""
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_STD_PARAGRAPH.FT_FLINEINDENT.text
-#: src/global.c:508
-#, fuzzy
-msgid "First File"
-msgstr "Umurongo ubanza"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_ALIGN_PARAGRAPH.FT_LASTLINE.text
-#: src/global.c:509
-#, fuzzy
-msgid "Last File"
-msgstr "Umurongo wa nyuma"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr ""
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr ""
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr ""
-
-# 214
-#: src/global.c:515
-msgid "Append"
-msgstr "kugereka"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr ""
-
-# 503
-#: src/global.c:517
-#, fuzzy
-msgid "Backup File"
-msgstr "inyibutsabubiko"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr ""
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-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:532
-msgid "Exit"
-msgstr "Gusohoka"
-
-#: src/global.c:533
-msgid "Where Is"
-msgstr ""
-
-#: src/global.c:534
-msgid "Prev Page"
-msgstr ""
-
-# sc/sdi\scslots.src:SID_PREVIEW_NEXT.text
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Ipaji ikurikira"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_STD_PARAGRAPH.FT_FLINEINDENT.text
-#: src/global.c:536
-#, fuzzy
-msgid "First Line"
-msgstr "Umurongo ubanza"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_ALIGN_PARAGRAPH.FT_LASTLINE.text
-#: src/global.c:537
-#, fuzzy
-msgid "Last Line"
-msgstr "Umurongo wa nyuma"
-
-#: src/global.c:538
-msgid "Suspend"
-msgstr ""
-
-#: src/global.c:540
-#, fuzzy
-msgid "Beg of Par"
-msgstr "Bya"
-
-#: src/global.c:541
-#, fuzzy
-msgid "End of Par"
-msgstr "Impera Bya"
-
-#: src/global.c:542
-msgid "FullJstify"
-msgstr ""
-
-# dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_REFRESH.text
-#: src/global.c:544
-msgid "Refresh"
-msgstr "Kugira gishya"
-
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Kongeramo Idosiye"
-
-#: src/global.c:548
-#, fuzzy
-msgid "Go To Line"
-msgstr "Gya kumurongo"
-
-#: src/global.c:551
-#, 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:556
-#, fuzzy
-msgid "Cancel the current function"
-msgstr "i KIGEZWEHO Umumaro"
-
-#: src/global.c:557
-msgid "Display this help text"
-msgstr ""
-
-#: src/global.c:560
-#, fuzzy
-msgid "Close the current file buffer / Exit from nano"
-msgstr "Funga IDOSIYE Bivuye"
-
-#: src/global.c:562
-#, fuzzy
-msgid "Exit from nano"
-msgstr "Bivuye"
-
-#: src/global.c:566
-#, fuzzy
-msgid "Write the current file to disk"
-msgstr "i KIGEZWEHO IDOSIYE Kuri"
-
-#: src/global.c:568
-#, fuzzy
-msgid "Insert another file into the current one"
-msgstr "IDOSIYE i KIGEZWEHO"
-
-#: src/global.c:570
-#, fuzzy
-msgid "Search for a string or a regular expression"
-msgstr "Ibisanzwe"
-
-#: src/global.c:571
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Kuri i Ibanjirije Mugaragaza"
-
-#: src/global.c:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Kuri i Komeza>> Mugaragaza"
-
-#: src/global.c:574
-#, fuzzy
-msgid "Cut the current line and store it in the cutbuffer"
-msgstr "i KIGEZWEHO Umurongo Na in i"
-
-#: src/global.c:576
-#, fuzzy
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Bivuye i i KIGEZWEHO Umurongo"
-
-#: src/global.c:578
-#, fuzzy
-msgid "Display the position of the cursor"
-msgstr "i Ibirindiro Bya i indanga"
-
-#: src/global.c:580
-#, fuzzy
-msgid "Invoke the spell checker, if available"
-msgstr "i Genzuranyuguti NIBA Bihari"
-
-#: src/global.c:582
-#, fuzzy
-msgid "Replace a string or a regular expression"
-msgstr "Ibisanzwe"
-
-#: src/global.c:583
-#, fuzzy
-msgid "Go to line and column number"
-msgstr "Kuri a Umurongo Umubare"
-
-#: src/global.c:585
-#, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "Umwandiko ku i indanga Ibirindiro"
-
-#: src/global.c:586
-#, fuzzy
-msgid "Repeat last search"
-msgstr "Iheruka Gushaka"
-
-#: src/global.c:588
-#, fuzzy
-msgid "Copy the current line and store it in the cutbuffer"
-msgstr "i KIGEZWEHO Umurongo Na in i"
-
-#: src/global.c:589
-#, fuzzy
-msgid "Indent the current line"
-msgstr "Kuri i KIGEZWEHO IDOSIYE"
-
-#: src/global.c:590
-#, fuzzy
-msgid "Unindent the current line"
-msgstr "Kuri i KIGEZWEHO IDOSIYE"
-
-#: src/global.c:591
-msgid "Undo the last operation"
-msgstr ""
-
-#: src/global.c:592
-msgid "Redo the last undone operation"
-msgstr ""
-
-#: src/global.c:594
-#, fuzzy
-msgid "Go forward one character"
-msgstr "Imbere Inyuguti"
-
-#: src/global.c:595
-#, fuzzy
-msgid "Go back one character"
-msgstr "Inyuma Inyuguti"
-
-#: src/global.c:597
-#, fuzzy
-msgid "Go forward one word"
-msgstr "Imbere ijambo"
-
-#: src/global.c:598
-#, fuzzy
-msgid "Go back one word"
-msgstr "subira inyuma ijambo"
-
-#: src/global.c:600
-#, fuzzy
-msgid "Go to previous line"
-msgstr "Kuri i Ibanjirije Umurongo"
-
-#: src/global.c:601
-#, fuzzy
-msgid "Go to next line"
-msgstr "Kuri i Komeza>> Umurongo"
-
-#: src/global.c:602
-#, fuzzy
-msgid "Go to beginning of current line"
-msgstr "Kuri i Itangiriro Bya i KIGEZWEHO Umurongo"
-
-#: src/global.c:603
-#, fuzzy
-msgid "Go to end of current line"
-msgstr "Kuri i Impera Bya i KIGEZWEHO Umurongo"
-
-#: src/global.c:606
-#, fuzzy
-msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Kuri i Itangiriro Bya i KIGEZWEHO Igika"
-
-#: src/global.c:608
-#, fuzzy
-msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Kuri i Impera Bya i KIGEZWEHO Igika"
-
-#: src/global.c:611
-#, fuzzy
-msgid "Go to the first line of the file"
-msgstr "Kuri i Itangira Umurongo Bya i IDOSIYE"
-
-#: src/global.c:613
-#, fuzzy
-msgid "Go to the last line of the file"
-msgstr "Kuri i Iheruka Umurongo Bya i IDOSIYE"
-
-#: src/global.c:615
-#, fuzzy
-msgid "Go to the matching bracket"
-msgstr "a"
-
-#: src/global.c:617
-msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
-
-#: src/global.c:619
-msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
-
-#: src/global.c:623
-#, fuzzy
-msgid "Switch to the previous file buffer"
-msgstr "Kuri i Ibanjirije IDOSIYE"
-
-#: src/global.c:625
-#, fuzzy
-msgid "Switch to the next file buffer"
-msgstr "Kuri i Komeza>> IDOSIYE"
-
-#: src/global.c:628
-#, fuzzy
-msgid "Insert the next keystroke verbatim"
-msgstr "Inyuguti S"
-
-#: src/global.c:630
-#, fuzzy
-msgid "Insert a tab at the cursor position"
-msgstr "a Isunika Inyuguti ku i indanga Ibirindiro"
-
-#: src/global.c:632
-#, fuzzy
-msgid "Insert a newline at the cursor position"
-msgstr "a Garuka ku i indanga Ibirindiro"
-
-#: src/global.c:634
-#, fuzzy
-msgid "Delete the character under the cursor"
-msgstr "i Inyuguti i indanga"
-
-#: src/global.c:636
-#, fuzzy
-msgid "Delete the character to the left of the cursor"
-msgstr "i Inyuguti Kuri i Ibumoso: Bya i indanga"
-
-#: src/global.c:639
-#, 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:642
-#, fuzzy
-msgid "Justify the entire file"
-msgstr "i IDOSIYE"
-
-#: src/global.c:646
-msgid "Count the number of words, lines, and characters"
-msgstr ""
-
-#: src/global.c:649
-#, fuzzy
-msgid "Refresh (redraw) the current screen"
-msgstr "Kongera Gushushanya i KIGEZWEHO Mugaragaza"
-
-#: src/global.c:651
-msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
-
-#: src/global.c:654
-msgid "Toggle the case sensitivity of the search"
-msgstr ""
-
-#: src/global.c:656
-#, fuzzy
-msgid "Reverse the direction of the search"
-msgstr "i Ibirindiro Bya i indanga"
-
-#: src/global.c:660
-#, fuzzy
-msgid "Toggle the use of regular expressions"
-msgstr "Ibisanzwe"
-
-#: src/global.c:664
-#, fuzzy
-msgid "Recall the previous search/replace string"
-msgstr "i Ibanjirije Gushaka Gusimbura Ikurikiranyanyuguti"
-
-#: src/global.c:666
-#, fuzzy
-msgid "Recall the next search/replace string"
-msgstr "i Ibanjirije Gushaka Gusimbura Ikurikiranyanyuguti"
-
-#: src/global.c:669
-#, fuzzy
-msgid "Go to file browser"
-msgstr "Kuri IDOSIYE Mucukumbuzi"
-
-#: src/global.c:672
-#, fuzzy
-msgid "Toggle the use of DOS format"
-msgstr "IDOSIYE Inyuma in Imiterere"
-
-#: src/global.c:673
-#, fuzzy
-msgid "Toggle the use of Mac format"
-msgstr "IDOSIYE Inyuma in Imiterere"
-
-#: src/global.c:675
-msgid "Toggle appending"
-msgstr ""
-
-#: src/global.c:676
-msgid "Toggle prepending"
-msgstr ""
-
-#: src/global.c:679
-msgid "Toggle backing up of the original file"
-msgstr ""
-
-#: src/global.c:680
-#, fuzzy
-msgid "Execute external command"
-msgstr "external Komandi:"
-
-#: src/global.c:684
-#, fuzzy
-msgid "Toggle the use of a new buffer"
-msgstr "OYA Kubona Ingano Bya"
-
-#: src/global.c:687
-#, fuzzy
-msgid "Exit from the file browser"
-msgstr "Bivuye i IDOSIYE Mucukumbuzi"
-
-#: src/global.c:689
-#, fuzzy
-msgid "Go to the first file in the list"
-msgstr "Kuri i Itangira Umurongo Bya i IDOSIYE"
-
-#: src/global.c:691
-#, fuzzy
-msgid "Go to the last file in the list"
-msgstr "Kuri i Iheruka Umurongo Bya i IDOSIYE"
-
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Kuri i Komeza>> Umurongo"
-
-#: src/global.c:693
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Kuri i Ibanjirije Umurongo"
-
-#: src/global.c:694
-#, 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:721
-msgid "Close"
-msgstr "Gufunga"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-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:735
-msgid "Justify"
-msgstr "Gukwiza umurongo wose"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-#, fuzzy
-msgid "Read File"
-msgstr "Idosiye"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
-msgid "Cur Pos"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr ""
-
-#: src/global.c:822
-msgid "Mark Text"
-msgstr ""
-
-#: src/global.c:828
-msgid "Copy Text"
-msgstr ""
-
-#: src/global.c:831
-msgid "Indent Text"
-msgstr ""
-
-#: src/global.c:834
-msgid "Unindent Text"
-msgstr ""
-
-#: src/global.c:838
-msgid "Undo"
-msgstr ""
-
-#: src/global.c:841
-msgid "Redo"
-msgstr ""
-
-# sch/sdi\schslots.src:SID_ROW_MOREFRONT.text
-#: src/global.c:847 src/global.c:851
-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:857 src/global.c:861
-msgid "Back"
-msgstr "Inyuma"
-
-#: src/global.c:868
-msgid "Next Word"
-msgstr ""
-
-#: src/global.c:871
-msgid "Prev Word"
-msgstr ""
-
-#: src/global.c:875
-msgid "Prev Line"
-msgstr ""
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr ""
-
-#: src/global.c:881
-msgid "Home"
-msgstr "Home"
-
-# officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..end-of-field.text
-#: src/global.c:884
-msgid "End"
-msgstr "Impera"
-
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr ""
-
-#: src/global.c:899
-msgid "Scroll Up"
-msgstr ""
-
-#: src/global.c:902
-msgid "Scroll Down"
-msgstr ""
-
-#: src/global.c:907
-#, fuzzy
-msgid "Previous File"
-msgstr "Idosiye"
-
-#: src/global.c:909
-#, fuzzy
-msgid "Next File"
-msgstr "Idosiye"
-
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr ""
-
-# sc/source\ui\src\textdlgs.src:RID_SCDLG_PARAGRAPH.1.RID_SVXPAGE_TABULATOR.text
-#: src/global.c:918
-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:921
-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:924
-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:927
-msgid "Backspace"
-msgstr "Gusiba usubira inyuma"
-
-#: src/global.c:944
-msgid "CutTillEnd"
-msgstr ""
-
-#: src/global.c:957
-msgid "Word Count"
-msgstr ""
-
-#: src/global.c:1299
-#, fuzzy
-msgid "Help mode"
-msgstr "Ubwoko"
-
-#: src/global.c:1301
-#, fuzzy
-msgid "Constant cursor position display"
-msgstr "indanga Ibirindiro"
-
-#: src/global.c:1303
-#, fuzzy
-msgid "Use of one more line for editing"
-msgstr "Bya Birenzeho Umwanya kugirango"
-
-#: src/global.c:1305
-msgid "Smooth scrolling"
-msgstr ""
-
-#: src/global.c:1307
-#, fuzzy
-msgid "Whitespace display"
-msgstr "Kugaragaza"
-
-#: src/global.c:1309
-#, fuzzy
-msgid "Color syntax highlighting"
-msgstr "Igaragaza cyane"
-
-#: src/global.c:1311
-#, fuzzy
-msgid "Smart home key"
-msgstr "Ku Ntangiriro Urufunguzo"
-
-#: src/global.c:1313
-#, fuzzy
-msgid "Auto indent"
-msgstr "Ikurura"
-
-#: src/global.c:1315
-#, fuzzy
-msgid "Cut to end"
-msgstr "Kuri Impera"
-
-#: src/global.c:1317
-#, fuzzy
-msgid "Long line wrapping"
-msgstr "Umurongo Gufunika"
-
-#: src/global.c:1319
-msgid "Conversion of typed tabs to spaces"
-msgstr ""
-
-#: src/global.c:1321
-#, fuzzy
-msgid "Backup files"
-msgstr "Idosiye"
-
-#: src/global.c:1323
-#, fuzzy
-msgid "Multiple file buffers"
-msgstr "IDOSIYE"
-
-#: src/global.c:1325
-#, fuzzy
-msgid "Mouse support"
-msgstr "Gushigikira"
-
-#: src/global.c:1327
-#, fuzzy
-msgid "No conversion from DOS/Mac format"
-msgstr "Ihindurangero Bivuye Imiterere"
-
-#: src/global.c:1329
-msgid "Suspension"
-msgstr ""
-
-#: src/global.c:1331
-#, 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:588
-#, fuzzy
-msgid "Key invalid in view mode"
-msgstr "in Ubwoko"
-
-#: src/nano.c:700
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer written to %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:702
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer not written to %s: %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:705
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer not written: %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:728
-#, fuzzy
-msgid "Window size is too small for nano...\n"
-msgstr "Ingano ni Gitoya kugirango"
-
-#: src/nano.c:821
-#, c-format
-msgid ""
-"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
-"\n"
-msgstr ""
-
-#: src/nano.c:824
-#, c-format
-msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr ""
-
-#: src/nano.c:826
-#, c-format
-msgid "Option\t\tMeaning\n"
-msgstr ""
-
-#: src/nano.c:829
-#, fuzzy
-msgid "Show this message"
-msgstr "iyi Ubutumwa"
-
-#: src/nano.c:830
-msgid "+LINE,COLUMN"
-msgstr ""
-
-#: src/nano.c:831
-#, fuzzy
-msgid "Start at line LINE, column COLUMN"
-msgstr "Gutangira ku Umurongo Umubare"
-
-#: src/nano.c:833
-#, fuzzy
-msgid "Enable smart home key"
-msgstr "Cyiza Ku Ntangiriro Urufunguzo"
-
-#: src/nano.c:834
-#, fuzzy
-msgid "Save backups of existing files"
-msgstr "Idosiye ku Kubika"
-
-#: src/nano.c:835
-msgid "-C <dir>"
-msgstr ""
-
-#: src/nano.c:835
-msgid "--backupdir=<dir>"
-msgstr ""
-
-#: src/nano.c:836
-#, fuzzy
-msgid "Directory for saving unique backup files"
-msgstr "kugirango Inyibutsa Idosiye"
-
-#: src/nano.c:839
-msgid "Use bold instead of reverse video text"
-msgstr ""
-
-#: src/nano.c:842
-msgid "Convert typed tabs to spaces"
-msgstr ""
-
-#: src/nano.c:845
-#, fuzzy
-msgid "Enable multiple file buffers"
-msgstr "Igikubo IDOSIYE"
-
-#: src/nano.c:850
-msgid "Use (vim-style) lock files"
-msgstr ""
-
-#: src/nano.c:852
-#, fuzzy
-msgid "Log & read search/replace string history"
-msgstr "Gusoma Gushaka Gusimbura Ikurikiranyanyuguti Urutonde"
-
-#: src/nano.c:855
-#, fuzzy
-msgid "Don't look at nanorc files"
-msgstr "ku Idosiye"
-
-#: src/nano.c:858
-msgid "Fix numeric keypad key confusion problem"
-msgstr ""
-
-#: src/nano.c:860
-msgid "Don't add newlines to the ends of files"
-msgstr ""
-
-#: src/nano.c:863
-#, fuzzy
-msgid "Don't convert files from DOS/Mac format"
-msgstr "GUHINDURA Idosiye Bivuye Imiterere"
-
-#: src/nano.c:865
-#, fuzzy
-msgid "Use one more line for editing"
-msgstr "Bya Birenzeho Umwanya kugirango"
-
-#: src/nano.c:868
-#, fuzzy
-msgid "Log & read location of cursor position"
-msgstr "Umwandiko ku i indanga Ibirindiro"
-
-#: src/nano.c:871
-msgid "-Q <str>"
-msgstr ""
-
-#: src/nano.c:871
-msgid "--quotestr=<str>"
-msgstr ""
-
-#: src/nano.c:872
-#, fuzzy
-msgid "Quoting string"
-msgstr "Ikurikiranyanyuguti Mburabuzi"
-
-#: src/nano.c:874
-#, fuzzy
-msgid "Restricted mode"
-msgstr "Ubwoko"
-
-#: src/nano.c:877
-msgid "Scroll by line instead of half-screen"
-msgstr ""
-
-#: src/nano.c:879
-#, fuzzy
-msgid "-T <#cols>"
-msgstr "-R"
-
-#: src/nano.c:879
-msgid "--tabsize=<#cols>"
-msgstr ""
-
-#: src/nano.c:880
-#, fuzzy
-msgid "Set width of a tab to #cols columns"
-msgstr "Ubugari Bya a Isunika in Kuri"
-
-#: src/nano.c:882
-msgid "Do quick statusbar blanking"
-msgstr ""
-
-#: src/nano.c:885
-#, fuzzy
-msgid "Print version information and exit"
-msgstr "Verisiyo Ibisobanuro Na Gusohoka"
-
-#: src/nano.c:888
-msgid "Detect word boundaries more accurately"
-msgstr ""
-
-#: src/nano.c:891
-msgid "-Y <str>"
-msgstr ""
-
-#: src/nano.c:891
-msgid "--syntax=<str>"
-msgstr ""
-
-#: src/nano.c:892
-#, fuzzy
-msgid "Syntax definition to use for coloring"
-msgstr "Insobanuro Kuri Gukoresha"
-
-#: src/nano.c:894
-#, fuzzy
-msgid "Constantly show cursor position"
-msgstr "Garagaza indanga Ibirindiro"
-
-#: src/nano.c:896
-msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
-
-#: src/nano.c:899
-#, fuzzy
-msgid "Automatically indent new lines"
-msgstr "Ikurura Gishya Imirongo"
-
-#: src/nano.c:900
-#, fuzzy
-msgid "Cut from cursor to end of line"
-msgstr "Bivuye indanga Kuri Impera Bya Umurongo"
-
-#: src/nano.c:903
-#, fuzzy
-msgid "Don't follow symbolic links, overwrite"
-msgstr "amahuza Guhindura"
-
-#: src/nano.c:905
-#, fuzzy
-msgid "Enable the use of the mouse"
-msgstr "Imbeba"
-
-#: src/nano.c:908
-msgid "-o <dir>"
-msgstr ""
-
-#: src/nano.c:908
-#, fuzzy
-msgid "--operatingdir=<dir>"
-msgstr "bushyinguro"
-
-#: src/nano.c:909
-#, fuzzy
-msgid "Set operating directory"
-msgstr "bushyinguro"
-
-#: src/nano.c:912
-#, fuzzy
-msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Na Utubuto"
-
-#: src/nano.c:914
-msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
-
-#: src/nano.c:916
-#, fuzzy
-msgid "-r <#cols>"
-msgstr "-R"
-
-#: src/nano.c:916
-#, fuzzy
-msgid "--fill=<#cols>"
-msgstr "--Kuzuza"
-
-#: src/nano.c:917
-#, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "Ubugari Bya a Isunika in Kuri"
-
-#: src/nano.c:920
-#, fuzzy
-msgid "-s <prog>"
-msgstr "-S"
-
-#: src/nano.c:920
-msgid "--speller=<prog>"
-msgstr ""
-
-#: src/nano.c:921
-msgid "Enable alternate speller"
-msgstr ""
-
-#: src/nano.c:924
-#, fuzzy
-msgid "Auto save on exit, don't prompt"
-msgstr "Kubika ku Gusohoka Urwinjiriro"
-
-#: src/nano.c:926
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:929
-#, fuzzy
-msgid "View mode (read-only)"
-msgstr "Gusoma Ubwoko"
-
-#: src/nano.c:931
-#, fuzzy
-msgid "Don't wrap long lines"
-msgstr "Gufunika Imirongo"
-
-#: src/nano.c:933
-#, fuzzy
-msgid "Don't show the two help lines"
-msgstr "Garagaza Ifashayobora Idirishya"
-
-#: src/nano.c:934
-#, fuzzy
-msgid "Enable suspension"
-msgstr "Imbeba"
-
-#: src/nano.c:935
-msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:939
-#, fuzzy
-msgid "(ignored, for Pico compatibility)"
-msgstr "(kugirango Bihuye neza"
-
-#: src/nano.c:949
-#, fuzzy, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr "Verisiyo"
-
-#: src/nano.c:954
-#, fuzzy, c-format
-msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
-msgstr "Muhinduzi HTTP www Muhinduzi org"
-
-#: src/nano.c:955
-#, fuzzy, c-format
-msgid ""
-"\n"
-" Compiled options:"
-msgstr "Amahitamo"
-
-#: src/nano.c:1033
-#, fuzzy
-msgid "Sorry, support for this function has been disabled"
-msgstr "Gushigikira kugirango iyi Umumaro Yahagaritswe"
-
-#: src/nano.c:1055
-#, fuzzy
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Kubika Byahinduwe"
-
-#: src/nano.c:1109
-msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
-
-#: src/nano.c:1135
-#, c-format
-msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
-
-#: src/nano.c:1203
-#, fuzzy
-msgid "Received SIGHUP or SIGTERM\n"
-msgstr "Cyangwa"
-
-#: src/nano.c:1225
-#, fuzzy, c-format
-msgid "Use \"fg\" to return to nano.\n"
-msgstr "Kuri Garuka Kuri"
-
-#: src/nano.c:1407
-#, fuzzy
-msgid "enabled"
-msgstr "Bikora"
-
-#: src/nano.c:1408
-#, fuzzy
-msgid "disabled"
-msgstr "Yahagaritswe"
-
-#: src/nano.c:1575 src/winio.c:1256
-#, fuzzy
-msgid "Unknown Command"
-msgstr "Ibendera"
-
-#: src/nano.c:1701
-msgid "XON ignored, mumble mumble"
-msgstr ""
-
-#: src/nano.c:1706
-msgid "XOFF ignored, mumble mumble"
-msgstr ""
-
-#: src/nano.c:2246 src/rcfile.c:1189
-#, fuzzy, c-format
-msgid "Requested tab size \"%s\" is invalid"
-msgstr "Isunika Ingano Sibyo"
-
-#: src/nano.c:2305 src/rcfile.c:1114
-#, 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:134
-#, fuzzy, c-format
-msgid "Error in %s on line %lu: "
-msgstr "in ku Umurongo"
-
-#: src/rcfile.c:189
-#, c-format
-msgid "Argument '%s' has an unterminated \""
-msgstr ""
-
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
-#, fuzzy
-msgid "Regex strings must begin and end with a \" character"
-msgstr "Ikurikiranyanyuguti Na Impera Na: a Inyuguti"
-
-#: src/rcfile.c:242 src/search.c:62
-#, c-format
-msgid "Bad regex \"%s\": %s"
-msgstr ""
-
-#: src/rcfile.c:262
-#, fuzzy
-msgid "Missing syntax name"
-msgstr "Izina:"
-
-#: src/rcfile.c:332
-msgid "The \"none\" syntax is reserved"
-msgstr ""
-
-#: src/rcfile.c:339
-msgid "The \"default\" syntax must take no extensions"
-msgstr ""
-
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Kongeramo a Ibara a Umurongo"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Ibara Izina:"
-
-#: src/rcfile.c:472 src/rcfile.c:569
-#, fuzzy
-msgid "Missing key name"
-msgstr "Izina:"
-
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
-
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
-msgstr ""
-
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
-
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
-
-#: src/rcfile.c:518 src/rcfile.c:603
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "OYA"
-
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
-
-#: src/rcfile.c:711
-#, 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:733
-#, fuzzy
-msgid "Cannot add a color command without a syntax command"
-msgstr "Kongeramo a Ibara a Umurongo"
-
-#: src/rcfile.c:738
-#, fuzzy
-msgid "Missing color name"
-msgstr "Ibara Izina:"
-
-#: src/rcfile.c:758
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Ibara Bibonerana"
-
-#: src/rcfile.c:776 src/rcfile.c:895
-msgid "Missing regex string"
-msgstr ""
-
-#: src/rcfile.c:848
-#, fuzzy
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"Gutangira a Impera"
-
-#: src/rcfile.c:890
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kongeramo a Ibara a Umurongo"
-
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
-
-#: src/rcfile.c:962
-msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr ""
-
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr ""
-
-#: src/rcfile.c:1037 src/rcfile.c:1217
-#, c-format
-msgid "Syntax \"%s\" has no color commands"
-msgstr ""
-
-#: src/rcfile.c:1055
-#, fuzzy, c-format
-msgid "Command \"%s\" not understood"
-msgstr "OYA"
-
-#: src/rcfile.c:1061
-#, fuzzy
-msgid "Missing flag"
-msgstr "Ibendera"
-
-#: src/rcfile.c:1083
-#, c-format
-msgid "Option \"%s\" requires an argument"
-msgstr ""
-
-#: src/rcfile.c:1101
-msgid "Option is not a valid multibyte string"
-msgstr ""
-
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
-#, fuzzy
-msgid "Non-blank characters required"
-msgstr "Isunika Na Umwanya Inyuguti Bya ngombwa"
-
-#: src/rcfile.c:1137
-#, fuzzy
-msgid "Two single-column characters required"
-msgstr "UMWE Inkingi Inyuguti Bya ngombwa"
-
-#: src/rcfile.c:1203
-#, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Ibendera"
-
-#: src/rcfile.c:1212
-#, fuzzy, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Ibendera"
-
-#: src/rcfile.c:1271
-#, fuzzy
-msgid "I can't find my home directory!  Wah!"
-msgstr "Gushaka Ku Ntangiriro bushyinguro"
-
-#: src/rcfile.c:1309
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Press Enter to continue starting nano.\n"
-msgstr "Kuri urifuzagukomeza"
-
-#: 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:204
-#, fuzzy
-msgid " (to replace) in selection"
-msgstr "(Kuri Gusimbura in Ihitamo"
-
-#: src/search.c:206
-#, 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:771
-#, fuzzy
-msgid "Could not pipe"
-msgstr "OYA"
-
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
-#, fuzzy
-msgid "Could not fork"
-msgstr "OYA"
-
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1875
-#, fuzzy, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Gushyiraho akugarizo Ikurikiranyanyuguti"
-
-#: src/text.c:2274
-#, fuzzy
-msgid "Can now UnJustify!"
-msgstr "NONEAHA"
-
-#: src/text.c:2472
-#, fuzzy
-msgid "Edit a replacement"
-msgstr "a"
-
-#: src/text.c:2558
-#, fuzzy
-msgid "Could not create pipe"
-msgstr "OYA Kurema"
-
-#: src/text.c:2560
-#, fuzzy
-msgid "Creating misspelled word list, please wait..."
-msgstr "ijambo Urutonde Tegereza"
-
-#: src/text.c:2652
-#, fuzzy
-msgid "Could not get size of pipe buffer"
-msgstr "OYA Kubona Ingano Bya"
-
-#: src/text.c:2703
-#, fuzzy
-msgid "Error invoking \"spell\""
-msgstr "Genzuranyuguti"
-
-#: src/text.c:2706
-#, fuzzy
-msgid "Error invoking \"sort -f\""
-msgstr "Ishungura F"
-
-#: src/text.c:2709
-msgid "Error invoking \"uniq\""
-msgstr ""
-
-#: src/text.c:2766 src/text.c:2975
-#, fuzzy
-msgid "Finished checking spelling"
-msgstr "Ivuganyuguti"
-
-#: src/text.c:2825
-#, fuzzy, c-format
-msgid "Error invoking \"%s\""
-msgstr "Genzuranyuguti"
-
-#: src/text.c:2970
-#, fuzzy, c-format
-msgid "Spell checking failed: %s"
-msgstr "Byanze"
-
-#: src/text.c:2972
-#, fuzzy, c-format
-msgid "Spell checking failed: %s: %s"
-msgstr "Byanze"
-
-#: src/text.c:3040
-#, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
-msgstr ""
-
-#: src/text.c:3041
-#, fuzzy
-msgid "In Selection:  "
-msgstr "Kuri Idosiye"
-
-#: src/utils.c:409 src/utils.c:421
-#, 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:2265
-msgid ""
-"Warning: Modifying a file which is not locked, check directory permission?"
-msgstr ""
-
-#: src/winio.c:3370
-#, fuzzy, c-format
-msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "Umurongo Col INYUGUTI"
-
-#: src/winio.c:3502
-#, 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:3503
-#, fuzzy
-msgid "version"
-msgstr "Verisiyo"
-
-#: src/winio.c:3504
-#, fuzzy
-msgid "Brought to you by:"
-msgstr "Kuri ku"
-
-#: src/winio.c:3505
-#, fuzzy
-msgid "Special thanks to:"
-msgstr "Kuri"
-
-#: src/winio.c:3506
-msgid "The Free Software Foundation"
-msgstr ""
-
-#: src/winio.c:3507
-msgid "For ncurses:"
-msgstr ""
-
-#: src/winio.c:3508
-#, fuzzy
-msgid "and anyone else we forgot..."
-msgstr "Na Ikindi Twebwe"
-
-#: src/winio.c:3509
-#, 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 "-E [dir]"
-#~ msgstr "-E"
-
-#, fuzzy
-#~ msgid "Use more space for editing"
-#~ msgstr "Birenzeho Umwanya kugirango"
-
-#, fuzzy
-#~ msgid "Do regular expression searches"
-#~ msgstr "Ibisanzwe imvugo"
-
-#, fuzzy
-#~ msgid "-o [dir]"
-#~ msgstr "-o"
-
-#, fuzzy
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Kuzuza Kuri Gufunika Imirongo ku"
-
-#, fuzzy
-#~ msgid "Verbatim input"
-#~ msgstr "Iyinjiza"
-
-#, 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
index c588c7e5..13e58cbe 100644
--- a/po/sl.gmo
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
index 0b0279a0..7d29804e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,14 +3,13 @@
 # This file is distributed under the same license as the nano package.
 #
 # Damir Jerovšek <damir.jerovsek@gmail.com>, 2012.
-# Klemen Košir <klemen913@gmail.com>, 2009, 2012 - 2013.
 # 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: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -22,132 +21,129 @@ msgstr ""
 "%100==4 ? 3 : 0);\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
 msgstr "Pojdi v mapo"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:277 src/browser.c:324 src/browser.c:347 src/files.c:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Napaka med branjem %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:665 src/browser.c:674
+#: src/browser.c:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(mapa)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(nad. mapa)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 msgid "Search"
 msgstr "Iskanje"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Backwards]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 msgid "Search Wrapped"
 msgstr "Iskanje je ovito"
 
-#: 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "To je edina pojavitev niza"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Ni trenutnega vzorca iskanja"
 
-#: src/files.c:137
+#: src/files.c:138
 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:143
-#, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+#: src/files.c:144
+#, 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:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Med zapisovanjem zaklepne datoteke %s je prišlo do napake: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Med brisanjem zaklepne datoteke %s je prišlo do napake: %s"
 
-#: src/files.c:271
-#, c-format
-msgid "Error opening lockfile %s: %s"
+#: src/files.c:266
+#, 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:281
-#, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+#: src/files.c:276
+#, 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."
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ni mogo�e vstaviti datoteke izven %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Ni ve� medpomnilnikov odprtih datotek"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Preklopljeno na %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Nov medpomnilnik"
 
-#: src/files.c:840
+#: src/files.c:835
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -156,7 +152,7 @@ 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -177,7 +173,7 @@ msgstr[3] ""
 "Prebrane so %lu vrstice (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
 "dovoljenj za pisanje)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -186,7 +182,7 @@ 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -205,7 +201,7 @@ msgstr[3] ""
 "Prebrane so %lu vrstice (pretvorjeno iz oblike Mac - Opozorilo: ni dovoljenj "
 "za pisanje)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -214,7 +210,7 @@ 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -233,7 +229,7 @@ msgstr[3] ""
 "Prebrane so %lu vrstice (Pretvorjeno iz oblike DOS - Opozorilo: ni dovoljenj "
 "za pisanje)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -242,7 +238,7 @@ msgstr[1] "Prebrana je %lu vrstica"
 msgstr[2] "Prebrani sta %lu vrstici"
 msgstr[3] "Prebrane so %lu vrstice"
 
-#: src/files.c:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -251,88 +247,88 @@ 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Branje datoteke"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Nova datoteka"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ni mogo�e najti"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" je mapa"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" je datoteka naprave"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Ukaz za izvedbo v novem medpomnilniku [iz %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ukaz za izvedbo [iz %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Datoteka za vstavitev v nov medpomnilnik [iz %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Datoteka za vstavitev [iz %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Neveljavna tipka v ne-ve�-medpomnilniškem na�inu"
 
-#: src/files.c:1594
+#: src/files.c:1591
 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:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ni mogo�e pisati zunaj %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Napaka med pisanjem datoteke varnostne kopije %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Ali je preve� varnostnih kopij datotek?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Napaka med pisanjem %s:%s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Napaka med pisanjem v za�asno datoteko: %s"
@@ -390,16 +386,16 @@ msgstr "Datoteka že obstraja. Ali naj bo prepisana? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Ali želite datoteko shraniti z DRUGIM imenom? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(ve�)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -408,7 +404,7 @@ msgstr ""
 "\n"
 "Za nadaljevanje pritisnite Enter\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -418,7 +414,7 @@ msgstr ""
 "Mapa je namenjena shranjevanju in nalaganju zgodovine iskanja in položaja "
 "kazalke\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -428,7 +424,7 @@ msgstr ""
 "S programom Nano ne bo mogo�e shranjevati in nalagati zgodovine iskanja in "
 "položaja kazalke\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -437,7 +433,7 @@ 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -448,645 +444,678 @@ msgstr ""
 "Premaknjena je na prednostno mesto (%s)\n"
 "Za ve� podrobnosti si poglejte pogosto zastavljena vprašanja."
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Prekli�i"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Zamenjaj"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Brez. zam."
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Lo�. �rk"
+msgid "Exit"
+msgstr "Kon�aj"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Nazaj"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Log. izraz"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "Prej. Zgo."
+msgid "Close"
+msgstr "Zapri"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Nasl. Zgo."
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Odizr. be."
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Nasl. bes."
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Odporavnaj"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "Iš�i nas."
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Prva dat."
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Zadnja dat."
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Do datotek"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "oblika DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "oblika Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Pripni"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Pripni na za�et."
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Varnostna kopija"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Izvedi ukaz"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Pojdi v mapo"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Pomo�"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Kon�aj"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Poiš�i"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Pred. str."
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Nasl. str."
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Prva vrst."
+#: src/global.c:487
+msgid "Replace"
+msgstr "Zamenjaj"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Zad. vrst."
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "V vrstico"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "V priprav."
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Pred. vrs."
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Za�. odst."
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Nasl. vrs."
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Kon. odst."
+#: src/global.c:491
+msgid "Read File"
+msgstr "Odpri dat."
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Pop. por."
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Osveži"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Vstavi dat."
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "V vrstico"
-
-#: src/global.c:551
+#. 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:501
 msgid "Justify the current paragraph"
 msgstr "Poravnaj trenutni odstavek"
 
-#. 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Prekli�i trenutno funkcijo"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Pokaži to besedilo pomo�i"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zapri trenutni medpomnilnik datoteke / Kon�aj nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Kon�aj nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Zapiši trenutno datoteko na disk"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Vstavi drugo datoteko v trenutno"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Poiš�i niz znakov ali logi�ni izraz"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "Pojdi na predhodni zaslon"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "Poiš�i niz znakov ali logi�ni izraz"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Pojdi na naslednji zaslon"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Pojdi na naslednji zaslon"
+
+#: src/global.c:525
 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:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Prilepi iz medpomnilnika izreza v trenutno vrstico"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Prikaži položaj kazalke"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Vklju�i �rkovalnik, �e je na voljo"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Zamenjaj niz ali logi�ni izraz"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Pojdi v Å¡tevilko vrstice in stolpca"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Ozna�i besedilo na mestu kazalke"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Ponovi zadnje iskanje"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopiraj trenutno vrstico in jo shrani v medpomni. izreza"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Zamakni trenutno vrstico"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Odstrani zamik trenutne vrstice"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Razveljavi zadnje dejanje"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Uveljavi zadnje razveljavljeno dejanje"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Pojdi naprej za en znak"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Pojdi nazaj za en znak"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Pojdi naprej za eno besedo"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Pojdi nazaj za eno besedo"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "Pojdi v predhodno vrstico"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Pojdi v naslednjo vrstico"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "Pojdi na za�etek trenutne vrstice"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Pojdi na konec trenutne vrstice"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Pojdi na za�etek odstavka; nato prejšnjega odstavka"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Pojdi preko konca odstavka; nato naslednjega odstavka"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Pojdi v prvo vrstico datoteke"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Pojdi v zadnjo vrstico datoteke"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Pojdi do ujemajo�ega oklepaja"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Pomakni se navzgor za eno vrstico brez drsenja kazalke"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Pomakni se navzdol za eno vrstico brez drsenja kazalke"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Preklopi na prejšnji medpomnilnik datoteke"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Preklopi na naslednji medpomnilnik datoteke"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Vstavi naslednji natan�ni pritisk tipk"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Vstavi tabulator na položaju kazalke"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Vstavi novo vrstico na položaju kazalke"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Izbriši znak pod kazalko"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Izbriši znak levo od kazalke"
 
-#: src/global.c:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Poravnaj celotno datoteko"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Preštej število besed, vrstic in znakov"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Osveži (ponovno nariši) trenutni zaslon"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Daj urejevalnik v pripravljenost (�e je omogo�eno)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Preklopi lo�evanje velikosti �rk iskanja"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Obrni smer iskanja"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Preklopi uporabo logi�nih izrazov"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Prikli�i predhodni niz iskanja/zamenjave"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Prikli�i naslednji niz iskanja/zamenjave"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Pojdi v brskalnik datotek"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Preklopi uporabo oblike DOS"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Preklopi uporabo oblike Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Preklopi pripenjanje"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Preklopi pripenjanje na za�etek"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Preklopi ustvarjanje varnostne kopije izvirne datoteke"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Izvedi zunanji ukaz"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Preklopi uporabo novega medpomnilnika"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Kon�aj brskalnik datotek"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Pojdi k prvi datoteki na seznamu"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Pojdi k zadnji datoteki na seznamu"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "Pojdi k naslednji datoteki na seznamu"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "Pojdi k predhodni datoteki na seznamu"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Pojdi k naslednji datoteki na seznamu"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Pojdi v mapo"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Zapri"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Vklju�i �rkovalnik, �e je na voljo"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Pojdi v predhodno vrstico"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Pojdi v naslednjo vrstico"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Pomo�"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Prekli�i"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Zapiši"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Pojdi v mapo"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Izre. bes."
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Poravnaj"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Odpri dat."
+#: src/global.c:726
+msgid "To Spell"
+msgstr "ÄŒrkuj"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Izre. bes."
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "V vrstico"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Odporavnaj"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Lo�. �rk"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Odizr. be."
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Log. izraz"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Nazaj"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Brez. zam."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Položaj kaz."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "ÄŒrkuj"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Pred. str."
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Nasl. str."
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Prva vrst."
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Zad. vrst."
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ni oklepaj"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Ozna. bes."
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopi. bes."
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Zama. bes."
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Odzam. be."
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Razveljavi"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Uveljavi"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Naprej"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Nazaj"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Nasl. bes."
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Naprej"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Pred. bes."
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Pred. vrs."
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Nasl. vrs."
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Nasl. bes."
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Domov"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Najdi drug oklepaj"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Za�. odst."
 
-#: src/global.c:899
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Kon. odst."
+
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Pomik gor"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Pomik dol"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Predhodna datoteka"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Naslednja datoteka"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Natan�ni vnos"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Vra�alka"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "IzrezDoKonca"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Å tetje besed"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "V priprav."
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "Prej. Zgo."
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "Nasl. Zgo."
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Nasl. bes."
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "oblika DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "oblika Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Pripni"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Pripni na za�et."
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Varnostna kopija"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Izvedi ukaz"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Do datotek"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Prva dat."
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Zadnja dat."
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Pred. vrs."
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "Na�in pomo�i"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Stalni prikaz položaja kazalke"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Uporaba ene vrstice ve� za urejanje"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Gladko drsenje"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ne lomi dolgih vrstic"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Prikaz presledkov"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Barvno poudarjanje skladnje"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Pametna tipka za Domov"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Samodejno zamikanje"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Izreži do konca"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Prelomi dolgih vrstic"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ne lomi dolgih vrstic"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Pretvarjanje tabulatorjev v presledne znake"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Datoteke varnostnih kopij"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Ve� medpomnilnikov datotek"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Podpora za miško"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Ni pretvorbe iz oblike DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Stanje pripravljenosti"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Blagi prelomi vrstic"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1106,7 +1135,7 @@ msgstr ""
 " Predhodni iskalni niz bo prikazan v oklepajih. Pritisk vnosne tipke brez "
 "predhodnega vnosa besedila, izvede predhodno iskanje.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1120,7 +1149,7 @@ msgstr ""
 " V na�inu Iskanja so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1140,7 +1169,7 @@ msgstr ""
 "V na�inu V vrstico so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1163,7 +1192,7 @@ msgstr ""
 "medpomnilnik (za preklop med medpomnilniki datotek je na voljo bližnjica "
 "Meta-< in >).  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1178,7 +1207,7 @@ msgstr ""
 " V na�inu vstavljanja datoteke so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1205,7 +1234,7 @@ msgstr ""
 " V na�inu zapisovanja so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1228,7 +1257,7 @@ msgstr ""
 "  V na�inu brskanja so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1250,7 +1279,7 @@ msgstr ""
 "predhodnega vnosa besedila, izvede predhodno iskanje.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1258,7 +1287,7 @@ msgstr ""
 " V na�inu iskanja v brskalniku so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1281,7 +1310,7 @@ msgstr ""
 "funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1305,7 +1334,7 @@ msgstr ""
 " V na�inu �rkovanja so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1325,7 +1354,7 @@ msgstr ""
 " V na�inu izvajanja ukazov so na voljo naslednje funkcijske tipke:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1345,7 +1374,7 @@ msgstr ""
 "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:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1363,7 +1392,7 @@ msgstr ""
 "zabeležena s simbolom Meta (M-) in se jih lahko vnese s tipkami Esc, Alt ali "
 "Meta, odvisno od nastavitve tipkovnice."
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1377,15 +1406,15 @@ msgstr ""
 "Nadomestne tipke so prikazane v oklepajih:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "omogo�i/onemogo�i"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Klju� je neveljaven v na�inu pogleda"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1394,7 +1423,7 @@ msgstr ""
 "\n"
 "Medpomnilnik je zapisan v %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1403,7 +1432,7 @@ msgstr ""
 "\n"
 "Medpomnilnik ni zapisan v %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1412,11 +1441,11 @@ msgstr ""
 "\n"
 "Medpomnilnik ni zapisan: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Velikost okna je premajhna za nano ...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1425,260 +1454,265 @@ msgstr ""
 "Uporaba: nano [MOŽNOSTI] [[+VRSTICA,STOLPEC] DATOTEKA] ...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, 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:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Možnost\t\tPomen\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Pokaži to sporo�ilo"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+VRSTICA,STOLPEC"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Za�etek v vrstici VRSTICA, stolpcu STOLPEC"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Omogo�i pametno tipko za Domov"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Shrani varnostne kopije obstoje�ih datotek"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <mapa>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<mapa>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Mapa za shranjevanje edinstvenih varnostnih kopij"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Uporabi krepko namesto obratnega besedila videa"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Pretvori vpisane tabulatorske znake v presledke"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Omogo�i ve� medpomnilnikov datotek"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr "Uporabi zaklepne datoteke"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Beleži in beri zgodovino niza iskanja in zamenjave"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Ne glej datotek nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Popravi težavo z zmedo s tipkami števil�nice"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Ne dodajaj novih vrstic na konec datotek"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ne pretvarjaj datotek iz oblike DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Uporabi eno ali ve� vrstic za urejanje"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "Shrani in preberi mesto kazalke"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <niz>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<niz>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Niz za navajanje"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Omejen na�in"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "Pomikaj se vrsti�no namesto pol-zaslonsko"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <Å¡t. stolpcev>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<Å¡t. stolpcev>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Nastavi Å¡irino tabulatorja na Å¡t. stolpcev stolpcev"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Hitro prazni vrstico stanja"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Prikaži podrobnosti razli�ice in kon�aj"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Zaznaj meje besed natan�neje"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <niz>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<niz>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Uporaba dolo�ila skladnje za barvanje"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Nenehno kaži položaj kazalke"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Popravi težavo zmede tipk vra�alke/izbriši"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Pokaži to besedilo pomo�i"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Samodejno zamakni nove vrstice"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Izreži od kazalke do konca vrstice"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Ne dovoli simbolnih povezav, ampak prepiši"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Omogo�i uporabo miške"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <mapa>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<mapa>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Nastavi mapo delovanja"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Ohrani tipke XON (^Q) in XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Tiho prezri težave za�enjanja kot napake datoteke rc"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <Å¡t. stolpcev>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<Å¡t. stolpcev>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Nastavi to�ko preloma na stolpcu št. stoplca"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Omogo�i nadomestni �rkovalnik"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Samodejno shrani ob izhodu in ne pokaži poziva"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "Dovoli splošno razveljavitev [POSKUSNO]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Na�in pogleda (samo za branje)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ne lomi dolgih vrstic"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Ne pokaži dveh vrstic pomo�i"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Omogo�i stanje pripravljenosti"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Omogo�i blage prelome vrstic"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(prezrto, za združljivost s programom Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano razli�ica %s (kodno prevedena %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1687,163 +1721,172 @@ msgstr ""
 "\n"
 " Kodno prevedene možnosti:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Žal je podpora za to funkcijo onemogo�ena"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 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:1109
+#: src/nano.c:1162
 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:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Branje iz stdin, ^C za prekinitev\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Prejet je bil SIGHUP ali SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Za vrnitev v nano uporabite \"fg\".\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "omogo�eno"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "onemogo�eno"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Neznan ukaz"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON je prezrt, mumble mumble"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF je prezrt, mumble mumble"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Zahtevana velikost tabulatorja \"%s\" je neveljavna"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Zahtevana velikost zapolnitve \"%s\" je neveljavna"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "DdYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "NnNn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "VvAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Vse"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Napaka v %s v vrstici %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' ima neuni�en \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slab logi�ni izraz \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Manjka ime skladnje"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Skladnja \"none\" je pridržana"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Skladnja \"default\" ne sme prejeti nobene pripone"
 
-#: src/rcfile.c:393
-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:398
-msgid "Missing magic string name"
-msgstr "Manjka ime �arobnega niza"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Manjka ime tipke"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, 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:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Treba je navesti funkcijo, ki se veže na tipko"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Treba je navesti meni, ki se veže na tipko (ali \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Ni mogo�e preslikati imena \"%s\" k funkciji"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Ni mogo�e preslikati imena \"%s\" k meniju"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Na žalost je pritisk tipk \"%s\" neveljavna vezava"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Napaka med branjem %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1858,95 +1901,119 @@ msgstr ""
 "\"black\", z neobvezno predpono \"bright\"\n"
 "za osprednje barve."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Ni mogo�e dodati ukaza barve brez ukaza skladnje"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Manjka ime barve"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Barva ozadja \"%s\" ne more biti svetla"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Manjka niz logi�nega izraza"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" potrebuje ustrezen \"end=\""
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Barva ozadja \"%s\" ne more biti svetla"
+
+#: src/rcfile.c:819
 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:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+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:880
+msgid "Missing magic string name"
+msgstr "Manjka ime �arobnega niza"
+
+#: src/rcfile.c:939
+#, 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:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Manjka ime barve"
+
+#: src/rcfile.c:974
+#, 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:962
+#: src/rcfile.c:976
+#, 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 ""
 "Poteka kon�anje programa. Za prilagajanje nastavitev nanorc, uporabite ukaz "
 "nano z možnostjo -I.\n"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ni mogo�e preslikati imena \"%s\" k meniju"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Ukaz \"%s\" ni dovoljen v vklju�eni datoteki"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladnja \"%s\" nima ukazov barv"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ukaz \"%s\" ni razumljiv"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Manjka zastavica"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Manjka ime barve"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Možnost \"%s\" zahteva argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Možnost ni veljaven ve�bajtni niz"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Zahtevani so ne-prazni znaki"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Potrebna sta dva enostolp�na znaka"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Ni mogo�e ponastaviti zastavice \"%s\""
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Neznana zastavica \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ni mogo�e najti doma�e mape!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1960,23 +2027,26 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ni mogo�e najti"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (za zamenjavo) v izbor"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (za zamenjavo)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Ali naj se primerek zamenja?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Zamenjaj z"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1985,19 +2055,20 @@ msgstr[1] "Zamenjana je %lu pojavitev"
 msgstr[2] "Zamenjani sta %lu pojavitvi"
 msgstr[3] "Zamenjane so %lu pojavitve"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1047
 msgid "Enter line number, column number"
 msgstr "Vnesite Å¡tevilko vrstice, Å¡tevilko stolpca"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Neveljavna Å¡tevilka vrstice ali stolpca"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ni oklepaj"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Ni ujemajo�ega oklepaja"
 
@@ -2009,222 +2080,296 @@ msgstr "Ozna�ba je nastavljena"
 msgid "Mark Unset"
 msgstr "Ozna�ba je ponastavljena"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr "Ni�esar ni v medpomnilniku razveljavitve!"
 
-#: 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:440 src/text.c:578
+#, 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:466 src/text.c:603
+#: src/text.c:451 src/text.c:588
 msgid "text add"
 msgstr "dodaj besedilo"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "izbriši besedilo"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "prelomi vrstico"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "združi vrstici"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "izreži besedilo"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "odizreži besedilo"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "prekini vrstico"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "vnesi besedilo"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 msgid "text replace"
 msgstr "zamenjaj besedilo"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo"
+#: src/text.c:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo."
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Ponastavljeno dejanje (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr "Ni�esar ni mogo�e uveljaviti!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Notranja napaka: nastavitev uveljavitve je spodletela. Shranite svoje delo."
+"Notranja napaka: ni mogo�e nastaviti preklica izreza. Shranite svoje delo."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Uveljavljeno dejanje (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Ni mogo�e povezati"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Ni mogo�e ustvariti cevi"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Ni mogo�e razvejiti"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, 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:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo."
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Slab niz navedka %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Zdaj je mogo�e preklicati poravnavo!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Uredi zamenjavo"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Ni mogo�e ustvariti cevi"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Ustvarjanje napa�no �rkovanega seznama besed, po�akajte ..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Ni mogo�e pridobiti velikosti medpomnilnika cevi"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Napaka pri priklicu \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Napaka pri priklicu \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Napaka pri priklicu \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Kon�ano preverjanje �rkovanja"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Napaka pri priklicu \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Vklju�i �rkovalnik, �e je na voljo"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Preverjanje �rkovanja je spodletelo: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Preverjanje �rkovanja je spodletelo: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ne dodajaj novih vrstic na konec datotek"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Pokaži to sporo�ilo"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Pokaži to sporo�ilo"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sBesede: %lu  Vrstice: %ld  Znaki: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "V izboru:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Natan�ni vnos"
+
 #: src/utils.c:409 src/utils.c:421
 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:1557
+#: src/winio.c:1558
 msgid "Unicode Input"
 msgstr "Vnos Unikod"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Pogled"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "MAPA:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Datoteka:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 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:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Urejevalnik besedil nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "razli�ica"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Zaslužni za izid programa:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Posebna zahvala:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "in vse, ki smo jih pozabili navesti ..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 "(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 "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 471dff7a..af309b3b 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index df9e721d..f87edae1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,1098 +1,1100 @@
-# Serbian translation of nano
+# Serbian translation of nano.
 # Copyright (C) 2003 Free Software Foundation, Inc.
-# Danilo Segan <dsegan@gmx.net>, 2003.
+# This file is distributed under the same license as the nano package.
 #
+# Danilo Segan <dsegan@gmx.net>, 2003.
+# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.2.2\n"
+"Project-Id-Version: nano-2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\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: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2013-10-27 08:17+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:221
 msgid "Go To Directory"
 msgstr "Иди у директоријум"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Отказано"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
-#, fuzzy, c-format
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
+#, c-format
 msgid "Error reading %s: %s"
-msgstr "Лоша ни�ка за цитирање %s: %s"
+msgstr "Грешка при читању „%s“: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
-msgstr ""
+msgstr "(дир)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
-msgstr ""
+msgstr "(главни дир)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 msgid " [Case Sensitive]"
-msgstr "[разл. �лова по величини]"
+msgstr " [разл. величину �лова]"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:194
+#: src/browser.c:806 src/search.c:192
 msgid " [Regexp]"
-msgstr "[рег. израз]"
+msgstr " [рег. израз]"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
-msgstr "[уназад]"
+msgstr " [уназад]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Ово је једина појава"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
-msgstr ""
+msgstr "�ема шаблона текуће претраге"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
+"�е могу да одредим мој идентет за датотеку закључавања (није у�пело „getpwuid"
+"()“)"
 
-#: src/files.c:143
-#, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr ""
-
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:144
 #, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "�е могу да одредим назив домаћина за датотеку закључавања: %s"
+
+#: src/files.c:170 src/files.c:207 src/files.c:217
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "Грешка у %s у %d. реду: "
+msgstr "Грешка запи�ивања датотеке закључавања „%s“: %s"
 
-#: src/files.c:234
-#, fuzzy, c-format
+#: src/files.c:232
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "Грешка у %s у %d. реду: "
+msgstr "Грешка бри�ања датотеке закључавања „%s“: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "Грешка у %s у %d. реду: "
+msgid "Error opening lock file %s: %s"
+msgstr "Грешка отварања датотеке закључавања „%s“: %s"
 
-#: src/files.c:281
-#, c-format
-msgid "Error reading lockfile %s: Not enough data read"
-msgstr ""
+#: src/files.c:276
+#, fuzzy, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Грешка читања датотеке закључавања „%s“: �ема довољно података читања"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "�е могох да уметнем датотеку изван %s"
+msgstr "�е могу да уметнем датотеку изван %s"
 
-#: src/files.c:437
-#, fuzzy
+#: src/files.c:431
 msgid "No more open file buffers"
-msgstr "�ема више отворених датотека"
+msgstr "�ема више међумеморије отворених датотека"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
-msgstr "Пребацих �е на %s"
+msgstr "Прешао �ам на %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
-msgstr "�ови бафер"
+msgstr "�ова међумеморија"
 
-#: src/files.c:840
-#, fuzzy, c-format
+#: src/files.c:835
+#, 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:845
-#, fuzzy, c-format
+#: src/files.c:840
+#, 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:851
-#, fuzzy, c-format
+#: src/files.c:846
+#, 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:855
-#, fuzzy, c-format
+#: src/files.c:850
+#, 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:861
-#, fuzzy, c-format
+#: src/files.c:856
+#, 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:865
-#, fuzzy, c-format
+#: src/files.c:860
+#, 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:871
-#, fuzzy, c-format
+#: src/files.c:866
+#, 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:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Учитавам датотеку"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "�ова датотека"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
-msgstr "�е нађох „%s“"
+msgstr "�и�ам нашао „%s“"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ је директоријум"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
-#, fuzzy, c-format
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "Датотека „%s“ чини датотеку уређаја"
+msgstr "„%s“ је датотека уређаја"
 
-#: src/files.c:1031
-#, fuzzy, c-format
+#: src/files.c:1026
+#, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Датотека коју уметнути у нови бафер [из %s] "
+msgstr "�аредба за извршавање у новој међумеморији [из %s] "
 
-#: src/files.c:1033
-#, fuzzy, c-format
+#: src/files.c:1028
+#, c-format
 msgid "Command to execute [from %s] "
-msgstr "�аредба за извршавање"
+msgstr "�аредба за извршавање [из %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Датотека коју уметнути у нови бафер [из %s] "
+msgstr "Датотека за уметање у нову међумеморију [из %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Датотека коју уметнути [из %s] "
+msgstr "Датотека за уметање [из %s] "
 
-#: src/files.c:1291
-#, fuzzy
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
-msgstr "�едозвољен та�тер у не-вишебафер�ком режиму"
+msgstr "�едозвољен та�тер у не-вишемеђумемориј�ком режиму"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
+"�и�ам у�пео да запишем датотеку резерве, да на�тавим �а чувањем? (Одговорите "
+"�а N ако ни�те �игурни)"
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "�е могох да упишем изван %s"
+msgstr "�е могу да пишем ван %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
+"�е могу да додам подешавање „--nofollow“ и�пред или иза �имболичке везе"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr ""
+msgstr "Грешка запи�ивања датотеке резерве „%s“: %s"
 
-#: src/files.c:1813 src/nano.c:706
-#, fuzzy
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
-msgstr ""
-"\n"
-"�е упи�ах %s (превише резервних датотека?)\n"
+msgstr "Превише резервних датотека?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
-#, fuzzy, c-format
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
+#, c-format
 msgid "Error writing %s: %s"
-msgstr "Лоша ни�ка за цитирање %s: %s"
+msgstr "Грешка приликом пи�ања „%s“: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr ""
+msgstr "Грешка пи�ања привремене датотеке: %s"
 
 #: src/files.c:2140
-#, fuzzy, c-format
+#, 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:2245
 msgid " [DOS Format]"
-msgstr "[ДОС запи�]"
+msgstr " [ДОС запи�]"
 
 #: src/files.c:2246
 msgid " [Mac Format]"
-msgstr "[Мек запи�]"
+msgstr " [Мек запи�]"
 
 #: src/files.c:2248
 msgid " [Backup]"
-msgstr "[Резерва]"
+msgstr " [Резерва]"
 
 #: src/files.c:2256
 msgid "Prepend Selection to File"
-msgstr "Додај избор на почетак датотеке"
+msgstr "Додаје избор на почетак датотеке"
 
 #: src/files.c:2257
 msgid "Append Selection to File"
-msgstr "Додај избор на крај датотеке"
+msgstr "Додаје избор на крај датотеке"
 
 #: src/files.c:2258
 msgid "Write Selection to File"
-msgstr "Упиши избор у датотеку"
+msgstr "Упи�ује избор у датотеку"
 
 #: src/files.c:2261
 msgid "File Name to Prepend to"
-msgstr "У коју датотеку додати"
+msgstr "�азив датотеке којој ће претходити"
 
 #: src/files.c:2262
 msgid "File Name to Append to"
-msgstr "У коју датотеку додати"
+msgstr "�азив датотеке за којом ће �ледити"
 
 #: src/files.c:2263
 msgid "File Name to Write"
-msgstr "У коју датотеку упи�ати"
+msgstr "�азив датотеке у којој ће упи�ати"
 
 #: src/files.c:2394
-#, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Датотека по�тоји, да ПРЕС�ИМИМ?"
 
 #: src/files.c:2403
 msgid "Save file under DIFFERENT NAME ? "
-msgstr ""
+msgstr "Да �ачувам датотеку под ДРУГ�ЧИЈИМ ��ЗИВОМ ?"
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "Датотека је измењена од када �те је отворили, да на�тавим �а чувањем ?"
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
-msgstr "(више)"
+msgstr "(још)"
 
-#: src/files.c:2942
-#, fuzzy, c-format
+#: src/files.c:2939
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"Прити�ните ентер за на�тавак покретања нана\n"
+"Прити�ните Уне�и да на�тавите\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
+"�е могу да направим директоријум „%s“: %s\n"
+"Потребан је за чување/учитавање и�торијата претраге или положаја кур�ора\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
+"Путања „%s“ није директоријум а мора бити.\n"
+"�ано неће бити у могућно�ти да учита или да �ачува и�торијат претраге или "
+"положаја кур�ора\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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/files.c:2983
+#: src/files.c:2978
 #, 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"
+"(погледајте нанова ЧПП о овој измени)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Откажи"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Замени"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Без замене"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Вел. �лова"
+msgid "Exit"
+msgstr "Изађи"
 
 #: src/global.c:472
-#, fuzzy
-msgid "Backwards"
-msgstr "[уназад]"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Рег. израз"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-#, fuzzy
-msgid "PrevHstory"
-msgstr "И�торијат"
+msgid "Close"
+msgstr "Затвори"
 
-#: src/global.c:503
+#: src/global.c:473
 #, fuzzy
-msgid "NextHstory"
-msgstr "И�торијат"
+msgid "Uncut Text"
+msgstr "�е �еци тек�т"
 
-#: src/global.c:504
+#: src/global.c:475
 #, fuzzy
-msgid "Go To Text"
-msgstr "Иди у ред"
+msgid "Unjustify"
+msgstr "Одравнај"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
-msgstr "Где је"
+msgstr "Где је �лдћи"
 
-#: src/global.c:508
-#, fuzzy
-msgid "First File"
-msgstr "Први ред"
-
-#: src/global.c:509
-#, fuzzy
-msgid "Last File"
-msgstr "По�ледњи ред"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "У датотеке"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "ДОС запи�"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Мекинтош запи�"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "�адодај"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Додај на почетак"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Сачини резерву датотеке"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Изврши наредбу"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Иди у директоријум"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Добијте помоћ"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Изађи"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Где је"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Претходна �трана"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Следећа �трана"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Први ред"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Замени"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "По�ледњи ред"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Иде у ред"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Су�пендуј"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Претходни ред"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Следећи ред"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr ""
+#: src/global.c:491
+msgid "Read File"
+msgstr "Читај датотеку"
 
-#: src/global.c:542
-#, fuzzy
+#: src/global.c:493
 msgid "FullJstify"
-msgstr "Пораванај"
+msgstr "ПуноПоравнање"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "О�вежи"
 
-#: src/global.c:546
-#, fuzzy
-msgid "Insert File"
-msgstr "Следећа датотека"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Иди у ред"
-
-#: src/global.c:551
-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:556
+#: src/global.c:501
+msgid "Justify the current paragraph"
+msgstr "Поравнава текући па�у�"
+
+#: src/global.c:503
 msgid "Cancel the current function"
-msgstr "Откажи текућу операцију"
+msgstr "Отказује текућу операцију"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
-msgstr ""
+msgstr "Приказује тек�т ове помоћи"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Затвори тренутно учитану датотеку/изађи из нана"
+msgstr "Затвара међумеморију тренутне датотеке / излази из нана"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
-msgstr "Изађи из нана"
+msgstr "Излази из нана"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
-msgstr "Упиши текућу датотеку на ди�к"
+msgstr "Упи�ује текућу датотеку на ди�к"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
-msgstr "Уметни другу датотеку у текућу"
+msgstr "Умеће другу датотеку у текућу"
 
-#: src/global.c:570
-#, fuzzy
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
-msgstr "Кори�ти регуларне изразе"
+msgstr "Тражи ни�ку или регуларни израз"
 
-#: src/global.c:571
+#: src/global.c:520
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Пребаци �е на претходни екран"
+msgid "Search for a string"
+msgstr "Тражи ни�ку или регуларни израз"
 
-#: src/global.c:572
+#: src/global.c:522
 #, fuzzy
-msgid "Go to next screen"
-msgstr "Пребаци �е на �ледећи екран"
+msgid "Go one screenful up"
+msgstr "Иде на �ледећи екран"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Иде на �ледећи екран"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "И�еци текући ред и �ме�ти га у и�ечке"
+msgstr "И�еца текући ред и �мешта га у и�ечке"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Убаци и�ечак у текући ред"
+msgstr "Убацује и�ечак у текући ред"
 
-#: src/global.c:578
-#, fuzzy
+#: src/global.c:528
 msgid "Display the position of the cursor"
-msgstr "Прикажи положај курзора"
+msgstr "Приказује положај курзора"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
-msgstr "Покрени правопи�ну проверу, ако је до�тупна"
+msgstr "Покреће проверу правопи�а, ако је до�тупна"
 
-#: src/global.c:582
-#, fuzzy
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
-msgstr "Кори�ти регуларне изразе"
+msgstr "Замењује ни�ку или регуларни израз"
 
-#: src/global.c:583
-#, fuzzy
+#: src/global.c:533
 msgid "Go to line and column number"
-msgstr "Иди на одређени ред"
+msgstr "Иде на ред и број �тупца"
 
-#: src/global.c:585
+#: src/global.c:535
 #, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "Означи тек�т на текућем положају курзора"
+msgid "Mark text starting from the cursor position"
+msgstr "Означава тек�т на положају курзора"
 
-#: src/global.c:586
-msgid "Repeat last search"
-msgstr ""
-
-#: src/global.c:588
+#: src/global.c:536
 #, fuzzy
+msgid "Repeat the last search"
+msgstr "Понавља по�ледњу претрагу"
+
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "И�еци текући ред и �ме�ти га у и�ечке"
+msgstr "И�еца текући ред и �мешта га у и�ечке"
 
-#: src/global.c:589
-#, fuzzy
+#: src/global.c:539
 msgid "Indent the current line"
-msgstr "Додај на текућу датотеку"
+msgstr "Увлачи текући ред"
 
-#: src/global.c:590
-#, fuzzy
+#: src/global.c:540
 msgid "Unindent the current line"
-msgstr "Додај на текућу датотеку"
+msgstr "Поништава увлачење текућег реда"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Поништава по�ледњу радњу"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Враћа по�ледњу поништену радњу"
 
-#: src/global.c:594
-#, fuzzy
+#: src/global.c:544
 msgid "Go forward one character"
-msgstr "Иди један знак напред"
+msgstr "Иде један знак унапред"
 
-#: src/global.c:595
-#, fuzzy
+#: src/global.c:545
 msgid "Go back one character"
-msgstr "Иди један знак назад"
+msgstr "Иде један знак уназад"
 
-#: src/global.c:597
-#, fuzzy
+#: src/global.c:547
 msgid "Go forward one word"
-msgstr "Иди једну реч унапред"
+msgstr "Иде једну реч унапред"
 
-#: src/global.c:598
-#, fuzzy
+#: src/global.c:548
 msgid "Go back one word"
-msgstr "Иди једну реч уназад"
+msgstr "Иде једну реч уназад"
 
-#: src/global.c:600
-#, fuzzy
+#: src/global.c:550
 msgid "Go to previous line"
-msgstr "Пребаци �е на претходни екран"
+msgstr "Иде на претходни ред"
 
-#: src/global.c:601
-#, fuzzy
+#: src/global.c:551
 msgid "Go to next line"
-msgstr "Иди један ред и�под"
+msgstr "Иде на �ледећи ред"
 
-#: src/global.c:602
-#, fuzzy
+#: src/global.c:552
 msgid "Go to beginning of current line"
-msgstr "Иди на почетак текућег реда"
+msgstr "Иде на почетак текућег реда"
 
-#: src/global.c:603
-#, fuzzy
+#: src/global.c:553
 msgid "Go to end of current line"
-msgstr "Иди на крај текућег реда"
+msgstr "Иде на крај текућег реда"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr ""
+msgstr "Иде на почетак па�у�а; затим претходног па�у�а"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr ""
+msgstr "Иде одмах по�ле краја па�у�а; затим �ледећег па�у�а"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
-msgstr "Иди у први ред датотеке"
+msgstr "Иде у први ред датотеке"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
-msgstr "Иди у по�ледњи ред датотеке"
+msgstr "Иде у по�ледњи ред датотеке"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:563
 msgid "Go to the matching bracket"
-msgstr "�ема одговарајуће заграде"
+msgstr "Иде на одговарајућу заграду"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Помера �е један ред горе без померања кур�ора"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Помера �е један ред доле без померања кур�ора"
 
-#: src/global.c:623
-#, fuzzy
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
-msgstr "Пребаци �е на претходни екран"
+msgstr "Пребацује �е на међумеморију претходне датотеке"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
-msgstr ""
+msgstr "Пребацује �е на међумеморију �ледеће датотеке"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
-msgstr ""
+msgstr "Умеће �ледећу до�ловно�т прити�ка та�тера"
 
-#: src/global.c:630
-#, fuzzy
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
-msgstr "Уметни прелом реда на текућем положају"
+msgstr "Умеће табулатор на положај кур�ора"
 
-#: src/global.c:632
-#, fuzzy
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
-msgstr "Уметни прелом реда на текућем положају"
+msgstr "Умеће нови ред на положај кур�ора"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
-msgstr "Обриши знак под курзором"
+msgstr "Брише знак под курзором"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
-msgstr "Обриши знак лево од курзора"
+msgstr "Брише знак лево од курзора"
 
-#: src/global.c:639
-#, fuzzy
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Убаци и�ечак у текући ред"
+msgstr "Од�еца од положаја курзора до краја датотеке"
 
-#: src/global.c:642
-#, fuzzy
+#: src/global.c:584
 msgid "Justify the entire file"
-msgstr "Поравнај текући па�у�"
+msgstr "Поравнава читаву датотеку"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Броји речи, редова, и знакова"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
-msgstr "О�вежи (понов и�цртај) текући екран"
+msgstr "О�вежава (поново и�цртава) текући екран"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Обу�тавља уређивача (ако је обу�тављање укључено)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "Пребацује о�етљиво�т величине �лова у претрази"
 
-#: src/global.c:656
-#, fuzzy
+#: src/global.c:598
 msgid "Reverse the direction of the search"
-msgstr "Прикажи положај курзора"
+msgstr "Заокреће правац претраге"
 
-#: src/global.c:660
-#, fuzzy
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
-msgstr "Кори�ти регуларне изразе"
+msgstr "Пребацује коришћење регуларних израза"
 
-#: src/global.c:664
-#, fuzzy
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
-msgstr "Уреди ни�ке претходних претрага и замена"
+msgstr "Опозива ни�ку претходне претраге и замене"
 
-#: src/global.c:666
-#, fuzzy
+#: src/global.c:608
 msgid "Recall the next search/replace string"
-msgstr "Уреди ни�ке претходних претрага и замена"
+msgstr "Опозива ни�ку �ледеће претраге и замене"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
-msgstr "Иди у прегледач датотека"
+msgstr "Иде у прегледач датотека"
 
-#: src/global.c:672
-#, fuzzy
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
-msgstr "Упишите датотеку у ДОС облику"
+msgstr "Пребацује коришћење ДОС запи�а"
 
-#: src/global.c:673
-#, fuzzy
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
-msgstr "Упишите датотеку у Мек облику"
+msgstr "Пребацује коришћење Мекинтош запи�а"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
-msgstr ""
+msgstr "Пребацује додавање након"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Пребацује додавање пре"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Пребацује �тварање резерве изворне датотеке"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
-msgstr "Изврши �пољну наредбу"
+msgstr "Извршава �пољну наредбу"
 
-#: src/global.c:684
-#, fuzzy
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
-msgstr "Измена убацивања у нови бафер"
+msgstr "Пребацује коришћење нове међумеморије"
 
-#: src/global.c:687
-#, fuzzy
+#: src/global.c:625
 msgid "Exit from the file browser"
-msgstr "Иди у прегледач датотека"
+msgstr "Излази из прегледача датотека"
 
-#: src/global.c:689
-#, fuzzy
+#: src/global.c:626
 msgid "Go to the first file in the list"
-msgstr "Иди у први ред датотеке"
+msgstr "Иде у прву датотеку на �пи�ку"
 
-#: src/global.c:691
-#, fuzzy
+#: src/global.c:627
 msgid "Go to the last file in the list"
-msgstr "Иди у по�ледњи ред датотеке"
+msgstr "Иде у по�ледњу датотеку на �пи�ку"
 
-#: src/global.c:692
-#, fuzzy
+#: src/global.c:628
+msgid "Go to the previous file in the list"
+msgstr "Иде на претходну датотеку на �пи�ку"
+
+#: src/global.c:629
 msgid "Go to the next file in the list"
-msgstr "Иди у по�ледњи ред датотеке"
+msgstr "Иде у �ледећу датотеку на �пи�ку"
+
+#: src/global.c:630
+msgid "Go to directory"
+msgstr "Иде у директоријум"
 
-#: src/global.c:693
+#: src/global.c:633
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Иди у први ред датотеке"
+msgid "Invoke the linter, if available"
+msgstr "Покреће проверу правопи�а, ако је до�тупна"
 
-#: src/global.c:694
-msgid "Go to directory"
-msgstr "Иди у директоријум"
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Иде на претходни ред"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Затвори"
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Иде на �ледећи ред"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
-msgstr "И�пиши"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Добави помоћ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
-msgid "Justify"
-msgstr "Пораванај"
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Откажи"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Прочитај датотеку"
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
+msgstr "И�пиши"
+
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Иди у директорјум"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
+#: src/global.c:712
 msgid "Cut Text"
 msgstr "И�еци тек�т"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Одравнај"
+#: src/global.c:721
+msgid "Justify"
+msgstr "Пораванај"
+
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Провери пи�ање"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
+#: src/global.c:731
 #, fuzzy
-msgid "UnCut Text"
-msgstr "Убаци тек�т"
+msgid "To Linter"
+msgstr "Иде у ред"
+
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Вел. �лова"
+
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Рег. израз"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Уназад"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "�е мењај"
+
+#: src/global.c:761
 msgid "Cur Pos"
-msgstr "Пол. курз."
+msgstr "Положај курзора"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "У проверу правопи�а"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Претходна �трана"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Следећа �трана"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Први ред"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "По�ледњи ред"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "�ије заграда"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Означи тек�т"
 
-#: src/global.c:828
-#, fuzzy
+#: src/global.c:791
 msgid "Copy Text"
-msgstr "И�еци тек�т"
+msgstr "Умножи тек�т"
 
-#: src/global.c:831
-#, fuzzy
+#: src/global.c:794
 msgid "Indent Text"
-msgstr "И�еци тек�т"
+msgstr "Увуци тек�т"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
-msgstr ""
+msgstr "Поништи увлачење"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
-msgstr ""
+msgstr "Опозови"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "�апред"
+msgstr "Поврати"
 
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "�азад"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Следећа реч"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "�апред"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Претходна реч"
 
-#: src/global.c:875
-#, fuzzy
-msgid "Prev Line"
-msgstr "Претходна �трана"
-
-#: src/global.c:878
-#, fuzzy
-msgid "Next Line"
-msgstr "Следећа датотека"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Следећа реч"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Почетак"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Крај"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "�ађи другу заграду"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Почтк па�у�а"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Крај па�у�а"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
-msgstr ""
+msgstr "Помакни горе"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
-msgstr ""
+msgstr "Помакни доле"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Претходна датотека"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Следећа датотека"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr ""
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
+msgstr "Улаз до�ловно�ти"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Табулатор"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
-msgstr "Уно�"
+msgstr "Уне�и"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
-msgstr "Бри�ање"
+msgstr "Врати про�тор"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
-msgstr ""
+msgstr "И�еци до краја"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
-msgstr ""
+msgstr "Изброј речи"
+
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Обу�тави"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "ПретИ�торј"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "СледИ�торј"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "�а тек�т"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "ДОС запи�"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Мекинтош запи�"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Додај позади"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Додај напред"
 
-#: src/global.c:1299
+#: src/global.c:933
+msgid "Backup File"
+msgstr "�аправи резерву"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Изврши наредбу"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "У датотеке"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Прва даттека"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "П�лдња дттка"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Претходни ред"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "Режим помоћи"
 
-#: src/global.c:1301
-#, fuzzy
+#: src/global.c:1217
 msgid "Constant cursor position display"
-msgstr "Кон�тантан положај курзора"
+msgstr "Сталан приказ положаја курзора"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
-msgstr ""
+msgstr "Кори�ти још један ред за уређивање"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Глатко клизање"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "�е прелама дуге редове"
+
+#: src/global.c:1225
 msgid "Whitespace display"
-msgstr ""
+msgstr "Приказ празнина"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "И�тицање �интак�е у боји"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
-msgstr ""
+msgstr "Паметни та�тер „Почетак“"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Самоувлачење"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
-msgstr "И�еци до краја"
+msgstr "И�ецање до краја"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "�е прелама дуге редове"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Претварање укуцаних табулатора у размаке"
 
-#: src/global.c:1321
-#, fuzzy
+#: src/global.c:1239
 msgid "Backup files"
-msgstr "Сачини резерву датотеке"
+msgstr "Резервне датотеке"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
-msgstr "Бафери више датотека"
+msgstr "Међумеморије више датотека"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Подршка за миша"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Без претварања из Мекинтош/ДОС запи�а"
 
-#: src/global.c:1329
-#, fuzzy
+#: src/global.c:1247
 msgid "Suspension"
-msgstr "Су�пендуј"
-
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr ""
+msgstr "Обу�тави"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:236
-#, fuzzy
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1106,18 +1108,15 @@ msgid ""
 msgstr ""
 "Помоћ за наредбу претраге\n"
 "\n"
-" Уне�ите речи или знаке које желите да нађете, и прити�ните Ентер. Уколико "
-"�е тражени тек�т пронађе, на екрану ће �е приказати положај најближег "
-"резултата претраге.\n"
+" Уне�ите речи или знаке које желите да нађете, и прити�ните Уне�и. Уколико "
+"по�тоји тражени тек�т, на екрану ће �е приказати положај најближег резултата "
+"претраге.\n"
 "\n"
 " Претходна ни�ка претраге ће �е приказати у угла�тим заградама након "
-"„Тражи:“. Прити�ком на Ентер уме�то уно�а новог тек�та ће изве�ти претходну "
-"претрагу.\n"
-"\n"
-" �аредни та�тери обављају неки по�ао у режиму претраге:\n"
-"\n"
+"„Тражи:“. Прити�ком на Уне�и без уно�а неког тек�та ће обавити претходну "
+"претрагу."
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1125,8 +1124,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:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1139,15 +1143,14 @@ msgid ""
 msgstr ""
 "Помоћ за одлазак у ред\n"
 "\n"
-" Уне�ите број реда у који желите да одете и прити�ните Ентер. Уколико има "
+" Уне�ите број реда у који желите да идете и прити�ните Уне�и. Уколико има "
 "мање редова тек�та од броја који �те унели, по�тавићу ва� на по�ледњи ред "
 "датотеке.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму одла�ка у ред:\n"
+" Следећи та�тери �у до�тупни у режиму одла�ка у ред:\n"
 "\n"
 
-#: src/help.c:260
-#, fuzzy
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1161,21 +1164,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:253
 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"
@@ -1183,9 +1181,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:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1202,18 +1204,18 @@ msgid ""
 msgstr ""
 "Помоћ за упи� датотеке\n"
 "\n"
-" Уне�ите име датотеке у коју желите да упишете текући бафер и прити�ните "
-"Ентер да �нимите.\n"
+" Уне�ите назив датотеке у којој желите да �ачувате текућу датотеку и "
+"прити�ните Уне�и да �ачувате датотеку.\n"
 "\n"
-" Уколико �те изабрали тек�т помоћу Ctrl-^, бићете упитани да ли желите да "
-"�ачувате изабрани део у одвојену датотеку. Да умањите шан�е пре�нимавања "
-"по�тојеће датотеке једним њеним делом, име текуће датотеке �е не подразумева "
-"у овом режиму.\n"
+" Уколико �те изабрали тек�т помоћу означавача, бићете упитани да ли желите "
+"да �ачувате �амо изабрани део у за�ебну датотеку. Да умањите шан�е "
+"пре�нимавања по�тојеће датотеке �амо једним њеним делом, назив текуће "
+"датотеке �е не подразумева у овом режиму.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму упи�а датотеке:\n"
+" Следећи та�тери �у до�тупни у режиму упи�а датотеке:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1229,17 +1231,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:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1252,27 +1253,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Помоћ за наредбу претраге\n"
+"Помоћ за наредбу претраге прегледача\n"
 "\n"
-" Уне�ите речи или знаке које желите да нађете, и прити�ните Ентер. Уколико "
-"�е тражени тек�т пронађе, на екрану ће �е приказати положај најближег "
-"резултата претраге.\n"
+" Уне�ите речи или знаке које желите да нађете, и прити�ните Уне�и. Уколико "
+"по�тоји тражени тек�т, на екрану ће �е приказати положај најближег резултата "
+"претраге.\n"
 "\n"
 " Претходна ни�ка претраге ће �е приказати у угла�тим заградама након "
-"„Тражи:“. Прити�ком на Ентер уме�то уно�а новог тек�та ће изве�ти претходну "
+"„Тражи:“. Прити�ком на Уне�и без уно�а неког тек�та ће обавити претходну "
 "претрагу.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму претраге:\n"
-"\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" Следећи та�тери �у до�тупни у режиму претраге прегледача:\n"
+"\n"
 
-#: src/help.c:315
-#, fuzzy
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1286,16 +1286,15 @@ msgid ""
 msgstr ""
 "Помоћ за одлазак у директоријум\n"
 "\n"
-" Уне�ите име директоријума у који желите да одете.\n"
+" Уне�ите назив директоријума у који желите да одете.\n"
 "\n"
 " Уколико није и�кључено допуњавање табулатором, можете кори�тити TAB та�тер "
-"да (покушате да) �амодопуните име директоријума.\n"
+"да (покушате да) �амодопуните назив директоријума.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму одла�ка у директоријум:\n"
+" Следећи та�тери �у до�тупни у режиму одла�ка у директоријум:\n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1315,11 +1314,10 @@ msgstr ""
 "упитани да замените �ваку појаву дате погрешно унете речи у текућој "
 "датотеци.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму провере правопи�а:\n"
+" Следећи та�тери �у до�тупни у режиму провере правопи�а:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1330,16 +1328,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:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1350,25 +1349,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1378,8 +1368,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:359
 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 "
@@ -1387,328 +1384,318 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
+"Такође, дво�труким прити�ком на та�тер Е�кејп и укуцавањем троцифреног "
+"децималног броја од 000 до 255 унећете знак �а одговарајућом вредношћу. "
+"Следећи прити�ци та�тера �у до�тупни у главном прозору уређивача. Замен�ки "
+"та�тери �у приказани у загради:\n"
+"\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "укључи/и�кључи"
 
-#: src/nano.c:588
-#, fuzzy
+#: src/nano.c:597
 msgid "Key invalid in view mode"
-msgstr "Та�тер недозвољен у прегледачком режиму"
+msgstr "�еи�праван та�тер у режиму прегледа"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Бафер упи�ан у %s\n"
+"Међумеморија је упи�ана у %s\n"
 
-#: src/nano.c:702
-#, fuzzy, c-format
+#: src/nano.c:711
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Бафер упи�ан у %s\n"
+"Међумеморија није упи�ана у %s:%s\n"
 
-#: src/nano.c:705
-#, fuzzy, c-format
+#: src/nano.c:714
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Бафер упи�ан у %s\n"
+"Међумеморија није упи�ана: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Величина прозора је премала за нана...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Употреба: nano [МОГУЋ�ОСТИ] [[+РЕД,СТУБ�Ц] Д�ТОТЕК�]...\n"
+"\n"
 
-#: src/nano.c:824
-#, fuzzy, c-format
+#: src/nano.c:835
+#, 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:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опција\t\tЗначење\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Прикажи ову поруку"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+РЕД,СТУБ�Ц"
 
-#: src/nano.c:831
-#, 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:843
 msgid "Start at line LINE, column COLUMN"
-msgstr "Почни у реду број РЕД"
+msgstr "Почиње у реду РЕД, �тупцу СТУБ�Ц"
 
-#: src/nano.c:833
-#, fuzzy
+#: src/nano.c:845
 msgid "Enable smart home key"
-msgstr "Укључи миша"
+msgstr "Укључује паметни та�тер „Почетак“"
 
-#: src/nano.c:834
-#, fuzzy
+#: src/nano.c:846
 msgid "Save backups of existing files"
-msgstr "�аправи резерву по�тојећих датотека при �нимању"
+msgstr "Чува резерве по�тојећих датотека"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
-msgstr ""
+msgstr "-C [дир]"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
-msgstr ""
+msgstr "--backupdir=[дир]"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
-msgstr ""
+msgstr "Директоријум за чување једин�твених датотека резерве"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Кори�ти подебљање уме�то обрнутог видео тек�та"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Претвара укуцане табулаторе у размаке"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
-msgstr "Омогући бафере �а више датотека"
+msgstr "Укључује међумеморије више датотека"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "Кори�ти (вим-�тила) датотеке закључавања"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
-msgstr "Дневник и читање претходних претрага/замена"
+msgstr "Бележи и чита и�торијат претраге/замене ни�ке"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
-msgstr "�е гледај у датотеке nanorc"
+msgstr "�е тражи у нанорц датотекама"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
-msgstr ""
+msgstr "Поправља проблеме та�тера нумеричке та�татуре"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "�е додаје нове редове на крајеве датотека"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
-msgstr "�е претварај датотеке из ДОС/Мекинтош облика"
+msgstr "�е претвара датотеке из ДОС/Мекинтош запи�а"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
-msgstr ""
+msgstr "Кори�ти још један ред за уређивање"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
-msgstr "Кон�тантан положај курзора"
+msgstr "Бележи и чита ме�то положаја курзора"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
-msgstr ""
+msgstr "-Q [ни�ка]"
 
-#: src/nano.c:871
-#, fuzzy
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[ни�ка]"
 
-#: src/nano.c:872
-#, fuzzy
+#: src/nano.c:884
 msgid "Quoting string"
-msgstr "�и�ка за цитирање, подразумевано „> “"
+msgstr "�и�ка за цитирање"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
-msgstr ""
+msgstr "Ограничени режим"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Премиче по ред уме�то пола екрана"
 
-#: src/nano.c:879
-#, fuzzy
+#: src/nano.c:891
 msgid "-T <#cols>"
-msgstr "-r [#колона]"
+msgstr "-T [#�тупци]"
 
-#: src/nano.c:879
-#, fuzzy
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[број]"
+msgstr "--tabsize=[#�тупци]"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
-msgstr "По�тавља ширину табулатора на број"
+msgstr "По�тавља ширину табулатора на „#�тупци“ �тубаца"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Обавља брзо чишћење траке �тања"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
-msgstr "И�пиши податке о издању и изађи"
+msgstr "И�пи�ује податке о издању и излази"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Тачније открива границе речи"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
-msgstr ""
+msgstr "-Y [ни�ка]"
 
-#: src/nano.c:891
-#, fuzzy
+#: src/nano.c:903
 msgid "--syntax=<str>"
-msgstr "--syntax [ни�ка]"
+msgstr "--syntax=[ни�ка]"
 
-#: src/nano.c:892
-#, fuzzy
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
-msgstr "Која дефиниција �интак�е �е кори�ти"
+msgstr "Одредница �интак�е за обојавање"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
-msgstr "Стално приказуј положај курзора"
+msgstr "�епрекидно приказује положај курзора"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
+msgstr "Поправља проблеме та�тера Поврати про�тор/Обриши"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Приказује тек�т ове помоћи"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
-msgstr "Само увуци нове редове"
+msgstr "Само�тално увлачи нове редове"
 
-#: src/nano.c:900
-#, fuzzy
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
-msgstr "�ека ^K и�еца од курзора до краја реда"
+msgstr "И�еца од курзора до краја реда"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
-msgstr "�е прати �имболичке везе, пре�ними их"
+msgstr "�е прати �имболичке везе, пре�нимава их"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
-msgstr "Укључи миша"
+msgstr "Укључује коришћење миша"
 
-#: src/nano.c:908
-msgid "-o <dir>"
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:908
-#, fuzzy
+#: src/nano.c:922
+msgid "-o <dir>"
+msgstr "-o [дир]"
+
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[дир]"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "По�тавља радни директоријум"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Та�тери за очување XON-а (^Q) и XOFF-а (^S)"
+msgstr "Очувава та�тере XON (^Q) и XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "�ечујно занемарује проблеме покретања као што �у грешке рц датотеке"
 
-#: src/nano.c:916
-#, fuzzy
+#: src/nano.c:930
 msgid "-r <#cols>"
-msgstr "-r [#колона]"
+msgstr "-r [#�тубац]"
 
-#: src/nano.c:916
-#, fuzzy
+#: src/nano.c:930
 msgid "--fill=<#cols>"
-msgstr "--fill=[#колона]"
+msgstr "--fill=[#�тубац]"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
-msgstr ""
-
-#: src/nano.c:920
+#: src/nano.c:931
 #, fuzzy
+msgid "Set hard-wrapping point at column #cols"
+msgstr "По�тавља тачку прелома на �тупцу бр. #�тубац"
+
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s [програм]"
 
-#: src/nano.c:920
-#, fuzzy
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=[програм]"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
-msgstr "Омогући неку другу проверу правопи�а"
+msgstr "Укључује замен�ку проверу правопи�а"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
-msgstr "Сам упиши при излазу, не питај"
+msgstr "Сам чува при излазу, не пита"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Дозвољава уопштено поништавање [ПРОБ�О]"
 
-#: src/nano.c:929
-#, fuzzy
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Режим прегледа (�амо за читање)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
-msgstr "�е преламај дуге редове"
-
-#: src/nano.c:933
+#: src/nano.c:945
 #, fuzzy
+msgid "Don't hard-wrap long lines"
+msgstr "�е прелама дуге редове"
+
+#: src/nano.c:947
 msgid "Don't show the two help lines"
-msgstr "�е приказуј прозор за помоћ"
+msgstr "�е приказује два реда помоћи"
 
-#: src/nano.c:934
-#, fuzzy
+#: src/nano.c:948
 msgid "Enable suspension"
-msgstr "Укључи �у�пензију"
+msgstr "Укључује обу�таву"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(занемарен, ради �агла�но�ти �а Пиком)"
+msgstr "Укључује меко преламање редова"
 
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr "Г�У нано издање %s (изграђено %s, %s)\n"
+msgstr " Гнуов нано издање %s (изграђено %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1717,169 +1704,172 @@ msgstr ""
 "\n"
 " Уграђене опције:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "�ажало�т, подршка за ову функцију је и�кључена"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
-"Сачувати измењени бафер (ОДГОВ�Р�ЊЕМ С� „�е“ ЋЕТЕ Б�ЦИТИ СВЕ ИЗМЕ�Е) ? "
+"Да �ачувам измењену међумеморију (ОДГОВОР „�е“ ЋЕ ОДБ�ЦИТИ СВЕ ИЗМЕ�Е) ? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "�е могу поново да отворим �тандардни улаз �а та�татуре, извините\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Читам �а �тандардног улаза, ^C да прекинете\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Примих SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1225
-#, fuzzy, c-format
+#: src/nano.c:1275
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Кори�тите „fg“ да �е вратите у нана"
+msgstr "Кори�тите „fg“ да �е вратите у нано.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "укључено"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "и�кључено"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
-msgstr ""
+msgstr "�епозната наредба"
 
-#: src/nano.c:1701
-#, fuzzy
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
-msgstr "XON занемарен, трт-мрт."
+msgstr "XON је занемарен, јао мени"
 
-#: src/nano.c:1706
-#, fuzzy
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF занемарен, трт-мрт."
+msgstr "XOFF је занемарен, јао мени"
 
-#: src/nano.c:2246 src/rcfile.c:1189
-#, fuzzy, c-format
+#: src/nano.c:2276 src/rcfile.c:1252
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "тражена величина табулатора %d је неи�правна"
+msgstr "Тражена величина табулатора %s је неи�правна"
 
-#: src/nano.c:2305 src/rcfile.c:1114
-#, fuzzy, c-format
+#: src/nano.c:2338 src/rcfile.c:1177
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "тражена величина попуне %d је неи�правна"
+msgstr "Тражена величина попуне %s је неи�правна"
+
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
-msgstr "YyДдDd"
+msgstr "ДдDdYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "�нNn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
-msgstr "Aa�а"
+msgstr "�а�а"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Све"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "�е"
 
-#: src/rcfile.c:134
-#, fuzzy, c-format
+#: src/rcfile.c:138
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Грешка у %s у %d. реду: "
+msgstr "Грешка у %s у %lu. реду: "
 
-#: src/rcfile.c:189
-#, fuzzy, c-format
+#: src/rcfile.c:193
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "аргумент %s �адржи недовршен \""
+msgstr "�ргумент „%s“ �адржи недовршени знак \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
-#, fuzzy
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
-msgstr "ни�ке регуларних израза морају почети и завршити �е знаком \"\n"
+msgstr "�и�ке регуларних израза морају почети и завршити �е знаком \""
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Лош регуларни израз „%s“: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
-msgstr "�едо�таје име �интак�е"
+msgstr "�едо�таје назив �интак�е"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Синтак�а „none“ је резерви�ана"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Синтак�а „default“ не �ме да �адржи проширења"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "�е могох да додам упуте за боју без �интак�ног реда"
+#: src/rcfile.c:411
+msgid "Missing key name"
+msgstr "�едо�таје назив та�тера"
+
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
 
-#: src/rcfile.c:398
+#: src/rcfile.c:441
 #, fuzzy
-msgid "Missing magic string name"
-msgstr "�едо�таје име боје"
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "�везе та�тера морају почети �а ^, M, или F"
 
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:450
 #, fuzzy
-msgid "Missing key name"
-msgstr "�едо�таје име �интак�е"
+msgid "Must specify a function to bind the key to"
+msgstr "Морате наве�ти функцију за коју �везати та�тер"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "�е могу да мапирам назив „%s“ ка функцији"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "�е могу да мапирам назив „%s“ ка изборнику"
 
-#: src/rcfile.c:512
+#: src/rcfile.c:497
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "�е могох да отворим %s ради упи�а: %s"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Извините, ни�ка та�тера „%s“ је неи�правна �веза"
 
-#: src/rcfile.c:518 src/rcfile.c:603
+#: src/rcfile.c:583
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "�е могох да покренем „%s“"
+msgid "Error expanding %s: %s"
+msgstr "Грешка при читању „%s“: %s"
 
-#: src/rcfile.c:540
+#: src/rcfile.c:626
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
-
-#: src/rcfile.c:711
-#, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1887,612 +1877,485 @@ 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:733
-#, fuzzy
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
-msgstr "�е могох да додам упуте за боју без �интак�ног реда"
+msgstr "�е могу да додам наредбу боје без наредбе �интак�е"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
-msgstr "�едо�таје име боје"
-
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
+msgstr "�едо�таје назив боје"
 
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
-msgstr ""
+msgstr "�едо�таје ни�ка регуларног израза"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ захтева и одговарајући „end=“"
 
-#: src/rcfile.c:890
-#, fuzzy
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Боја позадине „%s“ не може бити �ветла"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
-msgstr "�е могох да додам упуте за боју без �интак�ног реда"
+msgstr "�е могу да додам регуларни израз заглавља без наредбе �интак�е"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "�е могу да додам регуларни израз чаробне ни�ке без наредбе �интак�е"
+
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "�едо�таје назив чаробне ни�ке"
 
-#: src/rcfile.c:962
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "�е могу да додам регуларни израз заглавља без наредбе �интак�е"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "�едо�таје назив боје"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Кобна грешка: нема мапираних та�тера за функцију „%s“"
+
+#: src/rcfile.c:976
+#, 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 ""
+"Излазим.  Кори�тите нано �а опцијом „-I“ ако је потребно да дотерате ваша "
+"подешавања нанорц-а\n"
+
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "�е могу да мапирам назив „%s“ ка изборнику"
 
-#: src/rcfile.c:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "�аредба „%s“ није дозвољена у укљученој датотеци"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Синтак�а „%s“ нема наредбе боје"
 
-#: src/rcfile.c:1055
-#, fuzzy, c-format
+#: src/rcfile.c:1098
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "не разумех наредбу %s"
+msgstr "�и�ам разумео наредбу „%s“"
 
-#: src/rcfile.c:1061
+#: src/rcfile.c:1113
 #, fuzzy
-msgid "Missing flag"
-msgstr "�едо�таје име боје"
+msgid "Missing option"
+msgstr "�едо�таје назив боје"
 
-#: src/rcfile.c:1083
-#, fuzzy, c-format
+#: src/rcfile.c:1135
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "опција „%s“ захтева аргумент"
+msgstr "Опција „%s“ захтева аргумент"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Опција није и�правна вишебитна ни�ка"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
-msgstr ""
+msgstr "Потребни �у не-празни знаци"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
-msgstr ""
+msgstr "Потребна �у два знака једног-�тупца"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr ""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "�е могу да ра�поде�им обележје „%s“"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
-msgstr ""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "�епознато обележје „%s“"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
-msgstr "�е могох да нађем мој лични директоријум! Бре!"
+msgstr "Ја не могу да нађем мој лични директоријум! Бре, брате!"
 
-#: src/rcfile.c:1309
-#, fuzzy, c-format
+#: src/rcfile.c:1372
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"Прити�ните ентер за на�тавак покретања нана\n"
+"Прити�ните Уне�и да на�тавите покретање наноа\n"
 
 #: src/search.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "�е нађох „%s“"
+msgstr "�и�ам нашао „%.*s%s“"
 
-#: src/search.c:204
-#, fuzzy
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
-msgstr " (за замену)"
+msgstr " (за замену) у избору"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (за замену)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Да заменим ову појаву?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Замени �а"
 
-#: src/search.c:1004
-#, fuzzy, c-format
+#: src/search.c:1003
+#, 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:1047
 msgid "Enter line number, column number"
-msgstr "Уне�ите број реда"
+msgstr "Уне�ите број реда, број �тупца"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "�еи�праван број реда или �тупца"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "�ије заграда"
 
-#: src/search.c:1281
+#: src/search.c:1295
 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:434
 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"
+#: src/text.c:440 src/text.c:578
+#, 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:451 src/text.c:588
 msgid "text add"
-msgstr ""
+msgstr "додавање тек�та"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
-msgstr "Следећа датотека"
+msgstr "бри�ање тек�та"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
-msgstr ""
+msgstr "прелом реда"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
-msgstr ""
+msgstr "�пој реда"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
-msgstr ""
+msgstr "и�ецање тек�та"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
-msgstr ""
+msgstr "поништавање и�ецања тек�та"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
-msgstr ""
+msgstr "крај реда"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
-msgstr "Следећа датотека"
+msgstr "уметање тек�та"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Унутрашња грешка: непозната вр�та.  Молим �ачувајте ваш рад."
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Радња поништавања обављеног (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "�ичега за поновно обављање!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Унутрашња грешка: не могу да по�тавим поништавање од�ецања.  Молим �ачувајте "
+"ваш рад!!!"
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Радња поновног обављања (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "�е могу да направим цев"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "�е могу да направим �појку"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
-msgstr "�е могу да покренем"
-
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
+msgstr "�е могу да ра�цепим"
 
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Унутрашња грешка: не могу да по�тавим поништавање од�ецања.  Молим �ачувајте "
+"ваш рад!!!"
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Лоша ни�ка за цитирање %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Сада могу да „одравнам“!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Измените замену"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "�е могох да направим цевку"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
-msgstr "Образујем �пи�ак погрешно унетих речи, �ачекајте..."
+msgstr "Правим �пи�ак погрешно унетих речи, �ачекајте..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
-msgstr "�е могох да �азнам величину бафера за цевку"
+msgstr "�е могу да добавим величину међумеморије �појке"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Грешка при покретању „spell“-а"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при покретању „sort -f“-а"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при покретању „uniq“-а"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
-msgstr "Завршена провера правопи�а"
+msgstr "Завршио �ам проверу правопи�а"
 
-#: src/text.c:2825
-#, fuzzy, c-format
+#: src/text.c:2830
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "Грешка при покретању „spell“-а"
+msgstr "Грешка при покретању „%s“-а"
+
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Покреће проверу правопи�а, ако је до�тупна"
 
-#: src/text.c:2970
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "�еу�пешна провера правопи�а: %s"
+msgstr "Провера правопи�а није у�пела: %s"
 
-#: src/text.c:2972
-#, fuzzy, c-format
+#: src/text.c:2981
+#, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "�еу�пешна провера правопи�а: %s"
+msgstr "Провера правопи�а није у�пела: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "�е додаје нове редове на крајеве датотека"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
 #, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgid "Got 0 parsable lines from command: %s"
 msgstr ""
 
-#: src/text.c:3041
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
 #, fuzzy
+msgid "At last message"
+msgstr "Приказује ову поруку"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Приказује ову поруку"
+
+#: src/text.c:3372
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sРечи: %lu  Редова: %ld  Знакова: %lu"
+
+#: src/text.c:3373
 msgid "In Selection:  "
-msgstr "Додај избор на крај датотеке"
+msgstr "У избору:"
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Улаз до�ловно�ти"
 
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
-msgstr ""
+msgstr "Улаз Уникода"
 
-#: src/winio.c:2149 src/winio.c:2153
-#, fuzzy
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
-msgstr " Измењено "
+msgstr "Измењено "
 
-#: src/winio.c:2150
-#, fuzzy
+#: src/winio.c:2137
 msgid "View"
-msgstr " Преглед "
+msgstr "Преглед "
 
-#: src/winio.c:2164
-#, fuzzy
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "ДИР: "
 
-#: src/winio.c:2171
-#, fuzzy
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Датотека:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
+"Упозорење: Мењам датотеку која није закључана, да проверим дозволе "
+"директоријума?"
 
-#: src/winio.c:3370
-#, fuzzy, c-format
+#: src/winio.c:3351
+#, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Уређивач тек�та нано"
 
-#: src/winio.c:3503
-#, fuzzy
+#: src/winio.c:3485
 msgid "version"
 msgstr "издање "
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
-msgstr "Омогућили �у вам:"
+msgstr "Припремили:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
-msgstr "По�ебну захвално�т дугујемо:"
+msgstr "По�ебно �е захваљујемо:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
-msgstr "Задужбина за Слободни Софтвер"
+msgstr "Задужбини �лободног �офтвера"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "За ен-кур�и�:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
-msgstr "и �ви о�тали које �мо пропу�тили..."
+msgstr "и �вима о�талима које �мо пропу�тили..."
 
-#: src/winio.c:3509
-#, fuzzy
+#: src/winio.c:3491
 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"
-
-#~ 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 "Улазак отказан"
+msgstr "Хвала вам што кори�тите нано!"
 
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "�е могох да отворим датотеку ~/.nano_history, %s"
+#~ msgid "Insert File"
+#~ msgstr "Умеће датотеку"
 
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "�е могох да упишем датотеку ~/.nano_history, %s"
+#~ msgid "Go to previous screen"
+#~ msgstr "Иде на претходни екран"
 
-#~ 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"
+#~ msgid "Find Other Bracket"
 #~ msgstr "�ађи другу заграду"
 
-#~ msgid "Open previously loaded file"
-#~ msgstr "Отвори претходно коришћену датотеку"
+#~ msgid "Long line wrapping"
+#~ msgstr "Преламање дугог реда"
 
-#~ msgid "Open next loaded file"
-#~ msgstr "Отвори �ледеће учитану датотеку"
+#~ msgid "Soft line wrapping"
+#~ msgstr "Меко преламање реда"
 
-#~ msgid "Up"
-#~ msgstr "Горе"
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(занемарен, ради �агла�но�ти �а Пиком)"
 
-#~ msgid "Down"
-#~ msgstr "Доле"
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Морате наве�ти изборник за који �везати та�тер (или „all“)"
 
-#~ msgid "Direction"
-#~ msgstr "Смер"
+#~ msgid "Missing flag"
+#~ msgstr "�едо�таје обележје"
 
-#~ msgid "Space"
-#~ msgstr "Про�тор"
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Унутрашња грешка: непозната вр�та.  Молим �ачувајте ваш рад!!!"
 
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
 #~ msgstr ""
-#~ "Употреба: nano [+РЕД] [Дуге Гнуове опције] [опција] [датотека]\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Употреба: nano [+РЕД] [опција] [датотека]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+РЕД"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "Кори�ти неке друге функције за нумеричку та�татуру"
-
-#~ msgid "-Q [str]"
-#~ msgstr "-Q [ни�ка]"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "Изводи претраге по регуларним изразима"
-
-#~ msgid "-T [num]"
-#~ msgstr "-T [број]"
-
-#~ msgid "-Y [str]"
-#~ msgstr "-Y [ни�ка]"
-
-#~ msgid "-o [dir]"
-#~ msgstr "-o [дир]"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "По�тави и�пуњавање колона (прелом реда) на #колона"
-
-#~ 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 "Величина табулатора премала за нана...\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 2b9301a6..26cf9bf6 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 85a9f61f..12b14707 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,13 +1,13 @@
 # Swedish messages for nano.
 # Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
-# Daniel Nylander <po@danielnylander.se>, 2006.
-# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004.
 #
+# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004.
+# Daniel Nylander <po@danielnylander.se>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
 "PO-Revision-Date: 2006-08-24 20:53+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,135 +17,132 @@ msgstr ""
 "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:221
 msgid "Go To Directory"
 msgstr "Gå till katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fel vid inläsning av %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 msgid "Can't move up a directory"
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(föräldkat)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Baklänges]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 msgid "Search Wrapped"
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Detta är enda förekomsten"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "Inget aktuellt sökmönster"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr "Kunde inte skapa temporär fil: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "Fel vid skrivning av temporär fil: %s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "Fel vid skrivning av temporär fil: %s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Fel vid inläsning av %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan inte infoga fil från utanför %s"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Inga fler öppna filbuffertar"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "Växlade till %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Ny buffert"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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)"
 
-#: src/files.c:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -156,14 +153,14 @@ msgid_plural ""
 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:851
+#: src/files.c:846
 #, 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)"
 
-#: src/files.c:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -172,14 +169,14 @@ msgid_plural ""
 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:861
+#: src/files.c:856
 #, 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)"
 
-#: src/files.c:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -188,101 +185,101 @@ msgid_plural ""
 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:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Läste %lu rad"
 msgstr[1] "Läste %lu rader"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Läser filen"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunde inte hittas"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" är en katalog"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" är en enhetsfil"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Kommando att köra i ny buffert [från %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Kommando att köra [från %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil att infoga i ny buffert [från %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil att infoga [från %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tangenten ogiltig i icke-flerbuffertläget"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan inte skriva utanför %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 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"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fel vid skrivning av temporär fil: %s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "För många säkerhetskopierade filer?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fel vid skrivning av temporär fil: %s"
@@ -338,15 +335,15 @@ msgstr "Filen existerar, SKRIVA ÖVER? "
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Spara filen med ANNAT NAMN? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -355,28 +352,28 @@ msgstr ""
 "\n"
 "Tryck Enter för att fortsätta starta nano.\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -384,666 +381,694 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Ersätt"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Ingen ersättning"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Skiftkänsl"
+msgid "Exit"
+msgstr "Avsluta"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Bakåt"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Reguljärt uttr"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "FöregHisto"
+msgid "Close"
+msgstr "Stäng"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "NästaHisto"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Ångra kopi"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Gå till text"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "Ojustera"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "VarFinnsNäst"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "Första filen"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Sista filen"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Till filer"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS-format"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac-format"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Lägg till"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Infoga"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Säkerhetskopiera fil"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Kör kommando"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Gå till katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Få hjälp"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Avsluta"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Var finns"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Föreg sid"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Nästa sid"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Första raden"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Ersätt"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Sista raden"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Gå till rad"
 
-#: src/global.c:538
-#, fuzzy
-msgid "Suspend"
-msgstr "Suspendering"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Föreg rad"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "Börj på par"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Nästa rad"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Slut på par"
+#: src/global.c:491
+msgid "Read File"
+msgstr "Läs fil"
 
 # Osäker
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Fulljstera"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Infoga fil"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Gå till rad"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Avbryt den aktuella funktionen"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Visa denna hjälptext"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Stäng aktuell filbuffert / Avsluta nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Avsluta nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuella filen till disk"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Infoga ytterligare en fil i den nuvarande"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "Sök efter en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:571
+#: src/global.c:520
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Flytta till föregående skärm"
+msgid "Search for a string"
+msgstr "Sök efter en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Flytta till nästa skärm"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipper ut den aktuella raden och lagrar den i urklippsbufferten"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Klistra in från urklippsbufferten i aktuell rad"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Visa markörens position"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Starta stavningskontrollen, om tillgänglig"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "Ersätt en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "Gå till rad- och kolumnnummer"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Markera text vid markörpositionen"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Upprepa senaste sökning"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopiera den aktuella raden och lagrar den i urklippsbufferten"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Dra in aktuell rad"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Ångra indragning av aktuell rad"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:544
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Flytta framåt ett tecken"
 
-#: src/global.c:595
+#: src/global.c:545
 #, fuzzy
 msgid "Go back one character"
 msgstr "Flytta bakåt ett tecken"
 
-#: src/global.c:597
+#: src/global.c:547
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Gå framåt ett ord"
 
-#: src/global.c:598
+#: src/global.c:548
 #, fuzzy
 msgid "Go back one word"
 msgstr "Flytta ett ord bakåt"
 
-#: src/global.c:600
+#: src/global.c:550
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Flytta till föregående rad"
 
-#: src/global.c:601
+#: src/global.c:551
 #, fuzzy
 msgid "Go to next line"
 msgstr "Flytta till nästa rad"
 
-#: src/global.c:602
+#: src/global.c:552
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Flytta till början på aktuell rad"
 
-#: src/global.c:603
+#: src/global.c:553
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Flytta till slutet på aktuell rad"
 
-#: src/global.c:606
+#: src/global.c:556
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå till början på det aktuella stycket"
 
-#: src/global.c:608
+#: src/global.c:558
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Gå till slutet på det aktuella stycket"
 
-#: src/global.c:611
+#: src/global.c:560
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Gå till filens första rad"
 
-#: src/global.c:613
+#: src/global.c:561
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Gå till filens sista rad"
 
-#: src/global.c:615
+#: src/global.c:563
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Gå till matchande klammer"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rulla upp en rad utan att rulla markören"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rulla ned en rad utan att rulla markören"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Växla till föregående filbuffert"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Växla till nästa filbuffert"
 
 # Osäker
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Infoga nästa tecken ordagrant"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Infoga ett tabulatortecken vid markörpositionen"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "Infoga en vagnretur vid markörpositionen"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Ta bort tecknet under markören"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Ta bort tecknet till vänster om markören"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Klipp ut från markörens position till slutet av filen"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Justera hela filen"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "Räkna antalet ord, rader och tecken"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Uppdatera (rita om) den aktuella skärmen"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "Växla skiftlägeskänslig sökning"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "Vänd riktning för sökningen"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "Växla användning av reguljära uttryck"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Återkalla den föregående sök/ersätt-strängen"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Återkalla nästa sök/ersätt-sträng"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Gå till filbläddrare"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "Växla användning av DOS-format"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "Växla användning av Mac-format"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Växla inmatning efter"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Växla inmatning före"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "Växla säkerhetskopiering av originalfilen"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Kör externt kommando"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "Växla användning av en ny buffert"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Avsluta från filbläddraren"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "Gå till första filen i listan"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "Gå till sista filen i listan"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Gå till sista filen i listan"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Gå till första filen i listan"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Gå till sista filen i listan"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Gå till katalog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Stäng"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Starta stavningskontrollen, om tillgänglig"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Flytta till föregående rad"
+
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Flytta till nästa rad"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Få hjälp"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Spara"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Gå till katalog"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Klipp ut"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Justera"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Läs fil"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Stavkontr."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Klipp ut"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Gå till rad"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Ojustera"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Skiftkänsl"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "Ångra kopi"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Reguljärt uttr"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Bakåt"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Ingen ersättning"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Stavkontr."
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Föreg sid"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Nästa sid"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Första raden"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Sista raden"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Inte en klammer"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Markera text"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "Kopiera text"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "Dra in text"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Ångra indragning av text"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Framåt"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Bakåt"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Nästa ord"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Framåt"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Föreg ord"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Föreg rad"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Nästa rad"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Nästa ord"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Hem"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Hitta andra klammern"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Börj på par"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Slut på par"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Rulla upp"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Rulla ned"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Föregående fil"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Nästa fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "Ordagrann inmatning"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tabb"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Retur"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Backsteg"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "KlippTillSlut"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "Antal ord"
 
-#: src/global.c:1299
+#: src/global.c:898
+#, fuzzy
+msgid "Suspend"
+msgstr "Suspendering"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "FöregHisto"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "NästaHisto"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Gå till text"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS-format"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac-format"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Lägg till"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Infoga"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Säkerhetskopiera fil"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Kör kommando"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Till filer"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Första filen"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Sista filen"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Föreg rad"
+
+#: src/global.c:973
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Nästa rad"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1215
 msgid "Help mode"
 msgstr "Hjälpläge"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Konstant visning av markörposition"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Användning av ytterligare en rad för redigering"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Mjuk rullning"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Radbryt inte långa rader"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Visning av mellanrum"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Färgmarkering av syntax"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Smart hemtangent"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Automatisk indragning"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Klipp ut till slutet"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Radbryt långa rader"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Radbryt inte långa rader"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering av inmatade tabulatorer till blanksteg"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Säkerhetskopiera filer"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Flera filbuffertar"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Musstöd"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering från DOS/Mac-format"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Suspendering"
 
-#: src/global.c:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Radbryt långa rader"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1065,7 +1090,7 @@ msgstr ""
 "Att trycka Retur utan att ange någon text kommer att genomföra den tidigare "
 "sökningen.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1079,7 +1104,7 @@ msgstr ""
 " Följande funktionstangenter finns tillgängliga i sökläget:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1099,7 +1124,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i Gå till rad-läge:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1122,7 +1147,7 @@ msgstr ""
 "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:253
 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"
@@ -1136,7 +1161,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i infoga fil-läge:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1164,7 +1189,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i filskrivningsläge:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1188,7 +1213,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i filbläddraren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1212,7 +1237,7 @@ msgstr ""
 "sökningen.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1220,7 +1245,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i sökläget:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1244,7 +1269,7 @@ msgstr ""
 "läge:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1268,7 +1293,7 @@ msgstr ""
 " Följande funktionstangenter är tillgängliga i stavningskontrolläget:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1289,7 +1314,7 @@ msgstr ""
 " Följande tangenter är tillgängliga i det externa kommandoläget:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1309,7 +1334,7 @@ msgstr ""
 "visar filen som redigeras. Statusraden är tredje raden från nederkanten och "
 "visar viktiga meddelanden.  "
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1328,7 +1353,7 @@ msgstr ""
 "sekvenser skrivs med metatecknet (M) och och anges antingen med Esc-, Alt- "
 "eller Meta-tangenten beroende på dina tangentbordsinställningar.  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1342,15 +1367,15 @@ msgstr ""
 "huvudfönster. Alternativa tangenter visas inom parentes:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "aktivera/inaktivera"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Tangenten ogiltig i visningsläget"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1359,7 +1384,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs till %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1368,7 +1393,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte till %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1377,11 +1402,11 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Fönsterstorleken är för liten för Nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1390,261 +1415,266 @@ msgstr ""
 "Användning: nano [FLAGGOR] [[+RAD,KOLUMN] FIL]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Flagga\t\tLång GNU flagga\t\tBetydelse\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Flagga\t\tBetydelse\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Visa detta meddelande"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+RAD,KOLUMN"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "Starta vid radnummer RAD, kolumn KOLUMN"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Aktivera smart hemtangent"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Spara säkerhetskopior av befintliga filer"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Katalog för att spara unika säkerhetskopior"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "Använd fet stil istället för omvänd videotext"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Convertera angivna tabulatorer till blanksteg"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Använd flera filbuffertar"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Logga och läs stränghistorik för sök/ersätt"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "Titta inte i nanorc-filer"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Ta hand om förvirringsproblemet med numeriska tangentbordet"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "Lägg inte till nya rader på slutet av filer"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Konvertera inte filer från DOS/Mac-format"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Använd en rad till för redigering"
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Infoga ett tabulatortecken vid markörpositionen"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Citatsträng"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Begränsat läge"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <kolumner>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<kolumner>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "Ställ in bredden på ett tabbsteg till antal kolumner"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Gör en snabb rensning av statusraden"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Skriv ut versionsinformation och avsluta"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "Identifiera ordgränsen mer noggrant"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaxdefinition att använda för färger"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Visa markörposition hela tiden"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fixa förvirringsproblemet med Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Visa denna hjälptext"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Dra automatiskt in nya rader"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "Klipp ut från markören till slutet på raden"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Följ inte symboliska länkar, skriv över"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "Aktivera användning av musen"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Ställ in arbetskatalog"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Bevara XON (^Q)- och XOFF (^S)-tangenter"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <kolumner>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<kolumner>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Ställ in brytpunkt vid kolumnen \"kolumner\""
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Använd alternativ stavningskontroll"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Spara automatiskt vid avslut, fråga inte"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Visningsläge (skrivskyddat)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Radbryt inte långa rader"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "Visa inte de två hjälpraderna"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Använd suspendering"
 
-#: src/nano.c:935
+#: src/nano.c:950
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Radbryt långa rader"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorerad för kompatibilitet med Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano version %s (kompilerad %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1653,165 +1683,170 @@ msgstr ""
 "\n"
 " Kompileringsflaggor:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tyvärr, stöd för denna funktion har inaktiverats"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Spara ändrad buffert (ATT SVARA \"Nej\" KOMMER ATT FÖRSTÖRA ÄNDRINGAR)? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Använd \"fg\" för att återvända till nano.\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "aktiverad"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Okänt kommando"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorerades, mummel mummel"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorerades, mummel mummel"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Begärd tabulatorstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Begärd fyllningsstorlek \"%s\" är ogiltig"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Alla"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Nej"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fel i %s på rad %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentet \"%s\" har ett oavslutat \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Felaktigt reguljärt uttryck \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Syntaxnamn saknas"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Syntaxen \"none\" är reserverad"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Syntaxen \"default\" får inte ta utökningar"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Saknar reguljär uttryckssträng"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Missing key name"
 msgstr "Syntaxnamn saknas"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:512
-#, 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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Kunde inte starta \"%s\""
+#: src/rcfile.c:467
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
+
+#: src/rcfile.c:474
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
 
-#: src/rcfile.c:540
+#: src/rcfile.c:497
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fel vid inläsning av %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1826,94 +1861,120 @@ msgstr ""
 "\"cyan\", \"magenta\" och \"black\" (svart), med\n"
 "valfria prefixet \"bright\" (ljus) för förgrundsfärger."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Färgnamn saknas"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Bakgrundsfärgen \"%s\" kan inte vara ljus"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Saknar reguljär uttryckssträng"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kräver ett motsvarande \"end=\""
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Bakgrundsfärgen \"%s\" kan inte vara ljus"
+
+#: src/rcfile.c:819
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:875
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
+
+#: src/rcfile.c:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Saknar reguljär uttryckssträng"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Färgnamn saknas"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunde inte öppna %s för infogande: %s"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandot \"%s\" tillåts inte i inkluderad fil"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax \"%s\" har inga färgkommandon"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Förstår inte kommandot \"%s\""
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Flagga saknas"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "Färgnamn saknas"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Flaggan \"%s\" kräver ett argument"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "Flagga är inte en giltig flerbytesträng"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "Icke-blanktecken krävs"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Två enkel-kolumntecken krävs"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Kan inte bort flaggan \"%s\""
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Okänd flagga \"%s\""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jag kan inte hitta min hemkatalog! Buhu!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1927,43 +1988,47 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" kunde inte hittas"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (att ersätta) i markering"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (att ersätta)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Ersätta denna förekomst?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Ersätt med"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Ersatte %lu förekomst"
 msgstr[1] "Ersatte %lu förekomster"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1047
 msgid "Enter line number, column number"
 msgstr "Ange radnummer, kolumnnummer"
 
-#: src/search.c:1061
+#: src/search.c:1074
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Ange radnummer, kolumnnummer"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Inte en klammer"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Ingen matchande klammer"
 
@@ -1975,232 +2040,290 @@ msgstr "Markering satt"
 msgid "Mark Unset"
 msgstr "Markera borttagen"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 #, fuzzy
 msgid "text delete"
 msgstr "Nästa fil"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 #, fuzzy
 msgid "line wrap"
 msgstr "Radbryt långa rader"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 #, fuzzy
 msgid "text insert"
 msgstr "Nästa rad"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 #, fuzzy
 msgid "text replace"
 msgstr " (att ersätta)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Kunde inte använda rör"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Kunde inte skapa rör"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Kunde inte grena"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Felaktig citeringssträng %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Kan ojustera nu!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Redigera en ersättning"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Kunde inte skapa rör"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Skapar lista över felstavade ord, var vänlig vänta..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde inte få tag i rörbuffertens storlek"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "Fel vid start av \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "Fel vid start av \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "Fel vid start av \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Stavningskontrollen slutfördes"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fel vid start av \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Starta stavningskontrollen, om tillgänglig"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavningskontrollen misslyckades: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavningskontrollen misslyckades: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Lägg inte till nya rader på slutet av filer"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Visa detta meddelande"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Visa detta meddelande"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Rader: %ld  Tecken: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "I markering:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Ordagrann inmatning"
+
 #: src/utils.c:409 src/utils.c:421
 msgid "nano is out of memory!"
 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:1558
 msgid "Unicode Input"
 msgstr "Unicode-inmatning"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "Ändrad"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "Visa"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Textredigeraren nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Presenteras av:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Ytterligare tack till:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "För ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "och alla andra som vi har glömt..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Tack för att du använder nano!"
 
+#~ 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"
 
+#~ msgid "Could not pipe"
+#~ msgstr "Kunde inte använda rör"
+
 #~ msgid "Prepending to %s failed: %s"
 #~ msgstr "Infogning till %s misslyckades: %s"
 
@@ -2296,6 +2419,9 @@ msgstr "Tack för att du använder nano!"
 #~ 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%%)"
 
@@ -2374,8 +2500,8 @@ msgstr "Tack för att du använder nano!"
 #~ msgid "Could not reopen %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"
diff --git a/po/tr.gmo b/po/tr.gmo
index 825c3947..c4d77b37 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index 60d61676..a509537c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,13 +1,13 @@
-# 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: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -18,136 +18,133 @@ msgstr ""
 "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:221
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Dizine Git"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Ä°ptal edildi"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Geriye DoÄŸru]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "Bu tek bulgu"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
-#, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr ""
+#: src/files.c:144
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "%o izinleri %s dosyasına uygulanamadı: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Dosya %s dışından eklenemiyor"
 
-#: src/files.c:437
+#: src/files.c:431
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Başka açık dosya yok"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "%s 'e geçildi"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Yeni Arabellek"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -157,13 +154,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -171,13 +168,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:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -185,101 +182,101 @@ 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:871
+#: src/files.c:866
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%d satır okundu"
 
-#: src/files.c:874
+#: src/files.c:869
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "Dosya Okunuyor"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Yeni Dosya"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" bir dizin"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" bir aygıt dosyası"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, fuzzy, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Yeni arabelleÄŸe eklenecek dosya [%s 'den]"
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Çalıştırılacak komut"
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Yeni arabelleÄŸe eklenecek dosya [%s 'den]"
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Eklenecek dosya [%s tarafından] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Anahtar çoklu olmayan arabellek kipinde geçersiz"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "%s dışına yazılamıyor"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s yazılmamış (çok fazla yedek dosyası?)\n"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
@@ -335,15 +332,15 @@ msgstr "Dosya var, ÃœSTÃœNE YAZILSIN MI?"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(daha)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -352,28 +349,28 @@ msgstr ""
 "\n"
 "nano'yu başlatmaya devam etmek için Gir tuşuna basınız\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -381,699 +378,719 @@ msgid ""
 "(see the nano FAQ about this change)"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Ä°ptal"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "DeÄŸiÅŸtir"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "DeÄŸiÅŸtirme Yok"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Harf Duyarlı"
+msgid "Exit"
+msgstr "Çık"
 
 #: src/global.c:472
-#, fuzzy
-msgid "Backwards"
-msgstr " [Geriye DoÄŸru]"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Düzenli İfade"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Geçmiş"
+msgid "Close"
+msgstr "Kapat"
 
-#: src/global.c:503
+#: src/global.c:473
 #, fuzzy
-msgid "NextHstory"
-msgstr "Geçmiş"
+msgid "Uncut Text"
+msgstr "Kesmeyi Geri Al"
 
-#: src/global.c:504
+#: src/global.c:475
 #, 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:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Ara"
 
-#: src/global.c:508
-#, fuzzy
-msgid "First File"
-msgstr "İlk Satır"
-
-#: src/global.c:509
-#, fuzzy
-msgid "Last File"
-msgstr "Son Satır"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Dosyalara"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS Biçimi"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac Biçimi"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Sonuna Ekle"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Başına Ekle"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Yedek Dosyası"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Komut Çalıştır"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Dizine Git"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Yardım Al"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Çık"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Ara"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "Önceki Sayfa"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Sonraki Sayfa"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "İlk Satır"
+#: src/global.c:487
+msgid "Replace"
+msgstr "DeÄŸiÅŸtir"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Son Satır"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Satıra Git"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "Askıya Al"
+#: src/global.c:489
+#, fuzzy
+msgid "Prev Line"
+msgstr "Önceki Sayfa"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:490
+#, fuzzy
+msgid "Next Line"
+msgstr "Sonraki Dosya"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr ""
+#: src/global.c:491
+msgid "Read File"
+msgstr "Dosya Oku"
 
-#: src/global.c:542
+#: src/global.c:493
 #, fuzzy
 msgid "FullJstify"
 msgstr "Yasla"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Tazele"
 
-#: src/global.c:546
-#, fuzzy
-msgid "Insert File"
-msgstr "Sonraki Dosya"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Satıra Git"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "Yürürlükteki fonksiyonu iptal et"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:507
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Yüklenmiş olan dosyayı kapat/nano'dan çık"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "nano'dan çık"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "Yürütülmekte olan dosyayı diske yaz"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "Åžu anki dosyaya baÅŸka bir dosya ekle"
 
-#: src/global.c:570
+#: src/global.c:517
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:571
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Önceki ekrana git"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Sonraki ekrana git"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:525
 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:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Şu anki satıra kesim arabelleğini yapıştır"
 
-#: src/global.c:578
+#: src/global.c:528
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "İmlecin pozisyonunu göster"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/global.c:582
+#: src/global.c:532
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:583
+#: src/global.c:533
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Satır numarasına git"
 
-#: src/global.c:585
+#: src/global.c:535
 #, 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:586
-msgid "Repeat last search"
+#: src/global.c:536
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:588
+#: src/global.c:538
 #, 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:589
+#: src/global.c:539
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Yürürlükteki dosyanın sonuna ekle"
 
-#: src/global.c:590
+#: src/global.c:540
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Yürürlükteki dosyanın sonuna ekle"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:594
+#: src/global.c:544
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Bir karakter ileri git"
 
-#: src/global.c:595
+#: src/global.c:545
 #, fuzzy
 msgid "Go back one character"
 msgstr "Bir karakter geri gel"
 
-#: src/global.c:597
+#: src/global.c:547
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Bir kelime ileri git"
 
-#: src/global.c:598
+#: src/global.c:548
 #, fuzzy
 msgid "Go back one word"
 msgstr "Bir kelime geriye git"
 
-#: src/global.c:600
+#: src/global.c:550
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Önceki ekrana git"
 
-#: src/global.c:601
+#: src/global.c:551
 #, fuzzy
 msgid "Go to next line"
 msgstr "Bir satır aşağı in"
 
-#: src/global.c:602
+#: src/global.c:552
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Şu anki satırın başına git"
 
-#: src/global.c:603
+#: src/global.c:553
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Şu anki satırın sonuna git"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:615
+#: src/global.c:563
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Eşleşen ayraç yok"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:623
+#: src/global.c:570
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Önceki ekrana git"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:630
+#: src/global.c:574
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "İmlecin olduğu yerden satır başı yap"
 
-#: src/global.c:632
+#: src/global.c:575
 #, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "İmlecin olduğu yerden satır başı yap"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "İmlecin altındaki karakteri sil"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Ä°mlecin solundaki karakteri sil"
 
-#: src/global.c:639
+#: src/global.c:581
 #, 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:642
+#: src/global.c:584
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Şu anki paragrafı yasla"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "Şu anki ekranı tazele (yeniden çiz)"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:656
+#: src/global.c:598
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "İmlecin pozisyonunu göster"
 
-#: src/global.c:660
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:664
+#: src/global.c:606
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini düzenle"
 
-#: src/global.c:666
+#: src/global.c:608
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini düzenle"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:672
+#: src/global.c:614
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dosyayı DOS biçiminde yaz"
 
-#: src/global.c:673
+#: src/global.c:615
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Dosyayı Mac biçiminde yaz"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Harici komut çalıştır"
 
-#: src/global.c:684
+#: src/global.c:622
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Yeni arabelleğe girişi aç/kapa"
 
-#: src/global.c:687
+#: src/global.c:625
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:689
+#: src/global.c:626
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:691
+#: src/global.c:627
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Dosyanın son satırına git"
-
-#: src/global.c:693
+#: src/global.c:628
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:694
+#: src/global.c:629
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Dosyanın son satırına git"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "Dizine git"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "Kapat"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Satır numarasına git"
+
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Yardım Al"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Ä°ptal"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "Yaz"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Dizine Git"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "Metni Kes"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "Yasla"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "Dosya Oku"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Denetime"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "Metni Kes"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "Satıra Git"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "Yaslamayı Geri Al"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Harf Duyarlı"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
+#: src/global.c:741
+msgid "Regexp"
+msgstr "Düzenli İfade"
+
+#: src/global.c:746
 #, fuzzy
-msgid "UnCut Text"
-msgstr "Kesmeyi Geri Al"
+msgid "Backwards"
+msgstr " [Geriye DoÄŸru]"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:753
+msgid "No Replace"
+msgstr "DeÄŸiÅŸtirme Yok"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "İmleç Pozisyonu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Denetime"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Önceki Sayfa"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Sonraki Sayfa"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "İlk Satır"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Son Satır"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ayraç değil"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "Metni Ä°ÅŸaretle"
 
-#: src/global.c:828
+#: src/global.c:791
 #, fuzzy
 msgid "Copy Text"
 msgstr "Metni Kes"
 
-#: src/global.c:831
+#: src/global.c:794
 #, fuzzy
 msgid "Indent Text"
 msgstr "Metni Kes"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Ä°leri"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "Geri"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Sonraki Kelime"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Ä°leri"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Önceki Kelime"
 
-#: src/global.c:875
-#, fuzzy
-msgid "Prev Line"
-msgstr "Önceki Sayfa"
-
-#: src/global.c:878
-#, fuzzy
-msgid "Next Line"
-msgstr "Sonraki Dosya"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Sonraki Kelime"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Ev"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Son"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Diğer Köşeli Ayracı Bul"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr ""
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr ""
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "Önceki Dosya"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "Sonraki Dosya"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Sekme (TAB)"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Gir TuÅŸu (Enter)"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Sil"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Geri tuÅŸu"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Askıya Al"
+
+#: src/global.c:903
+#, fuzzy
+msgid "PrevHstory"
+msgstr "Geçmiş"
+
+#: src/global.c:907
+#, fuzzy
+msgid "NextHstory"
+msgstr "Geçmiş"
+
+#: src/global.c:911
+#, fuzzy
+msgid "Go To Text"
+msgstr "Satıra Git"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS Biçimi"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac Biçimi"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Sonuna Ekle"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Başına Ekle"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Yedek Dosyası"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Komut Çalıştır"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Dosyalara"
+
+#: src/global.c:958
+#, fuzzy
+msgid "First File"
+msgstr "İlk Satır"
+
+#: src/global.c:960
+#, fuzzy
+msgid "Last File"
+msgstr "Son Satır"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Yardım Kipi"
 
-#: src/global.c:1301
+#: src/global.c:1217
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Sabit imleç pozisyonu"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Yumuşak kaydırma"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Uzun satırları kaydırma"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Renkli sözdizimi vurgusu"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Otomatik hizala"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Sonuna kes"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Uzun satırları kaydırma"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1321
+#: src/global.c:1239
 #, fuzzy
 msgid "Backup files"
 msgstr "Yedek Dosyası"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Dosya arabelleklerini çokla"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Fare DesteÄŸi"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "DOS/Mac biçimi ile ilgili bir şey yok"
 
-#: src/global.c:1329
+#: src/global.c:1247
 #, fuzzy
 msgid "Suspension"
 msgstr "Askıya Al"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:220
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1100,7 +1117,7 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1109,7 +1126,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1129,7 +1146,7 @@ msgstr ""
 " Satıra Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1160,7 +1177,7 @@ msgstr ""
 " Dosya Ekle kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1169,7 +1186,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:259
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1199,7 +1216,7 @@ msgstr ""
 " Dosyayı Yaz kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1224,7 +1241,7 @@ msgstr ""
 " Dosya Tarayıcısı kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1252,13 +1269,13 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:299
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1281,7 +1298,7 @@ msgstr ""
 " Tarayıcı Dizine Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1305,7 +1322,7 @@ msgstr ""
 " Yazım Denetimi kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1326,7 +1343,7 @@ msgstr ""
 " Harici Komut kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1357,7 +1374,7 @@ msgstr ""
 "kullanılabilir.  Alternatif tuşlar parantez içinde gösterilmişlerdir:\n"
 "\n"
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1368,7 +1385,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1377,16 +1394,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "etkin/etkisiz"
 
-#: src/nano.c:588
+#: src/nano.c:597
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "GÖSTER kipi için geçersiz anahtar"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1395,7 +1412,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1404,7 +1421,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1413,292 +1430,296 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Pencere boyutu nano için çok küçük...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, 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:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Seçenek\t\tAnlamı\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Bu mesajı gösterir"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:831
+#. 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:843
 #, fuzzy
 msgid "Start at line LINE, column COLUMN"
 msgstr "LINE satır numarasından başla"
 
-#: src/nano.c:833
+#: src/nano.c:845
 #, fuzzy
 msgid "Enable smart home key"
 msgstr "Fare etkin"
 
-#: src/nano.c:834
+#: src/nano.c:846
 #, fuzzy
 msgid "Save backups of existing files"
 msgstr "Kaydetme anında varolan dosyaların yedeğini al"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Çoklu dosya arabelleği aktif"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "Metin arama/değiştirme geçmişini oku ve günlükle."
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "nanorc dosyalarına bakma"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Dosyalaro DOS/Mac biçiminden dönüştürme"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:880
 #, fuzzy
 msgid "Log & read location of cursor position"
 msgstr "Sabit imleç pozisyonu"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:883
 #, fuzzy
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[metin]"
 
-#: src/nano.c:872
+#: src/nano.c:884
 #, fuzzy
 msgid "Quoting string"
 msgstr "Alıntı dizgesi, öntanımlı \"> \""
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:879
+#: src/nano.c:891
 #, fuzzy
 msgid "-T <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:879
+#: src/nano.c:891
 #, fuzzy
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[sayı]"
 
-#: src/nano.c:880
+#: src/nano.c:892
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr "Sekmenin geniÅŸliÄŸini numaraya ayarla"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "Sürüm bilgisini yaz ve çık"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:891
+#: src/nano.c:903
 #, fuzzy
 msgid "--syntax=<str>"
 msgstr "--syntax [metin]"
 
-#: src/nano.c:892
+#: src/nano.c:904
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Kullanılacak sözdizim tanımlaması"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "İmleç pozisyonunu daimi göster"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "Bu mesajı gösterir"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Yeni satırlarda otomatik paragraf başı yap"
 
-#: src/nano.c:900
+#: src/nano.c:913
 #, 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:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Simgesel bağları takip etme, üzerine yaz"
 
-#: src/nano.c:905
+#: src/nano.c:918
 #, fuzzy
 msgid "Enable the use of the mouse"
 msgstr "Fare etkin"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:908
+#: src/nano.c:922
 #, fuzzy
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[dizin]"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "Çalışma dizinini belirle"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON (^Q) ve XOFF (^S) tuşlarını sakla"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:916
+#: src/nano.c:930
 #, fuzzy
 msgid "-r <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:916
+#: src/nano.c:930
 #, fuzzy
 msgid "--fill=<#cols>"
 msgstr "--fill=[#cols]"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:920
+#: src/nano.c:934
 #, fuzzy
 msgid "-s <prog>"
 msgstr "-s [prog]"
 
-#: src/nano.c:920
+#: src/nano.c:934
 #, fuzzy
 msgid "--speller=<prog>"
 msgstr "--speller=[prog]"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Alternatif yazım kontrolcüsü etkin"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Çıkışta sormaksızın otomatik kaydet"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr ""
 
-#: src/nano.c:929
+#: src/nano.c:943
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr "Göster (sadece okunur) kipi"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Uzun satırları kaydırma"
 
-#: src/nano.c:933
+#: src/nano.c:947
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr "Yardım penceresini gösterme"
 
-#: src/nano.c:934
+#: src/nano.c:948
 #, fuzzy
 msgid "Enable suspension"
 msgstr "Askıya almayı etkinleştir"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(Pico uyumluluğu için yoksayıldı)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano sürüm numarası: %s (%s, %s tarihinde derlendi)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1707,169 +1728,174 @@ msgstr ""
 "\n"
 " Derleme seçenekleri:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 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:1055
+#: src/nano.c:1110
 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:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ya da SIGTERM sinyali alındı\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, 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:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "etkin"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "etkisiz"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON yoksayıldı."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF yoksayıldı."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "istenen Tab değeri %d geçerli değil"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "istenen doldurma değeri %d geçerli değil"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Ee"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Hh"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Evet"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Tümü"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Hayır"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "%s argümanında sonlanmamış \" var"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 #, 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" yanlış bir düzenli ifade: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:393
-#, 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:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "Renk ismi eksik"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:512
-#, 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:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "\"%s\" çağırılamadı"
+#: src/rcfile.c:467
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
 
-#: src/rcfile.c:540
+#: src/rcfile.c:474
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:711
+#: src/rcfile.c:497
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:583
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr ""
+
+#: src/rcfile.c:626
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1883,96 +1909,121 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" ve \n"
 "\"black\", seçimli \"bright\" ön eki ile.\n"
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 #, 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\", \"end=\"e ihtiyaç duyar."
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:819
 #, 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:960
+#: src/rcfile.c:875
+#, 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:880
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Renk ismi eksik"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Renk ismi eksik"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, 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:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "%s komutu anlaşılamadı"
 
-#: src/rcfile.c:1061
+#: src/rcfile.c:1113
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, 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:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, 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:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ev dizinimi bulamıyorum!"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1986,43 +2037,47 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (değiştirmek için)"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (değiştirmek için)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "Bu bulgu deÄŸiÅŸtirilsin mi?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "Ä°le deÄŸiÅŸtir"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Satır numarasını girin"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Ayraç değil"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Eşleşen ayraç yok"
 
@@ -2035,228 +2090,264 @@ msgstr "Ä°ÅŸaretle"
 msgid "Mark Unset"
 msgstr "İşareti Kaldır"
 
-#: src/text.c:443
+#: src/text.c:434
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 #, fuzzy
 msgid "text delete"
 msgstr "Sonraki Dosya"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr ""
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 #, fuzzy
 msgid "text insert"
 msgstr "Sonraki Dosya"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 #, 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Boru işlemi gerçekleştirilemedi"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Boru yaratılamadı"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Fork işlemi gerçekleştirilemedi"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Şmdi yaslamayı geri alabilirsiniz!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Bir yerdeğiştirmeyi düzenle"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Boru yaratılamadı"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "Yazım hatası içeren kelimeler listeleniyor, lütfen bekleyiniz"
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "Boru arabelleğinin boyutu alınamıyor"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "\"sort -f\" çağırılırken hata"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" çağırılırken hata"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Yazım kontrolü bitti"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "Bu mesajı gösterir"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "Bu mesajı gösterir"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3041
+#: src/text.c:3373
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr ""
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 #, fuzzy
 msgid "Modified"
 msgstr " DeÄŸiÅŸtirildi "
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 #, fuzzy
 msgid "View"
 msgstr " Göster "
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 #, fuzzy
 msgid "DIR:"
 msgstr " DÄ°ZÄ°N: "
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 #, fuzzy
 msgid "File:"
 msgstr "Dosya: "
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "nano metin editörü"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 #, fuzzy
 msgid "version"
 msgstr "sürüm "
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "Size saÄŸlayan: "
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "Özel teşekkürler:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "ncurses için:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "ve unuttuÄŸumuz kiÅŸilere..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "nano kullandığınız için teşekkürler!\n"
@@ -2313,11 +2404,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"
@@ -2355,6 +2443,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"
 
@@ -2396,6 +2487,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"
 
@@ -2440,21 +2534,27 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ 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"
 
@@ -2532,6 +2632,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 dc2e76d5..9f2867c2 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 7e623106..ae87cd51 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,1097 +1,1087 @@
-# 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.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.1.99pre3\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2003-02-17 10:51+0300\n"
-"Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2014-05-23 07:14+0300\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"
+"X-Generator: Lokalize 1.5\n"
 
-#: src/browser.c:220
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
-msgstr "äÏ äÉÒÅËÔÏÒ¦§"
+msgstr "Перейти до каталогу"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
-msgstr "óËÁÓÏ×ÁÎÏ"
+msgstr "Ска�овано"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
-#, fuzzy, c-format
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
+#, c-format
 msgid "Error reading %s: %s"
-msgstr "ðÏÇÁÎÉÊ ÒÑÄÏË ÃÉÔÕ×ÁÎÎÑ %s: %s"
+msgstr "Помилка під ча� �проби читанн� %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
-msgstr ""
+msgstr "(кат)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
-msgstr ""
+msgstr "(батьк. кат.)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 msgid "Search"
-msgstr "ðÏÛÕË"
+msgstr "Пошук"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 msgid " [Case Sensitive]"
-msgstr " [òÅÇúÁÌÅÖ]"
+msgstr " [РегЗалеж]"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:194
+#: src/browser.c:806 src/search.c:192
 msgid " [Regexp]"
-msgstr " [æÏÒÍ÷ÉÒ]"
+msgstr " [ФормВир]"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
-msgstr " [îÁÚÁÄ]"
+msgstr " [�азад]"
 
 # message
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
-msgstr "ãÅ ¤ÄÉÎÅ ÓЦ×ÐÁĦÎÎÑ"
+msgstr "Це єдиний збіг"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
-msgstr ""
+msgstr "�емає поточного зразка дл� пошуку"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr ""
+msgstr "�е вдало�� визначити профіль дл� файла блокуванн� (помилка getpwuid())"
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr ""
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "�е вдало�� визначити назву вузла дл� файла блокуванн�: %s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
-#, fuzzy, c-format
+#: src/files.c:170 src/files.c:207 src/files.c:217
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "ðÏÍÉÌËÁ × %s Õ ÒÑÄËÕ %d: "
+msgstr "Помилка під ча� �проби запи�ати файл блокуванн� %s: %s"
 
-#: src/files.c:234
-#, fuzzy, c-format
+#: src/files.c:232
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "ðÏÍÉÌËÁ × %s Õ ÒÑÄËÕ %d: "
+msgstr "Помилка під ча� �проби вилучити файл блокуванн� %s: %s"
 
-#: src/files.c:271
-#, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "ðÏÍÉÌËÁ × %s Õ ÒÑÄËÕ %d: "
+#: src/files.c:266
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Помилка під ча� �проби відкрити файл блокуванн� %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
+"Помилка під ча� �проби прочитати дані з файла блокуванн� %s: прочитано "
+"недо�татньо даних"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "îÅ ÍÏÖÕ ×ÓÔÁ×ÉÔÉ ÆÁÊÌ ÐÏÚÁ %s"
+msgstr "�е можу в�тавити файл поза %s"
 
-#: src/files.c:437
-#, fuzzy
+#: src/files.c:431
 msgid "No more open file buffers"
-msgstr "â¦ÌØÛ ÎÅÍÁ צÄËÒÉÔÉÈ ÆÁÊ̦×"
+msgstr "Більше немає відкритих файлових буферів"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
-msgstr "ðÅÒÅÍËÎÕÔÏ ÄÏ %s"
+msgstr "Перемкнуто до %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
-msgstr "îÏ×ÉÊ âÕÆÅÒ"
+msgstr "�овий Буфер"
 
-#: src/files.c:840
-#, fuzzy, c-format
+#: src/files.c:835
+#, 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:845
-#, fuzzy, c-format
+#: src/files.c:840
+#, 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:851
-#, fuzzy, c-format
+#: src/files.c:846
+#, 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:855
-#, fuzzy, c-format
+#: src/files.c:850
+#, 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:861
-#, fuzzy, c-format
+#: src/files.c:856
+#, 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:865
-#, fuzzy, c-format
+#: src/files.c:860
+#, 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:871
-#, fuzzy, c-format
+#: src/files.c:866
+#, 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:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
-msgstr "þÉÔÁ¤ÍÏ ÆÁÊÌ.."
+msgstr "Читаємо файл.."
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
-msgstr "îÏ×ÉÊ ÆÁÊÌ"
+msgstr "�овий файл"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" ÎÅ ÚÎÁÊÄÅÎÏ"
+msgstr "\"%s\" не знайдено"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "æÁÊÌ \"%s\" ¤ ÄÉÒÅËÔÏÒ¦¤À"
+msgstr "«%s» є каталогом"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
-#, fuzzy, c-format
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "æÁÊÌ \"%s\" ¤ ÆÁÊÌÏÍ ÐÒÉÓÔÒÏÀ"
+msgstr "«%s» є файлом при�трою"
 
-#: src/files.c:1031
-#, fuzzy, c-format
+#: src/files.c:1026
+#, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ (× ÎÏ×ÉÊ ÂÕÆÅÒ) [×¦Ä %s] "
+msgstr "Команда, �ку �лід виконати у новому буфері [з %s] "
 
-#: src/files.c:1033
-#, fuzzy, c-format
+#: src/files.c:1028
+#, c-format
 msgid "Command to execute [from %s] "
-msgstr "ëÏÍÁÎÄÁ ÄÏ ×ÉËÏÎÁÎÎÑ "
+msgstr "Команда, �ку �лід виконати [з %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ (× ÎÏ×ÉÊ ÂÕÆÅÒ) [×¦Ä %s] "
+msgstr "Файл до в�тавки (в новий буфер) [від %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ [×¦Ä %s] "
+msgstr "Файл до в�тавки [від %s] "
 
-#: src/files.c:1291
-#, fuzzy
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
-msgstr "îÅצÒÎÁ ËÎÏÐËÁ × ÎÅ-ÍÕÌØÔÉÂÕÆÅÒÎÏÍÕ ÒÅÖÉͦ"
+msgstr "Клавіша недій�на у не мультибуферному режимі"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr ""
+"�е вдало�� запи�ати дані до файла резервної копії, продовжити �пробу "
+"зберегти дані? (�ати�ніть N, �кщо не певні) "
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "îÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ ÐÏÚÁ %s"
+msgstr "�е можу запи�ати поза %s"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
+"�е можна допи�увати на початку або наприкінці �имволічного по�иланн�, �кщо "
+"в�тановлено --nofollow"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr ""
+msgstr "Помилка під ча� �проби запи�ати до файла резервної копії %s: %s"
 
-#: src/files.c:1813 src/nano.c:706
-#, fuzzy
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
-msgstr ""
-"\n"
-"%s ÎÅ ÚÁÐÉÓÁÎÏ (ÎÁÄÔÏ ÂÁÇÁÔÏ ÒÅÚÅÒ×ÎÉÈ ÆÁÊ̦×?)\n"
+msgstr "Забагато файлів резервних копій?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
-#, fuzzy, c-format
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
+#, c-format
 msgid "Error writing %s: %s"
-msgstr "ðÏÇÁÎÉÊ ÒÑÄÏË ÃÉÔÕ×ÁÎÎÑ %s: %s"
+msgstr "Помилка під ча� �проби запи�ати %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr ""
+msgstr "Помилка під ча� �проби запи�ати до тимча�ового файла: %s"
 
 #: src/files.c:2140
-#, fuzzy, c-format
+#, 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:2245
 msgid " [DOS Format]"
-msgstr " [ÆÏÒÍÁÔ DOS]"
+msgstr " [формат DOS]"
 
 #: src/files.c:2246
 msgid " [Mac Format]"
-msgstr " [ÆÏÒÍÁÔ Mac]"
+msgstr " [формат Mac]"
 
 #: src/files.c:2248
 msgid " [Backup]"
-msgstr " [òÅÚÅÒ×]"
+msgstr " [Резерв]"
 
 #: src/files.c:2256
 msgid "Prepend Selection to File"
-msgstr "äÏÄÁÔÉ ÷ÉĦÌÅÎÅ ÄÏ ÆÁÊÌÕ (× ÐÏÞÁÔÏË ÆÁÊÌÁ)"
+msgstr "Допи�ати позначене до файла на початку"
 
 #: src/files.c:2257
 msgid "Append Selection to File"
-msgstr "äÏÄÁÔÉ ÷ÉĦÌÅÎÅ ÄÏ ÆÁÊÌÕ"
+msgstr "Допи�ати позначене до файла наприкінці"
 
 #: src/files.c:2258
 msgid "Write Selection to File"
-msgstr "úÁÐÉÓÁÔÉ ÷ÉĦÌÅÎÅ ÄÏ ÆÁÊÌÕ"
+msgstr "Запи�ати позначене до файла"
 
 #: src/files.c:2261
 msgid "File Name to Prepend to"
-msgstr "¶Í'Ñ ÆÁÊÌÕ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ"
+msgstr "�азва файла дл� допи�уванн�"
 
 #: src/files.c:2262
 msgid "File Name to Append to"
-msgstr "¶Í'Ñ ÆÁÊÌÕ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ"
+msgstr "�азва файла дл� допи�уванн�"
 
 #: src/files.c:2263
 msgid "File Name to Write"
-msgstr "¶Í'Ñ ÆÁÊÌÕ ÄÏ ÚÁÐÉÓÕ"
+msgstr "�азва файла дл� запи�уванн�"
 
 #: src/files.c:2394
-#, fuzzy
 msgid "File exists, OVERWRITE ? "
-msgstr "æÁÊÌ ¦ÓÎÕ¤, ðåòåðéóáôé ?"
+msgstr "Файл і�нує, ПЕРЕЗ�ПИС�ТИ? "
 
 #: src/files.c:2403
 msgid "Save file under DIFFERENT NAME ? "
-msgstr ""
+msgstr "Зберегти файл з іншою назвою? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
+"З ча�у, коли було відкрито файл, до нього було вне�ено зміни. Продовжити "
+"�проби зберегти дані? "
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
-msgstr "(ÄÁ̦)"
+msgstr "(далі)"
 
-#: src/files.c:2942
-#, fuzzy, c-format
+#: src/files.c:2939
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
-msgstr "îÁÔÉÓΦÔØ Enter ÄÌÑ ÐÏÄÏ×ÖÅÎÎÑ\n"
+msgstr ""
+"\n"
+"�ати�ніть Enter, щоб продовжити\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
+"�е вдало�� �творити каталог %s: %s\n"
+"Цей каталог потрібен дл� зберіганн� та завантаженн� журналу пошуку або даних "
+"щодо позиції кур�ора.\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
+"�дре�а %s не є адре�ою каталогу, хоча має нею бути.\n"
+"Nano не зможе завантажувати або зберігати дані щодо журналу пошуку та "
+"позицій кур�ора.\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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/files.c:2983
+#: src/files.c:2978
 #, 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, щоб дізнати�� більше про цю зміну)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "óËÁÓÕ×ÁÔÉ"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "úÁͦÎÁ"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "îÅ úÁͦÝÁÔÉ"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "òÅÇúÁÌÅÖ"
+msgid "Exit"
+msgstr "Вихід"
 
 #: src/global.c:472
-#, fuzzy
-msgid "Backwards"
-msgstr " [îÁÚÁÄ]"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "æÏÒÍ÷ÉÒ"
+msgid "Close"
+msgstr "Закрити"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-#, fuzzy
-msgid "PrevHstory"
-msgstr "¶ÓÔÏÒ¦Ñ"
+#: src/global.c:473
+msgid "Uncut Text"
+msgstr "Ска�Виріз"
 
-#: src/global.c:503
-#, fuzzy
-msgid "NextHstory"
-msgstr "¶ÓÔÏÒ¦Ñ"
+#: src/global.c:475
+msgid "Unjustify"
+msgstr "Ска�Вирівн"
 
-#: src/global.c:504
-#, fuzzy
-msgid "Go To Text"
-msgstr "äÏ òÑÄËÁ"
-
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
-msgstr "ðÏÛÕË"
-
-#: src/global.c:508
-#, fuzzy
-msgid "First File"
-msgstr "ðÅÒÛÉÊ òÑÄÏË"
-
-#: src/global.c:509
-#, fuzzy
-msgid "Last File"
-msgstr "ïÓÔÁÎÎ¦Ê òÑÄÏË"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "äÏ æÁÊ̦×"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "ÆÏÒÍÁÔ DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "ÆÏÒÍÁÔ Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "äÏÄÁÔÉ"
+msgstr "Знайти далі"
 
-#: src/global.c:516
-msgid "Prepend"
-msgstr "äÏÄÁÔÉ(0)"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "úÒÏÂÉÔÉ ÒÅÚÅÒ×ÎÕ ËÏЦÀ"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "÷ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "äÏ äÉÒÅËÔÏÒ¦§"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "äÏÐÏÍÏÇÁ"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "÷ÉȦÄ"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
-msgstr "ðÏÛÕË"
-
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "ðÏÐ.óÔÏÒ."
+msgstr "Пошук"
 
-#: src/global.c:535
-msgid "Next Page"
-msgstr "îÁÓÔ.óÔÏÒ."
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "ðÅÒÛÉÊ òÑÄÏË"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Заміна"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "ïÓÔÁÎÎ¦Ê òÑÄÏË"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "До Р�дка"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "ðÒÉÚÕÐÉÎËÁ -"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "ПопР�док"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:490
+msgid "Next Line"
+msgstr "�а�тР�док"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr ""
+#: src/global.c:491
+msgid "Read File"
+msgstr "Чит. файл"
 
-#: src/global.c:542
-#, fuzzy
+#: src/global.c:493
 msgid "FullJstify"
-msgstr "÷ÉÒ¦×ÎÀ×ÁÎÎÑ"
+msgstr "Вирівн�ти"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
-msgstr "ðÅÒÅÍÁÌÀ×ÁÔÉ"
-
-#: src/global.c:546
-#, fuzzy
-msgid "Insert File"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "äÏ òÑÄËÁ"
-
-#: src/global.c:551
-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:556
+#: src/global.c:501
+msgid "Justify the current paragraph"
+msgstr "Вирівн�ти поточний абзац"
+
+#: src/global.c:503
 msgid "Cancel the current function"
-msgstr "óËÁÓÕ×ÁÔÉ ÐÏÔÏÞÎÕ ÆÕÎËæÀ"
+msgstr "Ска�увати поточну функцію"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
-msgstr ""
+msgstr "Показати цю довідку"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
-msgstr "úÁËÒÉÔÉ ÚÁ×ÁÎÔÁÖÅÎÉÊ ÚÁÒÁÚ ÆÁÊÌ/÷ÉÊÔÉ ¦Ú nano"
+msgstr "Закрити буфер поточного файла  / Вийти з nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
-msgstr "÷ÉÈ¦Ä Ú nano"
+msgstr "Вихід з nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
-msgstr "úÁÐÉÓÁÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ ÎÁ ÄÉÓË"
+msgstr "Запи�ати поточний файл на ди�к"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
-msgstr "÷ÓÔÁ×ÉÔÉ ¦ÎÛÉÊ ÆÁÊÌ ÄÏ ÐÏÔÏÞÎÏÇÏ"
+msgstr "В�тавити інший файл до поточного"
 
-#: src/global.c:570
-#, fuzzy
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
-msgstr "æÏÒÍÁÌØΦ ×ÉÒÁÚÉ (regexp)"
+msgstr "Шукати р�док або формальний вираз"
 
-#: src/global.c:571
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅËÒÁÎÕ"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr "Шукати р�док"
 
-#: src/global.c:572
-#, fuzzy
-msgid "Go to next screen"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÅËÒÁÎÕ"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr "�а один екран вгору"
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr "�а один екран вниз"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "÷ÉÒ¦ÚÁÔÉ ÐÏÔÏÞÎÉÊ ÒÑÄÏË ÔÁ ÐÏͦÓÔÉÔÉ ÊÏÇÏ ÄÏ \"ËÉÛÅΦ\""
+msgstr "Вирізати поточний р�док та помі�тити його до \"кишені\""
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "óËÁÓÕ×ÁÔÉ ×ÉÒ¦ÚÁÎÎÑ ÔÁ ×ÓÔÁ×ÉÔÉ ÚͦÓÔ \"ËÉÛÅΦ\" ÄÏ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"
+msgstr "Ска�увати вирізанн� та в�тавити змі�т \"кишені\" до поточного р�дка"
 
-#: src/global.c:578
-#, fuzzy
+#: src/global.c:528
 msgid "Display the position of the cursor"
-msgstr "ðÏËÁÚÁÔÉ ÐÏÚÉæÀ ËÕÒÓÏÒÁ"
+msgstr "Показати розташуванн� кур�ора"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
-msgstr "÷ÉËÌÉËÁÔÉ ÐÒÏÇÒÁÍÕ ÐÏÛÕËÕ ÄÒÕËÁÒÓØËÉÈ ÐÏÍÉÌÏË (ÑËÝÏ ¤)"
+msgstr "Викликати програму пошуку друкар�ьких помилок (�кщо є)"
 
-#: src/global.c:582
-#, fuzzy
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
-msgstr "æÏÒÍÁÌØΦ ×ÉÒÁÚÉ (regexp)"
+msgstr "Замінити р�док або формальний вираз"
 
-#: src/global.c:583
-#, fuzzy
+#: src/global.c:533
 msgid "Go to line and column number"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ×ËÁÚÁÎÏÇÏ ÒÑÄËÁ"
+msgstr "Йти до р�дка та номеру �товпчика"
 
-#: src/global.c:585
-#, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "ðÏͦÔÉÔÉ ÔÅËÓÔ Ð¦Ä ÐÏÔÏÞÎÏÀ ÐÏÚÉæ¤À ËÕÒÓÏÒÁ"
+#: src/global.c:535
+msgid "Mark text starting from the cursor position"
+msgstr "Позначити тек�т, починаючи з поточної позиції кур�ора"
 
-#: src/global.c:586
-msgid "Repeat last search"
-msgstr ""
+#: src/global.c:536
+msgid "Repeat the last search"
+msgstr "Повторити о�танній пошук"
 
-#: src/global.c:588
-#, fuzzy
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "÷ÉÒ¦ÚÁÔÉ ÐÏÔÏÞÎÉÊ ÒÑÄÏË ÔÁ ÐÏͦÓÔÉÔÉ ÊÏÇÏ ÄÏ \"ËÉÛÅΦ\""
+msgstr "Скопіювати поточний р�док та зберегти його до \"кишені\""
 
-#: src/global.c:589
-#, fuzzy
+#: src/global.c:539
 msgid "Indent the current line"
-msgstr "äÏÄÁÔÉ ÄÏ ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ"
+msgstr "Додати від�туп у поточному р�дку"
 
-#: src/global.c:590
-#, fuzzy
+#: src/global.c:540
 msgid "Unindent the current line"
-msgstr "äÏÄÁÔÉ ÄÏ ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ"
+msgstr "Вилучити від�туп дл� поточного р�дка"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Ска�увати о�танню дію"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Відновити о�танню �ка�овану дію"
 
-#: src/global.c:594
-#, fuzzy
+#: src/global.c:544
 msgid "Go forward one character"
-msgstr "÷ÐÅÒÅÄ ÎÁ ÏÄÎÕ Ì¦ÔÅÒÕ"
+msgstr "Вперед на один �имвол"
 
-#: src/global.c:595
-#, fuzzy
+#: src/global.c:545
 msgid "Go back one character"
-msgstr "îÁÚÁÄ ÎÁ ÏÄÎÕ Ì¦ÔÅÒÕ"
+msgstr "�азад на один �имвол"
 
-#: src/global.c:597
-#, fuzzy
+#: src/global.c:547
 msgid "Go forward one word"
-msgstr "÷ÐÅÒÅÄ ÎÁ ÏÄÎÅ ÓÌÏ×Ï"
+msgstr "Вперед на одне �лово"
 
-#: src/global.c:598
-#, fuzzy
+#: src/global.c:548
 msgid "Go back one word"
-msgstr "îÁÚÁÄ ÎÁ ÏÄÎÅ ÓÌÏ×Ï"
+msgstr "�азад на одне �лово"
 
-#: src/global.c:600
-#, fuzzy
+#: src/global.c:550
 msgid "Go to previous line"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅËÒÁÎÕ"
+msgstr "Повернути�� до попереднього р�дка"
 
-#: src/global.c:601
-#, fuzzy
+#: src/global.c:551
 msgid "Go to next line"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÎÁ ÒÑÄÏË ÎÉÖÞÅ"
+msgstr "Перейти до на�тупного р�дка"
 
-#: src/global.c:602
-#, fuzzy
+#: src/global.c:552
 msgid "Go to beginning of current line"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÐÏÞÁÔËÕ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"
+msgstr "Перейти до початку р�дка"
 
-#: src/global.c:603
-#, fuzzy
+#: src/global.c:553
 msgid "Go to end of current line"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÎÁ ˦ÎÅÃØ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"
+msgstr "Перейти до кінц� р�дка"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr ""
+msgstr "�а початок поточного абзацу; потім на�тупного абзацу"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr ""
+msgstr "У кінець поточного абзацу; потім на�тупного абзацу"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÐÅÒÛÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до першого р�дка файла"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до о�таннього р�дка файла"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:563
 msgid "Go to the matching bracket"
-msgstr "îÅÍÁ צÄÐÏצÄÎϧ ÄÕÖËÉ"
+msgstr "Перейти до відповідної дужки"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Гортати на один р�док вгору без переміщенн� кур�ора"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Гортати на один р�док вниз без переміщенн� кур�ора"
 
-#: src/global.c:623
-#, fuzzy
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅËÒÁÎÕ"
+msgstr "Перемкнути�� на попередній файловий буфер"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
-msgstr ""
+msgstr "Перемкнути�� на на�тупний файловий буфер"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
-msgstr ""
+msgstr "В�тавити на�тупну комбінацію клавіш �к є"
 
-#: src/global.c:630
-#, fuzzy
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
-msgstr "÷ÓÔÁ×ÉÔÉ ÓÉÍ×ÏÌ CR (ÐÏ×ÅÒÎÅÎÎÑ ÇÏ̦×ËÉ) × ÐÏÚ. ËÕÒÓÏÒÁ"
+msgstr "В�тавити знак табул�ції в мі�це розташуванн� кур�ора"
 
-#: src/global.c:632
-#, fuzzy
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
-msgstr "÷ÓÔÁ×ÉÔÉ ÓÉÍ×ÏÌ CR (ÐÏ×ÅÒÎÅÎÎÑ ÇÏ̦×ËÉ) × ÐÏÚ. ËÕÒÓÏÒÁ"
+msgstr "В�тавити новий р�док у мі�ці розташуванн� кур�ора"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
-msgstr "÷ÉÄÁÌÉÔÉ Ì¦ÔÅÒÕ Ð¦Ä ËÕÒÓÏÒÏÍ"
+msgstr "Видалити літеру під кур�ором"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
-msgstr "÷ÉÄÁÌÉÔÉ Ì¦ÔÅÒÕ Ú̦×Á ×¦Ä ËÕÒÓÏÒÁ"
+msgstr "Видалити літеру зліва від кур�ора"
 
-#: src/global.c:639
-#, fuzzy
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
-msgstr "óËÁÓÕ×ÁÔÉ ×ÉÒ¦ÚÁÎÎÑ ÔÁ ×ÓÔÁ×ÉÔÉ ÚͦÓÔ \"ËÉÛÅΦ\" ÄÏ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"
+msgstr "Вирізати від позиції кур�ора до кінц� файла"
 
-#: src/global.c:642
-#, fuzzy
+#: src/global.c:584
 msgid "Justify the entire file"
-msgstr "÷ÉÒ¦×ÎÑÔÉ ÐÏÔÏÞÎÉÊ ÁÂÚÁÃ"
+msgstr "Вирівн�ти цілий файл"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Підрахувати кількі�ть �лів, р�дків та �имволів"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
-msgstr "ðÅÒÅÍÁÌÀ×ÁÔÉ ÐÏÔÏÞÎÉÊ ÅËÒÁÎ"
+msgstr "Перемалювати поточний екран"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Призупинити редактор (�кщо увімкнено)"
 
-#: src/global.c:654
-#, fuzzy
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
-msgstr "òÅÇÉÓÔÒÏÚÁÌÅÖÎÉÊ ÐÏÛÕË"
+msgstr "Увімкнути/вимкнути чутливі�ть пошуку до регі�тру"
 
-#: src/global.c:656
-#, fuzzy
+#: src/global.c:598
 msgid "Reverse the direction of the search"
-msgstr "ðÏËÁÚÁÔÉ ÐÏÚÉæÀ ËÕÒÓÏÒÁ"
+msgstr "Змінити напр�мок пошуку на протилежний"
 
-#: src/global.c:660
-#, fuzzy
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
-msgstr "æÏÒÍÁÌØΦ ×ÉÒÁÚÉ (regexp)"
+msgstr "Увімкнути/вимкнути викори�танн� формальних виразів"
 
-#: src/global.c:664
-#, fuzzy
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÐÏÐÅÒÅÄÎ¦Ê ÒÑÄÏË ÐÏÛÕËÕ/ÚÁͦÎÉ"
+msgstr "Згадати попередній р�док пошуку/заміни"
 
-#: src/global.c:666
-#, fuzzy
+#: src/global.c:608
 msgid "Recall the next search/replace string"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÐÏÐÅÒÅÄÎ¦Ê ÒÑÄÏË ÐÏÛÕËÕ/ÚÁͦÎÉ"
+msgstr "Згадати на�тупний р�док пошуку/заміни"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
-msgstr "äÏ ÐÅÒÅÇÌÑÄÁÞÁ ÆÁÊ̦×"
+msgstr "До перегл�дача файлів"
 
-#: src/global.c:672
-#, fuzzy
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
-msgstr "úÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ DOS"
+msgstr "Увімкнути/вимкнути викори�танн� формату DOS"
 
-#: src/global.c:673
-#, fuzzy
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
-msgstr "úÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ Mac"
+msgstr "Увімкнути/вимкнути викори�танн� формату Mac"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
-msgstr ""
+msgstr "Увімкнути/вимкнути додаванн� до кінц�"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Увімкнути/вимкнути додаванн� до початку"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Увімкнути/вимкнути резервне копіюванн� початкового файла"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
-msgstr "÷ÉËÏÎÁÔÉ ÚÏ×ΦÛÎÀ ËÏÍÁÎÄÕ"
+msgstr "Виконати зовнішню команду"
 
-#: src/global.c:684
-#, fuzzy
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
-msgstr "ðÅÒÅÍÉËÎÕÔÉ ÒÅÖÉÍ ×ÓÔÁ×ËÉ × ÎÏ×ÉÊ ÂÕÆÅÒ"
+msgstr "Увімкнути/вимкнути викори�танн� нового буферу"
 
-#: src/global.c:687
-#, fuzzy
+#: src/global.c:625
 msgid "Exit from the file browser"
-msgstr "äÏ ÐÅÒÅÇÌÑÄÁÞÁ ÆÁÊ̦×"
+msgstr "Вийти з перегл�дача файлів"
 
-#: src/global.c:689
-#, fuzzy
+#: src/global.c:626
 msgid "Go to the first file in the list"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÐÅÒÛÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до першого файла у �пи�ку"
 
-#: src/global.c:691
-#, fuzzy
+#: src/global.c:627
 msgid "Go to the last file in the list"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
-
-#: src/global.c:692
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до о�таннього файла у �пи�ку"
 
-#: src/global.c:693
-#, fuzzy
+#: src/global.c:628
 msgid "Go to the previous file in the list"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÐÅÒÛÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до попереднього файла у �пи�ку"
+
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "Перейти до на�тупного файла у �пи�ку"
 
-#: src/global.c:694
+#: src/global.c:630
 msgid "Go to directory"
-msgstr "äÏ äÉÒÅËÔÏÒ¦§"
+msgstr "До каталогу"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "úÁËÒÉÔÉ"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "Викликати linter, �кщо до�тупний"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
-msgstr "úÁÐÉÓÁÔÉ"
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr "До попереднього пов. linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
-msgid "Justify"
-msgstr "÷ÉÒ¦×ÎÀ×ÁÎÎÑ"
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr "Перейти до на�тупного повідомленн� linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "þÉÔ. æÁÊÌ"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Довідка"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Ска�увати"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
+#: src/global.c:671
+msgid "Write Out"
+msgstr "Випи�ати"
+
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "До каталогу"
+
+#: src/global.c:712
 msgid "Cut Text"
-msgstr "÷ÉÒ¦ÚÁÔÉ"
+msgstr "Вирізати"
+
+#: src/global.c:721
+msgid "Justify"
+msgstr "Вирівн�ти"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "óËÁÓ÷ÉÒ¦×Î"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Правопи�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-#, fuzzy
-msgid "UnCut Text"
-msgstr "óËÁÓ÷ÉÒ¦Ú"
+#: src/global.c:731
+msgid "To Linter"
+msgstr "До linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "РегЗалеж"
+
+#: src/global.c:741
+msgid "Regexp"
+msgstr "ФормВир"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "�азад"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "�е Заміщати"
+
+#: src/global.c:761
 msgid "Cur Pos"
-msgstr "ðÏÚÉæÑ"
+msgstr "Позиці�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "ðÒÁ×ÏÐÉÓ"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "Поп.Стор."
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "�а�т.Стор."
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Перший Р�док"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "О�танній Р�док"
+
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "До дужки"
+
+#: src/global.c:788
 msgid "Mark Text"
-msgstr "ðÏͦÔÉÔÉ"
+msgstr "Помітити"
 
-#: src/global.c:828
-#, fuzzy
+#: src/global.c:791
 msgid "Copy Text"
-msgstr "÷ÉÒ¦ÚÁÔÉ"
+msgstr "Скопіювати тек�т"
 
-#: src/global.c:831
-#, fuzzy
+#: src/global.c:794
 msgid "Indent Text"
-msgstr "÷ÉÒ¦ÚÁÔÉ"
+msgstr "Від�туп"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
-msgstr ""
+msgstr "Ска�Від�т"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
-msgstr ""
+msgstr "Ска�увати"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "÷ÐÅÒÅÄ"
+msgstr "Повторити"
 
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
-msgstr "îÁÚÁÄ"
+msgstr "�азад"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "îÁÓÔóÌÏ×Ï"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Вперед"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
-msgstr "ðÏÐóÌÏ×Ï"
+msgstr "ПопСлово"
 
-#: src/global.c:875
-#, fuzzy
-msgid "Prev Line"
-msgstr "ðÏÐ.óÔÏÒ."
-
-#: src/global.c:878
-#, fuzzy
-msgid "Next Line"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "�а�тСлово"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
-msgstr "ðÏÞÁÔÏË"
+msgstr "Початок"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
-msgstr "ë¦ÎÅÃØ"
+msgstr "Кінець"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "úÎÁÊÔÉ äÒÕÇÕ äÕÖËÕ"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "Поч.абзацу"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Кін.абзацу"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
-msgstr ""
+msgstr "Гортати вгору"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
-msgstr ""
+msgstr "Гортати вниз"
 
-#: src/global.c:907
-msgid "Previous File"
-msgstr "ðÏÐÅÒÅÄÎ¦Ê æÁÊÌ"
+#: src/global.c:851
+msgid "Prev File"
+msgstr "Поп. файл"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
+msgstr "�а�тупний файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr ""
+#: src/global.c:862
+msgid "Verbatim"
+msgstr "Буквально"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
-msgstr "ôÁÂÕÌÑæÑ"
+msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
-msgstr "÷×ÏÄ"
+msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
-msgstr "÷ÉÄÁÌÉÔÉ"
+msgstr "Delete"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
-msgstr "úÁ¦Ê"
+msgstr "Backspace"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
-msgstr ""
+msgstr "ВирДоКінц�"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
-msgstr ""
+msgstr "Кількі�ть �лів"
+
+#: src/global.c:898
+msgid "Suspend"
+msgstr "Призупинка -"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "ПопЖурнал"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "�а�тЖурнал"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "До тек�ту"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "формат DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "формат Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Додати"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Додати(0)"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Зробити резервну копію"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Виконати команду"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "До Файлів"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Перший файл"
 
-#: src/global.c:1299
+#: src/global.c:960
+msgid "Last File"
+msgstr "О�т. файл"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr "Поп. пов. lint"
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
-msgstr "òÅÖÉÍ ÄÏÐÏÍÏÇÉ"
+msgstr "Режим довідки"
 
-#: src/global.c:1301
-#, fuzzy
+#: src/global.c:1217
 msgid "Constant cursor position display"
-msgstr "ðÏÓÔ¦ÊÎÁ ÐÏÚÉÃ¦Ñ ËÕÒÓÏÒÁ"
+msgstr "По�тійно показувати мі�це розташуванн� кур�ора"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
-msgstr ""
+msgstr "Викори�танн� додаткового р�дка дл� редагуванн�"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
-msgstr "ðÌÁ×ÎÁ ÐÒÏËÒÕÔËÁ"
+msgstr "Плавна прокрутка"
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr "М’�ке перене�енн� надто довгих р�дків"
+
+#: src/global.c:1225
 msgid "Whitespace display"
-msgstr ""
+msgstr "Показ пробілів"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
-msgstr "ð¦ÄÓצÞÕ×ÁÎÎÑ ÓÉÎÔÁËÓÉÓÕ ËÏÌØÏÒÏÍ"
+msgstr "Під�вічуванн� �интак�и�у кольором"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
-msgstr ""
+msgstr "Розумна клавіша Home"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
-msgstr "á×ÔÏ-×ÉÒ¦×ÎÀ×ÁÎÎÑ"
+msgstr "�втовід�туп"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
-msgstr "÷ÉÒ¦ÚÁÔÉ ÄÏ Ë¦ÎÃÑ"
+msgstr "Вирізати до кінц�"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
+msgstr "Жор�тке перене�енн� надзвичайно довгих р�дків"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Перетворенн� знаків табул�ції на пробіли"
 
-#: src/global.c:1321
-#, fuzzy
+#: src/global.c:1239
 msgid "Backup files"
-msgstr "úÒÏÂÉÔÉ ÒÅÚÅÒ×ÎÕ ËÏЦÀ"
+msgstr "Резервні копії"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
-msgstr "äÅ˦ÌØËÁ ÆÁÊÌÏ×ÉÈ ÂÕÆÅÒ¦×"
+msgstr "Декілька файлових буферів"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
-msgstr "ð¦ÄÔÒÉÍËÁ ÍÉÛ¦"
+msgstr "Підтримка миші"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
-msgstr "îÅÍÁ ÐÅÒÅÔ×ÏÒÀ×ÁÎÎÑ ¦Ú DOS/Mac ÆÏÒÍÁÔÕ"
+msgstr "�ема перетворюванн� із DOS/Mac формату"
 
-#: src/global.c:1329
-#, fuzzy
+#: src/global.c:1247
 msgid "Suspension"
-msgstr "ðÒÉÚÕÐÉÎËÁ -"
+msgstr "Призупиненн�"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
-#, fuzzy
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1103,20 +1093,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ËÏÍÁÎÄÉ ÐÏÛÕËÕ\n"
-"\n"
-" ÷×ÅĦÔØ ÓÌÏ×Á ÁÂÏ Ì¦ÔÅÒÉ Ñ˦ ÷É ÛÕËÁ¤ÔÅ, ÔÁ ÎÁÔÉÓΦÔØ Enter. ñËÝÏ ÄÌÑ "
-"××ÅÄÅÎϧ ÷ÁÍÉ ÕÍÏ×É ÚÎÁÊÄÅÔØÓÑ ×¦ÄÐÏצÄÎÉÊ Ú¦Ç, ÅËÒÁÎ ÐÅÒÅͦÓÔÉÔØÓÑ × "
-"ÐÏÌÏÖÅÎÎÑ ÐÏÂÌÉÚÕ ÃØÏÇÏ Ú¦ÇÕ.\n"
+"Довідка про команди пошуку\n"
 "\n"
-" ðÏÐÅÒÅÄÎÑ ÕÍÏ×Á Ú¦ÇÕ Ú'Ñ×ÉÔØÓÑ Õ Ë×ÁÄÒÁÔÎÉÈ ÄÕÖËÁÈ Ð¦ÓÌÑ ÚÁÐÒÏÛÅÎÎÑ "
-"\"ðÏÛÕË:\". îÁÔÉÓÎÅÎÎÑ Enter ÂÅÚ ÒÅÄÁÇÕ×ÁÎÎÑ ÂÕÄØ-ÑËÏÇÏ ÔÅËÓÔÕ ÐÒÉÚ×ÅÄÅ ÄÏ "
-"ÐÏÛÕËÕ ÐÏÐÅÒÅÄÎØϧ ÕÍÏ×É Ú¦ÇÕ.\n"
-"\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ Õ ÒÅÖÉͦ ðÏÛÕËÕ:\n"
+" Введіть �лова чи �имволи дл� пошуку та нати�ніть Enter. Якщо введений вами "
+"тек�т буде знайдено, ви перейдете до мі�це найближчого збігу з шуканим "
+"р�дком. \n"
 "\n"
+" Попередній потрібний вам р�док буде показано в дужках пі�л� пропозиції "
+"пошуку. Якщо ви нати�нете Enter не ввівши жодного тек�ту, буде здій�нено "
+"пошук попереднього шуканого р�дка.  "
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1124,8 +1111,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:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1136,17 +1128,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1158,25 +1149,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"
-" ñËÝÏ ÷ÁÛ nano Ú¦ÂÒÁÎÉÊ ¦Ú ЦÄÔÒÉÍËÏÀ ÄÅ˦ÌØËÏÈ ÆÁÊÌÏ×ÉÈ ÂÕÆÅÒ¦×, ÔÁ ÃÑ "
-"ÍÏÖÌÉצÓÔØ ×צÍËÎÅÎÁ ÞÅÒÅÚ ÏÐæ§ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ -F ÁÂÏ --multibuffer, ÁÂÏ "
-"ÞÅÒÅÚ ËÏͦÎÁæÀ Meta-F, ÁÂÏ ÚÁ ÄÏÐÏÍÏÇÏÀ ÆÁÊÌÕ nanorc, ÆÁÊÌ ×ÓÔÁ×ÉÔØÓÑ × "
-"ÏËÒÅÍÉÊ ÆÁÊÌÏ×ÉÊ ÂÕÆÅÒ (ËÏÒÉÓÔÕÊÔÅÓØ Meta-< ÔÁ > ÝÏ ÐÅÒÅÍÉËÁÔÉÓØ Í¦Ö "
-"ÂÕÆÅÒÁÍÉ).\n"
+"Довідка по командах пошуку\n"
 "\n"
-" ñËÝÏ ÷ÁÍ ÐÏÔÒ¦ÂÅÎ ÏËÒÅÍÉÊ ÐÕÓÔÉÊ ÂÕÆÅÒ, ÐÒÏÓÔÏ ÖͦÔØ Enter × ÒÑÄËÕ "
-"ÚÁÐÒÏÛÅÎÎÑ ÂÅÚ ×ÐÉÓÕ×ÁÎÎÑ ¦ÍÅΦ ÆÁÊÌÕ, ÁÂÏ ×ÐÉÛ¦ÔØ ¦Í'Ñ ÎŦÓÎÕÀÞÏÇÏ ÆÁÊÌÕ ÔÁ "
-"ÎÁÔÉÓΦÔØ Enter.\n"
-"\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ × ÒÅÖÉͦ ÷ÓÔÁ×ÉÔÉ æÁÊÌ:\n"
+" Введіть �лова або �имволи, �кі Ви збираєте�� шукати, потім нати�ніть Enter. "
+"Якщо дл� введеного Вами знайдеть�� збіг, екран перемі�тить�� до найближчого "
+"збігу.\n"
 "\n"
+" Попередній р�док пошуку буде показано у дужках пі�л� запрошенн� 'Пошук:'. "
+"�ати�ненн� Enter без редагуванн� тек�ту продовжить попередній пошук.  "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1184,9 +1166,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:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1201,20 +1188,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:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1227,20 +1215,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:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1253,27 +1241,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:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" В режимі пошуку можна �кори�тати�� такими функціональними клавішами:\n"
+"\n"
 
-#: src/help.c:315
-#, fuzzy
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1285,19 +1271,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:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1310,18 +1295,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:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1332,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:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1352,25 +1338,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1380,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"
+" Си�тема позначень комбінацій клавіш на�тупна: комбінації з Control "
+"позначено �имволом (^), їх можна вве�ти за допомогою нати�канн� клавіші "
+"Control (Ctrl) або подвійного нати�канн� клавіші Escape (Esc); Комбінації з "
+"Esc позначено �имволом Meta (M), їх можна вве�ти за допомогою клавіш Esc, "
+"Alt або Meta, залежно від моделі викори�таної клавіатури.  "
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1389,499 +1373,489 @@ 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:391 src/help.c:466
 msgid "enable/disable"
-msgstr "ÄÏÚ×ÏÌÉÔÉ/ÚÁÂÏÒÏÎÉÔÉ"
+msgstr "дозволити/заборонити"
 
-#: src/nano.c:588
-#, fuzzy
+#: src/nano.c:597
 msgid "Key invalid in view mode"
-msgstr "îÅצÒÎÁ ËÎÏÐËÁ × ÒÅÖÉͦ VIEW"
+msgstr "�екоректна клавіша у режимі перегл�ду"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"âÕÆÅÒ ÚÁÐÉÓÁÎÏ ÄÏ %s\n"
+"Буфер запи�ано до %s\n"
 
-#: src/nano.c:702
-#, fuzzy, c-format
+#: src/nano.c:711
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"âÕÆÅÒ ÚÁÐÉÓÁÎÏ ÄÏ %s\n"
+"Буфер не запи�ано до %s: %s\n"
 
-#: src/nano.c:705
-#, fuzzy, c-format
+#: src/nano.c:714
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"âÕÆÅÒ ÚÁÐÉÓÁÎÏ ÄÏ %s\n"
+"Буфер не запи�ано: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
-msgstr "òÏÚÍ¦Ò ×¦ËÎÁ ÚÁÍÁÌÉÊ ÄÌÑ Nano...\n"
+msgstr "Розмір вікна замалий дл� nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Викори�танн�: nano [П�Р�МЕТРИ] [[+РЯДОК,СТОВПЧИК] Ф�ЙЛ]...\n"
+"\n"
 
-#: src/nano.c:824
-#, fuzzy, c-format
+#: src/nano.c:835
+#, 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:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "ïÐæÑ\t\túÎÁÞÅÎÎÑ\n"
-
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "ðÏËÁÚÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
+msgstr "Параметр\t\tПризначенн�\n"
 
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+РЯДОК,СТОВПЧИК"
 
-#: src/nano.c:831
-#, 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:843
 msgid "Start at line LINE, column COLUMN"
-msgstr "ðÏÞÁÔÉ Ú ÒÑÄËÁ ÎÏÍÅÒ òñäïë"
+msgstr "Почати зі вказаного р�дка та позиції"
 
-#: src/nano.c:833
-#, fuzzy
+#: src/nano.c:845
 msgid "Enable smart home key"
-msgstr "äÏÚ×ÏÌÉÔÉ ÍÉÛÕ"
+msgstr "Увімкнути розумну кнопку Home"
 
-#: src/nano.c:834
-#, fuzzy
+#: src/nano.c:846
 msgid "Save backups of existing files"
-msgstr "òÏÂÉÔÉ ÒÅÚÅÒ×Φ ËÏЦ§ ¦ÓÎÕÀÞÉÈ ÆÁÊÌ¦× ÐÒÉ ÚÁÐÉÓÕ"
+msgstr "Зберігати резервні копії на�вних файлів"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
-msgstr ""
+msgstr "-C <кат>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
-msgstr ""
+msgstr "--backupdir=<dir>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
-msgstr ""
+msgstr "Каталог дл� зберіганн� унікальних резервних копій"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Викори�товувати жирний шрифт замі�ть звичайного"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Перетворювати табул�ції у пробіли"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
-msgstr "äÏÚ×ÏÌÉÔÉ ÄÅ˦ÌØËÁ ÆÁÊÌÏ×ÉÈ ÂÕÆÅÒ¦×"
+msgstr "Дозволити декілька файлових буферів"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "Викори�товувати файли блокуванн� (�к у vim)"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
-msgstr "÷ÅÓÔÉ ÖÕÒÎÁÌ ÔÁ ÞÉÔÁÔÉ ¦ÓÔÏÒ¦À ÕÍÏ× ÐÏÛÕËÕ/ÚÁͦÎÉ"
+msgstr "Ве�ти журнал та читати і�торію умов пошуку/заміни"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
-msgstr "îÅ ÄÉ×ÉÔÉÓÑ × nanorc ÆÁÊÌÉ"
+msgstr "�е викори�товувати файли nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
-msgstr ""
+msgstr "Виправл�ти проблему малої клавіатури"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "�е додавати порожні р�дки у кінці файла"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
-msgstr "îÅÍÁ ÐÅÒÅÔ×ÏÒÀ×ÁÎÎÑ ¦Ú DOS/Mac ÆÏÒÍÁÔÕ"
+msgstr "�е перетворювати файли з формату DOS/Mac"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
-msgstr ""
+msgstr "Викори�товувати додатковий р�док дл� редагуванн�"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
-msgstr "ðÏÓÔ¦ÊÎÁ ÐÏÚÉÃ¦Ñ ËÕÒÓÏÒÁ"
+msgstr "Запи�увати до журналу і читати позицію кур�ора"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
-msgstr ""
+msgstr "-Q <р�д>"
 
-#: src/nano.c:871
-#, fuzzy
+#: src/nano.c:883
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[ÒÑÄÏË]"
+msgstr "--quotestr=<р�д>"
 
-#: src/nano.c:872
-#, fuzzy
+#: src/nano.c:884
 msgid "Quoting string"
-msgstr "òÑÄÏË ÐÏÓÉÌÁÎÎÑ, ÐÏ ÚÁÍÏ×ÞÅÎÎÀ \"> \""
+msgstr "Р�док цитуванн�"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
-msgstr ""
+msgstr "Обмежений режим"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Гортати на р�док, а не на пів екрана"
 
-#: src/nano.c:879
-#, fuzzy
+#: src/nano.c:891
 msgid "-T <#cols>"
-msgstr "-r [#ÓÔÏ×Ð]"
+msgstr "-T <#чи�ло>"
 
-#: src/nano.c:879
-#, fuzzy
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[ÞÉÓ]"
+msgstr "--tabsize=<#чи�ло>"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
-msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÒÏÚÍ¦Ò ÔÁÂÕÌÑæ§ =ÞÉÓ"
+msgstr "В�тановити ширину табул�ції у #чи�ло позицій"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Викори�товувати швидке очищуванн� р�дка �тану"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
-msgstr "ðÏËÁÚÁÔÉ ×ÅÒÓ¦À ÔÁ ×ÉÊÔÉ"
+msgstr "Показати вер�ію та вийти"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Викори�товувати більш точне визначенн� меж �лів"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
-msgstr ""
+msgstr "-Y <р�д>"
 
-#: src/nano.c:891
-#, fuzzy
+#: src/nano.c:903
 msgid "--syntax=<str>"
-msgstr "--syntax [ÒÑÄÏË]"
+msgstr "--syntax=<р�д>"
 
-#: src/nano.c:892
-#, fuzzy
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
-msgstr "÷ÉÚÎÁÞÅÎÎÑ ÓÉÎÔÁËÓÉÓÕ ÄÏ ×ÉËÏÒÉÓÔÁÎÎÑ"
+msgstr "Опи� �интак�и�у, �кий �лід викори�товувати дл� розфарбуванн�"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
-msgstr "ðÏÓÔ¦ÊÎÏ ÐÏËÁÚÕ×ÁÔÉ ÐÏÚÉæÀ ËÕÒÓÏÒÁ"
+msgstr "По�тійно показувати позицію кур�ора"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
+msgstr "Виправити проблему Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr "Показати цю довідку"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
-msgstr "á×ÔÏÍÁÔÉÞÎÏ ×ÉÒ¦×ÎÀ×ÁÔÉ ÎÏצ ÒÑÄËÉ"
+msgstr "�втоматично вирівнювати нові р�дки"
 
-#: src/nano.c:900
-#, fuzzy
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
-msgstr "äÏÚ×ÏÌÉÔÉ ^K ×ÉÒ¦ÚÁÔÉ ×¦Ä ËÕÒÓÏÒÁ ÄÏ Ë¦ÎÃÑ ÒÑÄËÁ"
+msgstr "Вирізати від кур�ора до кінц� р�дка"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
-msgstr "îÅ ÊÔÉ ÚÁ Ó¦Í̦ÎËÁÍÉ, ÁÌÅ ÐÅÒÅÐÉÓÕ×ÁÔÉ"
+msgstr "�е переходити за �имволічним по�иланн�ми, перезапи�увати"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
-msgstr "äÏÚ×ÏÌÉÔÉ ÍÉÛÕ"
+msgstr "Дозволити викори�танн� миші"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr "�е читати файл (лише запи�увати до нього)"
+
+#: src/nano.c:922
 msgid "-o <dir>"
-msgstr ""
+msgstr "-o <кат>"
 
-#: src/nano.c:908
-#, fuzzy
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[ÄÉÒ]"
+msgstr "--operatingdir=<кат>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
-msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÒÏÂÏÞÉÊ ËÁÔÁÌÏÇ"
+msgstr "В�тановити робочий каталог"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "úÂÅÒÅÇÔÉ ËÌÁצÛÉ XON (^Q) ÔÁ XOFF (^S)"
+msgstr "Зберегти клавіші XON (^Q) та XOFF (^S)"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Мовчки ігнорувати помилки запу�ку, наприклад rc-файла"
 
-#: src/nano.c:916
-#, fuzzy
+#: src/nano.c:930
 msgid "-r <#cols>"
-msgstr "-r [#ÓÔÏ×Ð]"
+msgstr "-r <#поз>"
 
-#: src/nano.c:916
-#, fuzzy
+#: src/nano.c:930
 msgid "--fill=<#cols>"
-msgstr "--fill=[#ÓÔÏ×Ð]"
+msgstr "--fill=<#поз>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
-msgstr ""
+#: src/nano.c:931
+msgid "Set hard-wrapping point at column #cols"
+msgstr "В�тановити значенн� позиції жор�ткого перене�енн� #поз"
 
-#: src/nano.c:920
-#, fuzzy
+#: src/nano.c:934
 msgid "-s <prog>"
-msgstr "-s [ÐÒÏÇ]"
+msgstr "-s <програма>"
 
-#: src/nano.c:920
-#, fuzzy
+#: src/nano.c:934
 msgid "--speller=<prog>"
-msgstr "--speller=[ÐÒÏÇ]"
+msgstr "--speller=<програма>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
-msgstr "áÌØÔÅÒÎÁÔÉ×ÎÁ ÐÒÏÇÒÁÍÁ ÐÅÒÅצÒËÉ ÐÒÁ×ÏÐÉÓÕ"
+msgstr "�льтернативна програма перевірки правопи�у"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
-msgstr "á×ÔÏúÁÐÉÓ ÐÒÉ ×ÉÈÏĦ, ÂÅÚ ÚÁÐÉÔÁÎØ"
+msgstr "�втоматичне збереженн� при виході, без запитань"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Дозволити функцію �ка�уванн� дій [ЕКСПЕРИМЕ�Т�ЛЬ��]"
 
-#: src/nano.c:929
-#, fuzzy
+#: src/nano.c:943
 msgid "View mode (read-only)"
-msgstr "òÅÖÉÍ ÐÅÒÅÇÌÑÄÁÎÎÑ (Ô¦ÌØËÉ ÞÉÔÁÎÎÑ)"
+msgstr "Режим перегл�ду (лише читанн�)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
-msgstr "îÅ ÚÁÇÏÒÔÁÔÉ ÄÏ×Ǧ ÒÑÄËÉ"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
+msgstr "�е перено�ити надто довгі р�дки жор�тко"
 
-#: src/nano.c:933
-#, fuzzy
+#: src/nano.c:947
 msgid "Don't show the two help lines"
-msgstr "îÅ ÐÏËÁÚÕ×ÁÔÉ ×¦ËÎÏ ÄÏÐÏÍÏÇÉ"
+msgstr "�е показувати два р�дка довідки внизу"
 
-#: src/nano.c:934
-#, fuzzy
+#: src/nano.c:948
 msgid "Enable suspension"
-msgstr "äÏÚ×ÏÌÉÔÉ ÐÒÉÚÕÐÉÎËÕ"
+msgstr "Дозволити призупиненн�"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(¦ÇÎÏÒÏ×ÁÎÏ, ÄÌÑ ÓÕͦÓÎÏÓÔ¦ ¦Ú Pico)"
+msgstr "Увімкнути м’�ке перене�енн� р�дків"
 
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano ×ÅÒÓ¦§ %s (Ú¦ÂÒÁÎÅ %s, %s)\n"
+msgstr " GNU nano вер�ії %s (зібране %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" ú¦ÂÒÁÎÏ Ú ÏÐæÑÍÉ:"
+" Зібрано з опці�ми:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
-msgstr "÷ÉÂÁÞÔÅ, ЦÄÔÒÉÍËÁ 椧 ÆÕÎËæ§ ÂÕÌÏ ÚÁÂÏÒÏÎÅÎÏ"
+msgstr "Вибачте, підтримка цієї функції було заборонено"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "úÂÅÒÅÇÔÉ ÚͦÎÅÎÉÊ ÂÕÆÅÒ (÷¦ÄÐÏצÄØ \"î¦\" óëáóõ´ ÷ó¶ úí¶îé) ? "
+msgstr "Зберегти змінений буфер (Відповідь \"�і\" СК�СУЄ ВСІ ЗМІ�И) ? "
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "�е вдало�� повторно відкрити �тандартний ввід з клавіатури\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Читанн� зі �тандартного вводу. ^C дл� перериванн�\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
-msgstr "ðÒÉÊÎÑÔÏ SIGHUP ÁÂÏ SIGTERM\n"
+msgstr "Прийн�то SIGHUP або SIGTERM\n"
 
-#: src/nano.c:1225
-#, fuzzy, c-format
+#: src/nano.c:1275
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "ëÏÒÉÓÔÕÊÔÅÓÑ ËÏÍÁÎÄÏÀ \"fg\" ÄÌÑ ÔÏÇÏ, ÝÏ ÐÏ×ÅÒÎÕÔÉÓÑ ÄÏ nano"
+msgstr "Викори�товуйте «fg» дл� поверненн� у nano\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
-msgstr "ÄÏÚ×ÏÌÅÎÏ"
+msgstr "дозволено"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
-msgstr "ÚÁÂÏÒÏÎÅÎÏ"
+msgstr "заборонено"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
-msgstr ""
+msgstr "�евідома команда"
 
-#: src/nano.c:1701
-#, fuzzy
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
-msgstr "XON ÉÇÎÏÒÏ×ÁÎÏ, ÍÕÒ-ÍÕÒ-ÍÕÒ"
+msgstr "XON проігноровано, мр-бр-бр"
 
-#: src/nano.c:1706
-#, fuzzy
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF ÉÇÎÏÒÏ×ÁÎÏ, ÐÒÉÍ-ЦÍ-ЦÍ"
+msgstr "XOFF проігноровано, мр-бр-бр"
 
-#: src/nano.c:2246 src/rcfile.c:1189
-#, fuzzy, c-format
+#: src/nano.c:2276 src/rcfile.c:1252
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "ÚÁÐÒÏÛÅÎÉÊ ÒÏÚÍ¦Ò ÔÁÂÕÌÑæ§ %d ¤ ÎÅËÏÒÅËÔÎÉÍ"
+msgstr "Запитаний розмір табул�ції «%s» не підходить"
 
-#: src/nano.c:2305 src/rcfile.c:1114
-#, fuzzy, c-format
+#: src/nano.c:2338 src/rcfile.c:1177
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "ÚÁÐÉÔÁÎÉÊ ÒÏÚÍ¦Ò ÚÁÐÏ×ÎÅÎÎÑ %d ¤ ÎÅËÏÒÅËÔÎÉÍ"
+msgstr "Запитаний некоректний розмір заповненн� \"%s\""
+
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
-msgstr "YyôÔ"
+msgstr "YyТт"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
-msgstr "NnîÎ"
+msgstr "Nn�н"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
-msgstr "Aa÷×"
+msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
-msgstr "ôÁË"
+msgstr "Так"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
-msgstr "÷ÓÅ"
+msgstr "В�е"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
-msgstr "î¦"
+msgstr "�і"
 
-#: src/rcfile.c:134
-#, fuzzy, c-format
+#: src/rcfile.c:138
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "ðÏÍÉÌËÁ × %s Õ ÒÑÄËÕ %d: "
+msgstr "Помилка в %s на р�дку %lu: "
 
-#: src/rcfile.c:189
-#, fuzzy, c-format
+#: src/rcfile.c:193
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "ÁÒÇÕÍÅÎÔ %s ÍÁ¤ ÚÁ˦ÎÞÕ×ÁÔÉÓÑ ÎÁ \""
+msgstr "�ргумент %s має незакриту \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
-#, fuzzy
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
-"ÒÑÄËÉ ÆÏÒÍÁÌØÎÉÈ ×ÉÒÁÚ¦× ÐÏ×ÉÎΦ ÐÏÞÉÎÁÔÉÓØ ÔÁ ÚÁ˦ÎÞÕ×ÁÔÉÓØ ÓÉÍ×ÏÌÏÍ '\"'\n"
+"Р�дки регул�рних виразів повинні починати�� та закінчувати�� лапками (\")"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "îŠצÒÎÉÊ ÒÅÇÕÌÑÒÎÉÊ ×ÉÒÁÚ \"%s\": %s"
+msgstr "�е вірний регул�рний вираз \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ÓÉÎÔÁËÓÉÓÕ"
+msgstr "Від�утн� назва �интак�и�у"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Синтак�и� «none» зарезервовано"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Синтак�и� \"default\" не може мати розширень"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "îÅ ÍÏÖÕ ÄÏÄÁÔÉ ËÏÍÁÎÄÕ ËÏÌØÏÒÕ ÂÅÚ ÒÑÄËÁ ÓÉÎÔÁËÓÉÓÕ"
+#: src/rcfile.c:411
+msgid "Missing key name"
+msgstr "Від�утн� назва клавіші"
 
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ËÏÌØÏÒÕ"
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "�азва клавіші є надто короткою"
 
-#: src/rcfile.c:472 src/rcfile.c:569
-#, fuzzy
-msgid "Missing key name"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ÓÉÎÔÁËÓÉÓÕ"
+#: src/rcfile.c:441
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "�азва клавіші має починати�� з «^», «M» або «F»"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:450
+msgid "Must specify a function to bind the key to"
+msgstr "Дл� прив’�зуванн� клавіші �лід вказати функцію"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
+"Слід вказати меню (або «all»), до �кого �лід прив’�зати клавішу або "
+"відв’�зати її"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:467
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "�е можна пов’�зати назву «%s» з функцією"
 
-#: src/rcfile.c:512
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ %s ÄÌÑ ÚÁÐÉÓÕ: %s"
+#: src/rcfile.c:474
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "�еможливо пов’�зати назву «%s» з меню"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "îÅ ÍÏÖÕ ×ÉËÏÎÁÔÉ \"%s\""
+#: src/rcfile.c:497
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Вибачте, призначенн� «%s» змінювати не можна"
 
-#: src/rcfile.c:540
+#: src/rcfile.c:583
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Error expanding %s: %s"
+msgstr "Помилка під ча� розгортанн� %s: %s"
 
-#: src/rcfile.c:711
-#, fuzzy, c-format
+#: src/rcfile.c:626
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1889,927 +1863,443 @@ 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:733
-#, fuzzy
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
-msgstr "îÅ ÍÏÖÕ ÄÏÄÁÔÉ ËÏÍÁÎÄÕ ËÏÌØÏÒÕ ÂÅÚ ÒÑÄËÁ ÓÉÎÔÁËÓÉÓÕ"
+msgstr "�е вдаєть�� додати команду кольору без команди �интак�и�у"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ËÏÌØÏÒÕ"
+msgstr "Від�утн� назва кольору"
 
-#: src/rcfile.c:758
+#: src/rcfile.c:663 src/rcfile.c:824
+msgid "Missing regex string"
+msgstr "�е вказано регул�рний вираз"
+
+#: src/rcfile.c:739
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" потребує відповідного \"end=\""
+
+#: src/rcfile.c:791
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr ""
+msgstr "Колір тла \"%s\" не може бути �вітлим"
 
-#: src/rcfile.c:776 src/rcfile.c:895
-msgid "Missing regex string"
+#: src/rcfile.c:819
+msgid "Cannot add a header regex without a syntax command"
+msgstr "�е вдаєть�� додати рег. вираз заголовку без команди �интак�и�у"
+
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
+"�е вдало�� додати формальний вираз контрольного р�дка без команди �интак�и�у"
 
-#: src/rcfile.c:848
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" ÐÏÔÒÅÂÕ¤ צÄÐÏצÄÎÏÇÏ \"end=\""
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "�е ви�тачає назви контрольного р�дка"
 
-#: src/rcfile.c:890
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "îÅ ÍÏÖÕ ÄÏÄÁÔÉ ËÏÍÁÎÄÕ ËÏÌØÏÒÕ ÂÅÚ ÒÑÄËÁ ÓÉÎÔÁËÓÉÓÕ"
+#: src/rcfile.c:939
+msgid "Cannot add a linter without a syntax command"
+msgstr "�е можна додавати linter без команди �интак�и�у"
+
+#: src/rcfile.c:944
+msgid "Missing linter command"
+msgstr "�е ви�тачає програми linter"
 
-#: src/rcfile.c:960
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "�е вдало�� знайти �интак�ичну кон�трукцію «%s» дл� розширенн�"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "Команда \"%s\" не дозволена у включеному файлі"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Синтак�и� \"%s\" не має колірних команд"
 
-#: src/rcfile.c:1055
-#, fuzzy, c-format
+#: src/rcfile.c:1098
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "ËÏÍÁÎÄÁ %s ÎÅ ÚÒÏÚÕͦÌÁ"
+msgstr "�е зрозуміла команда \"%s\""
 
-#: src/rcfile.c:1061
-#, fuzzy
-msgid "Missing flag"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ËÏÌØÏÒÕ"
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Пропущено параметр"
 
-#: src/rcfile.c:1083
-#, fuzzy, c-format
+#: src/rcfile.c:1135
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "ÏÐÃ¦Ñ %s ÐÏÔÒÅÂÕ¤ ÁÒÇÕÍÅÎÔÁ"
+msgstr "Опці� \"%s\" вимагає аргумент"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Опці� не є припу�тимим багатобайтовим р�дком"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
-msgstr ""
+msgstr "Вимагаєть�� непорожній �имвол"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
-msgstr ""
+msgstr "Вимагаєть�� два одинарних �имволи"
 
-#: src/rcfile.c:1203
-#, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "ÓËÉÎØÔÅ ÆÌÁÇ %d!\n"
+#: src/rcfile.c:1266
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "�еможливо �ка�увати визначенн� параметра «%s»"
 
-#: src/rcfile.c:1212
+#: src/rcfile.c:1275
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr ""
+msgid "Unknown option \"%s\""
+msgstr "�евідомий параметр «%s»"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
-msgstr "ñ ÎÅ ÍÏÖÕ ÚÎÁÊÔÉ Ó×ÏÀ ÄÏͦ×ËÕ! öÁÈ!"
+msgstr "Я не можу знайти �вою домівку! Жах!"
 
-#: src/rcfile.c:1309
-#, fuzzy, c-format
+#: src/rcfile.c:1372
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"îÁÖͦÔØ Enter ÝÏ ÐÒÏÄÏ×ÖÉÔÉ ÚÁ×ÁÎÔÁÖÅÎÎÑ nano\n"
+"�ати�ніть Enter, щоб продовжити завантаженн� nano.\n"
 
 #: src/search.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%s\" ÎÅ ÚÎÁÊÄÅÎÏ"
+msgstr "\"%.*s%s\" не знайдено"
 
-#: src/search.c:204
-#, fuzzy
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
-msgstr " (ÄÏ ÚÁͦÎÉ)"
+msgstr " (що змінювати) у позначеному"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
-msgstr " (ÄÏ ÚÁͦÎÉ)"
+msgstr " (до заміни)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
-msgstr "úÁͦÎÉÔÉ ÃÅÊ ÐÒÉͦÒÎÉË?"
+msgstr "Замінити цей примірник?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
-msgstr "úÁͦÎÉÔÉ ÎÁ"
+msgstr "Замінити на"
 
-#: src/search.c:1004
-#, fuzzy, c-format
+#: src/search.c:1003
+#, 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:1047
 msgid "Enter line number, column number"
-msgstr "÷×ÅĦÔØ ÎÏÍÅÒ ÒÑÄËÁ"
+msgstr "Введіть номер р�дка, номер р�ду"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "�еправильний номер р�дка або �товпчика"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
-msgstr "îÅ ÄÕÖËÁ"
+msgstr "�е дужка"
 
-#: src/search.c:1281
+#: src/search.c:1295
 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:434
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Буфер �ка�уванн� дій порожній!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
-msgstr ""
+msgstr "додаванн� тек�ту"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
+msgstr "вилученн� тек�ту"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
-msgstr ""
+msgstr "перене�енн� р�дка"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
-msgstr ""
+msgstr "об’єднанн� р�дків"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
-msgstr ""
+msgstr "обрізка тек�ту"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
-msgstr ""
+msgstr "�ка�уванн� обрізки тек�ту"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
-msgstr ""
+msgstr "розрив р�дка"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
+msgstr "в�тавка тек�ту"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Внутрішн� помилка: невідомий тип. Збережіть �вою роботу"
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Ска�ована ді� (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "�емає чого повторювати!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:572
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Внутрішн� помилка: не вдало�� налаштувати повторенн� дії. Збережіть "
+"результати вашої роботи."
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Повторена ді� (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "îÅ ÍÏÖÕ ÐÒÁÃÀ×ÁÔÉ ¦Ú ËÁÎÁÌÏÍ (pipe)"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "�е можу �творити канал (pipe)"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
-msgstr "îÅ ÍÏÖÕ ÚÒÏÂÉÔÉ fork()"
+msgstr "�е можу зробити fork()"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:945
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Внутрішн� помилка: не вдало�� налаштувати �ка�уванн� від�тупів. Збережіть "
+"результати вашої роботи."
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "ðÏÇÁÎÉÊ ÒÑÄÏË ÃÉÔÕ×ÁÎÎÑ %s: %s"
+msgstr "Поганий р�док цитуванн� %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
-msgstr "íÏÖÕ ÚÁÒÁÚ ÖÅ óËÁÓ÷ÉÒ¦×ÎÀ×ÁÎÎÑ!"
+msgstr "Можу зараз же Ска�Вирівнюванн�!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÚÁͦÎÕ"
+msgstr "Редагувати заміну"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "îÅ ÍÏÖÕ ÓÔ×ÏÒÉÔÉ ËÁÎÁÌ (pipe)"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
-msgstr "óÔ×ÏÒÀÀ ÐÅÒÅÌ¦Ë ÏÒÆÏÇÒÁƦÞÎÉÈ ÐÏÍÉÌÏË, ÚÁÖĦÔØ Â-ÌÁÓËÁ..."
+msgstr "Створюємо перелік орфографічних помилок, зачекайте..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
-msgstr "îÅ ÍÏÖÕ ÏÔÒÉÍÁÔÉ ÒÏÚÍ¦Ò ÂÕÆÅÒÕ ËÁÎÁÌÕ"
+msgstr "�е можу отримати розмір буферу каналу"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"spell\""
+msgstr "Помилка виконанн� \"spell\""
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"sort -f\""
+msgstr "Помилка виконанн� \"sort -f\""
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"uniq\""
+msgstr "Помилка виконанн� \"uniq\""
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
-msgstr "ðÅÒÅצÒËÕ ÏÒÆÏÇÒÁƦ§ ÚÁ×ÅÒÛÅÎÏ"
+msgstr "Перевірку орфографії завершено"
 
-#: src/text.c:2825
-#, fuzzy, c-format
+#: src/text.c:2830
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"spell\""
+msgstr "Помилка виконанн� \"%s\""
 
-#: src/text.c:2970
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr "Викликаємо програму дл� пошуку друкар�ьких помилок, зачекайте"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "ðÅÒÅצÒËÁ ÏÒÆÏÇÒÁƦ§ ÎÅ ×ÄÁÌÁÓÑ: %s"
+msgstr "Перевірка орфографії не вдала��: %s"
 
-#: src/text.c:2972
-#, fuzzy, c-format
+#: src/text.c:2981
+#, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "ðÅÒÅצÒËÁ ÏÒÆÏÇÒÁƦ§ ÎÅ ×ÄÁÌÁÓÑ: %s"
+msgstr "�е вдало�ь перевірити орфографію: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+msgid "No linter defined for this type of file!"
+msgstr "Дл� цього типу файлів не визначено обробника!"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr "Зберегти змінений буфер перед обробкою?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "Викликаємо linter, зачекайте"
+
+#: src/text.c:3204
 #, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Від команди отримано 0 придатних р�дків: %s"
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
+"Це повідомленн� пов’�зано із невідкритим файлом %s. Відкрити його у новому "
+"буфері?"
+
+#: src/text.c:3286
+msgid "At last message"
+msgstr "�а о�танньому повідомленні"
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr "�а першому повідомленні"
+
+#: src/text.c:3372
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sСлів: %lu Р�дків: %ld  Символів: %lu"
 
-#: src/text.c:3041
-#, fuzzy
+#: src/text.c:3373
 msgid "In Selection:  "
-msgstr "äÏÄÁÔÉ ÷ÉĦÌÅÎÅ ÄÏ ÆÁÊÌÕ"
+msgstr "У позначеному:  "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Буквальний ввід"
 
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
-msgstr ""
+msgstr "Ввід юнікод"
 
-#: src/winio.c:2149 src/winio.c:2153
-#, fuzzy
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
-msgstr " úͦÎÅÎÏ "
+msgstr "Змінено"
 
-#: src/winio.c:2150
-#, fuzzy
+#: src/winio.c:2137
 msgid "View"
-msgstr " ðÅÒÅÇÌÑÄ "
+msgstr "Вигл�д"
 
-#: src/winio.c:2164
-#, fuzzy
+#: src/winio.c:2151
 msgid "DIR:"
-msgstr " äÉÒ: "
+msgstr "Кат.:"
 
-#: src/winio.c:2171
-#, fuzzy
+#: src/winio.c:2158
 msgid "File:"
-msgstr "æÁÊÌ: "
+msgstr "Файл:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
+"Попередженн�: вно�имо зміни до файла, �кий не заблоковано, — перевірити "
+"права до�тупу до каталогу?"
 
-#: src/winio.c:3370
-#, fuzzy, c-format
+#: src/winio.c:3351
+#, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
-msgstr "ôÅËÓÔÏ×ÉÊ ÒÅÄÁËÔÏÒ nano"
+msgstr "Тек�товий редактор nano"
 
-#: src/winio.c:3503
-#, fuzzy
+#: src/winio.c:3485
 msgid "version"
-msgstr "×ÅÒÓ¦Ñ "
+msgstr "вер�і�"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
-msgstr "óÔ×ÏÒÅÎÏ ÄÌÑ ÷ÁÓ:"
+msgstr "Створено дл� Ва�:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
-msgstr "ïÓÏÂÌÉ×Á ÐÏÄÑËÁ:"
+msgstr "О�облива под�ка:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
-msgstr "The Free Software Foundation (æÏÎÄ ÷¦ÌØÎÏÇÏ ðÒÏÇÒÁÍÎÏÇÏ ÚÁÂÅÚÐÅÞÅÎÎÑ)"
+msgstr "The Free Software Foundation (Фонд Вільного Програмного забезпеченн�)"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
-msgstr "äÌÑ ncurses:"
+msgstr "За ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
-msgstr "ÔÁ ¦ÎÛÉÍ ËÏÇÏ ÍÉ ÚÁÂÕÌÉ..."
+msgstr "та іншим, кого ми забули..."
 
-#: src/winio.c:3509
-#, fuzzy
+#: src/winio.c:3491
 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 "-Q [str]"
-#~ msgstr "-Q [ÒÑÄÏË]"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "ðÏÛÕË ÐÏ ÆÏÒÍÁÌØÎÏÍÕ ×ÉÒÁÚÕ (regexp)"
-
-#~ msgid "-T [num]"
-#~ msgstr "-T [ÞÉÓ]"
-
-#~ msgid "-Y [str]"
-#~ msgstr "-Y [ÒÑÄÏË]"
-
-#~ msgid "-o [dir]"
-#~ msgstr "-o [ÄÉÒ]"
-
-#~ 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"
-
-#~ 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"
-#~ 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 "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"
-
-#~ msgid "Regexp Search%s%s"
-#~ msgstr "ðÏÛÕË æÏÒÍÁÌØÎÏÇÏ ÷ÉÒÁÚÕ%s%s"
-
-#~ msgid "Only %d lines available, skipping to last line"
-#~ msgstr "ô¦ÌØËÉ %d ÒÑÄË¦× Õ ÎÁÑ×ÎÏÓÔ¦, ÓËÉÐÁ¤ÍÏ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÒÑÄËÁ"
+msgstr "Д�куємо за викори�танн� nano!"
diff --git a/po/vi.gmo b/po/vi.gmo
index c788f1b4..69f6d96a 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index d37f7169..9552b212 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,157 +1,155 @@
 # Vietnamese translation for Nano.
-# Copyright © 2013 Free Software Foundation, Inc.
+# Bản dịch tiếng Việt dành cho nano.
+# Copyright © 2014 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-2013.
+# Trần Ng�c Quân <vnwildman@gmail.com>, 2012-2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.3.2pre4\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2013-03-19 14:35+0700\n"
+"POT-Creation-Date: 2014-05-29 01:07-0400\n"
+"PO-Revision-Date: 2014-05-14 15:15+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"
-"Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
 msgstr "�i tới thư mục"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "Bị hủy b�"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, 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:304
 msgid "Can't move up a directory"
 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:664 src/browser.c:673
 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:670
 msgid "(parent dir)"
 msgstr "(th.mục cha)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 msgid " [Case Sensitive]"
 msgstr " [Phân biệt HOA/thư�ng]"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:194
+#: src/browser.c:806 src/search.c:192
 msgid " [Regexp]"
-msgstr " [Biểu thức chính quy]"
+msgstr " [BTCQ]"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [Ngược lại]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 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:1035 src/search.c:580
 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:137
+#: src/files.c:138
 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:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr "Không thể nhận ra tên máy cho tập tin khóa: %s"
+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:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, 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:234
+#: src/files.c:232
 #, 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:271
+#: src/files.c:266
 #, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "Gặp lỗi khi mở tập tin khoá %s: %s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
-msgstr "Lỗi đ�c tập tin khóa (lockfile) %s: Dữ liệu không đủ"
+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 đủ"
 
-#: src/files.c:328
+#: src/files.c:322
 #, 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:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "Không còn bộ đệm mở tập tin nữa"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "�ã chuyển tới %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "Bộ nhớ đệm mới"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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)"
 
-#: src/files.c:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -163,13 +161,13 @@ msgstr[0] ""
 "��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:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -178,13 +176,13 @@ msgid_plural ""
 msgstr[0] ""
 "��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:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -193,104 +191,104 @@ msgid_plural ""
 msgstr[0] ""
 "��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:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "��c %lu dòng"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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)"
 
-#: src/files.c:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "�ang đ�c tập tin"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "Tập tin mới"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Không tìm thấy “%s�"
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "“%s� là một thư mục"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "“%s� là một tập tin thiết bị"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, 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:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Câu lệnh để thực hiện [từ %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, 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:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Tập tin để chèn [từ %s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 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:1594
+#: src/files.c:1591
 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 nếu không chắc "
 "chắn)"
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, 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:1731
+#: src/files.c:1728
 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:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, 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:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "Quá nhi�u tập tin sao lưu dự phòng?"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Lá»—i ghi %s: %s"
+msgstr "Gặp lỗi khi ghi %s: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Lỗi ghi 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:2140
 #, c-format
@@ -336,22 +334,22 @@ msgstr "Tên tập tin để ghi nhớ"
 
 #: src/files.c:2394
 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:2403
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Ghi tập tin dưới TÊN KH�C ? "
+msgstr "Ghi tập tin bằng TÊN MỚI ? "
 
-#: src/files.c:2414
+#: src/files.c:2415
 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?"
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(còn nữa)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -360,7 +358,7 @@ msgstr ""
 "\n"
 "Hãy nhấn RETURN để tiếp tục\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -369,7 +367,7 @@ 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/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -378,7 +376,7 @@ 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/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -387,7 +385,7 @@ 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/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -398,646 +396,660 @@ msgstr ""
 "tới vị trí ưu tiên (%s)\n"
 "(xem FAQ của nano để có thông tin v� thay đổi này)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Hủy b�"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "Thay thế"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "Không thay thế"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "Tính đến kiểu chữ"
+msgid "Exit"
+msgstr "Thoát"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "Ngược lại"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "Biểu thức chính quy"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "Lịch sử lùi"
+msgid "Close"
+msgstr "�óng"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "Lịch sử kế"
+#: src/global.c:473
+msgid "Uncut Text"
+msgstr "Dán chữ"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "Tới văn bản"
+#: src/global.c:475
+msgid "Unjustify"
+msgstr "B� CănHàng"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
-msgstr "Tiếp theo ở đâu"
-
-#: src/global.c:508
-msgid "First File"
-msgstr "Tập tin đầu"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "Tập tin cuối"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "Tới tập tin"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "�ịnh dạng DOS"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "�ịnh dạng Mac"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "Phụ thêm"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "Thêm vào trước"
+msgstr "Tiếp là đâu"
 
-#: src/global.c:517
-msgid "Backup File"
-msgstr "Tập tin Sao lưu dự phòng"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "Thực hiện lệnh"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "Tới thư mục"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "Trợ giúp"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "Thoát"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "Tìm kiếm"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "TrangTrÆ°á»›c"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "Trang kế"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "Dòng đầu"
+#: src/global.c:487
+msgid "Replace"
+msgstr "Thay thế"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "Dòng cuối"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "Tới dòng"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "NgÆ°ng"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "Dòng trước"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "�ầu đoạn văn"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "Dòng kế"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "Cuối đoạn văn"
+#: src/global.c:491
+msgid "Read File"
+msgstr "��c T.tin"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "Sắp hàng đầy đủ"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "Chèn tập tin"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "Tới dòng"
-
-#: src/global.c:551
-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:556
+#: src/global.c:501
+msgid "Justify the current paragraph"
+msgstr "Sắp chữ đúng hàng cho đoạn văn hiện tại"
+
+#: src/global.c:503
 msgid "Cancel the current function"
-msgstr "Hủy hàm hiện th�i"
+msgstr "Hủy hàm hiện tại"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "Hiển thị trợ giúp này"
 
-#: src/global.c:560
+#: src/global.c:507
 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:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "Thoát kh�i nano"
 
-#: src/global.c:566
+#: src/global.c:513
 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:568
+#: src/global.c:515
 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:570
+#: src/global.c:517
 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:571
-msgid "Go to previous screen"
-msgstr "V� màn hình trước"
+#: src/global.c:520
+msgid "Search for a string"
+msgstr "Tìm một chuỗi nào đó"
 
-#: src/global.c:572
-msgid "Go to next screen"
-msgstr "Tới màn hình kế"
+#: src/global.c:522
+msgid "Go one screenful up"
+msgstr "�i lên một màn hình"
 
-#: src/global.c:574
+#: src/global.c:523
+msgid "Go one screenful down"
+msgstr "�i xuống một màn hình"
+
+#: src/global.c:525
 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 nhớ nó vào bộ đệm cắt"
 
-#: src/global.c:576
+#: src/global.c:527
 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:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "Hiển thị vị trí con tr�"
 
-#: src/global.c:580
+#: src/global.c:530
 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:582
+#: src/global.c:532
 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:583
+#: src/global.c:533
 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:585
-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:535
+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:586
-msgid "Repeat last search"
-msgstr "Lặp lại tìm kiếm cuối cùng"
+#: src/global.c:536
+msgid "Repeat the last search"
+msgstr "Lặp lại tìm kiếm cuối"
 
-#: src/global.c:588
+#: src/global.c:538
 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 nhớ nó vào bộ đệm cắt"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "Thụt l� dòng hiện tại"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "Hủy thụt l� dòng hiện tại"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "Hủy bước vừa mới làm"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "Làm lại bước vừa mới được hủy"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "Tiếp tới một ký tự"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "Lùi lại một ký tự"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "Tiếp tới một từ"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "Lùi lại một từ"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "V� dòng trước"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "Tới dòng kế"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "V� đầu của dòng hiện tại"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "Tới cuối của dòng hiện tại"
 
-#: src/global.c:606
+#: src/global.c:556
 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:608
+#: src/global.c:558
 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:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "V� dòng đầu của tập tin"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "Tới dòng cuối của tập tin"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "Tới dấu ngoặc tương ứng"
 
-#: src/global.c:617
+#: src/global.c:565
 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:619
+#: src/global.c:567
 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:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "Chuyển tới bộ đệm tập tin trước"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "Chuyển tới bộ đệm tập tin tiếp theo"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "Chèn ký tự kế tiếp đúng nguyên văn"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "Chèn một ký tự tab tại vị trí con tr�"
 
-#: src/global.c:632
+#: src/global.c:575
 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:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "Xóa ký tự nằm dưới con tr�"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "Xóa ký tự ở bên trái con tr�"
 
-#: src/global.c:639
+#: src/global.c:581
 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:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "Sắp chữ đúng hàng cho cả tập tin"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "�ếm số từ, số dòng và số ký tự"
 
-#: src/global.c:649
+#: src/global.c:591
 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:651
+#: src/global.c:593
 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:654
+#: src/global.c:596
 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"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "�ảo ngược hướng tìm"
 
-#: src/global.c:660
+#: src/global.c:602
 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:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế trước"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế kế"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "�i tới trình duyệt tập tin"
 
-#: src/global.c:672
+#: src/global.c:614
 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:673
+#: src/global.c:615
 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:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "Bật/tắt khả năng phụ thêm"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "Bật/tắt khả năng thêm vào trước"
 
-#: src/global.c:679
+#: src/global.c:618
 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:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "Thực hiện câu lệnh ngoại trú"
 
-#: src/global.c:684
+#: src/global.c:622
 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:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "Thoát kh�i trình duyệt tập tin"
 
-#: src/global.c:689
+#: src/global.c:626
 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:691
+#: src/global.c:627
 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:692
-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:693
+#: src/global.c:628
 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:694
+#: src/global.c:629
+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:630
 msgid "Go to directory"
 msgstr "�i tới thư mục"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "�óng"
+#: src/global.c:633
+msgid "Invoke the linter, if available"
+msgstr "G�i trình lint, nếu có thể"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
-msgstr "Ghi"
+#: src/global.c:634
+msgid "Go to previous linter msg"
+msgstr "�ến l�i nhắn lint kế trước"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
-msgid "Justify"
-msgstr "Sắp chữ"
+#: src/global.c:635
+msgid "Go to next linter msg"
+msgstr "�ến l�i nhắn lint kế"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "��c T.tin"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "Trợ giúp"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "Hủy b�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
+#: src/global.c:671
+msgid "Write Out"
+msgstr "Ghi lại"
+
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "Tới ThMục"
+
+#: src/global.c:712
 msgid "Cut Text"
 msgstr "Cắt chữ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "B� sắp chữ"
+#: src/global.c:721
+msgid "Justify"
+msgstr "Sắp chữ"
+
+#: src/global.c:726
+msgid "To Spell"
+msgstr "Chính tả"
+
+#: src/global.c:731
+msgid "To Linter"
+msgstr "Linter"
+
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "Tính đến kiểu chữ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "B� cắt chữ"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "BTCQ"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "Ngược lại"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "Không thay thế"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "Vị trí"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "Chính tả"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "TrangTrÆ°á»›c"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "Trang kế"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "Dòng đầu"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "Dòng cuối"
+
+#: src/global.c:785
+msgid "To Bracket"
+msgstr "�ặt Ngoặc"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "�ánh dấu văn bản"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
-msgstr "Chép văn bản"
+msgstr "Chép VBản"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
-msgstr "Thụt l� văn bản"
+msgstr "Thụt VBản"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "Hủy thụt l� văn bản"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "Hủy bước"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "Hoàn lại"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "Kế tiếp"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
-msgstr "Kế trước"
+msgstr "Lùi"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "Từ kế"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "Kế tiếp"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "Từ trước"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "Dòng trước"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "Dòng kế"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "Từ kế"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "Nhà"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "Cuối"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "Tìm ngoặc đơn khác"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "�ầu đoạn văn"
 
-#: src/global.c:899
+#: src/global.c:839
+msgid "End of Par"
+msgstr "Cuối đoạn văn"
+
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "Cuộn lên"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "Cuộn xuống"
 
-#: src/global.c:907
-msgid "Previous File"
-msgstr "Tập tin kế trước"
+#: src/global.c:851
+msgid "Prev File"
+msgstr "Tập tin Trước"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
-msgstr "Tập tin kế tiếp"
+msgstr "Tập tin Sau"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
-msgstr "Dữ liệu nhập nguyên bản"
+#: src/global.c:862
+msgid "Verbatim"
+msgstr "�úng nguyên văn"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "Xoá"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "Xoá lùi"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
-msgstr "Cắt đến cuối"
+msgstr "Cắt�ếnCuối"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "�ếm từ"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "NgÆ°ng"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "LịchSửTrước"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "LịchSửKế"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "Tới văn bản"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "�ịnh dạng DOS"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "�ịnh dạng Mac"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "Phụ thêm"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "Thêm vào trước"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "Tập tin Sao lưu dự phòng"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "Thực hiện lệnh"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "Tới tập tin"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "Tập tin đầu"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "Tập tin cuối"
+
+#: src/global.c:971
+msgid "Prev Lint Msg"
+msgstr "LNhắn Lint tr"
+
+#: src/global.c:973
+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:1215
 msgid "Help mode"
 msgstr "Chế độ Trợ giúp"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "Hiển thị ví trí cố định của con tr�"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "Sử dụng nhi�u dòng hơn dành cho việc soạn thảo"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "Cuộn trơn mượt"
 
-#: src/global.c:1307
+#: src/global.c:1223
+msgid "Soft wrapping of overlong lines"
+msgstr "Ngắt m�m những dòng dài"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "Hiển thị khoảng trắng"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "Tô sáng cú pháp"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "Phím home khéo"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "Tự động thụt l�"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "Cắt tới cuối"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "Ngắt dòng dài"
+#: src/global.c:1235
+msgid "Hard wrapping of overlong lines"
+msgstr "Ngắt cứng những dòng dài"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "Chuyển các tab thành dấu cách"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "Tập tin sao lưu dự phòng"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "Bộ đệm đa tập tin"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "Hỗ trợ chuột"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "Không chuyển đổi từ định dạng DOS/Mac"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "Tạm dừng"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "Ngắt dòng m�m"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1059,7 +1071,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:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1073,7 +1085,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:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1092,7 +1104,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:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1106,7 +1118,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 "
@@ -1115,7 +1127,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:253
 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"
@@ -1129,7 +1141,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:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1146,18 +1158,18 @@ msgid ""
 msgstr ""
 "Văn bản của Trợ giúp cho Ghi nhớ 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 "
+" Hãy gõ tên bạn muốn ghi nhớ cho tập tin hiện tại và gõ Enter để hoàn thành "
 "ghi nhá»›.\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"
+"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"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1181,7 +1193,7 @@ msgstr ""
 " 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:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1205,7 +1217,7 @@ msgstr ""
 "này.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1213,7 +1225,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:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1236,7 +1248,7 @@ msgstr ""
 "mục:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1252,14 +1264,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:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1273,13 +1285,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:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1290,7 +1302,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 "
@@ -1299,7 +1311,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:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1317,7 +1329,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:359
 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 "
@@ -1330,15 +1342,15 @@ 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:391 src/help.c:466
 msgid "enable/disable"
 msgstr "bật/tắt"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "Phím không hợp lệ trong chế độ xem"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1347,29 +1359,29 @@ msgstr ""
 "\n"
 "Bộ nhớ đệm ghi vào %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, 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:705
+#: src/nano.c:714
 #, 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:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "Kích thước cửa sổ quá nh� cho nano...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1378,426 +1390,433 @@ msgstr ""
 "Cách dùng: nano [TÙY_CHỌN] [[+DÒNG,CỘT] TẬP_TIN]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, 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:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Tùy ch�n\t\t� nghĩa\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "Hiển thị thông báo này"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+DÒNG,CỘT"
 
-#: src/nano.c:831
+#. 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:843
 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:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "Bật dùng phím home khéo"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "Lưu trữ các tập tin đã có"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
-msgstr "-C <thư mục>"
+msgstr "-C <thư_mục>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<thư_mục>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "Thư mục để ghi nhớ tập tin lưu trữ duy nhất"
 
-#: src/nano.c:839
+#: src/nano.c:851
 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:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "Chuyển tab thành dấu cách"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "Bật dùng bộ đệm đa tập tin"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr "Dùng các tập tin khóa (kiểu-vim)"
 
-#: src/nano.c:852
+#: src/nano.c:864
 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:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "�ừng nhìn vào các tập tin nanorc"
 
-#: src/nano.c:858
+#: src/nano.c:870
 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:860
+#: src/nano.c:872
 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:863
+#: src/nano.c:875
 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:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "Sử dụng một dòng thêm để soạn thảo"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "Ghi nhật ký & đ�c vị trí tại vị trí con tr�"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <chuá»—i>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<chuá»—i>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "Chuỗi dùng để trích dẫn"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "Chế độ hạn chế"
 
-#: src/nano.c:877
+#: src/nano.c:889
 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:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#số_cột>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#số_cột>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 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:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "Xóa nhanh dòng trạng thái"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "In ra thông tin phiên bản và thoát"
 
-#: src/nano.c:888
+#: src/nano.c:900
 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:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <chuá»—i>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<chuá»—i>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "�ịnh nghĩa cú pháp để sử dụng khi tô màu"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "Luôn luôn hiển thị vị trí con tr�"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Giải quyết vấn đ� nhầm lẫn Backspace/Delete"
 
-#: src/nano.c:899
+#: src/nano.c:910
+msgid "Show this help text"
+msgstr "Hiển thị trợ giúp này"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "Tự động thụt các dòng mới"
 
-#: src/nano.c:900
+#: src/nano.c:913
 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:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "�ừng đi theo liên kết m�m, hãy ghi đè"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
-msgstr "Hỗ trợ chuột"
+msgstr "Hỗ trợ việc dùng chuột"
 
-#: src/nano.c:908
+#: src/nano.c:920
+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:922
 msgid "-o <dir>"
-msgstr "-o <thư mục>"
+msgstr "-o <thư_mục>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=<thư mục>"
+msgstr "--operatingdir=<thư_mục>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "�ặt thư mục thao tác"
 
-#: src/nano.c:912
+#: src/nano.c:926
 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:914
+#: src/nano.c:928
 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:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#số_cột>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#số_cột>"
 
-#: src/nano.c:917
-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:931
+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:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <chương trình>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<ch_trình>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "Dùng chương trình kiểm tra chính tả khác"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "Tự động ghi nhớ khi thoát, đừng h�i lại"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Cho phép hủy bước giống loài [VẪN THỰC NGHIỆM]"
+msgstr "Cho phép hủy bước chung [VẪN THỰC NGHIỆM]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "Chế độ Xem (chỉ đ�c)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+msgid "Don't hard-wrap long lines"
 msgstr "�ừng ngắt những dòng dài"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "�ừng hiển thị hai dòng trợ giúp"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "Bật dùng sự Tạm hoãn"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "Bật ngắt dòng m�m"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(bị l� đi, để tương thích với Pico)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, 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"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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/"
 
-#: src/nano.c:955
+#: src/nano.c:964
 #, 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:1033
+#: src/nano.c:1088
 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"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 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:1109
+#: src/nano.c:1162
 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:1135
+#: src/nano.c:1187
 #, 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"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Nhận được tín hiệu SIGHUP hoặc SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, 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:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "được bật"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "bị tắt"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "Lệnh không rõ"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "XON bị l� đi."
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF bị l� đi."
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, 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ệ"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, 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ệ"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Cc"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Kk"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "Có"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "Tất cả"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "Không"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Lỗi trong %s trên dòng %lu: "
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "�ối số “%s� chưa được \" kết thúc"
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 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:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Biểu thức chính sai “%s�: %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "Thiếu tên cú pháp"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "Cú pháp “none� là được để dành dùng trong tương lai"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Cú pháp “default� không chấp nhận phần mở rộng"
 
-#: src/rcfile.c:393
-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:398
-msgid "Missing magic string name"
-msgstr "Thiếu tên chuỗi kỳ diệu"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "Thiếu tên khoá"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-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:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr "Tên khóa quá ngắn"
 
-#: src/rcfile.c:493
-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:441
+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:504 src/rcfile.c:596
-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ả))"
+#: src/rcfile.c:450
+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"
 
-#: src/rcfile.c:512
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"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:467
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+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:518 src/rcfile.c:603
+#: src/rcfile.c:474
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+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:540
+#: src/rcfile.c:497
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+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:711
+#: src/rcfile.c:583
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Gặp lỗi khi khải triển %s: %s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1820,97 +1839,120 @@ msgstr ""
 " • bright\tsáng\n"
 "cho màu của văn bản."
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 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:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "Thiếu tên màu"
 
-#: src/rcfile.c:758
-#, 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:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "Thiếu các chuỗi biểu thức chính quy"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 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"
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, 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:819
 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:960
+#: src/rcfile.c:875
+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:880
+msgid "Missing magic string name"
+msgstr "Thiếu tên chuỗi kỳ diệu"
+
+#: src/rcfile.c:939
+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:944
+msgid "Missing linter command"
+msgstr "Thiếu lệnh linter"
+
+#: src/rcfile.c:974
 #, 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:962
+#: src/rcfile.c:976
+#, 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 cài đặt 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, 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:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, 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"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Cú pháp “%s� không có câu lệnh màu"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Không hiểu câu lệnh “%s�"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "Thiếu c�"
+#: src/rcfile.c:1113
+msgid "Missing option"
+msgstr "Thiếu tùy ch�n"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Tùy ch�n “%s� cần một tham số"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 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:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 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:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "Yêu cầu hai ký tự một cột"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, 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:1212
+#: src/rcfile.c:1275
 #, 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:1271
+#: src/rcfile.c:1334
 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:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1924,41 +1966,45 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "Không tìm thấy “%.*s%s�"
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " (thay thế) trong lựa ch�n"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (thay thế)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 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:961
 msgid "Replace with"
 msgstr "Thay thế bằng"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "Nhập số thứ tự dòng, cột"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "Sai số thứ tự dòng hoặc cột"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "Không phải ngoặc đơn"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "Không có ngoặc đơn tương ứng"
 
@@ -1970,224 +2016,294 @@ 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:434
 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:440 src/text.c:578
 #, 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:451 src/text.c:588
 msgid "text add"
 msgstr "thêm văn bản"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "xoá văn bản"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "ngắt dòng"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "nối dòng"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "văn bản cắt"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 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:508 src/text.c:611
 msgid "line break"
 msgstr "ngắt dòng"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "chèn văn bản"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+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:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Bước được hủy (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 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 cài đặt được việc hoàn lại. Hãy lưu tập tin"
+#: src/text.c:572
+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:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bước được hoàn lại (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "Không thể gửi qua đư�ng ống"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "Không thể tạo đư�ng ống"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "Không thể tạo tiến trình con"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr "Lỗi nội bộ: không thể cài đặt mà không cắt. Hãy lưu tập tin."
-
-#: src/text.c:955
-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:945
+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:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Chuỗi trích dẫn sai %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "Bây gi� có thể B� sắp chữ!"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "Sửa chuỗi thay thế"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "Không thể tạo đư�ng ống"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "�ang tạo danh sách từ sai chính tả, xin hãy ch�..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 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:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
-msgstr "Lỗi g�i “spell�"
+msgstr "Gặp lỗi khi g�i “spell�"
 
-#: src/text.c:2706
+#: src/text.c:2711
 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:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
-msgstr "Lỗi g�i “uniq�"
+msgstr "Gặp lỗi khi g�i “uniq�"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "Hoàn thành việc kiểm tra chính tả"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Lỗi g�i “%s�"
 
-#: src/text.c:2970
+#: src/text.c:2962
+msgid "Invoking spell checker, please wait"
+msgstr "G�i trình kiểm tra chính tả, vui lòng ch�"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Kiểm tra chính tả không thành công: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, 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:3040
+#: src/text.c:3015
+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:3026
+msgid "Save modified buffer before linting?"
+msgstr "Ghi lại bộ đệm đã sửa trước khi lint?"
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr "�ang g�i bộ lint, vui lòng ch�"
+
+#: src/text.c:3204
+#, 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:3238
+#, 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:3286
+msgid "At last message"
+msgstr "Tại thông báo cuối"
+
+#: src/text.c:3293
+msgid "At first message"
+msgstr "Tại thông báo đầu"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sTừ: %lu  Dòng: %ld  Ký tự: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "Trong lựa ch�n:  "
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "Dữ liệu nhập nguyên bản"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Dữ liệu nhập Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "�ã sửa đổi"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
-msgstr "Xem"
+msgstr "Trình bày"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "TH.MỤC:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "Tập tin:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 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:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "Trình soạn thảo văn bản nano"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "phiên bản"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "�ược đem tới bởi:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "�ặc biệt cảm ơn:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "Tổ chức Phần m�m Tự do (FSF)"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
-msgstr "Cho ncurses:"
+msgstr "Dành cho ncurses:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "và những ngư�i khác mà chúng tôi quên..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 msgid "Thank you for using nano!"
 msgstr "Cảm ơn bạn đã dùng nano!"
 
+#~ 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"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index a7860f45..dcaf6f9e 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 41ba0c4d..38266219 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,14 +1,14 @@
 # Simplified Chinese Messages for the nano editor
 # 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, 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-22 10:09-0400\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -18,134 +18,131 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
 msgstr "跳至目录"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "已�消"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "读�%s 出错：%s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(目录)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
 msgstr "(父目录)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [���索]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "这是惟一出现之处"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "没有当��索模�"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/files.c:143
+#: src/files.c:144
 #, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
+#: src/files.c:170 src/files.c:207 src/files.c:217
 #, fuzzy, c-format
 msgid "Error writing lock file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:234
+#: src/files.c:232
 #, fuzzy, c-format
 msgid "Error deleting lock file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
+msgid "Error opening lock file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:281
+#: src/files.c:276
 #, c-format
-msgid "Error reading lockfile %s: Not enough data read"
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "无法�入%s 外部的文件"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "无多余文件缓冲区��用"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "切�至%s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "新缓冲区"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
+#: src/files.c:840
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -155,13 +152,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "已读�%lu 行(转�自DOS 与Mac 格�- 警告：无写入��)"
 
-#: src/files.c:851
+#: src/files.c:846
 #, 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:855
+#: src/files.c:850
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -169,13 +166,13 @@ msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
 msgstr[0] "已读�%lu 行 (转�自Mac 格�- 警告：无写入��)"
 
-#: src/files.c:861
+#: src/files.c:856
 #, 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:865
+#: src/files.c:860
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -183,97 +180,97 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
 msgstr[0] "已读�%lu 行 (转�自DOS 格�- 警告：无写入��)"
 
-#: src/files.c:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已读�%lu 行"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "正在读�文件"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "新文件"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "找�到\"%s\""
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一个目录"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一个设备文件"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新缓冲区中执行的命令 [从%s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "执行的命令 [从%s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "��入新缓冲区的文件 [从%s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "��入的文件 [从%s] "
 
-#: src/files.c:1291
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "�多�缓冲区模�中此按键无效"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
 msgstr "写入备份文件失败，继续�存�？(如果�确定请输入N)"
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "无法写入%s 外部"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow 设定下，无法�引或附加至符�连结档"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "太多备份文件？"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "写入%s 出错：%s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "写入临时文件%s 出错"
@@ -328,15 +325,15 @@ msgstr "文件已存在，�覆盖�？"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以��的�称存档？"
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "在您打开文件�文件已被改�，是�继续�存？"
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2942
+#: src/files.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -345,7 +342,7 @@ msgstr ""
 "\n"
 "按下回车键继续\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
@@ -354,7 +351,7 @@ msgstr ""
 "无法创建目录 %s：%s\n"
 "然而�存和载入�索历�或光标�置需�它。\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
@@ -363,7 +360,7 @@ msgstr ""
 "路径%s 应为一个目录，但现在�是。\n"
 "Nano 将无法载入或�存�索历�或光标�置\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I tried to move\n"
@@ -372,7 +369,7 @@ msgstr ""
 "检测到了旧版的Nano 历�文件(%s)并试图移动到默认�置(%s)。\n"
 "此�作出现错误：%s"
 
-#: src/files.c:2983
+#: src/files.c:2978
 #, c-format
 msgid ""
 "Detected a legacy nano history file (%s) which I moved\n"
@@ -382,645 +379,678 @@ msgstr ""
 "检测到了旧版的Nano 历�文件(%s)并已移动到默认�置(%s)。\n"
 "(关于这个�更请�阅Nano 常�问题解答)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "�消"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "替�"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "�替�"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "区分大�写"
+msgid "Exit"
+msgstr "离开"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "���索"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "正则表达�"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
-msgid "PrevHstory"
-msgstr "�一记录"
+msgid "Close"
+msgstr "关闭"
 
-#: src/global.c:503
-msgid "NextHstory"
-msgstr "�一记录"
+#: src/global.c:473
+#, fuzzy
+msgid "Uncut Text"
+msgstr "还原剪切"
 
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "跳至文字"
+#: src/global.c:475
+#, fuzzy
+msgid "Unjustify"
+msgstr "还原对�"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
 msgstr "何处是下一个"
 
-#: src/global.c:508
-msgid "First File"
-msgstr "首文件"
-
-#: src/global.c:509
-msgid "Last File"
-msgstr "末文件"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "文件选�"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS 格�"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac 格�"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "附加"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "�引"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "备份文件"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "执行命令"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "跳至目录"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "求助"
-
-#: src/global.c:532
-msgid "Exit"
-msgstr "离开"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "�索"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "上页"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "下页"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "首行"
+#: src/global.c:487
+msgid "Replace"
+msgstr "替�"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "尾行"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "跳行"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "暂�"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "上行"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "段�开头"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "下行"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "段�结尾"
+#: src/global.c:491
+msgid "Read File"
+msgstr "读档"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "全部对�"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "�入文件"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "跳行"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "�消当�功能"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
 msgstr "显示帮助"
 
-#: src/global.c:560
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
 msgstr "关闭当�文件缓冲区 / 离开 nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "离开 nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "写入当�文件至�盘"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "�入其他文件至当�文件"
 
-#: src/global.c:570
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
 msgstr "查找字符串或正则表示�"
 
-#: src/global.c:571
-msgid "Go to previous screen"
-msgstr "跳至�一�"
+#: src/global.c:520
+#, fuzzy
+msgid "Search for a string"
+msgstr "查找字符串或正则表示�"
 
-#: src/global.c:572
-msgid "Go to next screen"
+#: src/global.c:522
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "跳至�一�"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "跳至�一�"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "剪切当�这行并存至剪贴�"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "从剪贴�粘贴至当�行"
 
-#: src/global.c:578
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "显示光标�置"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "�试�行拼写检查"
 
-#: src/global.c:582
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
 msgstr "替�字符串或正则表示�"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "跳至指定行与列�置"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "标记游标所在文字"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "��上次�索"
 
-#: src/global.c:588
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "拷�当�行至剪贴�"
 
-#: src/global.c:589
+#: src/global.c:539
 msgid "Indent the current line"
 msgstr "缩进当�行"
 
-#: src/global.c:590
+#: src/global.c:540
 msgid "Unindent the current line"
 msgstr "�消缩进当�行"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
 msgstr "撤销上次�作"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
 msgstr "��撤销的�作"
 
-#: src/global.c:594
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "��跳一字符"
 
-#: src/global.c:595
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "��跳一字符"
 
-#: src/global.c:597
+#: src/global.c:547
 msgid "Go forward one word"
 msgstr "��跳一个�"
 
-#: src/global.c:598
+#: src/global.c:548
 msgid "Go back one word"
 msgstr "��跳一个�"
 
-#: src/global.c:600
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "跳至�一行"
 
-#: src/global.c:601
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "跳至�一行"
 
-#: src/global.c:602
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "跳至当�行首"
 
-#: src/global.c:603
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "跳至当�行尾"
 
-#: src/global.c:606
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "跳至当�段�开头，如已在段�开头，则调至上一段�起始处"
 
-#: src/global.c:608
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "跳至当�段�结尾，如已在段�结尾，则调至下一段�结尾"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "跳至文件第一行"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "跳至文件最�一行"
 
-#: src/global.c:615
+#: src/global.c:563
 msgid "Go to the matching bracket"
 msgstr "移动至对应括�"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "�上�动一行但��动游标"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "�下�动一行但��动游标"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "切�至上个文件缓冲区"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "切�至下个文件缓冲区"
 
-#: src/global.c:628
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
 msgstr "�入下一按键原型"
 
-#: src/global.c:630
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "�入制表符于游标�置"
 
-#: src/global.c:632
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "�入新行于游标�置"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "删除游标之下的字符"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "删除游标左侧的字符"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "从游标�置剪切至文件结尾"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "对�整个文件"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "计算字数�行数与字符数"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "�新显示当�画�"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "暂�编辑器(如果�用了暂�)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
 msgstr "切�查找的区分大�写选项"
 
-#: src/global.c:656
+#: src/global.c:598
 msgid "Reverse the direction of the search"
 msgstr "�转�索方�"
 
-#: src/global.c:660
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
 msgstr "切�使用正则表示�"
 
-#: src/global.c:664
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
 msgstr "编辑�次�索/替�字符串"
 
-#: src/global.c:666
+#: src/global.c:608
 msgid "Recall the next search/replace string"
 msgstr "编辑下次�索/替�字符串"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "打开文件选�"
 
-#: src/global.c:672
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
 msgstr "切�使用DOS 格�"
 
-#: src/global.c:673
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
 msgstr "切�使用Mac 格�"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
 msgstr "切�追加"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
 msgstr "切��置�入"
 
-#: src/global.c:679
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
 msgstr "切�储存既有文件的备份"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "执行外部命令"
 
-#: src/global.c:684
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
 msgstr "切�使用新缓冲区"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "从文件选�离开"
 
-#: src/global.c:689
+#: src/global.c:626
 msgid "Go to the first file in the list"
 msgstr "跳至文件第一列"
 
-#: src/global.c:691
+#: src/global.c:627
 msgid "Go to the last file in the list"
 msgstr "跳至文件最�一列"
 
-#: src/global.c:692
-msgid "Go to the next file in the list"
-msgstr "跳至列表中的下一个文件"
-
-#: src/global.c:693
+#: src/global.c:628
 msgid "Go to the previous file in the list"
 msgstr "跳至列表中的�一个文件"
 
-#: src/global.c:694
+#: src/global.c:629
+msgid "Go to the next file in the list"
+msgstr "跳至列表中的下一个文件"
+
+#: src/global.c:630
 msgid "Go to directory"
 msgstr "跳至目录"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "关闭"
+#: src/global.c:633
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "�试�行拼写检查"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "跳至�一行"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "跳至�一行"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "求助"
+
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "�消"
+
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
 msgstr "写入"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "跳至目录"
+
+#: src/global.c:712
+msgid "Cut Text"
+msgstr "剪切文字"
+
+#: src/global.c:721
 msgid "Justify"
 msgstr "对�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "读档"
+#: src/global.c:726
+msgid "To Spell"
+msgstr "拼写检查"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
-msgid "Cut Text"
-msgstr "剪切文字"
+#: src/global.c:731
+#, fuzzy
+msgid "To Linter"
+msgstr "跳行"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "还原对�"
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "区分大�写"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
-msgid "UnCut Text"
-msgstr "还原剪切"
+#: src/global.c:741
+msgid "Regexp"
+msgstr "正则表达�"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "���索"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "�替�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "游标�置"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "拼写检查"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "上页"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "下页"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "首行"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "尾行"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "并�一个括�"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "标记文字"
 
-#: src/global.c:828
+#: src/global.c:791
 msgid "Copy Text"
 msgstr "�制文字"
 
-#: src/global.c:831
+#: src/global.c:794
 msgid "Indent Text"
 msgstr "缩进文字"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
 msgstr "�消缩进"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
 msgstr "撤销"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
 msgstr "��"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "��"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "��"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "�一个字"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "��"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "�一个字"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "上行"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "下行"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "�一个字"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "顶端"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "寻找其他括�"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "段�开头"
+
+#: src/global.c:839
+msgid "End of Par"
+msgstr "段�结尾"
 
-#: src/global.c:899
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "�上�动"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "�下�动"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "上个文件"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "下个文件"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "原形输入"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "制表符"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "回车"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "删除"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "退格"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "删至末端"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "字数统计"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "暂�"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "�一记录"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "�一记录"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "跳至文字"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS 格�"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac 格�"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "附加"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "�引"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "备份文件"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "执行命令"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "文件选�"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "首文件"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "末文件"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "上行"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "辅助模�"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "�续显示游标�置"
 
-#: src/global.c:1303
+#: src/global.c:1219
 msgid "Use of one more line for editing"
 msgstr "编辑时使用多一行"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "平滑��动画�"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "��自动�行"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "显示空格"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "语法色彩高亮"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "智能HOME 键"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "自动缩进"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "剪切至行尾"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "长行转�"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "��自动�行"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "已输入制表符至空白的转�"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "备份文件"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "多�文件缓冲区"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "鼠标支�"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "�从 DOS/Mac 格�转�"
 
-#: src/global.c:1329
+#: src/global.c:1247
 msgid "Suspension"
 msgstr "暂�"
 
-#: src/global.c:1331
-msgid "Soft line wrapping"
-msgstr "软�行"
-
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1040,7 +1070,7 @@ msgstr ""
 "最近一次�索的字符串将会显示在�索�示符�的括�中。�输入任何文字而直接按下"
 "回车键则会��使用最近一次的�索�件。"
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1054,7 +1084,7 @@ msgstr ""
 " 以下的功能键�用于�索模�：\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1073,7 +1103,7 @@ msgstr ""
 " 以下的功能键�用于跳行模�：\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1093,7 +1123,7 @@ msgstr ""
 "multibuffer�Meta-F 开关，或者 nanorc 文件��动的�，所�入的文件 将会被载入"
 "�外的缓冲区中 (利用 Meta-< 和 > 在文件缓冲区间切�)。 "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1107,7 +1137,7 @@ msgstr ""
 " 以下的功能键�用于�入文件模�：\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1133,7 +1163,7 @@ msgstr ""
 " 以下的功能键�用于写入文件模�：\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1155,7 +1185,7 @@ msgstr ""
 " 以下的功能键�用于文件选�：\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1177,7 +1207,7 @@ msgstr ""
 "按下回车键则会��最近一次的�索�件。\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1185,7 +1215,7 @@ msgstr ""
 "在�索模��使用如下的功能键：\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1206,7 +1236,7 @@ msgstr ""
 " 以下的功能键�用于跳至目录模�：\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1228,7 +1258,7 @@ msgstr ""
 " 以下的功能键�用于拼写检查模�：\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1247,7 +1277,7 @@ msgstr ""
 " 以下的功能键�用于执行命令模�：\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1267,7 +1297,7 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:366
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1282,7 +1312,7 @@ msgstr ""
 "是以\"中介\" (Meta, M) 符�表示，它�以�照您的键盘设定，利用Esc，Alt 或Meta "
 "�输入。"
 
-#: src/help.c:375
+#: src/help.c:359
 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 "
@@ -1294,15 +1324,15 @@ msgstr ""
 "的字符。下列按键组��用于主�编辑区，替代按键则显示于括�内“\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "�用/关闭"
 
-#: src/nano.c:588
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "观看模�中此按键无效"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1311,7 +1341,7 @@ msgstr ""
 "\n"
 "缓冲内容已写入 %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1320,7 +1350,7 @@ msgstr ""
 "\n"
 "缓冲内容未写入至 %s：%s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1329,11 +1359,11 @@ msgstr ""
 "\n"
 "缓冲区未写入：%s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
 msgstr "窗�尺寸对 nano �说太�了...\n"
 
-#: src/nano.c:821
+#: src/nano.c:832
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1342,259 +1372,264 @@ msgstr ""
 "用法: nano [选项] [[+行,列] 文件�]...\n"
 "\n"
 
-#: src/nano.c:824
+#: src/nano.c:835
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "选项\t\tGNU 长选项\t\t�义\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "选项\t\t�义\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "显示此信�"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+行,列"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "从所指列数与行数开始"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "�用智能 HOME 键"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "储存既有文件的备份"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
 msgstr "-C <目录>"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<目录>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "用以储存独一备份文件的目录"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
 msgstr "用粗体替代颜色�转"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "将已输入的制表符转�为空白"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "�用多�文件缓冲区功能"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
 msgstr ""
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "记录与读��索/替�的历�字符串"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "���考nanorc 文件"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "修正数字键区按键混淆问题"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "��将�行加到文件末端"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "��从 DOS/Mac 格�转�"
 
-#: src/nano.c:865
+#: src/nano.c:877
 msgid "Use one more line for editing"
 msgstr "编辑时多使用一行"
 
-#: src/nano.c:868
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
 msgstr "记录并读�光标�置"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
 msgstr "-Q <字符串>"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<字符串>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "引用代表字符串"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "�制模�"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
 msgstr "按行滚动而�是��"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "-T <#cols>"
 msgstr "-T <#列数>"
 
-#: src/nano.c:879
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#列数>"
 
-#: src/nano.c:880
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "设定制表符宽度为 #列数"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "状�行快速闪动"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "显示版本资讯并离开"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "更正确地侦测�字边界"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
 msgstr "-Y <字符串>"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "--syntax=<str>"
 msgstr "--syntax=<字符串>"
 
-#: src/nano.c:892
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
 msgstr "用于加亮的语法定义"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "�续显示游标�置"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "修正退格键/删除键混淆问题"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "显示帮助"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "自动缩进新行"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "从游标剪切至行尾"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "���照符�连结，而是覆盖"
 
-#: src/nano.c:905
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "�用鼠标功能"
 
-#: src/nano.c:908
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:922
 msgid "-o <dir>"
 msgstr "-o <目录>"
 
-#: src/nano.c:908
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<目录>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "设定�作目录"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "�留XON (^Q) 和XOFF (^S) 按键"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "沉默忽略�动问题, 比如rc 文件错误"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "-r <#cols>"
 msgstr "-r <#列数>"
 
-#: src/nano.c:916
+#: src/nano.c:930
 msgid "--fill=<#cols>"
 msgstr "--fill=<#列数>"
 
-#: src/nano.c:917
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:931
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "设定折行宽度为 #列数"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "-s <prog>"
 msgstr "-s <程�>"
 
-#: src/nano.c:920
+#: src/nano.c:934
 msgid "--speller=<prog>"
 msgstr "--speller=<程�>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "�用替代的拼写检查程�"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "离开时自动储存，���示"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
 msgstr "�许通用撤销[试验性特性]"
 
-#: src/nano.c:929
+#: src/nano.c:943
 msgid "View mode (read-only)"
 msgstr "查看(�读)模�"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "��自动�行"
 
-#: src/nano.c:933
+#: src/nano.c:947
 msgid "Don't show the two help lines"
 msgstr "��显示辅助区"
 
-#: src/nano.c:934
+#: src/nano.c:948
 msgid "Enable suspension"
 msgstr "�用暂�功能"
 
-#: src/nano.c:935
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
 msgstr "�用软�行"
 
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(忽略，为与Pico 相容)"
-
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano 版本%s (编译于%s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1603,161 +1638,170 @@ msgstr ""
 "\n"
 " 编译选项："
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "对�起，此功能的支�以�用"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "储存更动过的缓冲区�(回答 \"No\" 会撤销修改)？"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "对�起，无法从键盘设备�新打开标准输入\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "正在从标准输入读入，�用 ^C 中断\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到SIGHUP 或SIGTERM\n"
 
-#: src/nano.c:1225
+#: src/nano.c:1275
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "使用\"fg\" 返回nano\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "已�用"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "已�用"
 
-#: src/nano.c:1575 src/winio.c:1256
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
 msgstr "未知命令"
 
-#: src/nano.c:1701
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "忽略XON，嗯嗯。"
 
-#: src/nano.c:1706
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略XOFF，嗯嗯。"
 
-#: src/nano.c:2246 src/rcfile.c:1189
+#: src/nano.c:2276 src/rcfile.c:1252
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "所�求的制表符宽度%s 无效"
 
-#: src/nano.c:2305 src/rcfile.c:1114
+#: src/nano.c:2338 src/rcfile.c:1177
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "所�求的填满行数\"%s\" 无效"
 
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "全部"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "�"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "在%s(第%lu 行)中�生错误："
 
-#: src/rcfile.c:189
+#: src/rcfile.c:193
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "�数%s 有未�闭的 \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正则表示�字符串必须以 \" 字符开始�结�"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "�法的正则表示� \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "缺少语法�称"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 语法已被�留"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" 语法必须��任何副文件�"
 
-#: src/rcfile.c:393
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "无法在没有语法命令的情况下添加魔字符串"
-
-#: src/rcfile.c:398
-msgid "Missing magic string name"
-msgstr "缺少魔字符串�称"
-
-#: src/rcfile.c:472 src/rcfile.c:569
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "缺少键�称"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "键绑定必须以\"^\", \"M\" 或 \"F\" 开始"
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "必须指定键绑定到的函数"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "必须指定键绑定到的��(或 \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "无法映射�字\"%s\" 到一个函数"
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "无法映射�字\"%s\" 到一个��"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "对�起，键\"%s\" 属�法绑定"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "读�%s 出错：%s"
+
+#: src/rcfile.c:626
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1772,93 +1816,117 @@ msgstr ""
 "\"black\"(黑)，选择性的�置字 \"bright\"(明亮) \n"
 "�用于�景色。"
 
-#: src/rcfile.c:733
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
 msgstr "无法直接增加颜色而没有语法行"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "缺少颜色�称"
 
-#: src/rcfile.c:758
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "背景色%s ��为明亮"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "缺少正则表示�字符串"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" �求对应的\"end=\""
 
-#: src/rcfile.c:890
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色%s ��为明亮"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
 msgstr "无法直接增加头部正则表达�而没有语法行"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "无法在没有语法命令的情况下添加魔字符串"
+
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "缺少魔字符串�称"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "无法直接增加头部正则表达�而没有语法行"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "缺少颜色�称"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "严�错误; 没有键映射到函数 \"%s\""
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "无法映射�字\"%s\" 到一个��"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "命令\"%s\" 被�止在包�文件中使用"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "语法\"%s\" 没有color 命令"
 
-#: src/rcfile.c:1055
+#: src/rcfile.c:1098
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "无法识别\"%s\" 命令"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "缺少旗标"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "缺少颜色�称"
 
-#: src/rcfile.c:1083
+#: src/rcfile.c:1135
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "选项%s 需��数"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "选项并�正确的多字节字符串"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "需��空格字符"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "需�两个�行字符"
 
-#: src/rcfile.c:1203
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1266
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "无法解除旗标 %s 设定"
 
-#: src/rcfile.c:1212
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1275
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "未知旗标 %s"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找�到我的家目录�哇�"
 
-#: src/rcfile.c:1309
+#: src/rcfile.c:1372
 #, c-format
 msgid ""
 "\n"
@@ -1872,41 +1940,45 @@ msgstr ""
 msgid "\"%.*s%s\" not found"
 msgstr "找�到 \"%.*s%s\""
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " 在标记中(替�)"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (替�)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "替�这个？"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "替�我"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "输入列�，行�"
 
-#: src/search.c:1061
+#: src/search.c:1074
 msgid "Invalid line or column number"
 msgstr "无效的列�或行�"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "并�一个括�"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "无对应括�"
 
@@ -1918,222 +1990,294 @@ msgstr "标记设定"
 msgid "Mark Unset"
 msgstr "标记解除"
 
-#: src/text.c:443
+#: src/text.c:434
 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:440 src/text.c:578
+#, 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:451 src/text.c:588
 msgid "text add"
 msgstr "文字增加"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
 msgstr "文本删除"
 
-#: src/text.c:489 src/text.c:628
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
 msgstr "自动�行"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
 msgstr "行�并"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
 msgstr "文字剪切"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
 msgstr "�消剪切"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
 msgstr "�行符"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
 msgstr "文本�入"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "内部错误：未知类型。请�存您的工作。"
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
 msgstr "已撤销�作(%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 msgid "Nothing to re-do!"
 msgstr "没有���的�作�"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "内部错误：��设置失败。请�存您的工作"
+#: src/text.c:572
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "内部错误：无法�置�消剪切。请�存您的工作"
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
 msgstr "已���作(%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "管线功能无效"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "无法建立管线功能"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "执行功能无效"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:945
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "内部错误：无法�置�消剪切。请�存您的工作"
 
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "内部错误：未知类型。请�存您的工作。"
-
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "�良引用字符串%s：%s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "现在�以还原对��"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "编辑替代文字"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "无法建立管线功能"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立错字列表，请�待..."
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "无法得知管线缓冲区大�"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "�行 \"spell\" 错误"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "�行 \"sort -f\" 错误"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "�行 \"uniq\" 错误"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "拼写检查结�"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "�行 \"%s\" 错误"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "�试�行拼写检查"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼写检查失败：%s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼写检查失败：%s：%s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "��将�行加到文件末端"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "显示此信�"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "显示此信�"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字数: %lu  行数: %ld  字符数: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
 msgstr "于选择部份："
 
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "原形输入"
+
 #: src/utils.c:409 src/utils.c:421
 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:1558
 msgid "Unicode Input"
 msgstr "Unicode 输入"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "已更改"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "查看"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "目录："
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "文件："
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
 msgstr ""
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "nano 文本编辑器"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "�自于:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "特别感谢:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "自由软体基金会"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
 msgstr "ncurses 部份:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
 msgstr "以�其他我们�记得的人..."
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 "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 "管线功能无效"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr "写入备份文件%s 出错：文件所有者�匹�"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 05d24ed1..5eb2ffe0 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c6df6496..4b802029 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,15 +1,15 @@
-# 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: 2013-03-22 10:09-0400\n"
-"PO-Revision-Date: 2005-12-13 09:33+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
+"POT-Creation-Date: 2014-05-29 01:07-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"
@@ -17,263 +17,259 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:221
 msgid "Go To Directory"
 msgstr "跳至目錄"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:1074 src/files.c:2289
-#: src/nano.c:1077 src/search.c:219 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:234 src/browser.c:823 src/files.c:1069 src/files.c:2289
+#: src/nano.c:1132 src/search.c:216 src/search.c:311 src/search.c:974
+#: src/search.c:1053 src/text.c:3028 src/text.c:3243
 msgid "Cancelled"
 msgstr "已�消"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:267 src/browser.c:315
 #, 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:936
-#: src/files.c:945 src/files.c:1771 src/files.c:1897 src/files.c:1951
-#: src/files.c:1972 src/files.c:2095 src/files.c:2997 src/files.c:3199
-#: src/rcfile.c:654 src/rcfile.c:1293
+#: src/browser.c:278 src/browser.c:325 src/browser.c:348 src/files.c:931
+#: src/files.c:940 src/files.c:1769 src/files.c:1896 src/files.c:1950
+#: src/files.c:1971 src/files.c:2094 src/files.c:2990 src/files.c:3187
+#: src/rcfile.c:544 src/rcfile.c:1356
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "讀� %s 時發生錯誤: %s"
 
-#: src/browser.c:303
+#: src/browser.c:304
 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:664 src/browser.c:673
 msgid "(dir)"
 msgstr "(目錄)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:670
 msgid "(parent dir)"
-msgstr ""
+msgstr "(上層目錄)"
 
-#: src/browser.c:801 src/search.c:184
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:800 src/search.c:185
 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:188
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/browser.c:802 src/search.c:188
 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:194
+#: src/browser.c:806 src/search.c:192
 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:200
+#: src/browser.c:810 src/search.c:196
 msgid " [Backwards]"
 msgstr " [�後�尋]"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:902 src/browser.c:910 src/search.c:392
 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:999 src/browser.c:1032 src/search.c:511 src/search.c:514
+#: src/search.c:571 src/search.c:574
 msgid "This is the only occurrence"
 msgstr "這是惟一出�之處"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:1035 src/search.c:580
 msgid "No current search pattern"
 msgstr "沒有符�目��尋形�者"
 
-#: src/files.c:137
+#: src/files.c:138
 msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
-msgstr ""
+msgstr "無法確�我的身分以用於鎖定檔案 (getpwuid() 失敗)"
 
-#: src/files.c:143
+#: src/files.c:144
 #, fuzzy, c-format
-msgid "Couldn't determine hosttname for lock file: %s"
-msgstr "無法建立暫存檔案: %s"
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "無法確�主機�稱以用於鎖定檔案：%s"
 
-#: src/files.c:169 src/files.c:207 src/files.c:217
-#, fuzzy, c-format
+#: src/files.c:170 src/files.c:207 src/files.c:217
+#, c-format
 msgid "Error writing lock file %s: %s"
-msgstr "寫入暫存檔案 %s 時發生錯誤"
+msgstr "寫入鎖定檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:234
-#, fuzzy, c-format
+#: src/files.c:232
+#, c-format
 msgid "Error deleting lock file %s: %s"
-msgstr "寫入暫存檔案 %s 時發生錯誤"
+msgstr "刪除鎖定檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:271
+#: src/files.c:266
 #, fuzzy, c-format
-msgid "Error opening lockfile %s: %s"
-msgstr "讀� %s 時發生錯誤: %s"
+msgid "Error opening lock file %s: %s"
+msgstr "開啟鎖定檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:281
-#, c-format
-msgid "Error reading lockfile %s: Not enough data read"
-msgstr ""
+#: src/files.c:276
+#, fuzzy, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "讀�鎖定檔案 %s 時發生錯誤：未讀�足夠的資料"
 
-#: src/files.c:328
+#: src/files.c:322
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "無法�入 %s 外部的檔案"
 
-#: src/files.c:437
+#: src/files.c:431
 msgid "No more open file buffers"
 msgstr "無多餘檔案緩���開啟"
 
-#: src/files.c:453
+#: src/files.c:447
 #, c-format
 msgid "Switched to %s"
 msgstr "切�至 %s"
 
-#: src/files.c:454 src/global.c:520 src/winio.c:2168
+#: src/files.c:448 src/global.c:947 src/winio.c:2155
 msgid "New Buffer"
 msgstr "新緩��"
 
-#: src/files.c:840
+#: src/files.c:835
 #, 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:845
-#, fuzzy, c-format
+#: src/files.c:840
+#, 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:851
+#: src/files.c:846
 #, 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:855
-#, fuzzy, c-format
+#: src/files.c:850
+#, 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:861
+#: src/files.c:856
 #, 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:865
-#, fuzzy, c-format
+#: src/files.c:860
+#, 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:871
+#: src/files.c:866
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已讀� %lu 列"
 
-#: src/files.c:874
+#: src/files.c:869
 #, 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:914 src/files.c:950
+#: src/files.c:909 src/files.c:945
 msgid "Reading File"
 msgstr "正在讀�檔案"
 
-#: src/files.c:920
+#: src/files.c:915
 msgid "New File"
 msgstr "新檔案"
 
-#: src/files.c:923
+#: src/files.c:918
 #, c-format
 msgid "\"%s\" not found"
 msgstr "找�到 \"%s\""
 
-#: src/files.c:931 src/rcfile.c:645 src/rcfile.c:1243 src/rcfile.c:1284
+#: src/files.c:926 src/rcfile.c:537 src/rcfile.c:1306 src/rcfile.c:1347
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一個目錄"
 
-#: src/files.c:932 src/rcfile.c:646 src/rcfile.c:1244 src/rcfile.c:1285
-#, fuzzy, c-format
+#: src/files.c:927 src/rcfile.c:538 src/rcfile.c:1307 src/rcfile.c:1348
+#, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一個�置檔案"
 
-#: src/files.c:1031
+#: src/files.c:1026
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新緩��中執行的命令 [從 %s] "
 
-#: src/files.c:1033
+#: src/files.c:1028
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "執行的命令 [從 %s] "
 
-#: src/files.c:1039
+#: src/files.c:1034
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "所��入新緩��的檔案 [從 %s] "
 
-#: src/files.c:1041
+#: src/files.c:1036
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "所��入的檔案 [從 %s] "
 
-#: src/files.c:1291
-#, fuzzy
+#: src/files.c:1289
 msgid "Key invalid in non-multibuffer mode"
 msgstr "�多�緩��模�中此按�無效"
 
-#: src/files.c:1594
+#: src/files.c:1591
 msgid "Failed to write backup file, continue saving? (Say N if unsure) "
-msgstr ""
+msgstr "寫入備份檔案時失敗，�繼續儲存？(如果�確定就以 N 表示) "
 
-#: src/files.c:1716
+#: src/files.c:1713
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "無法寫入 %s 外部"
 
-#: src/files.c:1731
+#: src/files.c:1728
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow 設定下，無法�引或附加至符號連�檔"
 
-#: src/files.c:1812 src/files.c:1836 src/files.c:1854 src/files.c:1867
-#: src/files.c:1878 src/files.c:1907
-#, fuzzy, c-format
+#: src/files.c:1810 src/files.c:1835 src/files.c:1853 src/files.c:1866
+#: src/files.c:1877 src/files.c:1906
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "寫入暫存檔案 %s 時發生錯誤"
+msgstr "寫入暫存檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:1813 src/nano.c:706
+#: src/files.c:1811 src/nano.c:715
 msgid "Too many backup files?"
 msgstr "太多備份檔案？"
 
-#: src/files.c:1927 src/files.c:1984 src/files.c:2003 src/files.c:2015
-#: src/files.c:2039 src/files.c:2057 src/files.c:2067 src/files.c:2103
-#: src/files.c:2108 src/files.c:3069 src/files.c:3078 src/files.c:3102
-#: src/files.c:3114
+#: src/files.c:1926 src/files.c:1983 src/files.c:2002 src/files.c:2014
+#: src/files.c:2038 src/files.c:2056 src/files.c:2066 src/files.c:2102
+#: src/files.c:2107 src/files.c:3062 src/files.c:3071 src/files.c:3094
+#: src/files.c:3106
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "寫入 %s 時發生錯誤: %s"
 
-#: src/files.c:1961 src/text.c:2939 src/text.c:2951
+#: src/files.c:1960 src/text.c:2944 src/text.c:2956
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤"
@@ -298,15 +294,15 @@ msgstr " [備份]"
 
 #: src/files.c:2256
 msgid "Prepend Selection to File"
-msgstr "�引�擇部份於檔案"
+msgstr "�引�擇部分於檔案"
 
 #: src/files.c:2257
 msgid "Append Selection to File"
-msgstr "附加�擇部份至檔案"
+msgstr "附加�擇部分至檔案"
 
 #: src/files.c:2258
 msgid "Write Selection to File"
-msgstr "寫入�擇部份至檔案"
+msgstr "寫入�擇部分至檔案"
 
 #: src/files.c:2261
 msgid "File Name to Prepend to"
@@ -328,737 +324,733 @@ msgstr "檔案已存在，�覆寫嗎？"
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以��的�稱存檔？"
 
-#: src/files.c:2414
+#: src/files.c:2415
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "檔案從您開啟它後已被修改，�繼續儲存？"
 
-#: src/files.c:2846
+#: src/files.c:2847
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2942
-#, fuzzy, c-format
+#: src/files.c:2939
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue\n"
 msgstr ""
 "\n"
-"按下輸入�繼續啟動 nano\n"
+"按下輸入�以繼續\n"
 
-#: src/files.c:2959
+#: src/files.c:2954
 #, c-format
 msgid ""
 "Unable to create directory %s: %s\n"
 "It is required for saving/loading search history or cursor position\n"
 msgstr ""
+"無法建立目錄 %s：%s\n"
+"�於儲存/載入�尋歷�或游標�置而言，它是必�的\n"
 
-#: src/files.c:2964
+#: src/files.c:2959
 #, c-format
 msgid ""
 "Path %s is not a directory and needs to be.\n"
 "Nano will be unable to load or save search or cursor position history\n"
 msgstr ""
+"路徑 %s 並��必須是個目錄。\n"
+"Nano 將無法載入或儲存�尋或游標�置歷�\n"
 
-#: src/files.c:2980
+#: src/files.c:2975
 #, 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/files.c:2983
+#: src/files.c:2978
 #, 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)"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:466 src/prompt.c:1288
-msgid "Cancel"
-msgstr "�消"
-
-#: src/global.c:467
-msgid "Replace"
-msgstr "置�"
-
-#: src/global.c:468
-msgid "No Replace"
-msgstr "�置�"
-
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
 #: src/global.c:471
-msgid "Case Sens"
-msgstr "�大�寫"
+msgid "Exit"
+msgstr "離開"
 
 #: src/global.c:472
-msgid "Backwards"
-msgstr "�後�尋"
-
-#: src/global.c:476
-msgid "Regexp"
-msgstr "正�表示"
+msgid "Close"
+msgstr "關閉"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:502
+#: src/global.c:473
 #, fuzzy
-msgid "PrevHstory"
-msgstr "歷�記錄"
+msgid "Uncut Text"
+msgstr "還原剪下文字"
 
-#: src/global.c:503
+#: src/global.c:475
 #, fuzzy
-msgid "NextHstory"
-msgstr "歷�記錄"
-
-#: src/global.c:504
-msgid "Go To Text"
-msgstr "跳至文字"
+msgid "Unjustify"
+msgstr "還原�齊"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:506
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:479
 msgid "WhereIs Next"
-msgstr "何處是下一個"
-
-#: src/global.c:508
-#, fuzzy
-msgid "First File"
-msgstr "首列"
-
-#: src/global.c:509
-#, fuzzy
-msgid "Last File"
-msgstr "尾列"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:511
-msgid "To Files"
-msgstr "檔案�單"
-
-#: src/global.c:513
-msgid "DOS Format"
-msgstr "DOS 格�"
-
-#: src/global.c:514
-msgid "Mac Format"
-msgstr "Mac 格�"
-
-#: src/global.c:515
-msgid "Append"
-msgstr "附加"
-
-#: src/global.c:516
-msgid "Prepend"
-msgstr "�引"
-
-#: src/global.c:517
-msgid "Backup File"
-msgstr "備份檔案"
-
-#: src/global.c:518
-msgid "Execute Command"
-msgstr "執行命令"
-
-#: src/global.c:522
-msgid "Go To Dir"
-msgstr "跳至目錄"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:531
-msgid "Get Help"
-msgstr "求助"
+msgstr "下一個�置"
 
-#: src/global.c:532
-msgid "Exit"
-msgstr "離開"
-
-#: src/global.c:533
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:486
 msgid "Where Is"
 msgstr "�尋"
 
-#: src/global.c:534
-msgid "Prev Page"
-msgstr "上�"
-
-#: src/global.c:535
-msgid "Next Page"
-msgstr "下�"
-
-#: src/global.c:536
-msgid "First Line"
-msgstr "首列"
+#: src/global.c:487
+msgid "Replace"
+msgstr "置�"
 
-#: src/global.c:537
-msgid "Last Line"
-msgstr "尾列"
+#: src/global.c:488
+msgid "Go To Line"
+msgstr "跳列"
 
-#: src/global.c:538
-msgid "Suspend"
-msgstr "暫�"
+#: src/global.c:489
+msgid "Prev Line"
+msgstr "上列"
 
-#: src/global.c:540
-msgid "Beg of Par"
-msgstr "段�開頭"
+#: src/global.c:490
+msgid "Next Line"
+msgstr "下列"
 
-#: src/global.c:541
-msgid "End of Par"
-msgstr "段��尾"
+#: src/global.c:491
+msgid "Read File"
+msgstr "讀檔"
 
-#: src/global.c:542
+#: src/global.c:493
 msgid "FullJstify"
 msgstr "全部�齊"
 
-#: src/global.c:544
+#: src/global.c:495
 msgid "Refresh"
 msgstr "�新顯示"
 
-#: src/global.c:546
-msgid "Insert File"
-msgstr "�入檔案"
-
-#: src/global.c:548
-msgid "Go To Line"
-msgstr "跳列"
-
-#: src/global.c:551
+#. 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:501
 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:556
+#: src/global.c:503
 msgid "Cancel the current function"
 msgstr "�消目�功能"
 
-#: src/global.c:557
+#: src/global.c:504
 msgid "Display this help text"
-msgstr ""
+msgstr "顯示這份說明文字"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:507
 msgid "Close the current file buffer / Exit from nano"
-msgstr "關閉目�檔案緩��並離開 nano"
+msgstr "關閉目�檔案緩�� / 離開 nano"
 
-#: src/global.c:562
+#: src/global.c:509
 msgid "Exit from nano"
 msgstr "離開 nano"
 
-#: src/global.c:566
+#: src/global.c:513
 msgid "Write the current file to disk"
 msgstr "寫入目�檔案至�碟"
 
-#: src/global.c:568
+#: src/global.c:515
 msgid "Insert another file into the current one"
 msgstr "�入它檔至目�檔案"
 
-#: src/global.c:570
-#, fuzzy
+#: src/global.c:517
 msgid "Search for a string or a regular expression"
-msgstr "使用正�表示�"
+msgstr "使用字串或正�表示�來�尋"
 
-#: src/global.c:571
+#: src/global.c:520
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "跳至�一畫�"
+msgid "Search for a string"
+msgstr "使用字串或正�表示�來�尋"
 
-#: src/global.c:572
+#: src/global.c:522
 #, fuzzy
-msgid "Go to next screen"
+msgid "Go one screenful up"
 msgstr "跳至後一畫�"
 
-#: src/global.c:574
+#: src/global.c:523
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "跳至後一畫�"
+
+#: src/global.c:525
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "剪下目�這列並存至剪貼簿"
 
-#: src/global.c:576
+#: src/global.c:527
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "從剪貼簿還原至目�這列"
 
-#: src/global.c:578
-#, fuzzy
+#: src/global.c:528
 msgid "Display the position of the cursor"
 msgstr "顯示游標�置"
 
-#: src/global.c:580
+#: src/global.c:530
 msgid "Invoke the spell checker, if available"
 msgstr "嘗試呼�拼字檢查"
 
-#: src/global.c:582
-#, fuzzy
+#: src/global.c:532
 msgid "Replace a string or a regular expression"
-msgstr "使用正�表示�"
+msgstr "置�字串或正�表示�"
 
-#: src/global.c:583
+#: src/global.c:533
 msgid "Go to line and column number"
 msgstr "跳至指定列與行�置"
 
-#: src/global.c:585
-msgid "Mark text at the cursor position"
+#: src/global.c:535
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "標記游標所在文字"
 
-#: src/global.c:586
-msgid "Repeat last search"
+#: src/global.c:536
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "�覆上次�尋"
 
-#: src/global.c:588
-#, fuzzy
+#: src/global.c:538
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "剪下目�這列並存至剪貼簿"
 
-#: src/global.c:589
-#, fuzzy
+#: src/global.c:539
 msgid "Indent the current line"
-msgstr "附加至目�檔案"
+msgstr "縮排目�這列"
 
-#: src/global.c:590
-#, fuzzy
+#: src/global.c:540
 msgid "Unindent the current line"
-msgstr "附加至目�檔案"
+msgstr "�消目�這列的縮排"
 
-#: src/global.c:591
+#: src/global.c:541
 msgid "Undo the last operation"
-msgstr ""
+msgstr "復原上次的動作"
 
-#: src/global.c:592
+#: src/global.c:542
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "��最後一筆已復原作業"
 
-#: src/global.c:594
-#, fuzzy
+#: src/global.c:544
 msgid "Go forward one character"
 msgstr "��跳一字元"
 
-#: src/global.c:595
-#, fuzzy
+#: src/global.c:545
 msgid "Go back one character"
 msgstr "�後跳一字元"
 
-#: src/global.c:597
-#, fuzzy
+#: src/global.c:547
 msgid "Go forward one word"
-msgstr "��跳一個字"
+msgstr "��跳一字詞"
 
-#: src/global.c:598
-#, fuzzy
+#: src/global.c:548
 msgid "Go back one word"
-msgstr "�後跳一個字"
+msgstr "�後跳一字詞"
 
-#: src/global.c:600
-#, fuzzy
+#: src/global.c:550
 msgid "Go to previous line"
 msgstr "跳至�一列"
 
-#: src/global.c:601
-#, fuzzy
+#: src/global.c:551
 msgid "Go to next line"
 msgstr "跳至後一列"
 
-#: src/global.c:602
-#, fuzzy
+#: src/global.c:552
 msgid "Go to beginning of current line"
 msgstr "跳至目�列首"
 
-#: src/global.c:603
-#, fuzzy
+#: src/global.c:553
 msgid "Go to end of current line"
 msgstr "跳至目�列尾"
 
-#: src/global.c:606
-#, fuzzy
+#: src/global.c:556
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "跳至目�段�開頭"
+msgstr "跳至目�段�開頭；然後是�一段�的開頭"
 
-#: src/global.c:608
-#, fuzzy
+#: src/global.c:558
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "跳至目�段��尾"
+msgstr "跳至目�段��尾；然後是後一段�的�尾"
 
-#: src/global.c:611
+#: src/global.c:560
 msgid "Go to the first line of the file"
 msgstr "跳至檔案第一列"
 
-#: src/global.c:613
+#: src/global.c:561
 msgid "Go to the last line of the file"
 msgstr "跳至檔案最後一列"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:563
 msgid "Go to the matching bracket"
-msgstr "無�應括號"
+msgstr "跳至�應的括號"
 
-#: src/global.c:617
+#: src/global.c:565
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "�上�動一列但��動游標"
 
-#: src/global.c:619
+#: src/global.c:567
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "�下�動一列但��動游標"
 
-#: src/global.c:623
+#: src/global.c:570
 msgid "Switch to the previous file buffer"
 msgstr "切�至上個檔案緩��"
 
-#: src/global.c:625
+#: src/global.c:571
 msgid "Switch to the next file buffer"
 msgstr "切�至下個檔案緩��"
 
-#: src/global.c:628
-#, fuzzy
+#: src/global.c:573
 msgid "Insert the next keystroke verbatim"
-msgstr "�入字元原形"
+msgstr "�入下個按�的原形"
 
-#: src/global.c:630
-#, fuzzy
+#: src/global.c:574
 msgid "Insert a tab at the cursor position"
 msgstr "�入跳格字元於游標�置"
 
-#: src/global.c:632
-#, fuzzy
+#: src/global.c:575
 msgid "Insert a newline at the cursor position"
 msgstr "�入�列字元於游標�置"
 
-#: src/global.c:634
+#: src/global.c:576
 msgid "Delete the character under the cursor"
 msgstr "刪除游標之下的字元"
 
-#: src/global.c:636
+#: src/global.c:578
 msgid "Delete the character to the left of the cursor"
 msgstr "刪除游標左�的字元"
 
-#: src/global.c:639
+#: src/global.c:581
 msgid "Cut from the cursor position to the end of the file"
 msgstr "從游標�置剪下至檔案�尾"
 
-#: src/global.c:642
+#: src/global.c:584
 msgid "Justify the entire file"
 msgstr "�齊整個檔案"
 
-#: src/global.c:646
+#: src/global.c:588
 msgid "Count the number of words, lines, and characters"
 msgstr "計算字數�列數與字元數"
 
-#: src/global.c:649
+#: src/global.c:591
 msgid "Refresh (redraw) the current screen"
 msgstr "�新顯示目�畫�"
 
-#: src/global.c:651
+#: src/global.c:593
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "懸置編輯器 (如果懸置已啟用)"
 
-#: src/global.c:654
+#: src/global.c:596
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "切��尋的大�寫符�"
 
-#: src/global.c:656
-#, fuzzy
+#: src/global.c:598
 msgid "Reverse the direction of the search"
-msgstr "顯示游標�置"
+msgstr "倒轉�尋方�"
 
-#: src/global.c:660
-#, fuzzy
+#: src/global.c:602
 msgid "Toggle the use of regular expressions"
-msgstr "使用正�表示�"
+msgstr "切�使用正�表示�"
 
-#: src/global.c:664
-#, fuzzy
+#: src/global.c:606
 msgid "Recall the previous search/replace string"
-msgstr "編輯�次�尋/置�字串"
+msgstr "�用上次�尋/置�字串"
 
-#: src/global.c:666
-#, fuzzy
+#: src/global.c:608
 msgid "Recall the next search/replace string"
-msgstr "編輯�次�尋/置�字串"
+msgstr "�用下次�尋/置�字串"
 
-#: src/global.c:669
+#: src/global.c:611
 msgid "Go to file browser"
 msgstr "呼�檔案�單"
 
-#: src/global.c:672
-#, fuzzy
+#: src/global.c:614
 msgid "Toggle the use of DOS format"
-msgstr "以 DOS 格�寫入檔案"
+msgstr "切�使用 DOS 格�"
 
-#: src/global.c:673
-#, fuzzy
+#: src/global.c:615
 msgid "Toggle the use of Mac format"
-msgstr "以 Mac 格�寫入檔案"
+msgstr "切�使用 Mac 格�"
 
-#: src/global.c:675
+#: src/global.c:616
 msgid "Toggle appending"
-msgstr ""
+msgstr "切�附加"
 
-#: src/global.c:676
+#: src/global.c:617
 msgid "Toggle prepending"
-msgstr ""
+msgstr "切��置"
 
-#: src/global.c:679
-#, fuzzy
+#: src/global.c:618
 msgid "Toggle backing up of the original file"
-msgstr "儲存既有檔案的備份"
+msgstr "切�備份既有檔案"
 
-#: src/global.c:680
+#: src/global.c:619
 msgid "Execute external command"
 msgstr "執行外部命令"
 
-#: src/global.c:684
-#, fuzzy
+#: src/global.c:622
 msgid "Toggle the use of a new buffer"
-msgstr "無法得知管線緩��大�"
+msgstr "切�使用新緩��"
 
-#: src/global.c:687
+#: src/global.c:625
 msgid "Exit from the file browser"
 msgstr "從檔案�單離開"
 
-#: src/global.c:689
-#, fuzzy
+#: src/global.c:626
 msgid "Go to the first file in the list"
-msgstr "跳至檔案第一列"
+msgstr "跳至列表中的第一個檔案"
 
-#: src/global.c:691
-#, fuzzy
+#: src/global.c:627
 msgid "Go to the last file in the list"
-msgstr "跳至檔案最後一列"
+msgstr "跳至列表中的最後一個檔案"
 
-#: src/global.c:692
-#, fuzzy
+#: src/global.c:628
+msgid "Go to the previous file in the list"
+msgstr "跳至列表中的上一個檔案"
+
+#: src/global.c:629
 msgid "Go to the next file in the list"
-msgstr "跳至後一列"
+msgstr "跳至列表中的下一個檔案"
+
+#: src/global.c:630
+msgid "Go to directory"
+msgstr "跳至目錄"
 
-#: src/global.c:693
+#: src/global.c:633
 #, fuzzy
-msgid "Go to the previous file in the list"
+msgid "Invoke the linter, if available"
+msgstr "嘗試呼�拼字檢查"
+
+#: src/global.c:634
+#, fuzzy
+msgid "Go to previous linter msg"
 msgstr "跳至�一列"
 
-#: src/global.c:694
-msgid "Go to directory"
-msgstr "跳至目錄"
+#: src/global.c:635
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "跳至後一列"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:721
-msgid "Close"
-msgstr "關閉"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:655
+msgid "Get Help"
+msgstr "求助"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:730
-msgid "WriteOut"
-msgstr "寫入"
+#: src/global.c:658 src/prompt.c:1276
+msgid "Cancel"
+msgstr "�消"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:735
-msgid "Justify"
-msgstr "�齊"
+#: src/global.c:671
+#, fuzzy
+msgid "Write Out"
+msgstr "寫入"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:747
-msgid "Read File"
-msgstr "讀檔"
+#: src/global.c:697
+msgid "Go To Dir"
+msgstr "跳至目錄"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:764
+#: src/global.c:712
 msgid "Cut Text"
 msgstr "剪下文字"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:769
-msgid "UnJustify"
-msgstr "還原�齊"
+#: src/global.c:721
+msgid "Justify"
+msgstr "�齊"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:774
+#: src/global.c:726
+msgid "To Spell"
+msgstr "拼字檢查"
+
+#: src/global.c:731
 #, fuzzy
-msgid "UnCut Text"
-msgstr "還原剪下"
+msgid "To Linter"
+msgstr "跳列"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:779 src/global.c:806
+#: src/global.c:736
+msgid "Case Sens"
+msgstr "�大�寫"
+
+#: src/global.c:741
+msgid "Regexp"
+msgstr "正�表示�"
+
+#: src/global.c:746
+msgid "Backwards"
+msgstr "�後�尋"
+
+#: src/global.c:753
+msgid "No Replace"
+msgstr "�置�"
+
+#: src/global.c:761
 msgid "Cur Pos"
 msgstr "游標�置"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:788
-msgid "To Spell"
-msgstr "拼字檢查"
+#: src/global.c:771
+msgid "Prev Page"
+msgstr "上�"
 
-#: src/global.c:822
+#: src/global.c:773
+msgid "Next Page"
+msgstr "下�"
+
+#: src/global.c:776
+msgid "First Line"
+msgstr "首列"
+
+#: src/global.c:778
+msgid "Last Line"
+msgstr "尾列"
+
+#: src/global.c:785
+#, fuzzy
+msgid "To Bracket"
+msgstr "並�一個括號"
+
+#: src/global.c:788
 msgid "Mark Text"
 msgstr "標記文字"
 
-#: src/global.c:828
-#, fuzzy
+#: src/global.c:791
 msgid "Copy Text"
-msgstr "剪下文字"
+msgstr "複製文字"
 
-#: src/global.c:831
-#, fuzzy
+#: src/global.c:794
 msgid "Indent Text"
-msgstr "剪下文字"
+msgstr "縮排文字"
 
-#: src/global.c:834
+#: src/global.c:796
 msgid "Unindent Text"
-msgstr ""
+msgstr "�消縮排文字"
 
-#: src/global.c:838
+#: src/global.c:800
 msgid "Undo"
-msgstr ""
+msgstr "復原"
 
-#: src/global.c:841
+#: src/global.c:802
 msgid "Redo"
-msgstr ""
+msgstr "��"
 
-#: src/global.c:847 src/global.c:851
-msgid "Forward"
-msgstr "��"
-
-#: src/global.c:857 src/global.c:861
+#: src/global.c:807 src/global.c:813
 msgid "Back"
 msgstr "�後"
 
-#: src/global.c:868
-msgid "Next Word"
-msgstr "後一個字"
+#: src/global.c:809 src/global.c:815
+msgid "Forward"
+msgstr "��"
 
-#: src/global.c:871
+#: src/global.c:820
 msgid "Prev Word"
 msgstr "�一個字"
 
-#: src/global.c:875
-msgid "Prev Line"
-msgstr "上列"
-
-#: src/global.c:878
-msgid "Next Line"
-msgstr "下列"
+#: src/global.c:822
+msgid "Next Word"
+msgstr "後一個字"
 
-#: src/global.c:881
+#: src/global.c:826
 msgid "Home"
 msgstr "頂端"
 
-#: src/global.c:884
+#: src/global.c:828
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:896
-msgid "Find Other Bracket"
-msgstr "尋找其他括號"
+#: src/global.c:837
+msgid "Beg of Par"
+msgstr "段�開頭"
 
-#: src/global.c:899
+#: src/global.c:839
+msgid "End of Par"
+msgstr "段��尾"
+
+#: src/global.c:844
 msgid "Scroll Up"
 msgstr "�上�動"
 
-#: src/global.c:902
+#: src/global.c:846
 msgid "Scroll Down"
 msgstr "�下�動"
 
-#: src/global.c:907
-msgid "Previous File"
+#: src/global.c:851
+#, fuzzy
+msgid "Prev File"
 msgstr "上個檔案"
 
-#: src/global.c:909
+#: src/global.c:853
 msgid "Next File"
 msgstr "下個檔案"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:913 src/text.c:3055
-msgid "Verbatim Input"
+#: src/global.c:862
+#, fuzzy
+msgid "Verbatim"
 msgstr "原形輸入"
 
-#: src/global.c:918
+#: src/global.c:865
 msgid "Tab"
 msgstr "跳格�"
 
-#: src/global.c:921
+#: src/global.c:867
 msgid "Enter"
 msgstr "輸入�"
 
-#: src/global.c:924
+#: src/global.c:869
 msgid "Delete"
 msgstr "刪除�"
 
-#: src/global.c:927
+#: src/global.c:871
 msgid "Backspace"
 msgstr "退格�"
 
-#: src/global.c:944
+#: src/global.c:881
 msgid "CutTillEnd"
 msgstr "刪至末端"
 
-#: src/global.c:957
+#: src/global.c:891
 msgid "Word Count"
 msgstr "計算字數"
 
-#: src/global.c:1299
+#: src/global.c:898
+msgid "Suspend"
+msgstr "懸置"
+
+#: src/global.c:903
+msgid "PrevHstory"
+msgstr "上一筆記錄"
+
+#: src/global.c:907
+msgid "NextHstory"
+msgstr "下一筆記錄"
+
+#: src/global.c:911
+msgid "Go To Text"
+msgstr "跳至文字"
+
+#: src/global.c:922
+msgid "DOS Format"
+msgstr "DOS 格�"
+
+#: src/global.c:925
+msgid "Mac Format"
+msgstr "Mac 格�"
+
+#: src/global.c:928
+msgid "Append"
+msgstr "附加"
+
+#: src/global.c:930
+msgid "Prepend"
+msgstr "�引"
+
+#: src/global.c:933
+msgid "Backup File"
+msgstr "備份檔案"
+
+#: src/global.c:940
+msgid "Execute Command"
+msgstr "執行命令"
+
+#: src/global.c:955
+msgid "To Files"
+msgstr "檔案�單"
+
+#: src/global.c:958
+msgid "First File"
+msgstr "第一個檔案"
+
+#: src/global.c:960
+msgid "Last File"
+msgstr "最後的檔案"
+
+#: src/global.c:971
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "上列"
+
+#: src/global.c:973
+#, 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:1215
 msgid "Help mode"
 msgstr "輔助模�"
 
-#: src/global.c:1301
+#: src/global.c:1217
 msgid "Constant cursor position display"
 msgstr "�續顯示游標�置"
 
-#: src/global.c:1303
-#, fuzzy
+#: src/global.c:1219
 msgid "Use of one more line for editing"
-msgstr "編輯時使用更多空間"
+msgstr "編輯時多使用一列"
 
-#: src/global.c:1305
+#: src/global.c:1221
 msgid "Smooth scrolling"
 msgstr "平滑��動畫�"
 
-#: src/global.c:1307
+#: src/global.c:1223
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "��自動�列"
+
+#: src/global.c:1225
 msgid "Whitespace display"
 msgstr "顯示空格"
 
-#: src/global.c:1309
+#: src/global.c:1227
 msgid "Color syntax highlighting"
 msgstr "語法色彩標示"
 
-#: src/global.c:1311
+#: src/global.c:1229
 msgid "Smart home key"
 msgstr "智慧型 HOME 按�"
 
-#: src/global.c:1313
+#: src/global.c:1231
 msgid "Auto indent"
 msgstr "自動縮排"
 
-#: src/global.c:1315
+#: src/global.c:1233
 msgid "Cut to end"
 msgstr "剪下至列尾"
 
-#: src/global.c:1317
-msgid "Long line wrapping"
-msgstr "長列轉�"
+#: src/global.c:1235
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "��自動�列"
 
-#: src/global.c:1319
+#: src/global.c:1237
 msgid "Conversion of typed tabs to spaces"
 msgstr "已輸入跳格符號至空白的轉�"
 
-#: src/global.c:1321
+#: src/global.c:1239
 msgid "Backup files"
 msgstr "備份檔案"
 
-#: src/global.c:1323
+#: src/global.c:1241
 msgid "Multiple file buffers"
 msgstr "多�檔案緩��"
 
-#: src/global.c:1325
+#: src/global.c:1243
 msgid "Mouse support"
 msgstr "滑鼠支�"
 
-#: src/global.c:1327
+#: src/global.c:1245
 msgid "No conversion from DOS/Mac format"
 msgstr "�從 DOS/Mac 格�轉檔"
 
-#: src/global.c:1329
-#, fuzzy
+#: src/global.c:1247
 msgid "Suspension"
-msgstr "暫�"
-
-#: src/global.c:1331
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "長列轉�"
+msgstr "懸置"
 
-#: src/help.c:236
+#: src/help.c:220
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1078,7 +1070,7 @@ msgstr ""
 " �次�尋的字串將會顯示在 �尋: �示符號後�的括號中。�輸入任何文字 而直接按"
 "下輸入�則會履行�次的�尋。"
 
-#: src/help.c:245
+#: src/help.c:229
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1092,7 +1084,7 @@ msgstr ""
 " 以下的功能��用於�尋模�:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:235
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1111,7 +1103,7 @@ msgstr ""
 " 以下的功能��用於跳列模�: \n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:244
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1131,7 +1123,7 @@ msgstr ""
 "multibuffer�Meta-F 開關，或者 nanorc 檔案來啟動的話，所�入的檔案 將會被載入"
 "�外的緩��中 (利用 Meta-< 和 > 在檔案緩��間切�)。 "
 
-#: src/help.c:269
+#: src/help.c:253
 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"
@@ -1145,7 +1137,7 @@ msgstr ""
 " 以下的功能��用於�入檔案模�:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:259
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1164,14 +1156,14 @@ msgstr ""
 "\n"
 " 先�入您想�以此來儲存目�檔案的�稱，並按下輸入�來儲存檔案。\n"
 "\n"
-" 如果已經用標記�擇了文字，那麼您將會被�示，�儲存標記部份到�外的檔 案。為"
-"了�低目�檔案�被其中部份覆寫的機會，在此模�下，目�的檔��會 �為�設"
+" 如果已經用標記�擇了文字，那麼您將會被�示，�儲存標記部分到�外的檔 案。為"
+"了�低目�檔案�被其中部分覆寫的機會，在此模�下，目�的檔��會 �為�設"
 "值。\n"
 "\n"
 " 以下的功能��用於寫入檔案模�: \n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:273
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1193,8 +1185,7 @@ msgstr ""
 " 以下的功能��用於檔案�單: \n"
 "\n"
 
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:286
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1213,15 +1204,18 @@ msgstr ""
 "輸入的文字，畫�就會更新到最�乎�尋字串的�置。\n"
 "\n"
 " �次�尋的字串將會顯示在 �尋: �示符號後�的括號中。�輸入任何文字 而直接按"
-"下輸入�則會履行�次的�尋。"
+"下輸入�則會履行�次的�尋。\n"
+"\n"
 
-#: src/help.c:311
+#: src/help.c:295
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" 下列功能��用於�覽器�尋模�：\n"
+"\n"
 
-#: src/help.c:315
+#: src/help.c:299
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1243,8 +1237,7 @@ msgstr ""
 " 以下的功能��用於跳至目錄模�: \n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1266,8 +1259,7 @@ msgstr ""
 " 以下的功能��用於拼字檢查模�: \n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:327
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1286,8 +1278,7 @@ msgstr ""
 " 以下的功能��用於執行命令模�: \n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:340
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1301,14 +1292,13 @@ msgstr ""
 "nano 輔助說明\n"
 "\n"
 " nano 編輯器是設計來在功能性�易用性方�，模仿�盛頓大學的 Pico 文字 編輯器。"
-"它�有四個主�部份:頂列顯示程�版本�目�被編輯的檔案�稱， 以�是�這檔案已"
+"它�有四個主�部分:頂列顯示程�版本�目�被編輯的檔案�稱， 以�是�這檔案已"
 "經更動�。接著是主�編輯�，顯示正在編輯的檔案。狀態 列�於倒數第三列，用來顯"
-"示��的訊�。底部的兩列則顯示編輯器中最常用 到的快��。\n"
+"示��的訊�。\n"
 "\n"
 " "
 
-#: src/help.c:366
-#, fuzzy
+#: src/help.c:350
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1318,12 +1308,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:359
 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 "
@@ -1335,16 +1326,15 @@ msgstr ""
 "�應的字 元。下列按�組��用於主�編輯�，替代按�則顯示於括弧內:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:391 src/help.c:466
 msgid "enable/disable"
 msgstr "開啟/關閉"
 
-#: src/nano.c:588
-#, fuzzy
+#: src/nano.c:597
 msgid "Key invalid in view mode"
 msgstr "觀看模�中此按�無效"
 
-#: src/nano.c:700
+#: src/nano.c:709
 #, c-format
 msgid ""
 "\n"
@@ -1353,7 +1343,7 @@ msgstr ""
 "\n"
 "緩��已寫入 %s\n"
 
-#: src/nano.c:702
+#: src/nano.c:711
 #, c-format
 msgid ""
 "\n"
@@ -1362,7 +1352,7 @@ msgstr ""
 "\n"
 "緩��未寫入至 %s: %s\n"
 
-#: src/nano.c:705
+#: src/nano.c:714
 #, c-format
 msgid ""
 "\n"
@@ -1371,292 +1361,277 @@ msgstr ""
 "\n"
 "緩��未寫入: %s\n"
 
-#: src/nano.c:728
+#: src/nano.c:739
 msgid "Window size is too small for nano...\n"
-msgstr "視窗尺寸� nano 來說太�了...\n"
+msgstr "視窗尺寸� nano 來說太�了…\n"
 
-#: src/nano.c:821
-#, fuzzy, c-format
+#: src/nano.c:832
+#, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"用法: nano [+列數,行數] [�項] [檔案�稱]\n"
+"用法: nano [�項] [[+列數,行數] 檔案�稱]…\n"
 "\n"
 
-#: src/nano.c:824
-#, fuzzy, c-format
+#: src/nano.c:835
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "�項\t\tGNU 長�項\t\t�義\n"
 
-#: src/nano.c:826
+#: src/nano.c:837
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "�項\t\t�義\n"
 
-#: src/nano.c:829
-msgid "Show this message"
-msgstr "顯示此訊�"
-
-#: src/nano.c:830
+#: src/nano.c:840
 msgid "+LINE,COLUMN"
 msgstr "+列數,行數"
 
-#: src/nano.c:831
+#. 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:843
 msgid "Start at line LINE, column COLUMN"
 msgstr "從所指列數與行數開始"
 
-#: src/nano.c:833
+#: src/nano.c:845
 msgid "Enable smart home key"
 msgstr "開啟智慧型 HOME 按�功能"
 
-#: src/nano.c:834
+#: src/nano.c:846
 msgid "Save backups of existing files"
 msgstr "儲存既有檔案的備份"
 
-#: src/nano.c:835
+#: src/nano.c:847
 msgid "-C <dir>"
-msgstr ""
+msgstr "-C <目錄>"
 
-#: src/nano.c:835
-#, fuzzy
+#: src/nano.c:847
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=[目錄]"
+msgstr "--backupdir=<目錄>"
 
-#: src/nano.c:836
+#: src/nano.c:848
 msgid "Directory for saving unique backup files"
 msgstr "用以儲存�一備份檔案的目錄"
 
-#: src/nano.c:839
+#: src/nano.c:851
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "使用粗體以代替�白顯示文字"
 
-#: src/nano.c:842
+#: src/nano.c:854
 msgid "Convert typed tabs to spaces"
 msgstr "將已輸入的跳格符號轉�為空白"
 
-#: src/nano.c:845
+#: src/nano.c:857
 msgid "Enable multiple file buffers"
 msgstr "開啟多�檔案緩��功能"
 
-#: src/nano.c:850
+#: src/nano.c:862
 msgid "Use (vim-style) lock files"
-msgstr ""
+msgstr "使用 (vim 形�) 鎖定檔案"
 
-#: src/nano.c:852
+#: src/nano.c:864
 msgid "Log & read search/replace string history"
 msgstr "記錄與讀� �尋/置� 的歷�字串"
 
-#: src/nano.c:855
+#: src/nano.c:867
 msgid "Don't look at nanorc files"
 msgstr "���考 nanorc 檔案"
 
-#: src/nano.c:858
+#: src/nano.c:870
 msgid "Fix numeric keypad key confusion problem"
 msgstr "修正數字��按�混淆�題"
 
-#: src/nano.c:860
+#: src/nano.c:872
 msgid "Don't add newlines to the ends of files"
 msgstr "��將�列加到檔案末端"
 
-#: src/nano.c:863
+#: src/nano.c:875
 msgid "Don't convert files from DOS/Mac format"
 msgstr "��從 DOS/Mac 格�轉檔"
 
-#: src/nano.c:865
-#, fuzzy
+#: src/nano.c:877
 msgid "Use one more line for editing"
-msgstr "編輯時使用更多空間"
+msgstr "編輯時多使用一列"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:880
 msgid "Log & read location of cursor position"
-msgstr "標記游標所在文字"
+msgstr "記錄 & 讀�游標所在�置"
 
-#: src/nano.c:871
+#: src/nano.c:883
 msgid "-Q <str>"
-msgstr ""
+msgstr "-Q <字串>"
 
-#: src/nano.c:871
-#, fuzzy
+#: src/nano.c:883
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[字串]"
+msgstr "--quotestr=<字串>"
 
-#: src/nano.c:872
+#: src/nano.c:884
 msgid "Quoting string"
 msgstr "引用代表字串"
 
-#: src/nano.c:874
+#: src/nano.c:886
 msgid "Restricted mode"
 msgstr "�制模�"
 
-#: src/nano.c:877
+#: src/nano.c:889
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "�列�動以代替�個畫�"
 
-#: src/nano.c:879
-#, fuzzy
+#: src/nano.c:891
 msgid "-T <#cols>"
-msgstr "-T [#行數]"
+msgstr "-T <#行數>"
 
-#: src/nano.c:879
-#, fuzzy
+#: src/nano.c:891
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[#行數]"
+msgstr "--tabsize=<#行數>"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:892
 msgid "Set width of a tab to #cols columns"
 msgstr "設定跳格寬度為 #行數"
 
-#: src/nano.c:882
+#: src/nano.c:894
 msgid "Do quick statusbar blanking"
 msgstr "狀態列快速閃動"
 
-#: src/nano.c:885
+#: src/nano.c:897
 msgid "Print version information and exit"
 msgstr "顯示版本資訊並離開"
 
-#: src/nano.c:888
+#: src/nano.c:900
 msgid "Detect word boundaries more accurately"
 msgstr "更正確地�測單字邊界"
 
-#: src/nano.c:891
+#: src/nano.c:903
 msgid "-Y <str>"
-msgstr ""
+msgstr "-Y <字串>"
 
-#: src/nano.c:891
-#, fuzzy
+#: src/nano.c:903
 msgid "--syntax=<str>"
-msgstr "--syntax=[字串]"
+msgstr "--syntax=<字串>"
 
-#: src/nano.c:892
-#, fuzzy
+#: src/nano.c:904
 msgid "Syntax definition to use for coloring"
-msgstr "字串�為語法定義"
+msgstr "用於�色的語法定義"
 
-#: src/nano.c:894
+#: src/nano.c:906
 msgid "Constantly show cursor position"
 msgstr "�續顯示游標�置"
 
-#: src/nano.c:896
+#: src/nano.c:908
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "修正 退格�/刪除� 混淆�題"
 
-#: src/nano.c:899
+#: src/nano.c:910
+#, fuzzy
+msgid "Show this help text"
+msgstr "顯示這份說明文字"
+
+#: src/nano.c:912
 msgid "Automatically indent new lines"
 msgstr "自動縮排新列"
 
-#: src/nano.c:900
+#: src/nano.c:913
 msgid "Cut from cursor to end of line"
 msgstr "從游標剪下至列尾"
 
-#: src/nano.c:903
+#: src/nano.c:916
 msgid "Don't follow symbolic links, overwrite"
 msgstr "���照符號連�，而是覆寫"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:918
 msgid "Enable the use of the mouse"
 msgstr "開啟滑鼠功能"
 
-#: src/nano.c:908
-msgid "-o <dir>"
+#: src/nano.c:920
+msgid "Do not read the file (only write it)"
 msgstr ""
 
-#: src/nano.c:908
-#, fuzzy
+#: src/nano.c:922
+msgid "-o <dir>"
+msgstr "-o <目錄>"
+
+#: src/nano.c:922
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[目錄]"
+msgstr "--operatingdir=<目錄>"
 
-#: src/nano.c:909
+#: src/nano.c:923
 msgid "Set operating directory"
 msgstr "設定�作目錄"
 
-#: src/nano.c:912
+#: src/nano.c:926
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "�留 XON (^Q) 和 XOFF (^S) 按�"
 
-#: src/nano.c:914
+#: src/nano.c:928
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "默默地忽略�是 rc 檔案錯誤之類的啟動�題"
 
-#: src/nano.c:916
-#, fuzzy
+#: src/nano.c:930
 msgid "-r <#cols>"
-msgstr "-r [#行數]"
+msgstr "-r <#行數>"
 
-#: src/nano.c:916
-#, fuzzy
+#: src/nano.c:930
 msgid "--fill=<#cols>"
-msgstr "--fill=[#行數]    "
+msgstr "--fill=<#行數>"
 
-#: src/nano.c:917
+#: src/nano.c:931
 #, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "設定跳格寬度為 #行數"
+msgid "Set hard-wrapping point at column #cols"
+msgstr "設定�列點為 #行數"
 
-#: src/nano.c:920
-#, fuzzy
+#: src/nano.c:934
 msgid "-s <prog>"
-msgstr "-s [程�]"
+msgstr "-s <程�>"
 
-#: src/nano.c:920
-#, fuzzy
+#: src/nano.c:934
 msgid "--speller=<prog>"
-msgstr "--speller=[程�]"
+msgstr "--speller=<程�>"
 
-#: src/nano.c:921
+#: src/nano.c:935
 msgid "Enable alternate speller"
 msgstr "啟用替代的拼字檢查程�"
 
-#: src/nano.c:924
+#: src/nano.c:938
 msgid "Auto save on exit, don't prompt"
 msgstr "離開時自動儲存，���示"
 
-#: src/nano.c:926
+#: src/nano.c:940
 msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "�許一般的復原 [實驗性質]"
 
-#: src/nano.c:929
-#, fuzzy
+#: src/nano.c:943
 msgid "View mode (read-only)"
-msgstr "觀看 (唯讀) 模�"
+msgstr "觀看模� (唯讀)"
 
-#: src/nano.c:931
-msgid "Don't wrap long lines"
+#: src/nano.c:945
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "��自動�列"
 
-#: src/nano.c:933
-#, fuzzy
+#: src/nano.c:947
 msgid "Don't show the two help lines"
-msgstr "��顯示輔助�"
+msgstr "��顯示兩說明列"
 
-#: src/nano.c:934
-#, fuzzy
+#: src/nano.c:948
 msgid "Enable suspension"
-msgstr "開啟暫�功能"
+msgstr "開啟懸置功能"
 
-#: src/nano.c:935
-#, fuzzy
+#: src/nano.c:950
 msgid "Enable soft line wrapping"
-msgstr "長列轉�"
-
-#: src/nano.c:939
-msgid "(ignored, for Pico compatibility)"
-msgstr "(忽略，為了與 Pico 相容)"
+msgstr "開啟長列�列"
 
-#: src/nano.c:949
+#: src/nano.c:959
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
 msgstr " GNU nano 版本 %s (編譯於 %s, %s)\n"
 
-#: src/nano.c:954
+#: src/nano.c:963
 #, 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:955
+#: src/nano.c:964
 #, c-format
 msgid ""
 "\n"
@@ -1665,168 +1640,171 @@ msgstr ""
 "\n"
 " 編譯�項:"
 
-#: src/nano.c:1033
+#: src/nano.c:1088
 msgid "Sorry, support for this function has been disabled"
 msgstr "抱歉，已經關閉此功能的支�"
 
-#: src/nano.c:1055
+#: src/nano.c:1110
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "儲存更動�的緩��嗎 (回答 \"No\" 會撤銷修改)？"
 
-#: src/nano.c:1109
+#: src/nano.c:1162
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "無法�新開啟來自�盤的標準輸入，抱歉\n"
 
-#: src/nano.c:1135
+#: src/nano.c:1187
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "讀�自標準輸入，^C 以放棄\n"
 
-#: src/nano.c:1203
+#: src/nano.c:1253
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到 SIGHUP 或 SIGTERM\n"
 
-#: src/nano.c:1225
-#, fuzzy, c-format
+#: src/nano.c:1275
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "利用 \"fg\" 來回到 nano"
+msgstr "利用 \"fg\" 來回到 nano。\n"
 
-#: src/nano.c:1407
+#: src/nano.c:1457
 msgid "enabled"
 msgstr "é–‹å•Ÿ"
 
-#: src/nano.c:1408
+#: src/nano.c:1457
 msgid "disabled"
 msgstr "關閉"
 
-#: src/nano.c:1575 src/winio.c:1256
-#, fuzzy
+#: src/nano.c:1615 src/winio.c:1258
 msgid "Unknown Command"
-msgstr "旗標 %s 無法辨識"
+msgstr "�明的命令"
 
-#: src/nano.c:1701
-#, fuzzy
+#: src/nano.c:1732
 msgid "XON ignored, mumble mumble"
 msgstr "忽略 XON，嗯嗯。"
 
-#: src/nano.c:1706
-#, fuzzy
+#: src/nano.c:1737
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略 XOFF，嗯嗯。"
 
-#: src/nano.c:2246 src/rcfile.c:1189
-#, fuzzy, c-format
+#: src/nano.c:2276 src/rcfile.c:1252
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "所�求的跳格寬度 %s 無效"
+msgstr "所�求的跳格寬度 \"%s\" 無效"
 
-#: src/nano.c:2305 src/rcfile.c:1114
-#, fuzzy, c-format
+#: src/nano.c:2338 src/rcfile.c:1177
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "所�求的填滿行數 %s 無效"
+msgstr "所�求的填滿行數 \"%s\" 無效"
+
+#: src/nano.c:2384
+#, 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:1247
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1248
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1249
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1263
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1268
 msgid "All"
 msgstr "全部"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1273
 msgid "No"
 msgstr "�"
 
-#: src/rcfile.c:134
+#: src/rcfile.c:138
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "在 %s (�於第 %lu 列) 中發生錯誤: "
 
-#: src/rcfile.c:189
-#, fuzzy, c-format
+#: src/rcfile.c:193
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "引數 %s 有未�閉的 \""
+msgstr "引數 '%s' 有未�閉的 \""
 
-#: src/rcfile.c:216 src/rcfile.c:268 src/rcfile.c:404 src/rcfile.c:797
-#: src/rcfile.c:854 src/rcfile.c:907
+#: src/rcfile.c:220 src/rcfile.c:272 src/rcfile.c:684 src/rcfile.c:745
+#: src/rcfile.c:834 src/rcfile.c:886
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正�表示�字串必須以 \" 字元開始���"
 
-#: src/rcfile.c:242 src/search.c:62
+#: src/rcfile.c:246 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "�良的正�表示� \"%s\": %s"
 
-#: src/rcfile.c:262
+#: src/rcfile.c:266
 msgid "Missing syntax name"
 msgstr "缺少語法�稱"
 
-#: src/rcfile.c:332
+#: src/rcfile.c:336
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 語法已被�留"
 
-#: src/rcfile.c:339
+#: src/rcfile.c:343
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" 語法必須��任何副檔�"
 
-#: src/rcfile.c:393
-#, fuzzy
-msgid "Cannot add a magic string regex without a syntax command"
-msgstr "無法直接增加�色而沒有語法列"
-
-#: src/rcfile.c:398
-#, fuzzy
-msgid "Missing magic string name"
-msgstr "缺少正�表示�字串"
-
-#: src/rcfile.c:472 src/rcfile.c:569
-#, fuzzy
+#: src/rcfile.c:411
 msgid "Missing key name"
 msgstr "缺少語法�稱"
 
-#: src/rcfile.c:484 src/rcfile.c:585
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:420 src/rcfile.c:431
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:493
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:441
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "按�繫�必須以 \"^\", \"M\", 或 \"F\" 開始"
 
-#: src/rcfile.c:504 src/rcfile.c:596
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:450
+#, fuzzy
+msgid "Must specify a function to bind the key to"
+msgstr "必須指定按�所繫�的功能"
 
-#: src/rcfile.c:512
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:460
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:518 src/rcfile.c:603
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr ""
+#: src/rcfile.c:467
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "無法映射�稱「%s�到�一功能"
 
-#: src/rcfile.c:540
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+#: src/rcfile.c:474
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "無法映射�稱「%s�到�一�單"
+
+#: src/rcfile.c:497
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "抱歉，按�字串「%s�是��法的繫�"
 
-#: src/rcfile.c:711
+#: src/rcfile.c:583
 #, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "讀� %s 時發生錯誤: %s"
+
+#: src/rcfile.c:626
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1834,150 +1812,175 @@ 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:733
-#, fuzzy
+#: src/rcfile.c:648
 msgid "Cannot add a color command without a syntax command"
-msgstr "無法直接增加�色而沒有語法列"
+msgstr "無法增加�色命令而沒有語法命令"
 
-#: src/rcfile.c:738
+#: src/rcfile.c:653
 msgid "Missing color name"
 msgstr "缺少�色�稱"
 
-#: src/rcfile.c:758
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "背景色 %s ��為明亮"
-
-#: src/rcfile.c:776 src/rcfile.c:895
+#: src/rcfile.c:663 src/rcfile.c:824
 msgid "Missing regex string"
 msgstr "缺少正�表示�字串"
 
-#: src/rcfile.c:848
+#: src/rcfile.c:739
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" �求�應的 \"end=\""
 
-#: src/rcfile.c:890
-#, fuzzy
+#: src/rcfile.c:791
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色 \"%s\" ��為明亮"
+
+#: src/rcfile.c:819
 msgid "Cannot add a header regex without a syntax command"
-msgstr "無法直接增加�色而沒有語法列"
+msgstr "無法增加標頭正�表示�而沒有語法命令"
 
-#: src/rcfile.c:960
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+#: src/rcfile.c:875
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "無法增加魔法正�表示�而沒有語法命令"
+
+#: src/rcfile.c:880
+msgid "Missing magic string name"
+msgstr "缺少魔法字串�稱"
+
+#: src/rcfile.c:939
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "無法增加標頭正�表示�而沒有語法命令"
+
+#: src/rcfile.c:944
+#, fuzzy
+msgid "Missing linter command"
+msgstr "缺少�色�稱"
+
+#: src/rcfile.c:974
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "嚴�錯誤：沒有按�映射至功能「%s�"
 
-#: src/rcfile.c:962
+#: src/rcfile.c:976
+#, 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:1012 src/rcfile.c:1021 src/rcfile.c:1031
+#: src/rcfile.c:1037
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "無法映射�稱「%s�到�一�單"
+
+#: src/rcfile.c:1053 src/rcfile.c:1062 src/rcfile.c:1072
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "命令「%s�在包�的檔案中��許"
 
-#: src/rcfile.c:1037 src/rcfile.c:1217
+#: src/rcfile.c:1078 src/rcfile.c:1280
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "語法「%s�沒有任何�色命令"
 
-#: src/rcfile.c:1055
-#, fuzzy, c-format
+#: src/rcfile.c:1098
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "無法辨識 %s 命令"
+msgstr "無法辨識 \"%s\" 命令"
 
-#: src/rcfile.c:1061
-msgid "Missing flag"
-msgstr "缺少旗標"
+#: src/rcfile.c:1113
+#, fuzzy
+msgid "Missing option"
+msgstr "缺少�色�稱"
 
-#: src/rcfile.c:1083
-#, fuzzy, c-format
+#: src/rcfile.c:1135
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "�項 %s �求引數"
+msgstr "�項 \"%s\" �求引數"
 
-#: src/rcfile.c:1101
+#: src/rcfile.c:1153
 msgid "Option is not a valid multibyte string"
 msgstr "�項並�正確的多�元字串"
 
-#: src/rcfile.c:1127 src/rcfile.c:1155 src/rcfile.c:1164
+#: src/rcfile.c:1190 src/rcfile.c:1218 src/rcfile.c:1227
 msgid "Non-blank characters required"
 msgstr "需��空格字元"
 
-#: src/rcfile.c:1137
+#: src/rcfile.c:1200
 msgid "Two single-column characters required"
 msgstr "需�兩個單行字元"
 
-#: src/rcfile.c:1203
+#: src/rcfile.c:1266
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "無法解除旗標 %s 設定"
+msgid "Cannot unset option \"%s\""
+msgstr "無法解除旗標 \"%s\" 設定"
 
-#: src/rcfile.c:1212
+#: src/rcfile.c:1275
 #, fuzzy, c-format
-msgid "Unknown flag \"%s\""
-msgstr "旗標 %s 無法辨識"
+msgid "Unknown option \"%s\""
+msgstr "旗標 \"%s\" 無法辨識"
 
-#: src/rcfile.c:1271
+#: src/rcfile.c:1334
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找�到我的家目錄�哇�"
 
-#: src/rcfile.c:1309
-#, fuzzy, c-format
+#: src/rcfile.c:1372
+#, c-format
 msgid ""
 "\n"
 "Press Enter to continue starting nano.\n"
 msgstr ""
 "\n"
-"按下輸入�繼續啟動 nano\n"
+"按下輸入�以繼續啟動 nano。\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "找�到 \"%.*s%s\""
 
-#: src/search.c:204
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:201
 msgid " (to replace) in selection"
 msgstr " 在標記中(置�)"
 
-#: src/search.c:206
+#: src/search.c:203
 msgid " (to replace)"
 msgstr " (置�)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:782
 msgid "Replace this instance?"
 msgstr "置�這個？"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:961
 msgid "Replace with"
 msgstr "以此置�"
 
-#: src/search.c:1004
+#: src/search.c:1003
 #, 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:1047
 msgid "Enter line number, column number"
 msgstr "輸入列號，行號"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1074
 msgid "Invalid line or column number"
-msgstr "輸入列號，行號"
+msgstr "無效的列號或行號"
 
-#: src/search.c:1214
+#: src/search.c:1228
 msgid "Not a bracket"
 msgstr "並�一個括號"
 
-#: src/search.c:1281
+#: src/search.c:1295
 msgid "No matching bracket"
 msgstr "無�應括號"
 
@@ -1986,161 +1989,194 @@ msgid "Mark Set"
 msgstr "標記設定"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
 msgstr "標記解除"
 
-#: src/text.c:443
+#: src/text.c:434
 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:440 src/text.c:578
+#, 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:451 src/text.c:588
 msgid "text add"
-msgstr ""
+msgstr "文字加入"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:461 src/text.c:599
 msgid "text delete"
-msgstr "下個檔案"
+msgstr "文字刪除"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
+#: src/text.c:473 src/text.c:617
 msgid "line wrap"
-msgstr "長列轉�"
+msgstr "長列�列"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:488 src/text.c:626
 msgid "line join"
-msgstr ""
+msgstr "列��"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:500 src/text.c:640
 msgid "text cut"
-msgstr ""
+msgstr "文字剪下"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:504 src/text.c:644
 msgid "text uncut"
-msgstr ""
+msgstr "文字�消剪下"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:508 src/text.c:611
 msgid "line break"
-msgstr ""
+msgstr "分列符號"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:519 src/text.c:655
 msgid "text insert"
-msgstr "下列"
+msgstr "文字�入"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:537 src/text.c:648
 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:544 src/text.c:660 src/text.c:959
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "內部錯誤：�明型態。 請儲存您的工作。"
 
-#: src/text.c:563
+#: src/text.c:551
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "已復原動作 (%s)"
 
-#: src/text.c:578
+#: src/text.c:568
 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:572
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "內部錯誤：無法設定�消剪下。 請儲存您的工作。"
 
-#: src/text.c:676
+#: src/text.c:666
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "已��動作 (%s)"
 
-#: src/text.c:771
-msgid "Could not pipe"
-msgstr "管線功能無效"
+#: src/text.c:766 src/text.c:2563 src/text.c:3042
+msgid "Could not create pipe"
+msgstr "無法建立管線功能"
 
-#: src/text.c:798 src/text.c:2646 src/text.c:2798
+#: src/text.c:792 src/text.c:2651 src/text.c:2803 src/text.c:3093
 msgid "Could not fork"
 msgstr "執行功能無效"
 
-#: src/text.c:946
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:955
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+#: src/text.c:945
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "內部錯誤：無法設定�消剪下。 請儲存您的工作。"
 
-#: src/text.c:1875
+#: src/text.c:1878
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "�良引用字串 %s: %s"
 
-#: src/text.c:2274
+#: src/text.c:2279
 msgid "Can now UnJustify!"
 msgstr "�在�以還原�齊�"
 
-#: src/text.c:2472
+#: src/text.c:2477
 msgid "Edit a replacement"
 msgstr "編輯替代文字"
 
-#: src/text.c:2558
-msgid "Could not create pipe"
-msgstr "無法建立管線功能"
-
-#: src/text.c:2560
+#: src/text.c:2565
 msgid "Creating misspelled word list, please wait..."
-msgstr "正在建立錯字列表，請�待..."
+msgstr "正在建立錯字列表，請�待…"
 
-#: src/text.c:2652
+#: src/text.c:2657 src/text.c:3101
 msgid "Could not get size of pipe buffer"
 msgstr "無法得知管線緩��大�"
 
-#: src/text.c:2703
+#: src/text.c:2708
 msgid "Error invoking \"spell\""
 msgstr "呼� \"spell\" 錯誤"
 
-#: src/text.c:2706
+#: src/text.c:2711
 msgid "Error invoking \"sort -f\""
 msgstr "呼� \"sort -f\" 錯誤"
 
-#: src/text.c:2709
+#: src/text.c:2714
 msgid "Error invoking \"uniq\""
 msgstr "呼� \"uniq\" 錯誤"
 
-#: src/text.c:2766 src/text.c:2975
+#: src/text.c:2771 src/text.c:2984
 msgid "Finished checking spelling"
 msgstr "拼字檢查��"
 
-#: src/text.c:2825
+#: src/text.c:2830
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "呼� \"%s\" 錯誤"
 
-#: src/text.c:2970
+#: src/text.c:2962
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "嘗試呼�拼字檢查"
+
+#: src/text.c:2979
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼字檢查失敗: %s"
 
-#: src/text.c:2972
+#: src/text.c:2981
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼字檢查失敗: %s: %s"
 
-#: src/text.c:3040
+#: src/text.c:3015
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "��將�列加到檔案末端"
+
+#: src/text.c:3026
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:3048
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3204
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3238
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3286
+#, fuzzy
+msgid "At last message"
+msgstr "顯示此訊�"
+
+#: src/text.c:3293
+#, fuzzy
+msgid "At first message"
+msgstr "顯示此訊�"
+
+#: src/text.c:3372
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字數: %lu  列數: %ld  字元數: %lu"
 
-#: src/text.c:3041
+#: src/text.c:3373
 msgid "In Selection:  "
-msgstr "於�擇部份: "
+msgstr "於�擇部分: "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3387
+msgid "Verbatim Input"
+msgstr "原形輸入"
 
 #: src/utils.c:409 src/utils.c:421
 msgid "nano is out of memory!"
@@ -2148,131 +2184,98 @@ msgstr "nano 已耗盡記憶體�"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1558
 msgid "Unicode Input"
-msgstr ""
+msgstr "�國碼輸入"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2136 src/winio.c:2140
 msgid "Modified"
 msgstr "已更動"
 
-#: src/winio.c:2150
+#: src/winio.c:2137
 msgid "View"
 msgstr "觀看"
 
-#: src/winio.c:2164
+#: src/winio.c:2151
 msgid "DIR:"
 msgstr "目錄:"
 
-#: src/winio.c:2171
+#: src/winio.c:2158
 msgid "File:"
 msgstr "檔案:"
 
-#: src/winio.c:2265
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2255
 msgid ""
 "Warning: Modifying a file which is not locked, check directory permission?"
-msgstr ""
+msgstr "警告：正在變更一個未鎖定的檔案，�檢查一下目錄權�嗎？"
 
-#: src/winio.c:3370
+#: src/winio.c:3351
 #, 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:3502
+#: src/winio.c:3484
 msgid "The nano text editor"
 msgstr "nano 文字編輯器"
 
-#: src/winio.c:3503
+#: src/winio.c:3485
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3504
+#: src/winio.c:3486
 msgid "Brought to you by:"
 msgstr "來自於:"
 
-#: src/winio.c:3505
+#: src/winio.c:3487
 msgid "Special thanks to:"
 msgstr "特別感�:"
 
-#: src/winio.c:3506
+#: src/winio.c:3488
 msgid "The Free Software Foundation"
 msgstr "自由軟體基金會"
 
-#: src/winio.c:3507
+#: src/winio.c:3489
 msgid "For ncurses:"
-msgstr "ncurses 部份:"
+msgstr "ncurses 部分:"
 
-#: src/winio.c:3508
+#: src/winio.c:3490
 msgid "and anyone else we forgot..."
-msgstr "以�其他我們�記得的人..."
+msgstr "以�其他我們�記得的人…"
 
-#: src/winio.c:3509
+#: src/winio.c:3491
 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 "Make the current search/replace go backwards"
-#~ msgstr "使目��尋與置��後進行"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "�引於目�檔案"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "存檔時備份原始檔案"
-
-#~ msgid "Insert into new buffer"
-#~ msgstr "�入新的緩��"
-
-#~ msgid "Space"
-#~ msgstr "Space"
+#~ msgid "Insert File"
+#~ msgstr "�入檔案"
 
-#~ msgid ""
-#~ "Usage: nano [+LINE,COLUMN] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "用法: nano [+列數,行數] [GNU 長�項] [�項] [檔案�稱]\n"
-#~ "\n"
+#~ msgid "Go to previous screen"
+#~ msgstr "跳至�一畫�"
 
-#~ msgid "-C [dir]"
-#~ msgstr "-C [目錄]"
+#~ msgid "Find Other Bracket"
+#~ msgstr "尋找其他括號"
 
-#~ msgid "Use more space for editing"
-#~ msgstr "編輯時使用更多空間"
+#~ msgid "Long line wrapping"
+#~ msgstr "長列轉�"
 
-#~ msgid "-Q [str]"
-#~ msgstr "-Q [字串]"
+#~ msgid "Soft line wrapping"
+#~ msgstr "長列�列"
 
-#~ msgid "-Y [str]"
-#~ msgstr "-Y [字串]"
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(忽略，為了與 Pico 相容)"
 
-#~ msgid "-o [dir]"
-#~ msgstr "-o [目錄]"
+#~ 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 "Internal error: unknown type.  Please save your work"
+#~ msgstr "內部錯誤：�明型態。 請儲存您的工作"
 
-#~ msgid "Come on, be reasonable"
-#~ msgstr "別這樣，�性一點"
+#~ 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 f0b21c06..83ce0e7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
-localedir = $(datadir)/locale
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 096f34b8..80c688d4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+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 \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        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; \
-    test $$am__dry = yes; \
-  }
+    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@
@@ -53,9 +80,11 @@ build_triplet = @build@
 host_triplet = @host@
 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 \
@@ -76,14 +105,34 @@ 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 = \
@@ -91,11 +140,29 @@ am__can_run_installinfo = \
     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@
@@ -141,7 +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@
@@ -153,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@
@@ -182,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@
@@ -193,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@
@@ -210,7 +284,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 ACLOCAL_AMFLAGS = -I m4
 nano_SOURCES = browser.c \
 		chars.c \
@@ -274,10 +348,11 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	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 } \
@@ -298,16 +373,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) $(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)
@@ -332,39 +409,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 $<
 
 .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 `$(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; \
@@ -376,15 +442,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
@@ -393,6 +455,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
@@ -537,19 +614,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 1d03c7c6..4b9d6301 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -1,9 +1,9 @@
-/* $Id: browser.c 4548 2012-12-30 19:20:10Z astyanax $ */
+/* $Id: browser.c 4923 2014-05-28 15:40:24Z 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)  *
@@ -161,8 +161,8 @@ char *do_browser(char *path, DIR *dir)
 	}
 #endif /* !DISABLE_MOUSE */
 
-	parse_browser_input(&kbinput, &meta_key, &func_key);
-        s = get_shortcut(MBROWSER, &kbinput, &meta_key, &func_key);
+	parse_browser_input(&kbinput, &meta_key);
+	s = get_shortcut(MBROWSER, &kbinput, &meta_key);
         if (!s)
             continue;
         f = sctofunc((sc *) s);
@@ -173,10 +173,10 @@ char *do_browser(char *path, DIR *dir)
 		total_redraw();
 	} else if (f->scfunc == do_help_void) {
 #ifndef DISABLE_HELP
-	    do_browser_help();
+	    do_help_void();
 	    curs_set(0);
 #else
-		nano_disabled_msg();
+	    nano_disabled_msg();
 #endif
 	    /* Search for a filename. */
 	} else if (f->scfunc == do_search) {
@@ -217,7 +217,8 @@ char *do_browser(char *path, DIR *dir)
 #ifndef NANO_TINY
 			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)
@@ -540,29 +541,27 @@ void browser_init(const char *path, DIR *dir)
 }
 
 /* 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
+ * (the key itself) and meta_key (whether the key is a meta sequence).
+ * Also convert certain non-shortcut keys into their corresponding
  * shortcut keys. */
-void parse_browser_input(int *kbinput, bool *meta_key, bool *func_key)
+void parse_browser_input(int *kbinput, bool *meta_key)
 {
-    get_shortcut(MBROWSER, kbinput, meta_key, func_key);
+    get_shortcut(MBROWSER, kbinput, meta_key);
 
     /* Pico compatibility. */
     if (!*meta_key) {
 	switch (*kbinput) {
 	    case ' ':
-		*kbinput = sc_seq_or(do_page_down, 0);
+		*kbinput = KEY_NPAGE;
 		break;
 	    case '-':
-		*kbinput = sc_seq_or(do_page_up, 0);
+		*kbinput = KEY_PPAGE;
 		break;
 	    case '?':
 #ifndef DISABLE_HELP
 		*kbinput = sc_seq_or(do_help_void, 0);
 #endif
 		break;
-	    /* Cancel equivalent to Exit here. */
 	    case 'E':
 	    case 'e':
 		*kbinput = sc_seq_or(do_exit, 0);
@@ -635,7 +634,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 +709,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);
 
@@ -798,25 +797,19 @@ int filesearch_init(void)
 #ifndef NANO_TINY
 	&search_history,
 #endif
-	browser_refresh, "%s%s%s%s%s%s", _("Search"),
+	browser_refresh, "%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);
+	"", buf);
 
     /* Release buf now that we don't need it anymore. */
     free(buf);
@@ -830,7 +823,7 @@ int filesearch_init(void)
 	statusbar(_("Cancelled"));
 	return -1;
     } else {
-        s = get_shortcut(MBROWSER, &i, &meta_key, &func_key);
+	s = get_shortcut(MBROWSER, &i, &meta_key);
 	if (i == -2 || i == 0) {
 #ifdef HAVE_REGEX_H
 		/* Use last_search if answer is an empty string, or
@@ -845,7 +838,7 @@ int filesearch_init(void)
 		TOGGLE(CASE_SENSITIVE);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
-	} else if (s && s->scfunc ==  backwards_void) {
+	} else if (s && s->scfunc == backwards_void) {
 		TOGGLE(BACKWARDS_SEARCH);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
@@ -1070,7 +1063,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 5b5b34c3..443e7df9 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -1,9 +1,9 @@
-/* $Id: chars.c 4555 2013-01-03 04:23:10Z astyanax $ */
+/* $Id: chars.c 4908 2014-05-25 19:41:49Z 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)  *
@@ -43,6 +43,17 @@ static const wchar_t bad_wchar = 0xFFFD;
 static const char *const bad_mbchar = "\xEF\xBF\xBD";
 static const int bad_mbchar_len = 3;
 
+/* 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;
+}
+
 /* Enable UTF-8 support. */
 void utf8_init(void)
 {
@@ -54,7 +65,7 @@ bool using_utf8(void)
 {
     return use_utf8;
 }
-#endif
+#endif /* ENABLE_UTF8 */
 
 #ifndef HAVE_ISBLANK
 /* This function is equivalent to isblank(). */
@@ -184,9 +195,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 +483,18 @@ 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 = 0, 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;
-
-	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
@@ -788,9 +794,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;
@@ -893,7 +898,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 +940,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 +952,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 +965,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 e12efddf..19ef74b0 100644
--- a/src/color.c
+++ b/src/color.c
@@ -1,9 +1,9 @@
-/* $Id: color.c 4540 2011-03-05 05:01:13Z astyanax $ */
+/* $Id: color.c 4894 2014-05-16 10:34:05Z 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)  *
@@ -31,17 +31,53 @@
 #include <magic.h>
 #endif
 
-#ifdef ENABLE_COLOR
+#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;
@@ -56,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++;
 	    }
 	}
     }
@@ -71,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;
@@ -107,7 +137,7 @@ void color_init(void)
     }
 }
 
-/* Cleanup a regex we previously compiled */
+/* Clean up a regex we previously compiled. */
 void nfreeregex(regex_t **r)
 {
     assert(r != NULL);
@@ -123,17 +153,14 @@ void color_update(void)
     syntaxtype *tmpsyntax;
     syntaxtype *defsyntax = NULL;
     colortype *tmpcolor, *defcolor = NULL;
-    exttype *e;
+    regexlisttype *e;
 
-/* libmagic structures */
-/* magicstring will be NULL if we fail to get magic result */
+/* Var magicstring will stay NULL if we fail to get a magic result. */
 #ifdef HAVE_LIBMAGIC
     const char *magicstring = NULL;
-    const char *magicerr = NULL;
-    magic_t m;
+    magic_t cookie = NULL;
     struct stat fileinfo;
-#endif /* HAVE_LIBMAGIC */
-
+#endif
 
     assert(openfile != NULL);
 
@@ -159,32 +186,9 @@ void color_update(void)
 	}
     }
 
-#ifdef HAVE_LIBMAGIC
-
-    if (strcmp(openfile->filename,"") && stat(openfile->filename, &fileinfo) == 0) {
-	m = magic_open(MAGIC_SYMLINK |
-#ifdef DEBUG
-                       MAGIC_DEBUG | MAGIC_CHECK |
-#endif /* DEBUG */
-                       MAGIC_ERROR);
-	if (m == NULL || magic_load(m, NULL) < 0)
-	    fprintf(stderr, "something went wrong: %s [%s]\n", strerror(errno), openfile->filename);
-	else {
-	    magicstring = magic_file(m,openfile->filename);
-	    if (magicstring == NULL) {
-		magicerr = magic_error(m);
-		fprintf(stderr, "something went wrong: %s [%s]\n", magicerr, openfile->filename);
-            }
-#ifdef DEBUG
-	    fprintf(stderr, "magic string returned: %s\n", magicstring);
-#endif /* DEBUG */
-	}
-    }
-#endif /* HAVE_LIBMAGIC */
-
     /* 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) {
@@ -209,8 +213,7 @@ void color_update(void)
 		    regcomp(e->ext, fixbounds(e->ext_regex), REG_EXTENDED);
 		}
 
-		/* Set colorstrings if we matched the extension
-		 * regex. */
+		/* 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;
@@ -224,27 +227,27 @@ void color_update(void)
 	    }
 	}
 
-	    /* Check magic if we don't yet have an answer */
-#ifdef HAVE_LIBMAGIC
+	/* Check the headerline if the extension didn't match anything. */
 	if (openfile->colorstrings == NULL) {
-
 #ifdef DEBUG
-	    fprintf(stderr, "No match using extension, trying libmagic...\n");
-#endif /* DEBUG */
-
+	    fprintf(stderr, "No result from file extension, trying headerline...\n");
+#endif
 	    for (tmpsyntax = syntaxes; tmpsyntax != NULL;
 		tmpsyntax = tmpsyntax->next) {
-		for (e = tmpsyntax->magics; e != NULL; e = e->next) {
+
+		for (e = tmpsyntax->headers; e != NULL; e = e->next) {
 		    bool not_compiled = (e->ext == NULL);
+
 		    if (not_compiled) {
 			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 /* DEBUG */
-
-		    if (magicstring && regexec(e->ext, magicstring, 0, NULL, 0) == 0) {
+		    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;
@@ -255,52 +258,69 @@ void color_update(void)
 		}
 	    }
 	}
-#endif /* HAVE_LIBMAGIC */
 
-	/* If we haven't matched anything yet, try the headers */
+#ifdef HAVE_LIBMAGIC
+	/* Check magic if we don't have an answer yet. */
 	if (openfile->colorstrings == NULL) {
 #ifdef DEBUG
-	    fprintf(stderr, "No match for file extensions, looking at headers...\n");
+	    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->headers; e != NULL; e = e->next) {
+		for (e = tmpsyntax->magics; 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, "Matching regex \"%s\" against \"%s\"\n", e->ext_regex, magicstring);
 #endif
-		    if (regexec(e->ext, openfile->fileage->data, 0, NULL, 0) == 0) {
+		    /* 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;
-		    }
-
-		    if (openfile->colorstrings != NULL)
 			break;
+		    }
 
-		    /* Decompile e->ext_regex's specified regex if we aren't
-		     * going to use it. */
 		    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;
@@ -326,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;
@@ -372,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);
@@ -384,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;
@@ -398,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;
 
@@ -409,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) {
@@ -424,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 8c21c8eb..45773c9e 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 4911 2014-05-26 07:53:20Z bens $ */
 /**************************************************************************
  *   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)  *
@@ -44,6 +44,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);
@@ -125,7 +130,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,7 +167,6 @@ 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
 	 * file into the cutbuffer. */
@@ -190,10 +194,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 +209,19 @@ 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_end ? CUT_EOF : CUT);
+
+    /* Leave the text in the cutbuffer, and mark the file as
+     * modified. */
+    if (!copy_text) {
 	set_modified();
+    }
+#endif /* !NANO_TINY */
 
     /* Update the screen. */
     edit_refresh_needed = TRUE;
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     reset_multis(openfile->current, FALSE);
 #endif
 
@@ -247,9 +254,7 @@ void do_copy_text(void)
 /* Cut from the current cursor position to the end of the file. */
 void do_cut_till_end(void)
 {
-#ifndef NANO_TINY
-    add_undo(CUT);
-#endif
+    add_undo(CUT_EOF);
     do_cut_text(FALSE, TRUE, FALSE);
 }
 #endif /* !NANO_TINY */
@@ -264,12 +269,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 +290,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 e9fd27f6..78c4f0c6 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,9 +1,9 @@
-/* $Id: files.c 4558 2013-01-03 04:50:49Z astyanax $ */
+/* $Id: files.c 4878 2014-05-13 21:11:59Z 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)  *
@@ -47,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. */
@@ -80,7 +82,7 @@ void initialize_buffer(void)
     openfile->current_undo = NULL;
     openfile->lock_filename = NULL;
 #endif
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     openfile->colorstrings = NULL;
 #endif
 }
@@ -98,26 +100,25 @@ 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
-/* Actyally write the lock file.  This function will
-   ALWAYS annihilate any previous version of the file.
-   We'll borrow INSECURE_BACKUP here to decide about lock file
-   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
- */
+/* 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;
@@ -130,8 +131,8 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
     ssize_t lockdatalen = 1024;
     ssize_t wroteamt;
 
-    /* Run things which might fail first before we try and blow away
-       the old state */
+    /* 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)"));
@@ -140,7 +141,7 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
     mypid = getpid();
 
     if (gethostname(myhostname, 31) < 0) {
-       statusbar(_("Couldn't determine hosttname for lock file: %s"), strerror(errno));
+       statusbar(_("Couldn't determine hostname for lock file: %s"), strerror(errno));
        return -1;
     }
 
@@ -155,14 +156,14 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
     fd = open(lockfilename, cflags,
 	    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 
-    /* Maybe we just don't have write access, don't stop us from
-       opening the file at all, just don't set the lock_filename
-       and return success */
+    /* Maybe we just don't have write access.  Don't stop us from
+     * opening the file at all, just don't set the lock_filename and
+     * return success. */
     if (fd < 0 && errno == EACCES)
         return 1;
 
-    /* Now we've got a safe file stream.  If the previous open()
-    call failed, this will return NULL. */
+    /* 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) {
@@ -171,25 +172,24 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
         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
-     */
+    /* 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. */
     null_at(&lockdata, lockdatalen);
     lockdata[0] = 0x62;
     lockdata[1] = 0x30;
@@ -211,7 +211,7 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
 
 #ifdef DEBUG
     fprintf(stderr, "In write_lockfile(), write successful (wrote %d bytes)\n", wroteamt);
-#endif /* DEBUG */
+#endif
 
     if (fclose(filestream) == EOF) {
         statusbar(_("Error writing lock file %s: %s"),
@@ -224,10 +224,8 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
     return 1;
 }
 
-
-/* Less exciting, delete the lock file.
-   Return -1 if successful and complain on the statusbar, 1 otherwite
- */
+/* 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) {
@@ -238,12 +236,10 @@ int delete_lockfile(const char *lockfilename)
     return 1;
 }
 
-
-/* Deal with lockfiles.  Return -1 on refusing to override
-   the lock file, and 1 on successfully created the lockfile, 0 means
-   we were not successful on creating the lockfile but we should
-   continue to load the file and complain to the user.
- */
+/* 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));
@@ -255,12 +251,11 @@ int do_lockfile(const char *filename)
     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 /* DEBUG */
+#endif
     if (stat(lockfilename, &fileinfo) != -1) {
         ssize_t readtot = 0;
         ssize_t readamt = 0;
@@ -268,7 +263,7 @@ int do_lockfile(const char *filename)
         char *promptstr = (char *) nmalloc(128);
         int ans;
         if ((lockfd = open(lockfilename, O_RDONLY)) < 0) {
-            statusbar(_("Error opening lockfile %s: %s"),
+            statusbar(_("Error opening lock file %s: %s"),
                       lockfilename, strerror(errno));
             return -1;
         }
@@ -278,7 +273,7 @@ int do_lockfile(const char *filename)
         } while (readtot < 8192 && readamt > 0);
 
         if (readtot < 48) {
-            statusbar(_("Error reading lockfile %s: Not enough data read"),
+            statusbar(_("Error reading lock file %s: Not enough data read"),
                       lockfilename);
             return -1;
         }
@@ -291,7 +286,7 @@ int do_lockfile(const char *filename)
                 lockprog);
         fprintf(stderr, "user which created this lock file should be %s\n",
                 lockuser);
-#endif /* DEBUG */
+#endif
         sprintf(promptstr, "File being edited (by %s, PID %d, user %s), continue?",
                               lockprog, lockpid, lockuser);
         ans = do_yesno_prompt(FALSE, promptstr);
@@ -303,15 +298,14 @@ int do_lockfile(const char *filename)
 
     return write_lockfile(lockfilename, filename, FALSE);
 }
-#endif /* NANO_TINY */
-
+#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 new_buffer = (openfile == NULL
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	 || ISSET(MULTIBUFFER)
 #endif
 	);
@@ -336,10 +330,10 @@ void open_buffer(const char *filename, bool undoable)
     if (new_buffer)
 	make_new_buffer();
 
-    /* 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 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, &f) : -2;
 
     /* If we have a file, and we're loading into a new buffer, update
      * the filename. */
@@ -367,7 +361,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)
@@ -414,7 +408,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();
@@ -424,7 +418,7 @@ 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)
@@ -457,6 +451,7 @@ void switch_to_prevnext_buffer(bool next_buf)
 #ifdef DEBUG
     dump_filestruct(openfile->current);
 #endif
+    display_main_list();
 }
 
 /* Switch to the previous entry in the openfile filebuffer. */
@@ -482,9 +477,9 @@ bool close_buffer(void)
     if (openfile == openfile->next)
 	return FALSE;
 
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
         update_poshistory(openfile->filename, openfile->current->lineno, xplustabs()+1);
-#endif /* NANO_TINY */
+#endif
 
     /* Switch to the next file buffer. */
     switch_to_next_buffer_void();
@@ -492,18 +487,19 @@ bool close_buffer(void)
     /* 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 */
-
-/* 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.
- */
+#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. */
 int is_file_writable(const char *filename)
 {
     struct stat fileinfo, fileinfo2;
@@ -512,7 +508,6 @@ int is_file_writable(const char *filename)
     char *full_filename;
     bool ans = TRUE;
 
-
     if (ISSET(VIEW_MODE))
 	return TRUE;
 
@@ -522,7 +517,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);
@@ -563,7 +558,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
 
@@ -596,9 +591,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;
@@ -895,7 +890,7 @@ 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 */
+       permissions, just try the relative one. */
     if (full_filename == NULL
 	|| (stat(full_filename, &fileinfo) == -1 && stat(filename, &fileinfo2) != -1))
 	full_filename = mallocstrcpy(NULL, filename);
@@ -908,8 +903,8 @@ int open_file(const char *filename, bool newfie, FILE **f)
 #endif
 
     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"));
 	    free(full_filename);
@@ -936,7 +931,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");
@@ -1026,7 +1021,7 @@ 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
@@ -1034,7 +1029,7 @@ void do_insertfile(
 	} else {
 #endif
 	    msg =
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 		ISSET(MULTIBUFFER) ?
 		_("File to insert into new buffer [from %s] ") :
 #endif
@@ -1067,7 +1062,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
 		)) {
@@ -1078,11 +1073,10 @@ void do_insertfile(
 
 	    ans = mallocstrcpy(ans, answer);
 
-	    s = get_shortcut(currmenu, &i, &meta_key, &func_key);
+	    s = get_shortcut(currmenu, &i, &meta_key);
 
 #ifndef NANO_TINY
-#ifdef ENABLE_MULTIBUFFER
-
+#ifndef DISABLE_MULTIBUFFER
 	    if (s && s->scfunc == new_buffer_void) {
 		/* Don't allow toggling if we're in view mode. */
 		if (!ISSET(VIEW_MODE))
@@ -1117,7 +1111,7 @@ 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
 		)
@@ -1138,7 +1132,7 @@ void do_insertfile(
 		}
 #endif
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	    if (!ISSET(MULTIBUFFER)) {
 #endif
 		/* If we're not inserting into a new buffer, partition
@@ -1151,7 +1145,7 @@ void do_insertfile(
 			openfile->current_x);
 		edittop_inside =
 			(openfile->edittop == openfile->fileage);
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	    }
 #endif
 
@@ -1162,7 +1156,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);
@@ -1171,7 +1165,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. */
@@ -1194,12 +1188,19 @@ void do_insertfile(
 	    }
 #endif
 
-#ifdef ENABLE_MULTIBUFFER
-	    if (ISSET(MULTIBUFFER))
+#if !defined(DISABLE_MULTIBUFFER) && !defined(DISABLE_NANORC)
+	    if (ISSET(MULTIBUFFER)) {
 		/* Update the screen to account for the current
 		 * buffer. */
 		display_buffer();
-	    else
+
+#ifndef NANO_TINY
+		ssize_t savedposline, savedposcol;
+		if (!execute && ISSET(POS_HISTORY)
+			&& check_poshistory(answer, &savedposline, &savedposcol))
+		    do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE, FALSE);
+#endif
+	    } else
 #endif
 	    {
 		filestruct *top_save = openfile->fileage;
@@ -1270,8 +1271,6 @@ void do_insertfile(
 	    break;
 	}
     }
-    shortcut_init(FALSE);
-
     free(ans);
 }
 
@@ -1280,13 +1279,12 @@ void do_insertfile(
  * allow inserting a file into a new buffer. */
 void do_insertfile_void(void)
 {
-
     if (ISSET(RESTRICTED)) {
         nano_disabled_msg();
 	return;
     }
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     if (ISSET(VIEW_MODE) && !ISSET(MULTIBUFFER))
 	statusbar(_("Key invalid in non-multibuffer mode"));
     else
@@ -1314,7 +1312,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
@@ -1580,15 +1578,14 @@ 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.
- */
-
+/* 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 laast file we were paased so we don't keep asking this?
-                                     though maybe we should.... */
+    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) "));
@@ -1618,7 +1615,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
@@ -1732,17 +1729,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). */
+    /* 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
@@ -1813,10 +1811,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);
@@ -1828,8 +1827,8 @@ 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;
@@ -1847,7 +1846,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	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) {
@@ -1906,10 +1905,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 		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;
 	}
 
@@ -2114,7 +2113,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. */
@@ -2134,7 +2133,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",
@@ -2213,7 +2213,7 @@ bool do_writeout(bool exiting)
     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;
@@ -2291,7 +2291,7 @@ bool do_writeout(bool exiting)
 	    break;
 	} else {
 	    ans = mallocstrcpy(ans, answer);
-            s = get_shortcut(currmenu, &i, &meta_key, &func_key);
+	    s = get_shortcut(currmenu, &i, &meta_key);
 
 #ifndef DISABLE_BROWSER
 	    if (s && s->scfunc == to_files_void) {
@@ -2333,7 +2333,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
@@ -2406,8 +2406,9 @@ 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 */
+		/* 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,
@@ -2521,7 +2522,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);
 }
 
@@ -2896,7 +2897,7 @@ const char *tail(const char *foo)
     return tmp;
 }
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 /* Return the constructed dorfile path, or NULL if we can't find the home
  * directory.  The string is dynamically allocated, and should be
  * freed. */
@@ -2913,7 +2914,6 @@ char *construct_filename(const char *str)
     }
 
     return newstr;
-
 }
 
 char *histfilename(void)
@@ -2921,9 +2921,8 @@ char *histfilename(void)
     return construct_filename("/.nano/search_history");
 }
 
-/* Construct the legacy history filename
- * (Deprecate in 2.5, delete later
- */
+/* Construct the legacy history filename.
+ * (Deprecate in 2.5, delete later.) */
 char *legacyhistfilename(void)
 {
     return construct_filename("/.nano_history");
@@ -2934,8 +2933,6 @@ char *poshistfilename(void)
     return construct_filename("/.nano/filepos_history");
 }
 
-
-
 void history_error(const char *msg, ...)
 {
    va_list ap;
@@ -2947,13 +2944,11 @@ void history_error(const char *msg, ...)
     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.
- */
+/* 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;
@@ -2981,7 +2976,7 @@ void load_history(void)
 
 
     if (stat(legacyhist, &hstat) != -1 && stat(nanohist, &hstat) == -1) {
-	if (rename(legacyhist, nanohist)  == -1)
+	if (rename(legacyhist, nanohist) == -1)
 	    history_error(N_("Detected a legacy nano history file (%s) which I tried to move\nto the preferred location (%s) but encountered an error: %s"),
 		legacyhist, nanohist, strerror(errno));
 	else
@@ -2989,8 +2984,6 @@ void load_history(void)
 		legacyhist, nanohist);
     }
 
-
-
     /* Assume do_rcfile() has reported a missing home directory. */
     if (nanohist != NULL) {
 	FILE *hist = fopen(nanohist, "rb");
@@ -3090,8 +3083,7 @@ void save_history(void)
     }
 }
 
-
-/* Analogs for the POS history */
+/* Analogs for the POS history. */
 void save_poshistory(void)
 {
     char *poshist;
@@ -3126,9 +3118,8 @@ void save_poshistory(void)
     }
 }
 
-/* Update the POS history, given a filename line and column.
- * If no entry is found, add a new entry on the end
- */
+/* Update the POS history, given a filename line and column.  If no
+ * entry is found, add a new entry on the end. */
 void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
 {
    poshiststruct *posptr, *posprev = NULL;
@@ -3147,7 +3138,6 @@ void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
     }
 
     /* Didn't find it, make a new node yo! */
-
     posptr = (poshiststruct *) nmalloc(sizeof(poshiststruct));
     posptr->filename = mallocstrcpy(NULL, fullpath);
     posptr->lineno = lineno;
@@ -3163,17 +3153,16 @@ void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
 }
 
 
-/* Check the POS history to see if file matches
- * an existing entry.  If so return 1 and set line and column
- * to the right values  Otherwise return 0
- */
+/* Check the POS history to see if file matches an existing entry.  If
+ * so, return 1 and set line and column to the right 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;
+	return 0;
 
     for (posptr = poshistory; posptr != NULL; posptr = posptr->next) {
 	if (!strcmp(posptr->filename, fullpath)) {
@@ -3187,7 +3176,6 @@ int check_poshistory(const char *file, ssize_t *line, ssize_t *column)
     return 0;
 }
 
-
 /* Load histories from ~/.nano_history. */
 void load_poshistory(void)
 {
@@ -3200,7 +3188,7 @@ void load_poshistory(void)
 	if (hist == NULL) {
 	    if (errno != ENOENT) {
 		/* Don't save history when we quit. */
-		UNSET(HISTORYLOG);
+		UNSET(POS_HISTORY);
 		history_error(N_("Error reading %s: %s"), nanohist,
 			strerror(errno));
 	    }
@@ -3210,7 +3198,7 @@ void load_poshistory(void)
 	    ssize_t read, lineno, xno;
 	    poshiststruct *posptr;
 
-	    /* See if we can find the file we're currently editing */
+	    /* See if we can find the file we're currently editing. */
 	    while ((read = getline(&line, &buf_len, hist)) >= 0) {
 		if (read > 0 && line[read - 1] == '\n') {
 		    read--;
@@ -3248,4 +3236,4 @@ void load_poshistory(void)
     }
 }
 
-#endif /* !NANO_TINY && ENABLE_NANORC */
+#endif /* !NANO_TINY && !DISABLE_NANORC */
diff --git a/src/global.c b/src/global.c
index 00514671..e50cf5df 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1,9 +1,9 @@
-/* $Id: global.c 4556 2013-01-03 04:36:39Z astyanax $ */
+/* $Id: global.c 4928 2014-05-28 21:02:39Z 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)  *
@@ -67,7 +67,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 +88,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 +118,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. */
@@ -132,9 +132,9 @@ 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 */
+        /* Prefix of how to store the vim-style lock file. */
 const char *locking_suffix = ".swp";
-        /* Suffix of the vim-style lock file */
+        /* Suffix of the vim-style lock file. */
 #endif
 #ifndef DISABLE_OPERATINGDIR
 char *operating_dir = NULL;
@@ -149,7 +149,7 @@ 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;
@@ -157,19 +157,25 @@ char *syntaxstr = NULL;
 
 #endif
 
-bool edit_refresh_needed = 0;
+bool edit_refresh_needed = FALSE;
 	/* Did a command mangle enough of the buffer refresh that we
-	   should repaint the screen */
+	 * 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 */
+	/* 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 NANO_TINY
 filestruct *search_history = NULL;
@@ -185,7 +191,7 @@ filestruct *replaceage = NULL;
 filestruct *replacebot = NULL;
 	/* The bottom of the replace string history list. */
 poshiststruct *poshistory;
-	/* The cursor position history list  */
+	/* The cursor position history list. */
 #endif
 
 /* Regular expressions. */
@@ -197,13 +203,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;
@@ -220,19 +232,27 @@ size_t length_of_list(int menu)
     return i;
 }
 
-/* Just throw this here */
+/* 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)
 {
 }
@@ -251,12 +271,6 @@ void backup_file_void(void)
 void new_buffer_void(void)
 {
 }
-void backwards_void(void)
-{
-}
-void goto_dir_void(void)
-{
-}
 void no_replace_void(void)
 {
 }
@@ -264,35 +278,32 @@ void ext_cmd_void(void)
 {
 }
 
-/* Set type of function based on the string */
+/* Set type of function based on the string. */
 function_type strtokeytype(const char *str)
 {
-    if (str[0] ==  'M' || str[0] == 'm')
-        return META;
-    else if (str[0] == '^')
+    if (str[0] == '^')
         return CONTROL;
-    else if (str[0] ==  'F' || str[0] == 'F')
+    else if (str[0] == 'M')
+        return META;
+    else if (str[0] == 'F')
         return FKEY;
     else
 	return RAWINPUT;
 }
 
-/* Add a string to the new function list strict.
-   Does not allow updates, yet anyway */
+/* Add a string to the function list struct.
+ * Does not allow updates, not yet anyway. */
 void add_to_funcs(void (*func)(void), int menus, const char *desc, const char *help,
     bool blank_after, bool viewok)
 {
-    subnfunc *f;
+    subnfunc *f = 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;
@@ -304,42 +315,30 @@ void add_to_funcs(void (*func)(void), int menus, const char *desc, const char *h
 #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, void (*func)(void)) {
+/* 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;
-    const sc *metasc = NULL;
 
-    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 */
+    for (s = sclist; s != NULL; s = s->next)
+	if ((s->menu & menu) && s->scfunc == func)
 	    return s;
-	}
-    }
-
-    /* If we're here we may have found only meta sequences, if so use one */
-    if (metasc)
-	return metasc;
 
 #ifdef DEBUG
-    fprintf(stderr, "Whoops, returning null given func %ld in menu %d\n", (long) func, menu);
+    fprintf(stderr, "Whoops, returning null given func %ld in menu %x\n", (long) func, menu);
 #endif
     /* Otherwise... */
     return NULL;
 }
 
 
-/* Add a string to the new shortcut list implementation
-   Allows updates to existing entries in the list */
+/* Add a string to the shortcut list.
+ * Allows updates to existing entries in the list. */
 void add_to_sclist(int menu, const char *scstring, void (*func)(void), int toggle, int execute)
 {
     sc *s;
@@ -372,13 +371,23 @@ void add_to_sclist(int menu, const char *scstring, void (*func)(void), int toggl
     assign_keyinfo(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, "Setting sequence to %d for shortcut \"%s\" in menu %x\n", s->seq, scstring, (int) s->menu);
 #endif
 }
 
+/* Assign one function's shortcuts to another function. */
+void replace_scs_for(void (*oldfunc)(void), void (*newfunc)(void))
+{
+    sc *s;
+
+    for (s = sclist; s != NULL; s = s->next)
+	if (s->scfunc == oldfunc) {
+	    s->scfunc = newfunc;
+	}
+}
+
 /* Return the given menu's first shortcut sequence, or the default value
-  (2nd arg).  Assumes currmenu for the menu to check*/
+ * (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);
@@ -387,11 +396,10 @@ int sc_seq_or (void (*func)(void), int defaultval)
         return s->seq;
     /* else */
     return defaultval;
-
 }
 
-/* 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) {
@@ -406,160 +414,99 @@ void assign_keyinfo(sc *s)
     } 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 == RAWINPUT && (!strcasecmp(s->keystr, "kup")))
-	s->seq = KEY_UP;
-    else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kdown")))
-	s->seq = KEY_DOWN;
-    else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kleft")))
-	s->seq = KEY_LEFT;
-    else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kright")))
-	s->seq = KEY_RIGHT;
-    else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kinsert")))
-	s->seq = KEY_IC;
-    else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kdel")))
-	s->seq = KEY_DC;
-    else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kbsp")))
-	s->seq = KEY_BACKSPACE;
-    else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kenter")))
-	s->seq = KEY_ENTER;
-    else if (s->type == RAWINPUT && (!strcasecmp(s->keystr, "kpup")))
-	s->seq = KEY_PPAGE;
-    else if (s->type == RAWINPUT && (!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 == RAWINPUT && (!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 == RAWINPUT && (!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");
+    const char *fulljustify_tag = N_("FullJstify");
 #endif
-    const char *refresh_msg = N_("Refresh");
-#ifndef NANO_TINY
-    const char *insert_file_msg =  N_("Insert File");
-#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 =
@@ -568,22 +515,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");
@@ -607,10 +557,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 =
@@ -618,20 +566,14 @@ 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
@@ -671,28 +613,27 @@ 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");
+#endif
 #endif /* !DISABLE_HELP */
 
 #ifndef DISABLE_HELP
@@ -703,236 +644,231 @@ 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( do_cancel,
-	(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), FALSE, VIEW);
+
+    add_to_funcs(do_cancel, ((MMOST & ~MMAIN & ~MBROWSER) | MYESNO),
+	N_("Cancel"), IFSCHELP(nano_cancel_msg), FALSE, 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);
+	exit_tag, IFSCHELP(nano_exit_msg), FALSE, 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), FALSE, 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), FALSE, 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), TRUE,
+#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_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_search, MMAIN,
+	whereis_tag, IFSCHELP(nano_whereis_msg), FALSE, VIEW);
 
+    add_to_funcs(do_replace, MMAIN,
+	replace_tag, IFSCHELP(nano_replace_msg), FALSE, NOVIEW);
 
-    /* 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);
+#ifndef DISABLE_BROWSER
+    add_to_funcs(do_search, MBROWSER,
+	whereis_tag, IFSCHELP(nano_browser_whereis_msg), FALSE, VIEW);
 
-    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), TRUE, 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), FALSE, 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), TRUE, 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), FALSE, 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), FALSE, 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), TRUE, NOVIEW);
 #endif
 
+#ifndef NANO_TINY
+    add_to_funcs(case_sens_void, MWHEREIS|MREPLACE,
+	N_("Case Sens"), IFSCHELP(nano_case_msg), FALSE, 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), FALSE, VIEW);
+#endif
 
 #ifndef NANO_TINY
-	FALSE,
-#else
-	TRUE,
+    add_to_funcs(backwards_void, MWHEREIS|MREPLACE,
+	N_("Backwards"), IFSCHELP(nano_reverse_msg), FALSE, VIEW);
 #endif
-	NOVIEW);
 
-#ifndef NANO_TINY
+    add_to_funcs(do_replace, MWHEREIS,
+	replace_tag, IFSCHELP(nano_replace_msg), FALSE, VIEW);
 
-    add_to_funcs(do_mark, MMAIN, N_("Mark Text"),
-	IFSCHELP(nano_mark_msg), FALSE, VIEW);
+    add_to_funcs(no_replace_void, MREPLACE,
+	N_("No Replace"), IFSCHELP(nano_whereis_msg), FALSE, 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), FALSE, 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), FALSE, 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), TRUE, 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), FALSE, VIEW);
+    add_to_funcs(do_page_down, MMAIN|MHELP|MBROWSER,
+	N_("Next Page"), IFSCHELP(nano_nextpage_msg), FALSE, 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), FALSE, VIEW);
+    add_to_funcs(do_last_line, MMAIN|MHELP|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE,
+	N_("Last Line"), IFSCHELP(nano_lastline_msg), TRUE, 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), FALSE, VIEW);
 
-#endif
+    add_to_funcs(do_find_bracket, MMAIN,
+	N_("To Bracket"), IFSCHELP(nano_bracket_msg), FALSE, 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), FALSE, 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), TRUE, NOVIEW);
 
-    add_to_funcs(do_right, MALL, "", "", FALSE, VIEW);
+    add_to_funcs(do_indent_void, MMAIN,
+	N_("Indent Text"), IFSCHELP(nano_indent_msg), FALSE, NOVIEW);
+    add_to_funcs(do_unindent, MMAIN,
+	N_("Unindent Text"), IFSCHELP(nano_unindent_msg), TRUE, NOVIEW);
+
+    if (ISSET(UNDOABLE)) {
+	add_to_funcs(do_undo, MMAIN,
+	    N_("Undo"), IFSCHELP(nano_undo_msg), FALSE, NOVIEW);
+	add_to_funcs(do_redo, MMAIN,
+	    N_("Redo"), IFSCHELP(nano_redo_msg), TRUE, NOVIEW);
+    }
+#endif /* !NANO_TINY */
 
-    add_to_funcs(do_left, MMAIN, N_("Back"), IFSCHELP(nano_back_msg),
-	FALSE, VIEW);
+    add_to_funcs(do_left, MMAIN,
+	N_("Back"), IFSCHELP(nano_back_msg), FALSE, VIEW);
+    add_to_funcs(do_right, MMAIN,
+	N_("Forward"), IFSCHELP(nano_forward_msg), FALSE, 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), FALSE, VIEW);
+    add_to_funcs(do_right, MBROWSER,
+	N_("Forward"), IFSCHELP(nano_forwardfile_msg), FALSE, 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), FALSE, VIEW);
+    add_to_funcs(do_next_word_void, MMAIN,
+	N_("Next Word"), IFSCHELP(nano_nextword_msg), FALSE, 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_end, MMAIN,
+	N_("End"), IFSCHELP(nano_end_msg), FALSE, VIEW);
 
-    add_to_funcs(do_home, MMAIN, N_("Home"), IFSCHELP(nano_home_msg),
-	FALSE, 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), FALSE, VIEW);
+    add_to_funcs(do_down_void, MMAIN|MBROWSER,
+	next_line_tag, IFSCHELP(nano_nextline_msg), TRUE, 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), FALSE, VIEW);
+    add_to_funcs(do_para_end_void, MMAIN|MWHEREIS,
+	N_("End of Par"), IFSCHELP(nano_paraend_msg), FALSE, 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_void, MMAIN, N_("Enter"), IFSCHELP(nano_enter_msg),
-	FALSE, NOVIEW);
-    add_to_funcs(do_enter_void, 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), FALSE, VIEW);
+    add_to_funcs(do_scroll_down, MMAIN,
+	N_("Scroll Down"), IFSCHELP(nano_scrolldown_msg), TRUE, VIEW);
+#endif
+
+#ifndef DISABLE_MULTIBUFFER
+    add_to_funcs(switch_to_prev_buffer_void, MMAIN,
+	N_("Prev 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
+
+#if defined(NANO_TINY) && !defined(DISABLE_COLOR)
+    add_to_funcs(do_gotolinecolumn_void, MMAIN|MWHEREIS,
+	gotoline_tag, IFSCHELP(nano_gotoline_msg), TRUE, VIEW);
 #endif
-	NOVIEW);
 
-    add_to_funcs(do_backspace, MALL, "", "",
+    add_to_funcs(do_verbatim_input, MMAIN,
+	N_("Verbatim"), IFSCHELP(nano_verbatim_msg), FALSE, NOVIEW);
+
+    add_to_funcs(do_tab, MMAIN,
+	N_("Tab"), IFSCHELP(nano_tab_msg), FALSE, NOVIEW);
+    add_to_funcs(do_enter_void, MMAIN,
+	N_("Enter"), IFSCHELP(nano_enter_msg), FALSE, NOVIEW);
+    add_to_funcs(do_delete, MMAIN,
+	N_("Delete"), IFSCHELP(nano_delete_msg), FALSE, NOVIEW);
+    add_to_funcs(do_backspace, MMAIN,
+	N_("Backspace"), IFSCHELP(nano_backspace_msg),
 #ifndef NANO_TINY
 	FALSE,
 #else
@@ -941,67 +877,38 @@ void shortcut_init(bool unjustify)
 	NOVIEW);
 
 #ifndef NANO_TINY
-    add_to_funcs(do_cut_till_end, MMAIN, N_("CutTillEnd"),
-	IFSCHELP(nano_cut_till_end_msg), TRUE, NOVIEW);
+    add_to_funcs(do_cut_till_end, MMAIN,
+	N_("CutTillEnd"), IFSCHELP(nano_cut_till_end_msg), TRUE, NOVIEW);
 #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);
+    add_to_funcs(do_full_justify, MMAIN,
+	fulljustify_tag, IFSCHELP(nano_fulljustify_msg), FALSE, NOVIEW);
 #endif
 
 #ifndef NANO_TINY
-    add_to_funcs(do_wordlinechar_count, MMAIN, N_("Word Count"),
-	IFSCHELP(nano_wordcount_msg), FALSE, VIEW);
+    add_to_funcs(do_wordlinechar_count, MMAIN,
+	N_("Word Count"), IFSCHELP(nano_wordcount_msg), FALSE, VIEW);
 #endif
 
-    add_to_funcs(total_refresh, (MMAIN|MHELP), refresh_msg,
-	IFSCHELP(nano_refresh_msg), FALSE, VIEW);
+    add_to_funcs(total_refresh, MMAIN,
+	refresh_tag, IFSCHELP(nano_refresh_msg), FALSE, VIEW);
 
-    add_to_funcs(do_suspend_void, MMAIN, suspend_msg,
-	IFSCHELP(nano_suspend_msg), TRUE, VIEW);
-
-#ifndef NANO_TINY
-    add_to_funcs(case_sens_void,
-	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	case_sens_msg, IFSCHELP(nano_case_msg), FALSE, VIEW);
-
-    add_to_funcs(backwards_void,
-	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	backwards_msg, IFSCHELP(nano_reverse_msg), FALSE, VIEW);
-#endif
-
-#ifdef HAVE_REGEX_H
-    add_to_funcs(regexp_void,
-	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	regexp_msg, IFSCHELP(nano_regexp_msg), FALSE, VIEW);
-#endif
+    add_to_funcs(do_suspend_void, MMAIN,
+	N_("Suspend"), IFSCHELP(nano_suspend_msg), TRUE, VIEW);
 
 #ifndef NANO_TINY
     add_to_funcs(get_history_older_void,
-	(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE),
-	prev_history_msg, IFSCHELP(nano_prev_history_msg), FALSE, VIEW);
+	(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE),
+	N_("PrevHstory"), IFSCHELP(nano_prev_history_msg), FALSE, VIEW);
 
     add_to_funcs(get_history_newer_void,
-	(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE),
-	next_history_msg, IFSCHELP(nano_next_history_msg), FALSE, VIEW);
+	(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE),
+	N_("NextHstory"), IFSCHELP(nano_next_history_msg), FALSE, VIEW);
 #endif
 
-    add_to_funcs(no_replace_void, MREPLACE,
-	no_replace_msg, IFSCHELP(nano_whereis_msg), FALSE, VIEW);
-
     add_to_funcs(gototext_void, MGOTOLINE,
-	gototext_msg, IFSCHELP(nano_whereis_msg), TRUE, VIEW);
-
-#ifndef DISABLE_BROWSER
-    if (!ISSET(RESTRICTED))
-	add_to_funcs(to_files_void,
-	    (MGOTOLINE|MINSERTFILE),
-	    to_files_msg, IFSCHELP(nano_tofiles_msg), FALSE, VIEW);
-#endif
+	N_("Go To Text"), IFSCHELP(nano_whereis_msg), TRUE, VIEW);
 
 #ifndef NANO_TINY
     /* If we're using restricted mode, the DOS format, Mac format,
@@ -1010,274 +917,281 @@ 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))
+    if (!ISSET(RESTRICTED)) {
         add_to_funcs(dos_format_void, MWRITEFILE,
-            dos_format_msg, IFSCHELP(nano_dos_msg), FALSE, NOVIEW);
+            N_("DOS Format"), IFSCHELP(nano_dos_msg), FALSE, NOVIEW);
 
-    if (!ISSET(RESTRICTED))
         add_to_funcs(mac_format_void, MWRITEFILE,
-            mac_format_msg, IFSCHELP(nano_mac_msg), FALSE, NOVIEW);
+            N_("Mac Format"), IFSCHELP(nano_mac_msg), FALSE, NOVIEW);
 
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( append_void, MWRITEFILE,
-            append_msg, IFSCHELP(nano_append_msg), FALSE, NOVIEW);
+        add_to_funcs(append_void, MWRITEFILE,
+            N_("Append"), IFSCHELP(nano_append_msg), FALSE, NOVIEW);
+        add_to_funcs(prepend_void, MWRITEFILE,
+            N_("Prepend"), IFSCHELP(nano_prepend_msg), FALSE, NOVIEW);
 
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( prepend_void, MWRITEFILE,
-            prepend_msg, IFSCHELP(nano_prepend_msg), FALSE, NOVIEW);
+        add_to_funcs(backup_file_void, MWRITEFILE,
+            N_("Backup File"), IFSCHELP(nano_backup_msg), FALSE, NOVIEW);
+    }
 
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( backup_file_void, 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(ext_cmd_void, MINSERTFILE,
+	    N_("Execute Command"), IFSCHELP(nano_execute_msg), FALSE, 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_void, MINSERTFILE,
-	    ext_cmd_msg, IFSCHELP(nano_execute_msg), FALSE, NOVIEW);
+        add_to_funcs(ext_cmd_void, MEXTCMD,
+	    read_file_tag, IFSCHELP(nano_insert_msg), FALSE, 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_void, 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), FALSE, NOVIEW);
 #endif
+    }
+#endif /* !NANO_TINY */
 
-    add_to_funcs( do_insertfile_void, MEXTCMD,
-	insert_file_msg, IFSCHELP(nano_insert_msg), FALSE, VIEW);
+#ifndef DISABLE_BROWSER
+    if (!ISSET(RESTRICTED))
+	add_to_funcs(to_files_void, MWRITEFILE|MINSERTFILE,
+	    N_("To Files"), IFSCHELP(nano_tofiles_msg), FALSE, VIEW);
 
-#ifdef ENABLE_MULTIBUFFER
-     add_to_funcs( new_buffer_void, MEXTCMD,
-	new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW);
-#endif
+    add_to_funcs(do_first_file, (MBROWSER|MWHEREISFILE),
+	N_("First File"), IFSCHELP(nano_firstfile_msg), FALSE, VIEW);
+    add_to_funcs(do_last_file, (MBROWSER|MWHEREISFILE),
+	N_("Last File"), IFSCHELP(nano_lastfile_msg), FALSE, VIEW);
 #endif
 
-#ifndef DISABLE_HELP
-    add_to_funcs(edit_refresh, MHELP,
-	refresh_msg, nano_refresh_msg, FALSE, VIEW);
-
-    add_to_funcs(do_exit, MHELP, exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
-
-
+#if !defined(NANO_TINY) && !defined(DISABLE_BROWSER)
+    add_to_funcs(do_research, MBROWSER,
+	whereis_next_tag, IFSCHELP(nano_whereis_next_msg), FALSE, VIEW);
 #endif
 
-#ifndef DISABLE_BROWSER
-
-    add_to_funcs(do_first_file,
-	(MBROWSER|MWHEREISFILE),
-	first_file_msg, IFSCHELP(nano_firstfile_msg), FALSE, VIEW);
-
-    add_to_funcs(do_last_file,
-	(MBROWSER|MWHEREISFILE),
-	last_file_msg, IFSCHELP(nano_lastfile_msg), FALSE, VIEW);
-
-    add_to_funcs(goto_dir_void, MBROWSER,
-	goto_dir_msg, IFSCHELP(nano_gotodir_msg), FALSE, VIEW);
+#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), FALSE, VIEW);
+    add_to_funcs(do_page_down, MLINTER,
+	N_("Next Lint Msg"), IFSCHELP(nano_nextlint_msg), FALSE, VIEW);
 #endif
 
-    currmenu = MMAIN;
+    /* Start associating key combos with functions in specific menus. */
 
-    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(MMOST, "^G", do_help_void, 0, TRUE);
+    add_to_sclist(MMOST, "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, "Ins", 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, "^\\", do_replace, 0, TRUE);
+    add_to_sclist(MMAIN, "M-R", do_replace, 0, TRUE);
+    add_to_sclist(MMAIN, "F14", do_replace, 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_JUSTIFY
+    add_to_sclist(MMAIN, "^J", do_justify_void, 0, TRUE);
+    add_to_sclist(MMAIN, "F4", do_justify_void, 0, TRUE);
+#endif
 #ifndef DISABLE_SPELLER
     add_to_sclist(MMAIN, "^T", do_spell, 0, TRUE);
     add_to_sclist(MMAIN, "F12", do_spell, 0, TRUE);
+#else
+#ifndef DISABLE_COLOR
+    add_to_sclist(MMAIN, "^T", do_linter, 0, TRUE);
+    add_to_sclist(MMAIN, "F12", do_linter, 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_void, 0, FALSE);
-    add_to_sclist(MWHEREIS, "^T", do_gotolinecolumn_void, 0, FALSE);
+#endif
+    add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0, TRUE);
+    add_to_sclist(MMAIN, "F11", do_cursorpos_void, 0, TRUE);
+    add_to_sclist(MMAIN, "^_", do_gotolinecolumn_void, 0, TRUE);
+    add_to_sclist(MMAIN, "M-G", do_gotolinecolumn_void, 0, TRUE);
+    add_to_sclist(MMAIN, "F13", do_gotolinecolumn_void, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "^Y", do_page_up, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "F7", do_page_up, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "PgUp", do_page_up, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "^V", do_page_down, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "F8", do_page_down, 0, TRUE);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "PgDn", do_page_down, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP, "M-\\", do_first_line, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP, "M-|", do_first_line, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP, "M-/", do_last_line, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP, "M-?", do_last_line, 0, TRUE);
 #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_find_bracket, 0, TRUE);
+    add_to_sclist(MMAIN, "^^", do_mark, 0, TRUE);
+    add_to_sclist(MMAIN, "M-A", do_mark, 0, TRUE);
+    add_to_sclist(MMAIN, "F15", do_mark, 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(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);
+#endif
+    add_to_sclist(MMOST, "^B", do_left, 0, TRUE);
+    add_to_sclist(MMOST, "^F", do_right, 0, TRUE);
+    add_to_sclist(MMOST, "Left", do_left, 0, TRUE);
+    add_to_sclist(MMOST, "Right", do_right, 0, TRUE);
+#ifndef NANO_TINY
     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(MMOST, "^A", do_home, 0, TRUE);
+    add_to_sclist(MMOST, "Home", do_home, 0, TRUE);
+    add_to_sclist(MMOST, "^E", do_end, 0, TRUE);
+    add_to_sclist(MMOST, "End", do_end, 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, "Up", 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", get_history_older_void, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "kup", get_history_older_void, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "^N", get_history_newer_void, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "kdown", get_history_newer_void, 0, FALSE);
-#endif
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "Down", do_down_void, 0, TRUE);
 #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_void, 0, FALSE);
-    add_to_sclist(MREPLACE,
-	"M-C", case_sens_void, 0, FALSE);
-    add_to_sclist(MREPLACE2,
-	"M-C", case_sens_void, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,
-	"M-B", backwards_void, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,
-	"M-R", regexp_void, 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);
-
-#ifndef DISABLE_BROWSER
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-\\", do_first_file, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-|", do_first_file, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-/", do_last_file, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-?", do_last_file, 0, TRUE);
+    add_to_sclist(MMAIN, "M-(", do_para_begin_void, 0, TRUE);
+    add_to_sclist(MMAIN, "M-9", do_para_begin_void, 0, TRUE);
+    add_to_sclist(MMAIN, "M-)", do_para_end_void, 0, TRUE);
+    add_to_sclist(MMAIN, "M-0", do_para_end_void, 0, TRUE);
 #endif
-    add_to_sclist(MBROWSER|MWHEREISFILE, "^_", goto_dir_void, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "F13", goto_dir_void, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-G", goto_dir_void, 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);
 #endif
-
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_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);
 #endif
-    add_to_sclist(MALL, "M-V", do_verbatim_input, 0, TRUE);
+    add_to_sclist(MMOST, "M-V", do_verbatim_input, 0, TRUE);
 #ifndef NANO_TINY
-    add_to_sclist(MALL, "M-T", do_cut_till_end, 0, TRUE);
+    add_to_sclist(MMAIN, "M-T", do_cut_till_end, 0, TRUE);
+    add_to_sclist(MMAIN, "M-D", do_wordlinechar_count, 0, TRUE);
+#endif
 #ifndef DISABLE_JUSTIFY
-    add_to_sclist(MALL, "M-J", do_full_justify, 0, TRUE);
+    add_to_sclist(MMAIN|MWHEREIS, "M-J", do_full_justify, 0, TRUE);
 #endif
-    add_to_sclist(MMAIN, "M-D", do_wordlinechar_count, 0, TRUE);
+    add_to_sclist(MMAIN|MHELP, "^L", total_refresh, 0, FALSE);
+    add_to_sclist(MMAIN, "^Z", do_suspend_void, 0, FALSE);
+
+#ifndef NANO_TINY
+    /* Group of "Appearance" toggles. */
     add_to_sclist(MMAIN, "M-X", do_toggle_void, NO_HELP, TRUE);
     add_to_sclist(MMAIN, "M-C", do_toggle_void, CONST_UPDATE, TRUE);
     add_to_sclist(MMAIN, "M-O", do_toggle_void, MORE_SPACE, TRUE);
     add_to_sclist(MMAIN, "M-S", do_toggle_void, SMOOTH_SCROLL, TRUE);
+    add_to_sclist(MMAIN, "M-$", do_toggle_void, SOFTWRAP, TRUE);
     add_to_sclist(MMAIN, "M-P", do_toggle_void, WHITESPACE_DISPLAY, TRUE);
+#ifndef DISABLE_COLOR
     add_to_sclist(MMAIN, "M-Y", do_toggle_void, NO_COLOR_SYNTAX, TRUE);
+#endif
+
+    /* Group of "Editing-behavior" toggles. */
     add_to_sclist(MMAIN, "M-H", do_toggle_void, SMART_HOME, TRUE);
     add_to_sclist(MMAIN, "M-I", do_toggle_void, AUTOINDENT, TRUE);
     add_to_sclist(MMAIN, "M-K", do_toggle_void, CUT_TO_END, TRUE);
+#ifndef DISABLE_WRAPPING
     add_to_sclist(MMAIN, "M-L", do_toggle_void, NO_WRAP, TRUE);
+#endif
     add_to_sclist(MMAIN, "M-Q", do_toggle_void, TABS_TO_SPACES, TRUE);
+
+    /* Group of "Peripheral-feature" toggles. */
     add_to_sclist(MMAIN, "M-B", do_toggle_void, BACKUP_FILE, TRUE);
+#ifndef DISABLE_MULTIBUFFER
     add_to_sclist(MMAIN, "M-F", do_toggle_void, MULTIBUFFER, TRUE);
+#endif
+#ifndef DISABLE_MOUSE
     add_to_sclist(MMAIN, "M-M", do_toggle_void, USE_MOUSE, TRUE);
+#endif
     add_to_sclist(MMAIN, "M-N", do_toggle_void, NO_CONVERT, TRUE);
     add_to_sclist(MMAIN, "M-Z", do_toggle_void, SUSPEND, TRUE);
-    add_to_sclist(MMAIN, "M-$", do_toggle_void, SOFTWRAP, TRUE);
+#endif /* !NANO_TINY */
+
+    add_to_sclist(MMAIN, "^Q", xon_complaint, 0, TRUE);
+    add_to_sclist(MMAIN, "^S", xoff_complaint, 0, TRUE);
+
+    add_to_sclist(((MMOST & ~MMAIN & ~MBROWSER) | MYESNO), "^C", do_cancel, 0, FALSE);
+
+#ifndef NANO_TINY
+    add_to_sclist(MWHEREIS|MREPLACE, "M-B", backwards_void, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE, "M-C", case_sens_void, 0, FALSE);
 #endif
-    add_to_sclist(MGOTOLINE, "^T",  gototext_void, 0, FALSE);
-    add_to_sclist(MINSERTFILE|MEXTCMD, "M-F",  new_buffer_void, 0, FALSE);
-    add_to_sclist((MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR|MYESNO),
-	"^C", do_cancel, 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_void, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "M-M",  mac_format_void, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "M-A",  append_void, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "M-P",  prepend_void, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "M-B",  backup_file_void, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "^T",   to_files_void, 0, FALSE);
-    add_to_sclist(MINSERTFILE, "^T",  to_files_void, 0, FALSE);
-    add_to_sclist(MINSERTFILE, "^X",  ext_cmd_void, 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_void, 0, TRUE);
-    add_to_sclist(MALL, "kenter", do_enter_void, 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);
+    add_to_sclist(MWHEREIS|MREPLACE, "M-R", regexp_void, 0, FALSE);
+    add_to_sclist(MWHEREIS, "^R", do_replace, 0, FALSE);
+    add_to_sclist(MREPLACE, "^R", no_replace_void, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^Y", do_first_line, 0, TRUE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^V", do_last_line, 0, TRUE);
+#ifndef DISABLE_JUSTIFY
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "^W", do_para_begin_void, 0, TRUE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "^O", do_para_end_void, 0, TRUE);
+#endif
+    add_to_sclist(MWHEREIS, "^T", do_gotolinecolumn_void, 0, FALSE);
+    add_to_sclist(MGOTOLINE, "^T", gototext_void, 0, FALSE);
+#ifndef NANO_TINY
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "^P", get_history_older_void, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "Up", get_history_older_void, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "^N", get_history_newer_void, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "Down", get_history_newer_void, 0, FALSE);
+#endif
+#ifndef DISABLE_BROWSER
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-\\", do_first_file, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-|", do_first_file, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-/", do_last_file, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-?", do_last_file, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "^_", goto_dir_void, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-G", goto_dir_void, 0, TRUE);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "F13", goto_dir_void, 0, TRUE);
+#endif
+    add_to_sclist(MWRITEFILE, "M-D", dos_format_void, 0, FALSE);
+    add_to_sclist(MWRITEFILE, "M-M", mac_format_void, 0, FALSE);
+    add_to_sclist(MWRITEFILE, "M-A", append_void, 0, FALSE);
+    add_to_sclist(MWRITEFILE, "M-P", prepend_void, 0, FALSE);
+    add_to_sclist(MWRITEFILE, "M-B", backup_file_void, 0, FALSE);
+#ifndef DISABLE_BROWSER
+    add_to_sclist(MWRITEFILE|MINSERTFILE, "^T", to_files_void, 0, FALSE);
+#endif
+    add_to_sclist(MINSERTFILE|MEXTCMD, "^X", ext_cmd_void, 0, FALSE);
+    add_to_sclist(MINSERTFILE|MEXTCMD, "M-F", new_buffer_void, 0, FALSE);
+    add_to_sclist(MHELP|MBROWSER, "^C", do_exit, 0, TRUE);
+#ifndef DISABLE_HELP
+    add_to_sclist(MHELP, "^G", do_exit, 0, TRUE);
+#endif
+    add_to_sclist(MMOST, "^I", do_tab, 0, TRUE);
+    add_to_sclist(MMOST, "^M", do_enter_void, 0, TRUE);
+    add_to_sclist(MMOST, "Enter", do_enter_void, 0, TRUE);
+    add_to_sclist(MMOST, "^D", do_delete, 0, TRUE);
+    add_to_sclist(MMOST, "Del", do_delete, 0, TRUE);
+    add_to_sclist(MMOST, "^H", do_backspace, 0, TRUE);
+    add_to_sclist(MMOST, "Bsp", do_backspace, 0, TRUE);
 
 #ifdef DEBUG
     print_sclist();
 #endif
-
 }
 
-/* Free the given shortcut. */
-void free_shortcutage(shortcut **shortcutage)
+#ifndef DISABLE_COLOR
+void set_lint_shortcuts(void)
 {
-    assert(shortcutage != NULL);
+#ifndef DISABLE_SPELLER
+    replace_scs_for(do_spell, do_linter);
+#endif
+}
 
-    while (*shortcutage != NULL) {
-	shortcut *ps = *shortcutage;
-	*shortcutage = (*shortcutage)->next;
-	free(ps);
-    }
+void set_spell_shortcuts(void)
+{
+#ifndef DISABLE_SPELLER
+    replace_scs_for(do_linter, do_spell);
+#endif
 }
+#endif
 
 const subnfunc *sctofunc(sc *s)
 {
@@ -1290,12 +1204,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) {
         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");
@@ -1303,6 +1219,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:
@@ -1314,7 +1232,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:
@@ -1327,23 +1245,21 @@ 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, complete with the proper value for execute. */
+sc *strtosc(char *input)
 {
-     sc *s;
+    sc *s;
 
     s = (sc *)nmalloc(sizeof(sc));
-    s->execute = TRUE; /* overridden as needed below */
-
+    s->execute = TRUE; /* will be overridden as needed below */
 
 #ifndef DISABLE_HELP
     if (!strcasecmp(input, "help"))
@@ -1361,49 +1277,46 @@ sc *strtosc(int menu, char *input)
 	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;
+#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;
     else if (!strcasecmp(input, "uncut"))
 	s->scfunc = do_uncut_text;
+#ifndef NANO_TINY
+    else if (!strcasecmp(input, "cutrestoffile"))
+	s->scfunc = do_cut_till_end;
+    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"))
+	     !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;
     else if (!strcasecmp(input, "gotoline"))
 	s->scfunc = do_gotolinecolumn_void;
-    else if (!strcasecmp(input, "replace"))
-	s->scfunc = do_replace;
 #ifndef DISABLE_JUSTIFY
     else if (!strcasecmp(input, "justify"))
 	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;
     else if (!strcasecmp(input, "endpara"))
 	s->scfunc = do_para_end_void;
-    else if (!strcasecmp(input, "fulljustify"))
-	s->scfunc = do_full_justify;
 #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;
     else if (!strcasecmp(input, "unindent"))
@@ -1412,12 +1325,10 @@ sc *strtosc(int menu, char *input)
 	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;
     else if (!strcasecmp(input, "prevword"))
 	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;
     else if (!strcasecmp(input, "wordcount"))
@@ -1432,8 +1343,7 @@ sc *strtosc(int menu, char *input)
     } else if (!strcasecmp(input, "nexthistory")) {
 	s->scfunc =  get_history_newer_void;
 	s->execute = FALSE;
-    } else if (!strcasecmp(input, "nohelp") ||
-		!strcasecmp(input, "nohelp")) {
+    } else if (!strcasecmp(input, "nohelp")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = NO_HELP;
@@ -1449,14 +1359,20 @@ sc *strtosc(int menu, char *input)
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = SMOOTH_SCROLL;
+    } else if (!strcasecmp(input, "softwrap")) {
+	s->scfunc =  do_toggle_void;
+	s->execute = FALSE;
+	s->toggle = SOFTWRAP;
     } else if (!strcasecmp(input, "whitespacedisplay")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = WHITESPACE_DISPLAY;
+#ifndef DISABLE_COLOR
     } else if (!strcasecmp(input, "nosyntax")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = NO_COLOR_SYNTAX;
+#endif
     } else if (!strcasecmp(input, "smarthome")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
@@ -1469,10 +1385,12 @@ sc *strtosc(int menu, char *input)
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = CUT_TO_END;
+#ifndef DISABLE_WRAPPING
     } else if (!strcasecmp(input, "nowrap")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = NO_WRAP;
+#endif
     } else if (!strcasecmp(input, "tabstospaces")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
@@ -1481,14 +1399,18 @@ sc *strtosc(int menu, char *input)
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = BACKUP_FILE;
-    } else if (!strcasecmp(input, "mutlibuffer")) {
+#ifndef DISABLE_MULTIBUFFER
+    } else if (!strcasecmp(input, "multibuffer")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = MULTIBUFFER;
+#endif
+#ifndef DISABLE_MOUSE
     } else if (!strcasecmp(input, "mouse")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
 	s->toggle = USE_MOUSE;
+#endif
     } else if (!strcasecmp(input, "noconvert")) {
 	s->scfunc =  do_toggle_void;
 	s->execute = FALSE;
@@ -1498,24 +1420,34 @@ sc *strtosc(int menu, char *input)
 	s->execute = FALSE;
 	s->toggle = SUSPEND;
     }
-#endif /* NANO_TINY */
-    else if (!strcasecmp(input, "right") ||
-		!strcasecmp(input, "forward"))
-	s->scfunc = do_right;
+#endif /* !NANO_TINY */
     else if (!strcasecmp(input, "left") ||
-		!strcasecmp(input, "back"))
+	     !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"))
+	     !strcasecmp(input, "prevline"))
 	s->scfunc = do_up_void;
     else if (!strcasecmp(input, "down") ||
-		!strcasecmp(input, "nextline"))
+	     !strcasecmp(input, "nextline"))
 	s->scfunc = do_down_void;
     else if (!strcasecmp(input, "home"))
 	s->scfunc = do_home;
     else if (!strcasecmp(input, "end"))
 	s->scfunc = do_end;
-#ifdef ENABLE_MULTIBUFFER
+    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;
     else if (!strcasecmp(input, "nextbuf"))
@@ -1533,23 +1465,32 @@ sc *strtosc(int menu, char *input)
 	s->scfunc = do_backspace;
     else if (!strcasecmp(input, "refresh"))
 	s->scfunc = total_refresh;
+    else if (!strcasecmp(input, "suspend"))
+	s->scfunc = do_suspend_void;
     else if (!strcasecmp(input, "casesens")) {
 	s->scfunc = case_sens_void;
 	s->execute = FALSE;
+#ifndef NANO_TINY
     } else if (!strcasecmp(input, "regexp") ||
-		!strcasecmp(input, "regex")) {
+	       !strcasecmp(input, "regex")) {
 	s->scfunc = regexp_void;
 	s->execute = FALSE;
+    } else if (!strcasecmp(input, "backwards")) {
+	s->scfunc = backwards_void;
+	s->execute = FALSE;
+#endif
     } else if (!strcasecmp(input, "dontreplace")) {
 	s->scfunc = no_replace_void;
 	s->execute = FALSE;
     } else if (!strcasecmp(input, "gototext")) {
 	s->scfunc = gototext_void;
 	s->execute = FALSE;
+#ifndef DISABLE_BROWSER
     } else if (!strcasecmp(input, "browser") ||
-		!strcasecmp(input, "tofiles")) {
+	       !strcasecmp(input, "tofiles")) {
 	s->scfunc = to_files_void;
 	s->execute = FALSE;
+#endif
     } else if (!strcasecmp(input, "dosformat")) {
 	s->scfunc = dos_format_void;
 	s->execute = FALSE;
@@ -1565,7 +1506,7 @@ sc *strtosc(int menu, char *input)
     } else if (!strcasecmp(input, "backup")) {
 	s->scfunc =  backup_file_void;
 	s->execute = FALSE;
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     } else if (!strcasecmp(input, "newbuffer")) {
 	s->scfunc =  new_buffer_void;
 	s->execute = FALSE;
@@ -1582,17 +1523,14 @@ sc *strtosc(int menu, char *input)
 	free(s);
 	return NULL;
     }
-
     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"))
@@ -1600,8 +1538,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"))
@@ -1609,22 +1547,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;
+#endif
+#ifndef DISABLE_SPELLER
     else if (!strcasecmp(input, "spell"))
 	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
@@ -1674,12 +1619,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) {
@@ -1687,8 +1630,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) {
@@ -1697,6 +1639,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;
 
@@ -1717,7 +1679,7 @@ void thanks_for_all_the_fish(void)
 	syntaxes = syntaxes->next;
 	free(bill);
     }
-#endif /* ENABLE_COLOR */
+#endif /* !DISABLE_COLOR */
 #ifndef NANO_TINY
     /* Free the search and replace history lists. */
     if (searchage != NULL)
@@ -1725,11 +1687,21 @@ void thanks_for_all_the_fish(void)
     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 */
-
diff --git a/src/help.c b/src/help.c
index 6eee1297..369ad4f9 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,9 +1,9 @@
-/* $Id: help.c 4535 2011-02-26 14:22:37Z astyanax $ */
+/* $Id: help.c 4876 2014-05-13 20:34:15Z 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)  *
@@ -38,8 +38,6 @@ 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. */
     size_t line = 0;
 	/* The line number in help_text of the first displayed help
 	 * line.  This variable is zero-based. */
@@ -47,8 +45,8 @@ void do_help(void (*refresh_func)(void))
 	/* 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;
+	/* The menu we were called from. */
 #endif
     const char *ptr;
 	/* The current line of the help text. */
@@ -59,7 +57,6 @@ void do_help(void (*refresh_func)(void))
 
     curs_set(0);
     blank_edit();
-    wattroff(bottomwin, reverse_attr);
     blank_statusbar();
 
     /* Set help_text as the string to display. */
@@ -94,7 +91,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
@@ -129,25 +126,23 @@ void do_help(void (*refresh_func)(void))
 	kbinput = get_kbinput(edit, &meta_key, &func_key);
 
 #ifndef DISABLE_MOUSE
-        if (kbinput == KEY_MOUSE) {
+	if (kbinput == KEY_MOUSE) {
 		int mouse_x, mouse_y;
 		get_mouseinput(&mouse_x, &mouse_y, TRUE);
-		continue;
-	    /* Redraw the screen. */
+		continue;    /* Redraw the screen. */
 	}
 #endif
 
-	parse_help_input(&kbinput, &meta_key, &func_key);
-        s = get_shortcut(MHELP, &kbinput, &meta_key, &func_key);
+	parse_help_input(&kbinput, &meta_key);
+	s = get_shortcut(MHELP, &kbinput, &meta_key);
 	if (!s)
 	    continue;
-        f = sctofunc((sc *) s);
+	f = sctofunc((sc *) s);
 	if (!f)
 	    continue;
 
-	  if (f->scfunc == total_refresh) {
+	if (f->scfunc == total_refresh) {
 		total_redraw();
-		break;
 	} else if (f->scfunc == do_page_up) {
 		if (line > editwinrows - 2)
 		    line -= editwinrows - 2;
@@ -165,17 +160,14 @@ void do_help(void (*refresh_func)(void))
 	} 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;
+	    /* Abort the help browser. */
+	    break;
 	}
     }
 
@@ -201,14 +193,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 +208,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 +216,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 +376,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_void)
-		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 +416,39 @@ 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, ""))
+	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) {
-
-            if (scsfound == 3)
-		continue;
+	/* Let's simply show the first two shortcuts from the list. */
+	for (s = sclist, scsfound = 0; s != NULL; s = s->next) {
 
-            if (s->type == RAWINPUT)
+	    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,17 +460,19 @@ 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_void)
-		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. */
@@ -495,27 +480,25 @@ void help_init(void)
 }
 
 /* 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
+ * (the key itself) and meta_key (whether the key is a meta sequence).
+ * Also convert certain non-shortcut keys into their corresponding
  * shortcut keys. */
-void parse_help_input(int *kbinput, bool *meta_key, bool *func_key)
+void parse_help_input(int *kbinput, bool *meta_key)
 {
-    get_shortcut(MHELP, kbinput, meta_key, func_key);
+    get_shortcut(MHELP, kbinput, meta_key);
 
     if (!*meta_key) {
 	switch (*kbinput) {
 	    /* For consistency with the file browser. */
 	    case ' ':
-		*kbinput = sc_seq_or(do_page_up, 0);
+		*kbinput = KEY_NPAGE;
 		break;
 	    case '-':
-		*kbinput = sc_seq_or(do_page_down, 0);;
+		*kbinput = KEY_PPAGE;
 		break;
-	    /* Cancel is equivalent to Exit here. */
 	    case 'E':
 	    case 'e':
-		*kbinput = sc_seq_or(do_exit, 0);;
+		*kbinput = sc_seq_or(do_exit, 0);
 		break;
 	}
     }
@@ -547,17 +530,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 b5bd0820..a22e3532 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1,9 +1,9 @@
-/* $Id: move.c 4548 2012-12-30 19:20:10Z astyanax $ */
+/* $Id: move.c 4894 2014-05-16 10:34:05Z 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. */
@@ -79,8 +79,8 @@ void do_page_up(void)
 	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 %lu len %d\n",
+	i, skipped, (unsigned long) openfile->current->lineno, strlenpt(openfile->current->data));
 #endif
 	}
     }
@@ -89,7 +89,8 @@ openfile->current->lineno, strlenpt(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. */
@@ -563,13 +564,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,27 +580,43 @@ 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
 	) {
+#ifndef NANO_TINY
+	if (amount < 1 || scroll_only)
+	    amount = 1;
+#endif
 	edit_scroll(DOWN_DIR,
 #ifndef NANO_TINY
-		(ISSET(SMOOTH_SCROLL) || scroll_only) ? 1 :
+		(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
diff --git a/src/nano.c b/src/nano.c
index 073ee1aa..8c5b92d7 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1,9 +1,9 @@
-/* $Id: nano.c 4549 2013-01-01 03:24:39Z astyanax $ */
+/* $Id: nano.c 4924 2014-05-28 15:44:11Z 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
@@ -297,6 +297,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 +315,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 +324,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
@@ -369,7 +372,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 +385,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 +411,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 +422,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 +445,9 @@ 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. */
+    openfile->fileage = copy_filestruct(somebuffer);
     openfile->filebot = openfile->fileage;
     while (openfile->filebot->next != NULL)
 	openfile->filebot = openfile->filebot->next;
@@ -465,7 +469,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;
@@ -603,7 +612,7 @@ void finish(void)
     /* Restore the old terminal settings. */
     tcsetattr(0, TCSANOW, &oldterm);
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
     if (!no_rcfiles && ISSET(HISTORYLOG))
 	save_history();
     if (!no_rcfiles && ISSET(POS_HISTORY)) {
@@ -647,7 +656,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;
@@ -713,6 +722,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
 
@@ -815,7 +826,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"));
@@ -826,8 +837,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"));
@@ -841,10 +853,10 @@ 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 DISABLE_NANORC
 #ifndef NANO_TINY
     print_opt("-G", "--locking",
 	N_("Use (vim-style) lock files"));
@@ -887,7 +899,7 @@ 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
@@ -895,6 +907,7 @@ void usage(void)
     print_opt("-d", "--rebinddelete",
 	N_("Fix Backspace/Delete confusion problem"));
 #ifndef NANO_TINY
+    print_opt("-h", "--help", N_("Show this help text"));
     print_opt("-i", "--autoindent",
 	N_("Automatically indent new lines"));
     print_opt("-k", "--cut", N_("Cut from cursor to end of line"));
@@ -904,6 +917,7 @@ 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"));
@@ -914,7 +928,7 @@ void usage(void)
 	N_("Silently ignore startup issues like rc file errors"));
 #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>"),
@@ -928,17 +942,13 @@ void usage(void)
 
     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
@@ -948,26 +958,79 @@ 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(" (C) 1999..2014 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_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_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");
@@ -981,29 +1044,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");
@@ -1065,9 +1120,9 @@ void do_exit(void)
 #ifndef NANO_TINY
         if (ISSET(LOCKING) && openfile->lock_filename)
             delete_lockfile(openfile->lock_filename);
-#endif /* NANO_TINY */
+#endif
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	/* Exit only if there are no more open file buffers. */
 	if (!close_buffer())
 #endif
@@ -1076,11 +1131,10 @@ void do_exit(void)
     } else if (i != 1)
 	statusbar(_("Cancelled"));
 
-    shortcut_init(FALSE);
     display_main_list();
 }
 
-/* Another placeholder for function mapping */
+/* Another placeholder for function mapping. */
 void do_cancel(void)
 {
     ;
@@ -1090,15 +1144,14 @@ static struct sigaction pager_oldaction, pager_newaction;  /* Original and tempo
 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");
@@ -1118,15 +1171,14 @@ void finish_stdin_pager(void)
     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 */
+    /* 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();
@@ -1135,8 +1187,8 @@ void stdin_pager(void)
     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
@@ -1156,8 +1208,6 @@ void stdin_pager(void)
     finish_stdin_pager();
 }
 
-
-
 /* Initialize the signal handlers. */
 void signal_init(void)
 {
@@ -1295,7 +1345,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
@@ -1353,11 +1403,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);
 
@@ -1375,13 +1425,13 @@ 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;
@@ -1393,25 +1443,24 @@ void do_toggle(int flag)
 
     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"));
 }
 
-/* Bleh */
+/* Bleh. */
 void do_toggle_void(void)
 {
-;
+    ;
 }
 #endif /* !NANO_TINY */
 
@@ -1517,15 +1566,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
+ * meta sequence, set func_key to TRUE if the character is a function key.
+ * 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 *meta_key, bool *func_key, bool allow_funcs)
 {
     int input;
 	/* The character we read in. */
@@ -1538,10 +1582,6 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
     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);
 
@@ -1567,7 +1607,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
     }
 
     /* Check for a shortcut in the main list. */
-    s = get_shortcut(MMAIN, &input, meta_key, func_key);
+    s = get_shortcut(MMAIN, &input, meta_key);
 
     /* If we got a shortcut from the main list, or a "universal"
      * edit window shortcut, set have_shortcut to TRUE. */
@@ -1610,8 +1650,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 	 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. */
+	     * for verbatim input, turn off prepending of wrapped text. */
 	    if (have_shortcut && (!have_shortcut || s == NULL || s->scfunc !=
 		do_verbatim_input))
 		wrap_reset();
@@ -1640,11 +1679,7 @@ 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. */
+		/* Handle the normal edit-window shortcuts. */
 		default:
 		    /* If the function associated with this shortcut is
 		     * cutting or copying text, indicate this. */
@@ -1658,19 +1693,17 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 
 		    if (s->scfunc != 0) {
 			const subnfunc *f = sctofunc((sc *) s);
-			*ran_func = TRUE;
 			if (ISSET(VIEW_MODE) && f && !f->viewok)
 			    print_view_warning();
 			else {
 #ifndef NANO_TINY
 			    if (s->scfunc == do_toggle_void)
 				do_toggle(s->toggle);
-			    else {
-#else
-			    {
+			    else
 #endif
+			    {
 				s->scfunc();
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 				if (f && !f->viewok && openfile->syntax != NULL
 					&& openfile->syntax->nmultis > 0) {
 				    reset_multis(openfile->current, FALSE);
@@ -1678,16 +1711,14 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 #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;
 				}
-
 			    }
 			}
 		    }
-		    *finished = TRUE;
 		    break;
 	    }
 	}
@@ -1725,7 +1756,9 @@ int do_mouse(void)
 	    /* 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);
@@ -1734,7 +1767,7 @@ int do_mouse(void)
 	    fprintf(stderr, "mouse_y = %d, current_y = %d\n", mouse_y, openfile->current_y);
 #endif
 
- 	if (ISSET(SOFTWRAP)) {
+	if (ISSET(SOFTWRAP)) {
 	    int i = 0;
 	    for (openfile->current = openfile->edittop;
 		 openfile->current->next && i < mouse_y;
@@ -1793,19 +1826,19 @@ int do_mouse(void)
 }
 #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));
 }
 
-/* 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;
@@ -1813,30 +1846,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 %lu... ", (unsigned long) fileptr->lineno);
 #endif
 
 		alloc_multidata_if_needed(fileptr);
@@ -1844,38 +1873,39 @@ 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 %d... ", 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 %lu to find end... ", (unsigned 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;
@@ -1883,18 +1913,16 @@ void precalc_multicolorinfo(void)
 
 		    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);
@@ -1907,21 +1935,19 @@ void precalc_multicolorinfo(void)
 #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 %lu as CBEGINBEFORE\n", (unsigned 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 %lu pos %d to continue\n", (unsigned long) fileptr->lineno, 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;
@@ -1932,14 +1958,14 @@ 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, orig_lenpt = 0, i = 0;
     char *char_buf = charalloc(mb_cur_max());
     int char_buf_len;
 
@@ -1998,7 +2024,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 ==
@@ -2009,6 +2035,10 @@ 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))
@@ -2016,7 +2046,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 		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))
@@ -2025,7 +2055,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
     }
 
     /* Well we might also need a full refresh if we've changed the
-       line length to be a new multiple of COLS */
+     * 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)
 	    edit_refresh_needed = TRUE;
@@ -2034,8 +2064,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 
     openfile->placewewant = xplustabs();
 
-
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     reset_multis(openfile->current, FALSE);
 #endif
     if (edit_refresh_needed == TRUE) {
@@ -2056,7 +2085,7 @@ int main(int argc, char **argv)
     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. */
@@ -2065,10 +2094,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'},
@@ -2080,7 +2109,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'},
@@ -2089,6 +2118,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
@@ -2151,7 +2181,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)
@@ -2161,11 +2191,11 @@ int main(int argc, char **argv)
     while ((optchr =
 #ifdef HAVE_GETOPT_LONG
 	getopt_long(argc, argv,
-		"h?ABC:DEFGHIKLNOPQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz$",
+		"ABC:DEFGHIKLNOPQ:RST:UVWY:abcdefghijklmno:pqr:s:tuvwxz$",
 		long_options, NULL)
 #else
 	getopt(argc, argv,
-		"h?ABC:DEFGHIKLNOPQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz$")
+		"ABC:DEFGHIKLNOPQ:RST:UVWY:abcdefghijklmno:pqr:s:tuvwxz$")
 #endif
 		) != -1) {
 	switch (optchr) {
@@ -2196,12 +2226,12 @@ 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 DISABLE_NANORC
 #ifndef NANO_TINY
 	    case 'G':
 		SET(LOCKING);
@@ -2266,7 +2296,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;
@@ -2293,6 +2323,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);
@@ -2333,11 +2366,9 @@ int main(int argc, char **argv)
 #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':
@@ -2351,8 +2382,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);
 	}
     }
 
@@ -2367,20 +2402,19 @@ int main(int argc, char **argv)
     if (ISSET(RESTRICTED)) {
 	UNSET(SUSPEND);
 	UNSET(BACKUP_FILE);
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 	no_rcfiles = TRUE;
 #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;
@@ -2463,7 +2497,7 @@ 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
@@ -2475,12 +2509,12 @@ 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
     /* Set up the search/replace history. */
     history_init();
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
     if (!no_rcfiles) {
 	if (ISSET(HISTORYLOG) || ISSET(POS_HISTORY)) {
 	    if (check_dotnano() == 0) {
@@ -2493,10 +2527,8 @@ int main(int argc, char **argv)
 	if (ISSET(POS_HISTORY))
 	    load_poshistory();
     }
-#endif /* ENABLE_NANORC */
-#endif /* NANO_TINY */
+#endif /* !DISABLE_NANORC */
 
-#ifndef NANO_TINY
     /* Set up the backup directory (unless we're using restricted mode,
      * in which case backups are disabled, since they would allow
      * reading from or writing to files not specified on the command
@@ -2504,7 +2536,7 @@ int main(int argc, char **argv)
      * that backup files will be saved there. */
     if (!ISSET(RESTRICTED))
 	init_backup_dir();
-#endif
+#endif /* !NANO_TINY */
 
 #ifndef DISABLE_OPERATINGDIR
     /* Set up the operating directory.  This entails chdir()ing there,
@@ -2565,16 +2597,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)
@@ -2609,6 +2653,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
@@ -2627,7 +2684,7 @@ int main(int argc, char **argv)
 	optind++;
     }
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     old_multibuffer = ISSET(MULTIBUFFER);
     SET(MULTIBUFFER);
 
@@ -2653,19 +2710,19 @@ int main(int argc, char **argv)
 		    iline = 1;
 		    icol = 1;
 		}
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
                   else {
-		    /* See if we have a POS history to use if we haven't overridden it */
+		    /* 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 /* NANO_TINY */
+#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
@@ -2682,7 +2739,7 @@ int main(int argc, char **argv)
 	UNSET(VIEW_MODE);
     }
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     if (!old_multibuffer)
 	UNSET(MULTIBUFFER);
 #endif
@@ -2691,29 +2748,30 @@ 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)
 	do_gotolinecolumn(startline, startcol, FALSE, FALSE, FALSE,
 		FALSE);
-# ifndef NANO_TINY
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
     else {
-	/* See if we have a POS history to use if we haven't overridden it */
+	/* 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 /* NANO_TINY */
+#endif
 
     display_main_list();
 
     display_buffer();
 
     while (TRUE) {
-	bool meta_key, func_key, s_or_t, ran_func, finished;
+	bool meta_key, func_key;
 
 	/* Make sure the cursor is in the edit window. */
 	reset_cursor();
@@ -2743,11 +2801,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(&meta_key, &func_key, TRUE);
     }
 
     /* We should never get here. */
     assert(FALSE);
 }
-
diff --git a/src/nano.h b/src/nano.h
index cbb6862a..50c651c2 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -1,9 +1,9 @@
-/* $Id: nano.h 4569 2013-03-17 22:09:38Z astyanax $ */
+/* $Id: nano.h 4908 2014-05-25 19:41:49Z bens $ */
 /**************************************************************************
  *   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)  *
@@ -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)
@@ -189,10 +188,18 @@ typedef enum {
 }  function_type;
 
 typedef enum {
-    ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, UNCUT, ENTER, INSERT, OTHER
+    ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, CUT_EOF, PASTE, ENTER, INSERT, 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. */
@@ -215,50 +222,68 @@ 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 */
-    exttype *magics;
-	/* Regexes to match libmagic results */
+    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. */
     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. */
@@ -271,8 +296,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;
 
@@ -298,43 +324,44 @@ 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 */
+	/* String type data we will use for copying the affected line back. */
     char *strdata2;
-	/* Sigh, need this too it looks like */
+	/* Sigh, need this too, it looks like. */
     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 */
+	/* Was the marker set when we cut? */
     bool to_end;
-	/* was this a cut to end */
+	/* Was this a cut to end? */
     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;
 
 
 typedef struct poshiststruct {
     char *filename;
-        /* The file. */
+	/* The file. */
     ssize_t lineno;
-	/* Line number we left off on */
+	/* Line number we left off on. */
     ssize_t xno;
-	/* x position in the file we left off on */
+	/* x position in the file we left off on. */
     struct poshiststruct *next;
 } poshiststruct;
-#endif /* NANO_TINY */
+
+#endif /* !NANO_TINY */
 
 
 typedef struct openfilestruct {
@@ -353,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;
@@ -371,16 +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 */
+	/* 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
@@ -400,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);
@@ -419,7 +435,7 @@ typedef struct shortcut {
 	/* Next shortcut. */
 } shortcut;
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 typedef struct rcoption {
    const char *name;
 	/* The name of the rcfile option. */
@@ -431,29 +447,29 @@ typedef struct rcoption {
 
 typedef struct sc {
     char *keystr;
-	/* The shortcut key for a function, ASCII version */
+	/* The shortcut key for a function, ASCII version. */
     function_type type;
-        /* What kind of function key is it for convenience later */
+	/* What kind of function key it is, for convenience later. */
     int seq;
-        /* The actual sequence to check on the type is determined */
+	/* The actual sequence to check on the type is determined. */
     int menu;
-        /* What list does this apply to */
+	/* What list this applies to. */
     void (*scfunc)(void);
-        /* The function we're going to run */
+	/* 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 {
     void (*scfunc)(void);
-	/* What function is this */
+	/* 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
@@ -464,16 +480,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,
@@ -513,270 +537,50 @@ enum
     UNDOABLE,
     SOFTWRAP,
     POS_HISTORY,
-    LOCKING
+    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 */
+#ifndef NANO_TINY
+/* Extra bits for the undo function. */
 #define UNdel_del		(1<<0)
 #define UNdel_backspace	(1<<1)
 #define UNsplit_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. */
-
+#define UNcut_cutline		(1<<3)
 #endif /* !NANO_TINY */
 
 #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 8a67e51e..12366dd7 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -1,9 +1,9 @@
-/* $Id: prompt.c 4527 2011-02-07 14:45:56Z astyanax $ */
+/* $Id: prompt.c 4878 2014-05-13 21:11:59Z 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)  *
@@ -93,7 +93,7 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
     }
 
     /* Check for a shortcut in the current list. */
-    s = get_shortcut(currmenu, &input, meta_key, func_key);
+    s = get_shortcut(currmenu, &input, meta_key);
 
     /* If we got a shortcut from the current list, or a "universal"
      * statusbar prompt shortcut, set have_shortcut to TRUE. */
@@ -131,7 +131,7 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
 	/* 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 (*have_shortcut || get_key_buffer_len() == 0) {
 	    if (kbinput != NULL) {
 		/* Display all the characters in the input buffer at
 		 * once, filtering out control characters. */
@@ -191,7 +191,7 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
 	    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. */
+		     * prompt, disable verbatim input. */
 		    if (!ISSET(RESTRICTED) ||
 			openfile->filename[0] == '\0' ||
 			currmenu != MWRITEFILE) {
@@ -225,15 +225,14 @@ 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 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. */
 		f = sctofunc((sc *) s);
-		if (s->scfunc != 0 &&  s->execute == TRUE) {
-			*ran_func = TRUE;
+		if (s->scfunc != 0 && s->execute == TRUE) {
+		    *ran_func = TRUE;
 		    if (f && (!ISSET(VIEW_MODE) || (f->viewok)))
 		        f->scfunc();
 		}
@@ -325,7 +324,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);
@@ -859,7 +858,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();
 
@@ -872,7 +873,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);
@@ -981,7 +983,7 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
 	    &ran_func, &finished, TRUE, refresh_func);
 	assert(statusbar_x <= strlen(answer));
 
-	s = get_shortcut(currmenu, &kbinput, meta_key, func_key);
+	s = get_shortcut(currmenu, &kbinput, meta_key);
 
 	if (s)
 	    if (s->scfunc == do_cancel || s->scfunc == do_enter_void)
@@ -990,106 +992,92 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
 #ifndef DISABLE_TABCOMP
 	if (s && s->scfunc != 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);
+#ifndef NANO_TINY
+	    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
+					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);
+	    if (allow_tabs)
+		answer = input_tab(answer, allow_files, &statusbar_x,
+				   &tabbed, refresh_func, list);
 
-		update_statusbar_line(answer, statusbar_x);
+	    update_statusbar_line(answer, statusbar_x);
 	} else
 #endif /* !DISABLE_TABCOMP */
 #ifndef NANO_TINY
 	if (s && s->scfunc == 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);
-		    }
+	    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 (s && s->scfunc == 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);
-		    }
+	    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);
+		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;
-		}
+		/* 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);
+	    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;
+	    /* 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;
 
@@ -1103,8 +1091,8 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
 
 
 #ifndef NANO_TINY
-    /* Set the current position in the history list to the bottom and
-     * free magichistory, if we need to. */
+    /* 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);
 
@@ -1119,7 +1107,7 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
      * we've finished putting in an answer, reset the statusbar cursor
      * position too. */
     if (s) {
-	if (s->scfunc ==  do_cancel || s->scfunc == do_enter_void ||
+	if (s->scfunc == do_cancel || s->scfunc == do_enter_void ||
 	ran_func) {
 	    statusbar_x = old_statusbar_x;
 	    statusbar_pww = old_pww;
@@ -1206,7 +1194,7 @@ int do_prompt(bool allow_tabs,
 
     /* If we left the prompt via Cancel or Enter, set the return value
      * properly. */
-    if (s && s->scfunc ==  do_cancel)
+    if (s && s->scfunc == do_cancel)
 	retval = -1;
     else if (s && s->scfunc == do_enter_void)
 	retval = (*answer == '\0') ? -2 : 0;
@@ -1293,12 +1281,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. */
@@ -1314,9 +1305,9 @@ int do_yesno_prompt(bool all, const char *msg)
 
 	currmenu = MYESNO;
 	kbinput = get_kbinput(bottomwin, &meta_key, &func_key);
-	s = get_shortcut(currmenu, &kbinput, &meta_key, &func_key);
+	s = get_shortcut(currmenu, &kbinput, &meta_key);
 
-	if (s && s->scfunc ==  do_cancel)
+	if (s && s->scfunc == do_cancel)
 	    ok = -1;
 #ifndef DISABLE_MOUSE
 	else if (kbinput == KEY_MOUSE) {
diff --git a/src/proto.h b/src/proto.h
index ed574ade..e328f88f 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -1,9 +1,9 @@
-/* $Id: proto.h 4569 2013-03-17 22:09:38Z astyanax $ */
+/* $Id: proto.h 4919 2014-05-28 13:24:05Z 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)  *
@@ -60,13 +60,17 @@ 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;
@@ -99,7 +103,9 @@ extern char *alt_speller;
 
 extern sc *sclist;
 extern subnfunc *allfuncs;
-#ifdef ENABLE_COLOR
+extern subnfunc *exitfunc;
+extern subnfunc *uncutfunc;
+#ifndef DISABLE_COLOR
 extern syntaxtype *syntaxes;
 extern char *syntaxstr;
 #endif
@@ -124,7 +130,11 @@ 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;
 
@@ -133,7 +143,7 @@ extern char *homedir;
 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);
+void parse_browser_input(int *kbinput, bool *meta_key);
 void browser_refresh(void);
 bool browser_select_filename(const char *needle);
 int filesearch_init(void);
@@ -152,6 +162,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
@@ -218,19 +229,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);
@@ -255,7 +266,6 @@ void do_cut_text_void(void);
 #ifndef NANO_TINY
 void do_copy_text(void);
 void do_cut_till_end(void);
-
 #endif
 void do_uncut_text(void);
 
@@ -268,7 +278,7 @@ void open_buffer(const char *filename, bool undoable);
 void replace_buffer(const char *filename);
 #endif
 void display_buffer(void);
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 void switch_to_prevnext_buffer(bool next);
 void switch_to_prev_buffer_void(void);
 void switch_to_next_buffer_void(void);
@@ -323,7 +333,7 @@ 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)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 char *histfilename(void);
 void load_history(void);
 bool writehist(FILE *hist, filestruct *histhead);
@@ -333,40 +343,26 @@ void load_poshistory(void);
 void save_poshistory(void);
 int check_poshistory(const char *file, ssize_t *line, ssize_t *column);
 #endif
+#ifndef DISABLE_COLOR
+void set_lint_shortcuts(void);
+void set_spell_shortcuts(void);
+#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
-#endif
-	, int metaval, int funcval, int miscval, bool view, void
-	(*func)(void));
-void shortcut_init(bool unjustify);
-void free_shortcutage(shortcut **shortcutage);
+void shortcut_init(void);
 #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);
+void parse_help_input(int *kbinput, bool *meta_key);
 size_t help_line_len(const char *ptr);
 #endif
+void do_help_void(void);
 
 /* All functions in move.c. */
 void do_first_line(void);
@@ -427,7 +423,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);
@@ -468,8 +464,6 @@ 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);
 void do_toggle_void(void);
 #endif
@@ -483,8 +477,7 @@ 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 *meta_key, bool *func_key, bool allow_funcs);
 #ifndef DISABLE_MOUSE
 int do_mouse(void);
 #endif
@@ -549,24 +542,24 @@ int do_prompt(bool allow_tabs,
 void do_prompt_abort(void);
 int do_yesno_prompt(bool all, const char *msg);
 
-/* All functions in rcfile.c. */
-#ifdef ENABLE_NANORC
+/* Most functions in rcfile.c. */
+#ifndef DISABLE_NANORC
 void rcfile_error(const char *msg, ...);
 char *parse_next_word(char *ptr);
 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_magic_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
 	);
@@ -590,7 +583,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
@@ -611,10 +604,11 @@ 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
+#ifndef DISABLE_NANORC
 bool history_has_changed(void);
 #endif
 void history_init(void);
@@ -686,6 +680,9 @@ 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);
+#endif
 #ifndef NANO_TINY
 void do_wordlinechar_count(void);
 #endif
@@ -703,7 +700,7 @@ void sunder(char *str);
 #ifndef HAVE_GETLINE
 ssize_t ngetline(char **lineptr, size_t *n, FILE *stream);
 #endif
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 #ifndef HAVE_GETDELIM
 ssize_t ngetdelim(char **lineptr, size_t *n, int delim, FILE *stream);
 #endif
@@ -766,8 +763,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 *get_shortcut(int menu, int *kbinput, bool *meta_key);
 const sc *first_sc_for(int menu, void (*func)(void));
 void blank_line(WINDOW *win, int y, int x, int n);
 void blank_titlebar(void);
@@ -803,7 +799,7 @@ 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);
+sc *strtosc(char *input);
 function_type strtokeytype(const char *str);
 int strtomenu(char *input);
 void assign_keyinfo(sc *s);
@@ -812,29 +808,6 @@ void xoff_complaint(void);
 int sc_seq_or (void (*func)(void), 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 enable_nodelay(void);
 void disable_nodelay(void);
@@ -843,12 +816,14 @@ void disable_nodelay(void);
 extern const char *regexp_msg;
 #endif
 
-#ifdef NANO_EXTRA
+#ifndef DISABLE_EXTRA
 void do_credits(void);
 #endif
 
-/* May as just throw these here since they are just placeholders */
+/* 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);
@@ -864,5 +839,4 @@ void goto_dir_void(void);
 void no_replace_void(void);
 void ext_cmd_void(void);
 
-
 #endif /* !PROTO_H */
diff --git a/src/rcfile.c b/src/rcfile.c
index 9bcf7606..d4810df3 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1,9 +1,9 @@
-/* $Id: rcfile.c 4569 2013-03-17 22:09:38Z astyanax $ */
+/* $Id: rcfile.c 4878 2014-05-13 21:11:59Z 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},
@@ -47,7 +48,7 @@ static const rcoption rcopts[] = {
 #ifndef DISABLE_MOUSE
     {"mouse", USE_MOUSE},
 #endif
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     {"multibuffer", MULTIBUFFER},
 #endif
     {"morespace", MORE_SPACE},
@@ -99,6 +100,12 @@ static const rcoption rcopts[] = {
     {"wordbounds", WORD_BOUNDS},
     {"softwrap", SOFTWRAP},
 #endif
+#ifndef DISABLE_COLOR
+    {"titlecolor", 0},
+    {"statuscolor", 0},
+    {"keycolor", 0},
+    {"functioncolor", 0},
+#endif
     {NULL, 0}
 };
 
@@ -108,14 +115,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
@@ -197,7 +201,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)
 {
@@ -253,7 +257,7 @@ void parse_syntax(char *ptr)
 {
     const char *fileregptr = NULL, *nameptr = NULL;
     syntaxtype *tmpsyntax, *prev_syntax;
-    exttype *endext = NULL;
+    regexlisttype *endext = NULL;
 	/* The end of the extensions list for this syntax. */
 
     assert(ptr != NULL);
@@ -315,12 +319,12 @@ 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;
 
 #ifdef DEBUG
     fprintf(stderr, "Starting a new syntax type: \"%s\"\n", nameptr);
@@ -340,10 +344,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++;
@@ -358,7 +361,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)) {
@@ -374,77 +377,8 @@ void parse_syntax(char *ptr)
 	} else
 	    free(newext);
     }
-
-}
-
-
-/* Parse the next syntax string from the line at ptr, and add it to the
- * global list of color syntaxes. */
-void parse_magictype(char *ptr)
-{
-#ifdef HAVE_LIBMAGIC
-    const char *fileregptr = NULL;
-    exttype *endext = 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 extensions into their part of the struct. */
-    while (*ptr != '\0') {
-	exttype *newext;
-	    /* The new extension structure. */
-
-	while (*ptr != '"' && *ptr != '\0')
-	    ptr++;
-
-	if (*ptr == '\0')
-	    return;
-
-	ptr++;
-
-	fileregptr = ptr;
-	ptr = parse_next_regex(ptr);
-	if (ptr == NULL)
-	    break;
-
-	newext = (exttype *)nmalloc(sizeof(exttype));
-
-	/* Save the regex if it's valid. */
-	if (nregcomp(fileregptr, REG_NOSUB)) {
-	    newext->ext_regex = mallocstrcpy(NULL, fileregptr);
-	    newext->ext = NULL;
-
-	    if (endext == NULL)
-		endsyntax->magics = newext;
-	    else
-		endext->next = newext;
-	    endext = newext;
-	    endext->next = NULL;
-	} else
-	    free(newext);
-    }
-#endif /* HAVE_LIBMAGIC */
 }
+#endif /* !DISABLE_COLOR */
 
 int check_bad_binding(sc *s)
 {
@@ -454,20 +388,25 @@ int check_bad_binding(sc *s)
     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)
+/* 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;
@@ -476,206 +415,182 @@ 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);
+    /* 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;
+	}
+    }
 
-    if (!strcmp(funcptr, "")) {
-	rcfile_error(
-		N_("Must specify function to bind key to"));
+    /* 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;
     }
 
+    if (dobind) {
+	funcptr = ptr;
+	ptr = parse_next_word(ptr);
+
+	if (!strcmp(funcptr, "")) {
+	    rcfile_error(N_("Must specify a function to bind the key to"));
+	    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\")"));
+	/* TRANSLATORS: Do not translate the word "all". */
+	rcfile_error(N_("Must specify a menu (or \"all\") in which to bind/unbind the key"));
 	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) {
+	newsc = strtosc(funcptr);
+	if (newsc == NULL) {
+	    rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
+	    return;
+	}
     }
 
+    menu = strtomenu(menuptr);
     if (menu < 1) {
-	rcfile_error(
-		N_("Could not map name \"%s\" to a menu"), menuptr);
+	rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
 	return;
     }
 
-
 #ifdef DEBUG
-    fprintf(stderr, "newsc now address %d, menu func assigned = %d, menu = %d\n",
-	&newsc, newsc->scfunc, menu);
+    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
 
-
-    newsc->keystr = keycopy;
-    newsc->menu = menu;
-    newsc->type = strtokeytype(newsc->keystr);
-    assign_keyinfo(newsc);
+    if (dobind) {
+	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);
+	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);
-	return;
+	if (check_bad_binding(newsc)) {
+	    rcfile_error(N_("Sorry, keystroke \"%s\" may not be rebound"), newsc->keystr);
+	    free(newsc);
+	    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 */
+    /* Now find and delete any existing same shortcut in the menu(s). */
     for (s = sclist; s != NULL; s = s->next) {
-        if (((s->menu & newsc->menu)) && s->seq == newsc->seq) {
-	    s->menu &= ~newsc->menu;
+	if (((s->menu & menu)) && !strcmp(s->keystr, keycopy)) {
 #ifdef DEBUG
-	    fprintf(stderr, "replaced menu entry %d\n", s->menu);
+	    fprintf(stderr, "deleting entry from menu %x\n", s->menu);
 #endif
+	    s->menu &= ~menu;
 	}
     }
-    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"));
-	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");
-#endif
-
-    if (keycopy[0] != 'M' && keycopy[0] != '^' && keycopy[0] != 'F' && keycopy[0] != 'K') {
-	rcfile_error(
-		N_("keybindings must begin with \"^\", \"M\", or \"F\""));
-	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\")"));
-	return;
-    }
-
-    menu = strtomenu(menuptr);
-    if (menu < 1) {
-	rcfile_error(
-		N_("Could not map name \"%s\" to a menu"), menuptr);
-	return;
-    }
-
-
-#ifdef DEBUG
-    fprintf(stderr, "unbinding \"%s\" from menu = %d\n", keycopy, menu);
-#endif
-
-    /* Now find the apropriate entries in the menu to delete */
-    for (s = sclist; s != NULL; s = s->next) {
-        if (((s->menu & menu)) && !strcmp(s->keystr,keycopy)) {
-	    s->menu &= ~menu;
-#ifdef DEBUG
-	    fprintf(stderr, "deleted menu entry %d\n", s->menu);
-#endif
-	}
+    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,
@@ -723,7 +638,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);
@@ -741,36 +656,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"));
@@ -781,7 +668,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;
@@ -833,6 +720,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;
 	    }
 
@@ -862,8 +753,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;
 
@@ -871,17 +762,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 */
+	    /* 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);
 
@@ -896,11 +825,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(
@@ -911,39 +838,126 @@ 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);
+}
+#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;
@@ -957,9 +971,10 @@ static void check_vitals_mapped(void)
            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"));
+                   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;
@@ -972,7 +987,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
 	)
@@ -980,6 +995,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;
@@ -1004,9 +1022,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"),
@@ -1015,7 +1056,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"),
@@ -1024,7 +1065,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(
@@ -1038,27 +1079,38 @@ void parse_rcfile(FILE *rcstream
 			endsyntax->desc);
 	    parse_syntax(ptr);
 	}
-	else if (strcasecmp(keyword, "magic") == 0) {
- 	    parse_magictype(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);
+#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;
 	}
 
@@ -1102,6 +1154,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;
@@ -1200,19 +1263,19 @@ 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 undo/redo was enabled, reinitialize the lists. */
 		if (strcasecmp(rcopts[i].name, "undo") == 0)
-		    shortcut_init(0);
+		    shortcut_init();
 		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);
@@ -1252,7 +1315,7 @@ void do_rcfile(void)
     rcstream = fopen(nanorc, "rb");
     if (rcstream != NULL)
 	parse_rcfile(rcstream
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 		, FALSE
 #endif
 		);
@@ -1294,7 +1357,7 @@ void do_rcfile(void)
 			strerror(errno));
 	} else
 	    parse_rcfile(rcstream
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 		, FALSE
 #endif
 		);
@@ -1310,10 +1373,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 74bfb072..c8c97bf9 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,9 +1,9 @@
-/* $Id: search.c 4559 2013-01-03 05:00:34Z astyanax $ */
+/* $Id: search.c 4921 2014-05-28 14:34:11Z 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)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 static bool history_changed = FALSE;
 	/* Have any of the history lists changed? */
 #endif
@@ -181,26 +181,23 @@ int search_init(bool replacing, bool use_answer)
 #ifndef NANO_TINY
 	&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);
@@ -219,12 +216,12 @@ int search_init(bool replacing, bool use_answer)
 	statusbar(_("Cancelled"));
 	return -1;
     } else {
-	void (*func)(void);
+	void (*func)(void) = NULL;
 
 	for  (s = sclist; s != NULL; s = s->next)
 	    if ((s->menu & currmenu) && i == s->seq) {
 	        func = s->scfunc;
-	  	break;
+		break;
 	    }
 
 	if (i == -2 || i == 0 ) {
@@ -307,10 +304,10 @@ bool findnextstr(
     /* Look for needle in the current line we're searching. */
     enable_nodelay();
     while (TRUE) {
-        if (time(NULL) - lastkbcheck > 1) {
-            lastkbcheck = time(NULL);
+	if (time(NULL) - lastkbcheck > 1) {
+	    lastkbcheck = time(NULL);
 	    f = getfuncfromkey(edit);
-            if (f && f->scfunc == do_cancel) {
+	    if (f && f->scfunc == do_cancel) {
 		statusbar(_("Cancelled"));
 		return FALSE;
 	    }
@@ -361,7 +358,7 @@ bool findnextstr(
 	/* We've finished processing the file, so get out. */
 	if (search_last_line) {
 	    not_found_msg(needle);
-            disable_nodelay();
+	    disable_nodelay();
 	    return FALSE;
 	}
 
@@ -525,7 +522,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 +570,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 +633,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 +716,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;
@@ -781,6 +778,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);
@@ -866,12 +864,12 @@ ssize_t do_replace_loop(
 	    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 &&
@@ -954,11 +952,12 @@ void do_replace(void)
 #ifndef DISABLE_TABCOMP
 	TRUE,
 #endif
-	MREPLACE2, last_replace,
+	MREPLACEWITH, last_replace,
 	&meta_key, &func_key,
 #ifndef NANO_TINY
 	&replace_history,
 #endif
+	/* TRANSLATORS: This is a prompt. */
 	edit_refresh, _("Replace with"));
 
 #ifndef NANO_TINY
@@ -1008,6 +1007,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
@@ -1031,6 +1043,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 #ifndef NANO_TINY
 		NULL,
 #endif
+		/* TRANSLATORS: This is a prompt. */
 		edit_refresh, _("Enter line number, column number"));
 
 	free(ans);
@@ -1042,9 +1055,9 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 	    return;
 	}
 
+	s = get_shortcut(currmenu, &i, &meta_key);
 
-	s = get_shortcut(currmenu, &i, &meta_key, &func_key);
-	if (s && s->scfunc ==  gototext_void) {
+	if (s && s->scfunc == gototext_void) {
 	    /* Keep answer up on the statusbar. */
 	    search_init(TRUE, TRUE);
 
@@ -1083,10 +1096,11 @@ 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. */
@@ -1291,7 +1305,7 @@ void do_find_bracket(void)
     free(found_ch);
 }
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 /* Indicate whether any of the history lists have changed. */
 bool history_has_changed(void)
 {
@@ -1394,7 +1408,7 @@ void update_history(filestruct **h, const char *s)
     *hbot = (*hbot)->next;
     (*hbot)->data = mallocstrcpy(NULL, "");
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
     /* Indicate that the history's been changed. */
     history_changed = TRUE;
 #endif
@@ -1431,7 +1445,7 @@ char *get_history_newer(filestruct **h)
     return (*h)->data;
 }
 
-/* More placeholders */
+/* More placeholders. */
 void get_history_newer_void(void)
 {
     ;
diff --git a/src/text.c b/src/text.c
index 81eafc9d..c7723d80 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,9 +1,9 @@
-/* $Id: text.c 4565 2013-01-20 07:51:34Z astyanax $ */
+/* $Id: text.c 4919 2014-05-28 13:24:05Z 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)  *
@@ -112,9 +112,8 @@ void do_delete(void)
 	    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) {
@@ -141,11 +140,11 @@ void do_delete(void)
 
     if (ISSET(SOFTWRAP) && edit_refresh_needed == FALSE)
 	if (strlenpt(openfile->current->data) / COLS != orig_lenpt / COLS)
-	    edit_refresh_needed  = TRUE;
+	    edit_refresh_needed = TRUE;
 
     set_modified();
 
-    if (edit_refresh_needed  == FALSE)
+    if (edit_refresh_needed == FALSE)
 	update_line(openfile->current, openfile->current_x);
 }
 
@@ -216,8 +215,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,69 +358,61 @@ 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 */
+    /* Compute cutbottom for the uncut using our 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);
+    copy_from_filestruct(cutbuffer);
     free_filestruct(cutbuffer);
     cutbuffer = NULL;
 
+    if (u->xflags == UNcut_cutline)
+	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);
+    goto_line_posx(u->lineno, u->begin);
+
+    if (ISSET(NO_NEWLINES) && openfile->current->lineno != u->lineno) {
+	openfile->current_x = strlen(openfile->current->data);
+	openfile->placewewant = xplustabs();
+    }
+
     openfile->mark_set = u->mark_set;
     if (cutbuffer)
 	free(cutbuffer);
     cutbuffer = 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; ) {
+    openfile->mark_begin = fsfromline(u->mark_begin_lineno);
 
-#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;
+    if (!ISSET(CUT_TO_END))
 	openfile->mark_set = TRUE;
-    }
 
-    openfile->mark_begin_x = u->mark_begin_x;
+    openfile->mark_begin_x = (u->xflags == UNcut_cutline) ? 0 : u->mark_begin_x;
     do_cut_text(FALSE, u->to_end, TRUE);
     openfile->mark_set = FALSE;
     openfile->mark_begin = NULL;
@@ -430,12 +420,13 @@ void redo_cut(undo *u) {
     edit_refresh_needed = TRUE;
 }
 
-/* Undo the last thing(s) we did */
+/* Undo the last thing(s) we did. */
 void do_undo(void)
 {
+    bool gotolinecolumn = FALSE;
     undo *u = openfile->current_undo;
-    filestruct *f = openfile->current, *t;
-    int len = 0;
+    filestruct *t = 0;
+    size_t len = 0;
     char *undidmsg, *data;
     filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
 
@@ -444,15 +435,9 @@ void do_undo(void)
 	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,7 +446,7 @@ 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;
@@ -470,19 +455,18 @@ void do_undo(void)
 	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 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 == UNdel_backspace)
-	    openfile->current_x += strlen(u->strdata);
+	goto_line_posx(u->mark_begin_lineno, u->mark_begin_x);
 	break;
 #ifndef DISABLE_WRAPPING
     case SPLIT:
@@ -497,48 +481,51 @@ void do_undo(void)
 	    delete_node(foo);
 	}
 	renumber(f);
+	gotolinecolumn = TRUE;
 	break;
-#endif /* DISABLE_WRAPPING */
+#endif /* !DISABLE_WRAPPING */
     case UNSPLIT:
 	undidmsg = _("line join");
 	t = make_new_node(f);
 	t->data = mallocstrcpy(NULL, u->strdata);
-	data = mallocstrncpy(NULL, f->data, u->begin);
+	data = mallocstrncpy(NULL, f->data, u->begin + 1);
 	data[u->begin] = '\0';
 	free(f->data);
 	f->data = data;
 	splice_node(f, t, f->next);
-	renumber(f);
+	goto_line_posx(u->lineno, u->begin);
 	break;
+    case CUT_EOF:
     case CUT:
 	undidmsg = _("text cut");
         undo_cut(u);
 	break;
-    case UNCUT:
+    case PASTE:
 	undidmsg = _("text uncut");
-	redo_cut(u);
+	undo_paste(u);
 	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 = (char *) nrealloc(f->data, strlen(f->data) + strlen(&f->next->data[u->mark_begin_x]) + 1);
+	    strcat(f->data, &f->next->data[u->mark_begin_x]);
 	    unlink_node(foo);
 	    delete_node(foo);
 	}
+	goto_line_posx(u->lineno, u->begin);
 	break;
     case INSERT:
 	undidmsg = _("text insert");
 	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();
 	u->cutbuffer = cutbuffer;
 	u->cutbottom = cutbottom;
@@ -548,28 +535,31 @@ 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;
-
     }
+
     renumber(f);
-    do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
+    if (gotolinecolumn)
+	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;
+    set_modified();
 }
 
+/* Redo the last thing(s) we undid. */
 void do_redo(void)
 {
+    bool gotolinecolumn = FALSE;
     undo *u = openfile->undotop;
-    filestruct *f = openfile->current;
-    int len = 0;
+    size_t len = 0;
     char *undidmsg, *data;
 
     for (; u != NULL && u->next != openfile->current_undo; u = u->next)
@@ -579,18 +569,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,7 +583,7 @@ 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");
 	len = strlen(f->data) + strlen(u->strdata) + 1;
@@ -608,6 +593,7 @@ void do_redo(void)
 	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 DEL:
 	undidmsg = _("text delete");
@@ -617,10 +603,13 @@ void do_redo(void)
 	strcpy(&data[u->begin], &f->data[u->begin + strlen(u->strdata)]);
 	free(f->data);
 	f->data = data;
+	openfile->current_x = u->begin;
+	openfile->placewewant = xplustabs();
+	goto_line_posx(u->lineno, u->begin);
 	break;
     case ENTER:
 	undidmsg = _("line break");
-	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+	goto_line_posx(u->lineno, u->begin);
 	do_enter(TRUE);
 	break;
 #ifndef DISABLE_WRAPPING
@@ -630,54 +619,55 @@ void do_redo(void)
 	    prepend_wrap = TRUE;
         do_wrap(f, TRUE);
 	renumber(f);
+	gotolinecolumn = TRUE;
 	break;
-#endif /* DISABLE_WRAPPING */
+#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;
+	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;
 	    unlink_node(tmp);
 	    delete_node(tmp);
 	}
 	renumber(f);
+	goto_line_posx(u->lineno, u->begin);
 	break;
+    case CUT_EOF:
     case CUT:
 	undidmsg = _("text cut");
 	redo_cut(u);
 	break;
-    case UNCUT:
+    case PASTE:
 	undidmsg = _("text uncut");
-	undo_cut(u);
+	redo_paste(u);
 	break;
     case REPLACE:
 	undidmsg = _("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();
+	goto_line_posx(u->lineno, u->begin);
+	copy_from_filestruct(u->cutbuffer);
 	break;
     default:
-	undidmsg = _("Internal error: unknown type.  Please save your work");
+	undidmsg = _("Internal error: unknown type.  Please save your work.");
 	break;
-
     }
-    do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
+
+    if (gotolinecolumn)
+	do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
     statusbar(_("Redid action (%s)"), undidmsg);
 
     openfile->current_undo = u;
     openfile->last_action = OTHER;
-
+    set_modified();
 }
 #endif /* !NANO_TINY */
 
@@ -693,7 +683,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
@@ -738,11 +727,17 @@ 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) {
+void do_enter_void(void)
+{
     do_enter(FALSE);
 }
 
@@ -768,13 +763,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";
@@ -840,26 +834,28 @@ 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 */
+	/* Last thing we cut to set up the undo for uncut. */
+    ssize_t wrap_loc;
+	/* For calculating split beginning. */
 
     if (!ISSET(UNDOABLE))
 	return;
 
-    /* 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) ||
+	(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;
@@ -870,7 +866,7 @@ 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;
@@ -881,30 +877,28 @@ void add_undo(undo_type current_action)
     u->strdata = NULL;
     u->strdata2 = NULL;
     u->cutbuffer = NULL;
-    u->cutbottom  = NULL;
+    u->cutbottom = NULL;
     u->mark_set = 0;
-    u->mark_begin_lineno = 0;
-    u->mark_begin_x = 0;
+    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 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);
+	    char_buf[char_buf_len] = '\0';
+	    u->strdata = char_buf;  /* Note: there is likely more memory allocated than necessary. */
+	    u->mark_begin_x += char_buf_len;
 	    break;
 	}
-	/* Else purposely fall into unsplit code */
+	/* Else purposely fall into unsplit code. */
 	current_action = u->type = UNSPLIT;
     case UNSPLIT:
 	if (fs->current->next) {
@@ -920,33 +914,43 @@ void add_undo(undo_type current_action)
 #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 */
+	/* Don't bother 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;
 	break;
-#endif /* DISABLE_WRAPPING */
+#endif /* !DISABLE_WRAPPING */
     case INSERT:
     case REPLACE:
 	data = mallocstrcpy(NULL, fs->current->data);
 	u->strdata = data;
 	break;
+    case CUT_EOF:
+	u->to_end = TRUE;
     case CUT:
 	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) && !u->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(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:
@@ -964,16 +968,13 @@ void add_undo(undo_type current_action)
     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))
@@ -989,9 +990,9 @@ void update_undo(undo_type action)
 #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 && action != SPLIT
 	    && openfile->current->lineno != fs->current_undo->lineno)) {
         add_undo(action);
 	return;
@@ -1001,53 +1002,35 @@ 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;
+	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);
+    }
+    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 */
-	    if (!u->xflags)
-		u->xflags = UNdel_del;
-	    else if (u->xflags != UNdel_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 = UNdel_backspace;
-	    else if (u->xflags != UNdel_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--;
+	    /* 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 */
+	    /* They deleted something else on the line. */
+	    free(char_buf);
 	    add_undo(DEL);
 	    return;
 	}
@@ -1055,48 +1038,65 @@ void update_undo(undo_type action)
 	fprintf(stderr, "current undo data now \"%s\"\nu->begin = %d\n", u->strdata, u->begin);
 #endif
 	break;
+    }
+    case CUT_EOF:
     case CUT:
 	if (!cutbuffer)
 	    break;
 	if (u->cutbuffer)
 	    free(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 if (!ISSET(CUT_TO_END)) {
+	    /* Compute cutbottom for the uncut using our copy. */
+	    u->cutbottom = u->cutbuffer;
+	    while (u->cutbottom->next != NULL)
+		u->cutbottom = u->cutbottom->next;
+	    if (!u->to_end)
+		u->lineno++;
+	}
 	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;
+    case ENTER:
+	u->mark_begin_x = fs->current_x;
+	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 */
+	 * and as such we should note that so we can destroy it later. */
 	u->xflags = UNsplit_madenew;
 	break;
-#endif /* DISABLE_WRAPPING */
+#endif /* !DISABLE_WRAPPING */
     case UNSPLIT:
-	/* These cases are handled by the earlier check for a new line and action */
-    case ENTER:
+	/* 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);
+    fprintf(stderr, "Done in update_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");
-#endif
-	add_undo(action);
+
     }
-    fs->last_action = action;
-}
 
 #endif /* !NANO_TINY */
 
@@ -1353,7 +1353,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
@@ -1362,17 +1362,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
@@ -1387,8 +1388,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)
@@ -1397,34 +1398,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;
+       /* 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;
@@ -1433,8 +1434,8 @@ 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;
+    char_len = parse_mbchar(line, NULL, NULL);
+    line += char_len;
 
     while (*line != '\0' && (is_blank_mbchar(line)
 #ifndef DISABLE_HELP
@@ -1446,10 +1447,10 @@ ssize_t break_line(const char *line, ssize_t goal
 	    break;
 #endif
 
-	line_len = parse_mbchar(line, NULL, NULL);
+	char_len = parse_mbchar(line, NULL, NULL);
 
-	line += line_len;
-	blank_loc += line_len;
+	line += char_len;
+	blank_loc += char_len;
     }
 
     return blank_loc;
@@ -1811,7 +1812,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
@@ -1969,7 +1970,7 @@ void do_justify(bool full_justify)
     bool modified_save = openfile->modified;
 
     int kbinput;
-    bool meta_key, func_key, s_or_t, ran_func, finished;
+    bool meta_key, func_key;
     const sc *s;
 
     /* Move to the beginning of the current line, so that justifying at
@@ -1981,7 +1982,9 @@ 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;
@@ -2281,14 +2284,13 @@ void do_justify(bool full_justify)
 	do_cursorpos(TRUE);
 
     /* Display the shortcut list with UnJustify. */
-    shortcut_init(TRUE);
+    uncutfunc->desc = unjust_tag;
     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(&meta_key, &func_key, FALSE);
+    s = get_shortcut(MMAIN, &kbinput, &meta_key);
 
     if (s && s->scfunc == do_uncut_text) {
 	/* Splice the justify buffer back into the file, but only if we
@@ -2351,11 +2353,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. */
@@ -2704,7 +2707,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))
@@ -2955,6 +2958,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);
@@ -2978,6 +2985,329 @@ 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;
+    const sc *s;
+    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:%d bytes (%s)\n", 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! %d:%d:%s\n", tmplineno, 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 (1) {
+	ssize_t tmpcol = 1;
+	int kbinput;
+	bool meta_key, func_key;
+
+	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, &meta_key, &func_key);
+	s = get_shortcut(currmenu, &kbinput, &meta_key);
+	tmplint = curlint;
+
+	if (!s)
+	    continue;
+        else if (s->scfunc == do_cancel)
+	    break;
+        else if (s->scfunc == do_help_void) {
+	    tmplint = NULL;
+	    do_help_void();
+        } else if (s->scfunc == do_page_down) {
+	    if (curlint->next != NULL)
+	        curlint = curlint->next;
+	    else {
+	        statusbar(_("At last message"));
+		continue;
+	    }
+	} else if (s->scfunc == do_page_up) {
+	    if (curlint->prev != NULL)
+		curlint = curlint->prev;
+	    else {
+	        statusbar(_("At first message"));
+		continue;
+	    }
+	}
+    }
+    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();
+}
+#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. */
@@ -3083,4 +3413,3 @@ void do_verbatim_input(void)
 
     free(output);
 }
-
diff --git a/src/utils.c b/src/utils.c
index 675a70a4..e311db84 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,9 +1,9 @@
-/* $Id: utils.c 4563 2013-01-13 08:37:54Z astyanax $ */
+/* $Id: utils.c 4893 2014-05-15 20:00:46Z 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)  *
@@ -187,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(). */
@@ -247,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
@@ -259,8 +259,8 @@ 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.  */
+/* 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;
@@ -476,7 +476,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,
@@ -546,7 +549,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;
@@ -598,7 +601,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. */
@@ -630,7 +633,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 d3cf4e46..eb0cedc1 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1,9 +1,9 @@
-/* $Id: winio.c 4569 2013-03-17 22:09:38Z astyanax $ */
+/* $Id: winio.c 4918 2014-05-28 01:35:51Z astyanax $ */
 /**************************************************************************
  *   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,9 +120,10 @@ 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)
+	if ((input = wgetch(win)) == ERR)
            return;
     } else
 	while ((input = wgetch(win)) == ERR) {
@@ -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
@@ -304,14 +304,15 @@ int *get_input(WINDOW *win, size_t input_len)
  * [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. */
+ * off. */
 int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 {
     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, meta_key, func_key)) == ERR)
+	;
 
     /* If we read from the edit window, blank the statusbar if we need
      * to. */
@@ -324,7 +325,7 @@ 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. */
+ * a function key. */
 int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 {
     static int escapes = 0, byte_digits = 0;
@@ -339,7 +340,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:
@@ -610,7 +612,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 #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
@@ -761,12 +763,12 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			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. */
@@ -831,7 +833,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 +843,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/
@@ -980,7 +982,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,28 +1033,28 @@ 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);;
+			retval = sc_seq_or(do_page_down, 0);
 			break;
 		    case '7': /* Esc [ 7 ~ == Home on rxvt. */
 			retval = sc_seq_or(do_home, 0);
@@ -1061,10 +1063,10 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			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/
@@ -1220,13 +1222,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 +1303,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 +1531,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 +1558,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 +1639,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 +1659,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,43 +1679,44 @@ 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);
+		unget_kbinput(s->seq, s->type == META, FALSE);
 	    }
 	} else
 	    /* Handle releases/clicks of the first mouse button that
@@ -1746,8 +1743,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(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,21 +1760,16 @@ 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 menu, int *kbinput, bool *meta_key)
 {
     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. */
@@ -1786,44 +1778,37 @@ const sc *get_shortcut(int menu, int *kbinput, bool
 		&& ((s->type == META && *meta_key == TRUE && *kbinput == s->seq)
 		|| (s->type != META && *kbinput == s->seq))) {
 #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, menu, 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 */
+/* Try to get a function back from a window.  Just a wrapper. */
 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);
+    s = get_shortcut(currmenu, &kbinput, &meta_key);
     if (!s)
 	return NULL;
 
-    f = sctofunc((sc *) s);
-    return f;
-
+    return sctofunc((sc *) s);
 }
 
-
-
 /* 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 +1984,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 +2000,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 +2019,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 +2098,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 +2231,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();
@@ -2260,8 +2248,10 @@ void set_modified(void)
 	titlebar(NULL);
 #ifndef NANO_TINY
 	if (ISSET(LOCKING)) {
-	    if (openfile->lock_filename == NULL) {
-                /* Translators: Try to keep this at most 80 characters. */
+	    if (!strcmp(openfile->filename, ""))
+		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,
@@ -2279,8 +2269,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
 
@@ -2296,7 +2286,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
@@ -2304,21 +2294,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);
@@ -2385,7 +2377,7 @@ void bottombars(int menu)
 	    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) {
@@ -2418,9 +2410,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;
@@ -2429,7 +2424,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);
     }
 }
 
@@ -2477,7 +2477,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. */
@@ -2492,23 +2492,29 @@ 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);
+    /* 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. */
+#ifndef USE_SLANG
+    wredrawln(edit, line, 1);
+#endif
 
-#ifdef ENABLE_COLOR
+#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  */
+	/* 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;
+	    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 */
+		fileptr->multidata[i] = -1;	/* Assume this applies until we know otherwise. */
 	}
 	for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
 	    int x_start;
@@ -2597,16 +2603,16 @@ void edit_draw(filestruct *fileptr, const char *converted, int
 		if (md == -1)
 		    fileptr->multidata[tmpcolor->id] = CNONE; /* until we find out otherwise */
 		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,
@@ -2756,12 +2762,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. */
@@ -2826,10 +2832,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 */
@@ -2838,13 +2844,12 @@ 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. */
@@ -2900,10 +2905,10 @@ int update_line(filestruct *fileptr, size_t index)
 #ifdef DEBUG
 	    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)
@@ -2912,7 +2917,7 @@ int update_line(filestruct *fileptr, size_t index)
 
 	    /* Paint the line. */
 	    edit_draw(fileptr, converted, line, index);
- 	    free(converted);
+	    free(converted);
 	    extralinesused++;
 	}
     }
@@ -2946,8 +2951,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;
@@ -2960,7 +2964,7 @@ void compute_maxrows(void)
 
     maxrows = 0;
     for (n = 0; n < editwinrows && foo; n++) {
-	maxrows ++;
+	maxrows++;
 	n += strlenpt(foo->data) / COLS;
 	foo = foo->next;
     }
@@ -2969,7 +2973,7 @@ void compute_maxrows(void)
 	maxrows += editwinrows - n;
 
 #ifdef DEBUG
-    fprintf(stderr, "compute_maxrows(): maxrows = %ld\n", maxrows);
+    fprintf(stderr, "compute_maxrows(): maxrows = %i\n", maxrows);
 #endif
 }
 
@@ -2981,8 +2985,8 @@ void compute_maxrows(void)
  * 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. */
@@ -2992,36 +2996,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. */
 
@@ -3038,10 +3012,10 @@ 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)) {
+	/* Don't over-scroll on long lines. */
+	if (ISSET(SOFTWRAP) && (direction == UP_DIR)) {
 	    ssize_t len = strlenpt(openfile->edittop->data) / COLS;
-	    i -=  len;
+	    i -= len;
 	    if (len > 0)
 		do_redraw = TRUE;
 	}
@@ -3113,6 +3087,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
@@ -3130,10 +3105,9 @@ 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 %d was offscreen, oldcurrent = %d edittop = %d",
+	    openfile->current->lineno, old_current->lineno, openfile->edittop->lineno);
 #endif
 
 #ifndef NANO_TINY
@@ -3221,7 +3195,7 @@ 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 ||
@@ -3323,6 +3297,13 @@ void total_refresh(void)
  * portion of the window. */
 void display_main_list(void)
 {
+#ifndef DISABLE_COLOR
+    if (openfile->syntax && openfile->syntax->linter)
+	set_lint_shortcuts();
+    else
+	set_spell_shortcuts();
+#endif
+
     bottombars(MMAIN);
 }
 
@@ -3394,7 +3375,6 @@ void disable_nodelay(void)
    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)
@@ -3414,7 +3394,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)
@@ -3426,11 +3406,11 @@ 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
+#ifndef DISABLE_EXTRA
+#define CREDIT_LEN 57
 #define XLCREDIT_LEN 8
 
 /* Easter egg: Display credits.  Assume nodelay(edit) and scrollok(edit)
@@ -3454,9 +3434,10 @@ void do_credits(void)
 	"David Lawrence Ramsey",
 	"David Benbennick",
 	"Mike Frysinger",
+	"Benno Schulenberg",
 	"Ken Tyler",
 	"Sven Guckes",
-	NULL,				/* credits[15], handled below. */
+	NULL,				/* credits[16], handled below. */
 	"Pauli Virtanen",
 	"Daniele Medri",
 	"Clement Laforet",
@@ -3470,6 +3451,7 @@ void do_credits(void)
 	"Albert Chin",
 	"",
 	NULL,				/* "Special thanks to:" */
+	"Monique, Brielle & Joseph",
 	"Plattsburgh State University",
 	"Benet Laboratories",
 	"Amy Allegretta",
@@ -3489,7 +3471,7 @@ void do_credits(void)
 	"",
 	"",
 	"",
-	"(C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007",
+	"(C) 1999 - 2014",
 	"Free Software Foundation, Inc.",
 	"",
 	"",
@@ -3509,10 +3491,10 @@ void do_credits(void)
 	N_("Thank you for using nano!")
     };
 
-    /* credits[15]: Make sure this name is displayed properly, since we
+    /* credits[16]: 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] =
+    credits[16] =
 #ifdef ENABLE_UTF8
 	 using_utf8() ? "Florian K\xC3\xB6nig" :
 #endif
@@ -3594,4 +3576,4 @@ void do_credits(void)
 
     total_refresh();
 }
-#endif /* NANO_EXTRA */
+#endif /* !DISABLE_EXTRA */