Various changes
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 2e56ccb..63461ee 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0aa.  Last change: 2004 May 08
+*change.txt*    For Vim version 7.0aa.  Last change: 2004 Jun 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -963,8 +963,9 @@
 1. Unnamed register ""				*quote_quote* *quotequote*
 Vim fills this register with text deleted with the "d", "c", "s", "x" commands
 or copied with the yank "y" command, regardless of whether or not a specific
-register was used (e.g.  "xdd).  An exception is the '_' register: "_dd does
-not store the deleted text in any register.  Vim uses the contents of this
+register was used (e.g.  "xdd).  This is like the unnamed register is pointing
+to the last used register.  An exception is the '_' register: "_dd does not
+store the deleted text in any register.  Vim uses the contents of this
 register for any put command (p or P) which does not specify a register.
 Additionally you can access it with the name '"'.  This means you have to type
 two double quotes.  Writing to the "" register writes to register "0.
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index e25c34a..827f780 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0aa.  Last change: 2004 Apr 28
+*editing.txt*   For Vim version 7.0aa.  Last change: 2004 Jun 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -338,6 +338,7 @@
 backticks must be around the whole item.  It is not possible to have text
 directly before the first or just after the last backtick.
 
+							*`=*
 You can have the backticks expanded as a Vim expression, instead of
 an external command, by using the syntax `={expr}` e.g. >
 	:let foo='bar'
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index cbe1237..00f5474 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0aa.  Last change: 2004 May 20
+*fold.txt*      For Vim version 7.0aa.  Last change: 2004 Jun 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -564,7 +564,7 @@
 deletes the whole closed fold under the cursor.
 
 For Ex commands the range is adjusted to always start at the first line of a
-fold and end at the last line of a fold.  Thus this command: >
+closed fold and end at the last line of a closed fold.  Thus this command: >
 	:s/foo/bar/g
 when used with the cursor on a closed fold, will replace "foo" with "bar" in
 all lines of the fold.
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 430a3eb..2e59cc0 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0aa.  Last change: 2004 Jun 02
+*gui.txt*       For Vim version 7.0aa.  Last change: 2004 Jun 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -932,6 +932,22 @@
 	else
 	   echo "Boring old console"
 	endif
+<							*setting-guifont*
+- When you use the same vimrc file on various systems, you can use something
+  like this to set options specifically for each type of GUI: >
+
+	if has("gui_running")
+	    if has("gui_gtk2")
+		:set guifont=Luxi\ Mono\ 12
+	    elseif has("gui_kde")
+		:set guifont=Luxi\ Mono/12/-1/5/50/0/0/0/1/0
+	    elseif has("x11")
+		" Also for GTK 1
+		:set guifont=*-lucidatypewriter-medium-r-normal-*-*-180-*-*-m-*-*
+	    elseif has("gui_win32")
+		:set guifont=Luxi_Mono:h12:cANSI
+	    endif
+	endif
 
 ==============================================================================
 7. Shell Commands					*gui-shell*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 5dfb582..0d48e98 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 08
+*options.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2795,31 +2795,42 @@
 	the font cannot be found you will get an error message.  To try other
 	font names a list can be specified, font names separated with commas.
 	The first valid font is used.
+
 	When 'guifontset' is not empty, 'guifont' is not used.
+
 	Spaces after a comma are ignored.  To include a comma in a font name
 	precede it with a backslash.  Setting an option requires an extra
 	backslash before a space and a backslash.  See also
 	|option-backslash|.  For example: >
 	    :set guifont=Screen15,\ 7x13,font\\,with\\,commas
-<	will make vim try to use the font "Screen15" first, and if it fails it
+<	will make Vim try to use the font "Screen15" first, and if it fails it
 	will try to use "7x13" and then "font,with,commas" instead.
+
+	If none of the fonts can be loaded, Vim will keep the current setting.
+	If an empty font list is given, Vim will try using other resource
+	settings (for X, it will use the Vim.font resource), and finally it
+	will try some builtin default which should always be there ("7x13" in
+	the case of X).  The font names given should be "normal" fonts.  Vim
+	will try to find the related bold and italic fonts.
+
+	For Win32, GTK and Photon only: >
+	    :set guifont=*
+<	will bring up a font requester, where you can pick the font you want.
+
+	The font name depends on the GUI used.  See |setting-guifont| for a
+	way to set 'guifont' for various systems.
+
 	For the GTK+ 2 GUI the font name looks like this: >
 	    :set guifont=Andale\ Mono\ 11
 <	That's all.  XLFDs are no longer accepted.
 								*E236*
 	Note that the fonts must be mono-spaced (all characters have the same
-	width).
+	width).  An exception is GTK 2: all fonts are accepted, but
+	mono-spaced fonts look best.
+
 	To preview a font on X11, you might be able to use the "xfontsel"
 	program.  The "xlsfonts" program gives a list of all available fonts.
-	For Win32, GTK and Photon only: >
-	    :set guifont=*
-<	will bring up a font requester, where you can pick the font you want.
-	If none of the fonts can be loaded, vim will keep the current setting.
-	If an empty font list is given, vim will try using other resource
-	settings (for X, it will use the Vim.font resource), and finally it
-	will try some builtin default which should always be there ("7x13" in
-	the case of X).  The font names given should be "normal" fonts.  Vim
-	will try to find the related bold and italic fonts.
+
 	For the Win32 GUI					*E244* *E245*
 	- takes these options in the font name:
 		hXX - height is XX (points, can be floating-point)
@@ -2913,7 +2924,7 @@
 			global
 			{not in Vi}
 			{only available when compiled with GUI enabled}
-	This option only has an effect in the GUI version of vim.  It is a
+	This option only has an effect in the GUI version of Vim.  It is a
 	sequence of letters which describes what components and options of the
 	GUI should be used.
 	To avoid problems with flags that are added in the future, use the
@@ -4484,10 +4495,11 @@
 	    system('lpr' . (&printdevice == '' ? '' : ' -P' . &printdevice)
 		. ' ' . v:fname_in) . delete(v:fname_in) + v:shell_error
 <
-	On MS-Windows machines the default is to copy the file to the
-	currently specified printdevice: >
+	On MS-Dos, MS-Windows and OS/2 machines the default is to copy the
+	file to the currently specified printdevice: >
 
-	    system('copy' . ' ' . v:fname_in . ' "' . &printdevice . '"')
+	    system('copy' . ' ' . v:fname_in . (&printdevice == ''
+			? ' LPT1:' : (' \"' . &printdevice . '\"')))
 			. delete(v:fname_in)
 <
 	On VMS machines the default is to send the file to either the default
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 160bcb9..f9e1301 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.0aa.  Last change: 2004 May 28
+*starting.txt*  For Vim version 7.0aa.  Last change: 2004 Jun 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1019,6 +1019,11 @@
 To change it later, use a ":let" command like this: >
 	:let $VIMRUNTIME = "/home/piet/vim/vim54"
 
+In case you need the value of $VIMRUNTIME in a shell (e.g., for a script that
+greps in the help files) you might be able to use this: >
+
+	VIMRUNTIME=`vim -e -T dumb --cmd 'exe "set t_cm=\<C-M>"|echo $VIMRUNTIME|quit' | tr -d '\015' `
+
 ==============================================================================
 6. Suspending						*suspend*
 
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index db32235..5bd9723 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 09
+*syntax.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1348,7 +1348,7 @@
 original one and then adds the code to highlight functions.
 
 In java 1.1 the functions System.out.println() and System.err.println() should
-only be used for debugging. Therefor it is possible to highlight debugging
+only be used for debugging.  Therefore it is possible to highlight debugging
 statements differently. To do this you must add the following definition in
 your startup file: >
 	:let java_highlight_debug=1
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 9a77ade..25f0a20 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -3844,6 +3844,7 @@
 `.	motion.txt	/*`.*
 `0	motion.txt	/*`0*
 `<	motion.txt	/*`<*
+`=	editing.txt	/*`=*
 `>	motion.txt	/*`>*
 `A	motion.txt	/*`A*
 `[	motion.txt	/*`[*
@@ -4018,6 +4019,7 @@
 bufwinnr()	eval.txt	/*bufwinnr()*
 bug-fixes-5	version5.txt	/*bug-fixes-5*
 bug-fixes-6	version6.txt	/*bug-fixes-6*
+bug-fixes-7	version7.txt	/*bug-fixes-7*
 bug-reports	intro.txt	/*bug-reports*
 bugreport.vim	intro.txt	/*bugreport.vim*
 bugs	intro.txt	/*bugs*
@@ -4166,6 +4168,7 @@
 compatible-default	starting.txt	/*compatible-default*
 compile-changes-5	version5.txt	/*compile-changes-5*
 compile-changes-6	version6.txt	/*compile-changes-6*
+compile-changes-7	version7.txt	/*compile-changes-7*
 compiler-manx	quickfix.txt	/*compiler-manx*
 compiler-pyunit	quickfix.txt	/*compiler-pyunit*
 compiler-select	quickfix.txt	/*compiler-select*
@@ -5056,12 +5059,14 @@
 improved-viminfo	version5.txt	/*improved-viminfo*
 improvements-5	version5.txt	/*improvements-5*
 improvements-6	version6.txt	/*improvements-6*
+improvements-7	version7.txt	/*improvements-7*
 inactive-buffer	windows.txt	/*inactive-buffer*
 include-search	tagsrch.txt	/*include-search*
 inclusive	motion.txt	/*inclusive*
 incomp-small-6	version6.txt	/*incomp-small-6*
 incompatible-5	version5.txt	/*incompatible-5*
 incompatible-6	version6.txt	/*incompatible-6*
+incompatible-7	version7.txt	/*incompatible-7*
 indent()	eval.txt	/*indent()*
 indent-expression	indent.txt	/*indent-expression*
 indent.txt	indent.txt	/*indent.txt*
@@ -5378,6 +5383,7 @@
 network	pi_netrw.txt	/*network*
 new-5	version5.txt	/*new-5*
 new-6	version6.txt	/*new-6*
+new-7	version7.txt	/*new-7*
 new-GTK-GUI	version5.txt	/*new-GTK-GUI*
 new-Select-mode	version5.txt	/*new-Select-mode*
 new-View	version6.txt	/*new-View*
@@ -5387,6 +5393,7 @@
 new-color-schemes	version6.txt	/*new-color-schemes*
 new-commands	version5.txt	/*new-commands*
 new-commands-5.4	version5.txt	/*new-commands-5.4*
+new-data-types	version7.txt	/*new-data-types*
 new-debug-itf	version6.txt	/*new-debug-itf*
 new-debug-mode	version6.txt	/*new-debug-mode*
 new-diff-mode	version6.txt	/*new-diff-mode*
@@ -5405,6 +5412,7 @@
 new-highlighting	version5.txt	/*new-highlighting*
 new-indent-flex	version6.txt	/*new-indent-flex*
 new-items-6	version6.txt	/*new-items-6*
+new-items-7	version7.txt	/*new-items-7*
 new-line-continuation	version5.txt	/*new-line-continuation*
 new-multi-byte	version5.txt	/*new-multi-byte*
 new-multi-lang	version6.txt	/*new-multi-lang*
@@ -5794,6 +5802,7 @@
 setcmdpos()	eval.txt	/*setcmdpos()*
 setline()	eval.txt	/*setline()*
 setreg()	eval.txt	/*setreg()*
+setting-guifont	gui.txt	/*setting-guifont*
 setwinvar()	eval.txt	/*setwinvar()*
 sftp	pi_netrw.txt	/*sftp*
 sgml-syntax	syntax.txt	/*sgml-syntax*
@@ -6387,6 +6396,7 @@
 version4.txt	version4.txt	/*version4.txt*
 version5.txt	version5.txt	/*version5.txt*
 version6.txt	version6.txt	/*version6.txt*
+version7.txt	version7.txt	/*version7.txt*
 vi-differences	vi_diff.txt	/*vi-differences*
 vi:	options.txt	/*vi:*
 vi_diff.txt	vi_diff.txt	/*vi_diff.txt*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index c8b9576..00d94c1 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2004 Jun 13
+*todo.txt*      For Vim version 7.0aa.  Last change: 2004 Jun 16
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,22 +30,241 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-GTK2: font dialog uses font size zero when 'guifont' is "Courier".  Patch from
-Yasuhiro Matsumoto, 2004 June 8.
+This example doesn't work:
+    :e `=foo . ".c" `
+Inside `` don't use " as the start of a comment.
+Also don't expand % or #.
 
-Python indent: # aser: still adds extra indent.
+Corrections for docs from A3.  Skip ones already done.
 
 
 For version 7.0:
 -   Include many PATCHES:
+    9   Win32 GuI: The print dialog uses a font which doesn't display multi-byte
+	messages.  Include patch from Vipin Aravind?  Update from Yasuhiro
+	Matsumoto.
+    8   ":winpos" doesn't work.  Patch from Vipin Aravind.
+    8   Add GTK 2.3 file dialog support.  Patch by Grahame Bowland, 2004 Mar 15,
+	but it doesn't use "initdir" or "dflt". (will update patch)
+    8   On Sinix SYS_NMLN isn't defined.  Include patch from Cristiano De
+	Michele.  He no longer has such a machine.
+    8   Add file locking.  Lock a file when starting to edit it with flock() or
+	fcntl().  This patch has advisory file locking while reading/writing
+	the file: ~/vim/patches/kahn_file_locking .
+	Do we still want this/
+    8   Add buffer-local autocommands?  Reduces overhead for autocommands that
+	trigger often (inserting a character, switching mode).
+	    :au Event <buffer> do-something
+	E.g.:
+	    :au BufEnter <buffer> menu enable ...
+	    :au BufLeave <buffer> menu disable ...
+	Patch from Yakov Lerner, including test (2004 Jan 7).
+        He'll send updated patch.
+    Autocommands:
+	VimResized	    - When the Vim window has been resized (SIGWINCH)
+	  patch from Yakov Lerner, 2003 July 24.
+	  He'll write documentation and send updated patch.
     -   Include the kvim patch. http://freenux.org/vim/ (Mickael Marchand)
 	Do not add Qtopia yet, it doesn't work very well.
+	Mickael will update the patch before 21st.
+    --- responses above
+    7   Make "5dd" on last-but-one-line not delete anything (Vi compatible).
+	Add flag in 'cpoptions' for this.  When not present, "2dd" in the last
+	line should delete the last line.  Patch from greenx 2002 Apr 11.
+    8   Accelerators don't work in a dialog.  Include patch from Martin Dalecki
+	(Jan 3, tested by David Harrison).  Should work with Alt-o then.
+    7   Use accelerators for the Motif file selection dialog.  Patch from
+	Martin Dalecki 2002 Jan 11.
+    8   Add a few more command names to the menus.  Patch from Jiri Brezina
+	(28 feb 2002).
+    8   Patch to add 'transparency' option.  Disadvantage: it's slow. (Eckehard
+	Berns, 2004 May 9) http://ecki.to/vim-icns/TransBack.diff
+    8   Patches from "Rain Dog" Cucka:
+	- guifont selector (2002 Dec 15)
+	- scrollbar (2002 Dec 8)
+	- Quartz fonts (2002 Dec 8)
+    7   ATTENTION dialog choices are more logical when "Delete it' appears
+	before "Quit".  Patch by Robert Webb, 2004 May 3.
+    8   Unix: When libcall() fails there is no clear error message.  Johannes
+	Zellner has a patch for this.
+    8   ":hardcopy":
+	- Patch to append CTRL-D to PostScript output (Mike Williams, 2004 Jun
+	  14)
+	- support printing multi-byte characters.  Patch from Motonobu
+	  Ichimura.  New (better) patch from Mike Williams (2004 Jan 20)
+    9   Merge in ideas from ~/vim/patches/tutor.txt (Gabriel Zachmann)
+    8   Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
+    -   Include flipcase patch: ~/vim/patches/wall.flipcase2 ?  Make it work
+	for multi-byte characters.
+    7   Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
+	'flipcase' variable: upper/lowercase pairs.
+	Insert comma's between pairs and allow a range, make it look like
+	'isfname'.  E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153".  The colon to
+	separate the from and to part is optional.
+    -   Win32: add options to print dialog.  Patch from Vipin Aravind.
+    -   Patch to add highlighting for whitespace. (Tom Schumm, 2003 Jul 5)
+	use the patch that keeps using HLF_8 if HLF_WS has not
+	been given values.
+	Add section in help files for these highlight groups?
+    8   "fg" and "bg" don't work in an xterm.  Get default colors from xterm
+	with an ESC sequence.  Ideas in: ~/vim/patches/vikas.xtermcolors .
+    7   Add "DefaultFG" and "DefaultBG" for the colors of the menu. (Martin
+	Dalecki has a patch for Motif)
+    -   Add possibility to highlight specific columns (for Fortran).  Or put a
+	line in between columns (e.g. for 'textwidth').
+	Patch to add 'hlcolumn' from Vit Stradal, 2004 May 20.
+    9   Add cursor-column highlighting.  Enable it with 'cursorcolumn' option,
+	set highlighting with "CursorColumn" group.  Useful for aligning text.
+	Also cursor-row highlighting.  Patch from Yasuhiro Matsumoto for
+	underlining the cursor line, 2004 Mar 24.
+	Alternatie: when 'number' is set highlight the number of the current
+	line.
+    7   Be able to call a function while passing on a variable number of
+	arguments:
+	    :function Foo(abc, ...)
+	    :  call Bar(a:abc, a:*)
+	Charles Campbell has a patch for this
+    8   Add ":n" to fnamemodify(): normalize path, remove "../" when possible.
+	Aric Blumer has a patch for this.
+    8   Add functions:
+	tr(expr, from, to)	translate chars (Patch from Ron Aaron, Apr 8
+				2004)
+	strrep()		Repeat a string (patch from Christophe Poucet,
+				2003 Sep 12, also contains XX)
+				Alt: repeat(expr, count) werkt ook voor lists.
+	mousex() mousey()	get position of mouse pointer (patch by Ross
+				Presser)
+				He will send a new patch.
+				Is this really useful?
+	---
+	multibyteidx(string, idx) Byte index in multi-byte character.
+				Patch by Ilya Sher, 2004 Feb 25
+	menuprop({name}, {idx}, {what})
+				Get menu property of menu {name} item {idx}.
+				menuprop("", 1, "name") returns "File".
+				menuprop("File", 1, "n") returns "nmenu
+				File.Open..." argument.
+				Patch by Ilya Sher, 2004 Apr 22
+	mapname({idx}, mode)	return the name of the idx'th mapping.
+				Patch by Ilya Sher, 2004 Mar 4.
+	match({pat}, {string} [,start] [,count]) get index of count'th match
+				Patch by Ilya Sher, 2004 Mar 31
+	find()			find file in 'path' (patch from Johannes
+				Zellner 2001 Dec 20)
+	realname()		Get user name (first, last, full)
+				user_fullname() patch by Nikolai Weibull, Nov
+				3 2002)
+	getfperm()		file permissions, in form "rwxrwxrwx"
+				(patch from Nikolai Weibull 2003 Jan 13)
+	getftype()		"file", "dir", "link", "other"?
+				(patch from Nikolai Weibull 2003 Jan 13)
+	setbufline()		set line in any buffer (patch from Yegappan
+				Lakshmanan, 2003 Jan 21)
+	winnr("$")		Get number of windows.  (patch from Nikolai
+				Weibull 2003 Jan 13) (another patch from
+				Yegappan Lakshmanan, 2003 Aug 31)
+	search()		Add optional offset argument.
+				Add 'n' flag.  (patch from Nikolai Weibull
+				2003 Jan 13)
+	confirm()		add "flags" argument, with 'v' for vertical
+				layout and 'c' for console dialog. (Haegg)
+				Flemming Madsen has a patch for the 'c' flag
+				(2003 May 13)
+	system({cmd}, {expr})	Filter {expr} through the shell command
+				{cmd} and return the result.
+				(Patch from Yegappan Lakshmanan)
+	raisewin()		raise gvim window (see HierAssist patch for
+				Tcl implementation ~/vim/HierAssist/ )
+	gettext()		Translate a message.  (Patch from Yasuhiro
+				Matsumoto) How to get the messages into the
+				.po files?
+    7   Add "nbsp" in 'listchars'?  Patch from David Blanchet, 2003 Jul 28.
+    7   Add patch from Benoit Cerrina to integrate Vim and Perl functions
+	better.  Now also works for Ruby (2001 Nov 10)
+    7   Add 'taglistfiles' option, show file name and type when listing matching
+	tags name with CTRL-D completion.  Patch from Yegappan Lakshmanan.
+    7   Motif: use the menu font consistently.  Patch from Martin Dalecki 2002
+	Jan 11.
+    -   Motif: add 3D shading for the menu entries?  Patch from Martin Dalecki.
+    8   Add expression-expansion, so that the user can define his own kind of
+	completion.  Patch from Taro Muraoka, 2003 Aug 26.
+    7   Completion of network shares, patch by Yasuhiro Matsumoto.
+    9   When 'autoindent' is set, hitting <CR> twice, while there is text after
+	the cursor, doesn't delete the autoindent in the resulting blank line.
+	(Rich Wales) This is Vi compatible, but it looks like a bug.  Rich has
+	a suggestion for a patch to fix this.
+	e-mail to Rich bounced.
+    7   Make ":startinsert" command work directly for functions and scripts?
+	Also make it possible to append (it's difficult at end of line).
+	And add ":startreplace" (patch by Charles Campbell, 2004 Jan 9,
+	http://www.erols.com/astronaut/vim/index.html#Patch)
+    8   Text objects: Add "a'" and 'a"': a single or double quoted string.
+	(Tim Chase) Patch from Taro Muraoka (2003 Dec 16).
+    7   For Visual mode: Command to do a search for the string in the marked
+	area.  Only when fewer than two lines. Use "g/" and "gb".  Patch from
+	Yegappan Lakshmanan.
+    7   When 'rightleft' is set, the search pattern should be displayed right
+	to left as well?  See patch of Dec 26. (Nadim Shaikli)
+    8   Add patch from Charles Campbell to have ":0file!" remove the name of
+	the current buffer. (2003 June 17)
+    8   Make it possible to delete marks.  Charles Campbell has a patch that
+	does this with the markclear() function (2004 Jan 9).  And the
+	":delmark" command (2004 Feb 9)
+    7   Win32: Add patch for 5-button mouse. (Michael Geddes 2001 Nov 26)
+    8   Lock all used memory so that it doesn't get swapped to disk (uncrypted).
+	Patch by Jason Holt, 2003 May 23.
+    7   Support a stronger encryption.  Jason Holt implemented AES (May 6 2003).
+    7   Add ! register, for shell commands. (patch from Grenie)
+    7   Add the MzScheme interface.  Patch on http://iamphet.nm.ru/scheme/
+	(Sergey Khorev)
+    8   Make 'statusline' local, so that each window can have a different
+	value.  But should it also be local to a buffer? (Yegappan Lakshmanan
+	has a patch, 2002 feb 15)
+    8   In the gzip plugin, also recognize *.gz.orig, *.gz.bak, etc.  Like it's
+	done for filetype detection.  Patch from Walter Briscoe, 2003 Jul 1.
+    7   Add a "-@ filelist" argument: read file names from a file. (David
+	Kotchan has a patch for it)
+    8   Add term entries for function keys on xterm with alt and ctrl (new in
+	pl 94).  E.g., Control adds ";5" in "<Esc>[20;5~".  Find a generic way
+	to prepend a modifier in console mode, to avoid having to specify each
+	individual modified key.
+	Steve Wall has a patch (2002 Mar 12) for adding function keys up to 37,
+	with modifiers.
+    8   Include a connection to an external program through a pipe?  See
+	patches from Felbinger for a mathematica interface.
+	Or use emacs server kind of thing?
+    7   Add an option to set the width of the 'number' column.  Eight
+	positions is often more than needed.  Or adjust the width to the
+	length of the file?
+	Add patch that adds 'numberlen' option. (James Harvey)
+	Other patch with min and max from Emmanuel Renieris (2002 Jul 24)
+	Other patch without an option by Gilles Roy (2002 Jul 25)
+    7   Add ":justify" command.  Patch from Vit Stradal 2002 Nov 25.
+    -   findmatch() should be adjusted for Lisp.  See remark at
+	get_lisp_indent().  Esp. \( and \) should be skipped. (Dorai Sitaram,
+	incomplete patch Mar 18)
+    8   Sorting of filenames for completion is wrong on systems that ignore
+	case of filenames.  Add 'ignorefncase' option.  When set, case in
+	filenames is ignored for sorting them. Patch by Mike Williams:
+	~/vim/patches/ignorefncase.  Also change what matches?  Or use another
+	option name.
+-   Change ga_room into ga_maxlen, so that it doesn't need to be
+    incremented/decremented each time.
 -   new DATA TYPES: lists, dictionaries and function references.
+	Check old patch from Robert Webb for array support.
     Add type checking?  See ~/vim/ideas.txt.
 -   Add SPELLCHECKER, with easy to add support for many languages.
+    8   Add spell checking.  Use "ispell -a" somehow.
+	~/vim/patches/wm_vim-5_4d.zip  can be used as an example (includes
+	ispell inside Vim).  Gautam Iyer has an example with "aspell".
+	"engspchk" from Charles Campbell is a good way.  Support for
+	approximate-regexps will help (agrep http://www.tgries.de/agrep/).
 -   REFACTORING: The main() function is very long.  Move parts to separate
     functions, especially loops.  Ideas from Walter Briscoe (2003 Apr 3, 2004
     Feb 9).
+-   Improve the interface between the generic GUI code and the system-specific
+    code.  Generic code handles text window with scrollbars, system-specific
+    code menu, toolbar, etc.
 -   Store messages to allow SCROLLING BACK for all commands.  And other "less"
     like commands.
 -   "INTELLISENSE".  First cleanup the Insert-mode completion.
@@ -81,6 +300,7 @@
 -   STICKY CURSOR: Add a way of scrolling that leaves the cursor where it is.
     Especially when using the scrollbar.  Typing a cursor-movement command
     scrolls back to where the cursor is.
+8   Support four composing characters, needed for Hebrew. (Ron Aaron)
 
 
 Vi incompatibility:
@@ -135,9 +355,6 @@
     (Sayre).
 7   Add flag in 'cpoptions' that makes operator (yank, filter) not move the
     cursor, at least when cancelled. (default Vi compatible).
-7   Make "5dd" on last-but-one-line not delete anything (Vi compatible).
-    Add flag in 'cpoptions' for this.  When not present, "2dd" in the last
-    line should delete the last line.  Patch from greenx 2002 Apr 11.
 7   This Vi-trick doesn't work: "Q" to go to Ex mode, then "g/pattern/visual".
     In Vi you can edit in visual mode, and when doing "Q" you jump to the next
     match.  Nvi can do it too.
@@ -210,8 +427,6 @@
     Put focus event in input buffer and let generic Vim code handle it?
 8   When activating the Vim window with mouse click, don't move cursor to
     mouse position.  Catch WM_MOUSEACTIVATE. (Luevelsmeyer)
-9   The print dialog uses a font which doesn't display multi-byte messages.
-    Include patch from Vipin Aravind?  Update from Yasuhiro Matsumoto.
 8   Win32: When mouse is hidden and in the toolbar, moving it won't make it
     appear. (Sami Salonen)
 8   Windows NT: writing to aux.* makes Vim hang. (Acevedo)
@@ -311,10 +526,6 @@
 
 Motif GUI:
 8   Popup menu ordering is wrong.
-8   Accelerators don't work in a dialog.  Include patch from Martin Dalecki
-    (Jan 3, tested by David Harrison).  Should work with Alt-o then.
-7   Use accelerators for the Motif file selection dialog.  Patch from Martin
-    Dalecki 2002 Jan 11.
 7   Use XmStringCreateLocalized() instead of XmStringCreateSimple()?
     David Harrison says it's OK (it exists in Motif 1.2).
 8   The texts in the find/replace dialog don't use the right font.
@@ -344,7 +555,6 @@
     doesn't work.
 8   Menu priority for sub-menus for: Amiga, BeOS.
 8   Add menu separators for Amiga, RISCOS.
-8   Add a few more command names.  Patch from Jiri Brezina (28 feb 2002).
 8   Add way to specify the file filter for the browse dialog.  At least for
     browse().
 8   Add dialog for search/replace to other GUIs?  Tk has something for this,
@@ -491,7 +701,6 @@
     a Netware network drive.  Use same function as for Win32 GUI?
 8   In os_win32.h, HAVE_STRICMP and HAVE_STRNICMP are defined only if __GNUC__
     is not defined.  Shouldn't that be the other way around?
-8   ":winpos" doesn't work.  Patch from Vipin Aravind.
 7   Use SetConsoleCP() and SetConsoleOutputCP() to implement 'termencoding'?
     Avoids that input and output work differently.  Need to be restored when
     exiting.
@@ -516,12 +725,6 @@
 8   Inputting Unicode characters does not work in the terminal.  They appear
     to arrive as upper and lower bytes. (David Brown, 2004 April 17)
 8   Typing Unicode characters doesn't work at all in the GUI.
-8   Patch to add 'transparency' option.  Disadvantage: it's slow. (Eckehard
-    Berns, 2004 May 9) http://ecki.to/vim-icns/TransBack.diff
-8   Patches from "Rain Dog" Cucka:
-    - guifont selector (2002 Dec 15)
-    - scrollbar (2002 Dec 8)
-    - Quartz fonts (2002 Dec 8)
 9   Problems in Carbon version for OS X: (Benji Fisher)
     - keyboard shortcuts in the menus get lost.
 8   The Vim/About menu doesn't work.
@@ -563,8 +766,6 @@
     when compiled with Python (threading).
 7   The messages for "vim --help" and "vim --version" don't use
     'termencoding'.
-7   ATTENTION dialog choices are more logical when "Delete it' appears before
-    "Quit".  Patch by Robert Webb, 2004 May 3.
 8   When 'scrollbind' is set, a window won't scroll horizontally if the cursor
     line is too short.  Add a word in 'scrollopt' to allow moving the cursor
     to longer line that is visible.  A similar thing is done for the GUI when
@@ -651,8 +852,6 @@
 9   The "Error detected while processing modelines" message should have an
     error number.
 7   The message in bt_dontwrite_msg() could be clearer.
-8   Unix: When libcall() fails there is no clear error message.  Johannes
-    Zellner has a patch for this.
 8   The script ID that is stored with an option and displayed with ":verbose
     set" isn't reset when the option is set internally.  For example when
     'foldlevel' is set from 'foldlevelstart'.
@@ -678,13 +877,10 @@
 8   When using CTRL-D after ":help", restrict the number of matches to a
     thousand, otherwise using CTRL-D without an argument takes too long.
 8   ":hardcopy":
-    - Patch to append CTRL-D to PostScript output (Mike Williams, 2004 Jun 11)
     - Using the cterm_color[] table is wrong when t_colors is > 16.
     - Need to handle unprintable characters.
     - Win32: On a B&W printer syntax highlighting isn't visible.  Perform
       dithering to make grey text?
-    - support printing multi-byte characters.  Patch from Motonobu Ichimura.
-      New (better) patch from Mike Williams (2004 Jan 20)
     - Add a flag in 'printoptions' to add an empty page to make the total
       number even.  "addempty"? (Mike Williams)
     - Should interpreted CTRL-L as a page break.
@@ -817,7 +1013,6 @@
     it. (Lohner)  Try out with "vt100" entry, cm replaced with cX.
 7   When an include file starts with "../", the check for already visiting
     this file doesn't work.  Need to simplify the file name.
-8   On Sinix SYS_NMLN isn't defined.  Include patch from Cristiano De Michele.
 7   The names and comments for the arguments of do_browse() are confusing.
     "dflt" isn't the default file name when "initdir" is not NULL and
     "initdir" is the default path to be used.
@@ -927,7 +1122,6 @@
 
 Documentation:
 8   Extend usr_27.txt a bit. (Adam Seyfarth)
-9   Merge in ideas from ~/vim/patches/tutor.txt (Gabriel Zachmann)
 7   Add a section on debugging scripts in the user manual.
 9   Make the Reference Manual more precise.  For each command mention:
     - change to cursor position and curswant
@@ -989,9 +1183,6 @@
     disabling it.  Be careful that tear-offs don't disappear (keep one empty
     item?).
     Alternative: use BufEnter and BufLeave autocommands.
-8   Add file locking.  Lock a file when starting to edit it with flock() or
-    fcntl().  This patch has advisory file locking while reading/writing the
-    file: ~/vim/patches/kahn_file_locking .
 8   make a vimtutor script for Amiga and other systems.
 7   Add the arguments for configure to the ":version" output?
 
@@ -1065,14 +1256,10 @@
     so that the user can fix the problem.
 8   Add configure option to be able to disable using the iconv library. (Udo
     Schweigert)
-8   Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
 9   'aleph' should be set to 1488 for Unicode. (Zvi Har'El)
 8   Should add test for using various commands with multi-byte characters.
--   Include flipcase patch: ~/vim/patches/wall.flipcase2 ?  Make it work for
-    multi-byte characters.
 8   'infercase' doesn't work with multi-byte characters.
 8   toupper() function doesn't handle byte count changes.
-8   Support four composing characters, needed for Hebrew. (Ron Aaron)
 8   "ga" should show all composing characters, also if there are more than 2.
 7   When searching, should order of composing characters be ignored?
 8   Should implement 'delcombine' for command line editing.
@@ -1122,7 +1309,6 @@
 -   Win32: when 'printfont' is empty use 'guifont'.
 -   Unix: Use some dialog box to do the obvious settings (paper size, printer
     name, portrait/landscape, etc).
--   Win32: add options to print dialog.  Patch from Vipin Aravind.
 -   PostScript: only works for 7-bit ASCII and EBCDIC.  Should support
     different 'encoding' values somehow.
 -   Allow specifying the paper size, instead of using a standard size.  Same
@@ -1133,10 +1319,6 @@
 
 
 Syntax highlighting:
--   Patch to add highlighting for whitespace. (Tom Schumm, 2003 Jul 5)
-    use the patch that keeps using HLF_8 if HLF_WS has not
-    been given values.
-    Add section in help files for these highlight groups?
 8   Make ":syn off" use 'runtimepath' instead of $VIMRUNTIME. (Gary Johnson)
     Should do the same for ":syn on" and ":syn manual".
 8   Support "containedin" argument for ":syn include", so that the defined
@@ -1184,8 +1366,6 @@
     re-insert the [] if possible.
 8   Make it possible to use color of text for Visual highlight group (like for
     the Cursor).
-8   "fg" and "bg" don't work in an xterm.  Get default colors from xterm with
-    an ESC sequence.  Ideas in: ~/vim/patches/vikas.xtermcolors .
 8   Make it possible to only highlight a sub-expression of a match.  Like
     using "\1" in a ":s" command.
 8   Support for deleting syntax items:
@@ -1204,8 +1384,6 @@
     character.  For Visual mode. (xterm-selection already does this).
 8   Highlight non-printable characters with "SpecialChar", linked to
     "Special".  Display them with the digraph characters, if possible.
-7   Add "DefaultFG" and "DefaultBG" for the colors of the menu. (Martin
-    Dalecki has a patch for Motif)
 8   Highlight the clipboard-selection with a highlight group.
 8   Be able to reset highlighting to its original (default) values.
 7   Be able to write current highlighting to a file as commands, similar to
@@ -1236,11 +1414,6 @@
 7   CTRL-] checks the highlight group for finding out what the tag is.
 7   Add an explanation how a list of words can be used to highlight misspelled
     words.
-8   Add spell checking.  Use "ispell -a" somehow.
-    ~/vim/patches/wm_vim-5_4d.zip  can be used as an example (includes ispell
-    inside Vim).  Gautam Iyer has an example with "aspell".  "engspchk" from
-    Charles Campbell is a good way.  Support for approximate-regexps will help
-    (agrep http://www.tgries.de/agrep/).
 7   Command line completion for ":find" should search in 'path'.
 8   Add more command line completion for :syntax.
 8   Add more command line completion for :highlight.
@@ -1267,9 +1440,6 @@
 -   Make it possible to add "contains" items for all items in a group.	Useful
     when extending an already existing syntax file.
 -   Add line-continuation pattern for non-syncing items too?
--   Add possibility to highlight specific columns (for Fortran).  Or put a
-    line in between columns (e.g. for 'textwidth').
-    Patch to add 'hlcolumn' from Vit Stradal, 2004 May 20.
 -   Add possibility to highlight the whole line, including the right margin
     (for comment blocks).
 -   Add 'hlmatch' option: List of flags:
@@ -1303,11 +1473,6 @@
 8   Allow range for ":exec".  Pass it on to the executed command. (Webb)
 8   exists("&&option") tests if 'option' is actually implemented.  Useful for
     'shellslash', for example.
-7   Be able to call a function while passing on a variable number of
-    arguments:
-	:function Foo(abc, ...)
-	:  call Bar(a:abc, a:*)
-    Charles Campbell has a patch for this
 8   Have a look at VSEL.  Would it be useful to include? (Bigham)
 8   Add ":fungroup" command, to group function definitions together.  When
     encountered, all functions in the group are removed.  Suggest using an
@@ -1329,26 +1494,10 @@
        file belongs to a sourced script?
 7   Add "n" flag to search() function, just like searchpair(). (Alexey
     Marinichev)
-8   Add ":n" to fnamemodify(): normalize path, remove "../" when possible.
-    Aric Blumer has a patch for this.
 7   Add argument to winwidth() to subtract the space taken by 'foldcolumn',
     signs and/or 'number'.
 8   Add functions:
-	multibyteidx(string, idx) Byte index in multi-byte character.
-				Patch by Ilya Sher, 2004 Feb 25
-	menuprop({name}, {idx}, {what})
-				Get menu property of menu {name} item {idx}.
-				menuprop("", 1, "name") returns "File".
-				menuprop("File", 1, "n") returns "nmenu
-				File.Open..." argument.
-				Patch by Ilya Sher, 2004 Apr 22
-	mapname({idx}, mode)	return the name of the idx'th mapping.
-				Patch by Ilya Sher, 2004 Mar 4.
-	match({pat}, {string} [,start] [,count]) get index of count'th match
-				Patch by Ilya Sher, 2004 Mar 31
 	sprintf(format, arg, ..) How to prevent a crash???
-	mousex() mousey()	get position of mouse pointer (patch by Ross
-				Presser)
 	attributes()		return file protection flags "drwxrwxrwx"
 	mkdir(dir)		Create directory
 	copy(from, to)		Copy a file
@@ -1360,48 +1509,15 @@
 				Visual block mode.
 	tagtype(tag)		get type of tag (also checks if it exists)
 	getacp()		Win32: get codepage (Glenn Maynard)
-	tr(expr, from, to)	translate chars (Patch from Ron Aaron, Apr 8
-				2004)
-	find()			find file in 'path' (patch from Johannes
-				Zellner 2001 Dec 20)
-	realname()		Get user name (first, last, full)
-				user_fullname() patch by Nikolai Weibull, Nov
-				3 2002)
-	getfperm()		file permissions, in form "rwxrwxrwx"
-				(patch from Nikolai Weibull 2003 Jan 13)
-	getftype()		"file", "dir", "link", "other"?
-				(patch from Nikolai Weibull 2003 Jan 13)
-	setbufline()		set line in any buffer (patch from Yegappan
-				Lakshmanan, 2003 Jan 21)
 	getbufline()		get line from any buffer
 	deletebufline()		delete line in any buffer
 	appendbufline()		append line in any buffer
-	winnr("$")		Get number of windows.  (patch from Nikolai
-				Weibull 2003 Jan 13) (another patch from
-				Yegappan Lakshmanan, 2003 Aug 31)
-	search()		Add optional offset argument.
-				Add 'n' flag.  (patch from Nikolai Weibull
-				2003 Jan 13)
 	sort()			Sort a newline-separated string.  Also:
 				":sort".
 	libcall()		Allow more than one argument.
 	libcallext()		Like libcall(), but using a callback function
 				to allow the library to execute a command or
 				evaluate an expression.
-	confirm()		add "flags" argument, with 'v' for vertical
-				layout and 'c' for console dialog. (Haegg)
-				Flemming Madsen has a patch for the 'c' flag
-				(2003 May 13)
-	system({cmd}, {expr})	Filter {expr} through the shell command
-				{cmd} and return the result.
-				(Patch from Yegappan Lakshmanan)
-	raisewin()		raise gvim window (see HierAssist patch for
-				Tcl implementation ~/vim/HierAssist/ )
-	gettext()		Translate a message.  (Patch from Yasuhiro
-				Matsumoto) How to get the messages into the
-				.po files?
-	strrep()		Repeat a string (patch from Christophe Poucet,
-				2003 Sep 12, also contains XX)
 	char2hex()		convert char string to hex string.  XX
 	hex2char()		convert hex string to char string. XX
 7   Make bufname("'0") return the buffer name from mark '0.  How to get the
@@ -1440,12 +1556,6 @@
 7   Automatically load a function from a file when it is called.  Need an
     option for the search path. (Sekera)
 7   Persistent variables: "p:var"; stored in viminfo file and sessions files.
-7   Include support for arrays?  Patch from Robert Webb.
-    This is restricted to fixed-size arrays indexed by number.  Better: Use
-    associative arrays: a[5] = 3, a["some"] = 'x'. Implement by translating
-    into ordinary variables: a[5] is "-a-5", a["some"] is "a-some", a[5][6] is
-    "a-5-6".  But how to do array assignment and concatenation?
-    Alternative: use dictionaries, like Python.
 
 
 Robustness:
@@ -1617,7 +1727,6 @@
     an event handler where ":normal" can't be used.  Also useful when
     'lazyredraw' is set in a mapping.
 7   Make 'list' and 'linebreak' work together.
-7   Add "nbsp" in 'listchars'?  Patch from David Blanchet, 2003 Jul 28.
 
 
 Scrolling:
@@ -1655,8 +1764,6 @@
 
 Perl interface:
 8   Rename typemap file to something else?
-7   Add patch from Benoit Cerrina to integrate Vim and Perl functions better.
-    Now also works for Ruby (2001 Nov 10)
 7   Make buffers accessed as Perl arrays. (Clark)
 7   Make it possible to compile with non-ANSI C?
 6   Tcl/Tk has the "load" command: load a shared library (.so or .dll).
@@ -1710,8 +1817,6 @@
 7   Better support for jumping to where a function or variable is used.  Use
     the id-utils, with a connection to "gid" (Emacs can do it too).  Add
     ":idselect", which uses an "ID" database (made by "mkid") like "tselect".
-7   Add 'taglistfiles' option, show file name and type when listing matching
-    tags name with CTRL-D completion.  Patch from Yegappan Lakshmanan.
 
 
 Security:
@@ -1758,8 +1863,6 @@
 
 
 GUI:
-8   Add GTK 2.3 file dialog support.  Patch by Grahame Bowland, 2004 Mar 15,
-    but it doesn't use "initdir" or "dflt".
 8   Make inputdialog() work for Photon, Amiga, RiscOS.
 -   <C--> cannot be mapped.  Should be possible to recognize this as a
     normal "-" with the Ctrl modifier.
@@ -1781,8 +1884,6 @@
     explicit.  There are too many #ifdefs in gui.c.
     If possible, separate the Vim code completely from the GUI code, to allow
     running them in separate processes.
-8   Support a background bitmap.  Useful for marking a column.  Patch from
-    Heather Downs (GTK) and Vince Negri (Win32).
 7   X11: Support cursorColor resource and "-cr" argument.
 8   X11 (and others): CTRL-; is not different from ';'.  Set the modifier mask
     to include CTRL for keys where CTRL produces the same ASCII code.
@@ -1793,8 +1894,6 @@
 8   Selecting font names in X11 is difficult, make a script or something to
     select one.  Martin Dalecki has a font selector for Motif, but it needs a
     bit more work.
-7   Motif: use the menu font consistently.  Patch from Martin Dalecki 2002 Jan
-    11.
 8   Visual highlighting should keep the same font (bold, italic, etc.).
 8   Add flag to 'guioptions' to not put anything in the clipboard at all?
 8   Should support a way to use keys that we don't recognize yet.  Add a
@@ -1838,7 +1937,6 @@
     button selected, <Esc> should close the dialog.
 -   Motif steals <F10> from us, to pop up menus with the keyboard.  How do we
     get it back if we want it?
--   Motif: add 3D shading for the menu entries?  Patch from Martin Dalecki.
 -   Paste in Insert mode should not do autowrap etc.  Or maybe this should be
     changeable with an option?
 -   Put a nice picture in the icon (but how do we do that?).
@@ -1898,13 +1996,6 @@
 8   When editing "tt.gz", which is in DOS format, 'fileformat' stays at
     "unix", thus writing the file changes it.  Somehow detect that the read
     command used dos fileformat.  Same for 'fileencoding'.
-8   Add buffer-local autocommands?  Reduces overhead for autocommands that
-    trigger often (inserting a character, switching mode).
-	:au Event <buffer> do-something
-    E.g.:
-	:au BufEnter <buffer> menu enable ...
-	:au BufLeave <buffer> menu disable ...
-    Patch from Yakov Lerner, including test (2004 Jan 7).
 -   Add events to autocommands:
     Error	    - When an error happens
     NormalEnter	    - Entering Normal mode
@@ -1937,8 +2028,6 @@
 		      that marks can be updated.  HierAssist has patch to add
 		      BufChangePre, BufChangePost and RevertBuf. (Shah)
     WinResized	    - When a window has been resized
-    VimResized	    - When the Vim window has been resized (SIGWINCH)
-		      patch from Yakov Lerner, 2003 July 24.
 -   Add autocommand to be executed every so many seconds?  For writing the
     file now and then ('autosave').
 				  *'autosave'* *'as'* *'noautosave'* *'noas'*
@@ -1961,8 +2050,6 @@
 8   Add option to set different behavior for Insert mode completion:
     - ignore/match case
     - different characters than 'iskeyword'
-8   Add expression-expansion, so that the user can define his own kind of
-    completion.  Patch from Taro Muraoka, 2003 Aug 26.
 8   Add a command to undo the completion, go back to the original text.
 8   Use the class information in the tags file to do context-sensitive
     completion.  After "foo." complete all member functions/variables of
@@ -2045,7 +2132,6 @@
     file name, so it can be edited.  Also with modifiers, such as "%:h".
 8   When completing command names, either sort them on the long name, or list
     them with the optional part inside [].
-7   Completion of network shares, patch by Yasuhiro Matsumoto.
 7   Completion of ":map x ": fill in the current mapping, so that it can be
     edited. (Sven Guckes)
 7   Add completion for when entering an expression after CTRL-R= and "=.
@@ -2083,10 +2169,6 @@
 
 
 Insert mode:
-9   When 'autoindent' is set, hitting <CR> twice, while there is text after
-    the cursor, doesn't delete the autoindent in the resulting blank line.
-    (Rich Wales) This is Vi compatible, but it looks like a bug.  Rich has a
-    suggestion for a patch to fix this.
 8   When using CTRL-O in Insert mode, then executing an insert command
     "a" or "i", should we return to Insert mode after <Esc>? (Eggink)
     Perhaps it can be allowed a single time, to be able to do
@@ -2094,10 +2176,6 @@
     ":map <F2> 5aabc<Esc>" works only once from Insert mode.
 7   Use CTRL-G <count> to repeat what follows.  Useful for inserting a
     character multiple times or repeating CTRL-Y.
-7   Make ":startinsert" command work directly for functions and scripts?
-    Also make it possible to append (it's difficult at end of line).
-    And add ":startreplace" (patch by Charles Campbell, 2004 Jan 9,
-    http://www.erols.com/astronaut/vim/index.html#Patch)
 7   Use 'matchpairs' for 'showmatch': When inserting a character check if it
     appears in the rhs of 'matchpairs'.
 -   In Insert mode (and command line editing?): Allow undo of the last typed
@@ -2261,8 +2339,6 @@
     deletes the current and previous sentence. (Jens Paulus)
 7   Add "g{" and "g}" to move to the first/last character of a paragraph
     (instead of the line just before/after a paragraph as with "{" and "}").
-8   Add "a'" and 'a"': a single or double quoted string. (Tim Chase)
-    Patch from Taro Muraoka (2003 Dec 16).
 6   Ignore comment leaders for objects.  Make "das" work in reply-email.
 5   Make it possible to use syntax group matches as a text object.  For
     example, define a "ccItem" group, then do "da<ccItem>" to delete one.
@@ -2308,7 +2384,7 @@
 7   CTRL-V :s should substitute only in the block, not to whole lines. (David
     Young is working on this)
 7   Filtering a block should only apply to the block, not to the whole lines.
-    When the number of lines is increased, add lines. When decreased, padd with
+    When the number of lines is increased, add lines. When decreased, pad with
     spaces or delete? Use ":`<,`>" on the command line.
 8   After filtering the Visual area, make "gv" select the filtered text?
     Currently "gv" only selects a single line, not useful.
@@ -2323,9 +2399,6 @@
     the right column, and then use up/down movements to select the line,
     without changing the column.
 6   ":left" and ":right" should work in Visual block mode.
-7   For Visual mode: Command to do a search for the string in the marked area.
-    Only when fewer than two lines. Use "g/" and "gb".  Patch from Yegappan
-    Lakshmanan.
 7   CTRL-I and CTRL-O should work in Visual mode, but only jump to marks in the
     current buffer.
 7   CTRL-A and CTRL-X should increase/decrease all numbers in the Visual area.
@@ -2460,8 +2533,6 @@
     search(). (Brett)
 7   Add pattern item to use properties of Unicode characters.  In Perl it's
     "\p{L}" for a letter.  See Regular Expression Pocket Reference.
-7   When 'rightleft' is set, the search pattern should be displayed right to
-    left as well?  See patch of Dec 26. (Nadim Shaikli)
 8   Would it be possible to allow ":23,45/pat/flags" to search for "pat" in
     lines 23 to 45?  Or does this conflict with Ex range syntax?
 8   Allow identical pairs in 'matchpairs'.  Restrict the search to the current
@@ -2590,8 +2661,6 @@
 
 
 Buffer list:
-8   Add patch from Charles Campbell to have ":0file!" remove the name of the
-    current buffer. (2003 June 17)
 7   Command to execute a command in another buffer: ":inbuf {bufname} {cmd}".
     Also for other windows: ":inwin {winnr} {cmd}".  How to make sure that
     this works properly for all commands, and still be able to return to the
@@ -2769,9 +2838,6 @@
     to jump to the mark (in current window or new window).  Start it with
     ":browse marks"?
 6   Add a menu that lists the Marks like ":marks". (Amerige)
-8   Make it possible to delete marks.  Charles Campbell has a patch that does
-    this with the markclear() function (2004 Jan 9).  And the ":delmark"
-    command (2004 Feb 9)
 7   For ":jumps", ":tags" and ":marks", for not loaded buffers, remember the
     text at the mark.  Highlight the column with the mark.
 7   Highlight each mark in some way (With "Mark" highlight group).
@@ -2855,7 +2921,6 @@
 
 
 Mouse support:
-7   Win32: Add patch for 5-button mouse. (Michael Geddes 2001 Nov 26)
 8   Add 'o' flag to 'mouse'?
 7   Be able to set a 'mouseshape' for the popup menu.
 8   Add 'mouse' flag, which sets a behavior like Visual mode, but automatic
@@ -2872,9 +2937,6 @@
 Crypt and security:
 8   Also crypt the swapfile, each block separately.  Change mf_write() and
     mf_read().  How to get b_p_key to these functions?
-7   Support a stronger encryption.  Jason Holt implemented AES (May 6 2003).
-8   Lock all used memory so that it doesn't get swapped to disk (uncrypted).
-    Patch by Jason Holt, 2003 May 23.
 
 
 Argument list:
@@ -2904,7 +2966,7 @@
 	to position of previous deleted (to swap foo and bar in " + foo")
 8   Should be able to yank and delete into the "/ register.
     How to take care of the flags (offset, magic)?
-7   Add ! register, for shell commands. (patch from Grenie)
+
 
 Debug mode:
 7   Add something to enable debugging when a remote message is received.
@@ -2919,8 +2981,6 @@
 Various improvements:
 8   Add ":rename" command: rename the file of the current buffer and rename
     the buffer.  Buffer may be modified.
-7   Add the MzScheme interface.  Patch on http://iamphet.nm.ru/scheme/
-    (Sergey Khorev)
 6   In the quickfix window statusline add the command used to get the list of
     errors, e.g. ":make foo", ":grep something *.c".
 6   Python interface: add vim.message() function. (Michal Vitecek, 2002 Nov 5)
@@ -2933,13 +2993,8 @@
     to manipulate text without changing the window layout.
 8   Add a command to revert to the saved version of file; undo or redo until
     all changes are gone.
-8   Make 'statusline' local, so that each window can have a different value.
-    But should it also be local to a buffer? (Yegappan Lakshmanan has a patch,
-    2002 feb 15)
 7   Add a ":cpfile", go in the other direction as ":cnfile".
 6   "vim -q -" should read the list of errors from stdin. (Gautam Mudunuri)
-8   In the gzip plugin, also recognize *.gz.orig, *.gz.bak, etc.  Like it's
-    done for filetype detection.  Patch from Walter Briscoe, 2003 Jul 1.
 8   Add "--remote-fail": When contacting the server fails, exit Vim.
     Add "--remote-self": When contacting the server fails, do it in this Vim.
     Overrules the default of "--remote-send" to fail and "--remote" to do it
@@ -2953,16 +3008,8 @@
     CR characters.  For example, for "dos" files remove CR characters at the
     end of the line, so that a file with mixed line endings is cleaned up.
     To just not display the CR characters: Add a flag to 'display'?
-7   Add a "-@ filelist" argument: read file names from a file. (David Kotchan
-    has a patch for it)
 7   Some compilers give error messages in which the file name does not have a
     path.  Be able to specify that 'path' is used for these files.
-8   Add term entries for function keys on xterm with alt and ctrl (new in pl
-    94).  E.g., Control adds ";5" in "<Esc>[20;5~".  Find a generic way to
-    prepend a modifier in console mode, to avoid having to specify each
-    individual modified key.
-    Steve Wall has a patch (2002 Mar 12) for adding function keys up to 37,
-    with modifiers.
 7   Xterm sends <Esc>O3F for <M-End>.  Similarly for other <M-Home>, <M-Left>,
     etc.  Combinations of Alt, Ctrl and Shift are also possible.  Recognize
     these to avoid inserting the raw byte sequence, handle like the key
@@ -2984,26 +3031,13 @@
 8   Support printing on Unix.  Can use "lpansi.c" as an example. (Bookout)
 8   Add put command that replaces the text under it.  Esp. for blockwise
     Visual mode.
-7   Enhance termreponse stuff: Add t_CV(?): pattern of term response, use
+7   Enhance termresponse stuff: Add t_CV(?): pattern of term response, use
     regexp: "\e\[[>?][0-9;]*c", but only check just after sending t_RV.
 7   Add "g|" command: move to N'th column from the left margin (after wrapping
     and applying 'leftcol').  Works as "|" like what "g0" is to "0".
-7   Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
-    'flipcase' variable: upper/lowercase pairs.
-    Insert comma's between pairs and allow a range, make it look like
-    'isfname'.  E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153".  The colon to
-    separate the from and to part is optional.
 7   Support setting 'equalprg' to a user function name.
-9   Add cursor-column highlighting.  Enable it with 'cursorcolumn' option, set
-    highlighting with "CursorColumn" group.  Useful for aligning text.
-    Also cursor-row highlighting.
-    Patch from Yasuhiro Matsumoto for underlining the cursor line, 2004 Mar 24.
-    Alternatie: when 'number' is set highlight the number of the current line.
 7   Highlight the characters after the end-of-line differently.
 7   When 'whichwrap' contains "l", "$dl" should join lines?
-8   Include a connection to an external program through a pipe?  See patches
-    from Felbinger for a mathematica interface.
-    Or use emacs server kind of thing?
 8   Add an argument to configure to use $CFLAGS and not modify it? (Mooney)
 8   Enabling features is a mix of configure arguments and defines in
     feature.h.  How to make this consistent?  Feature.h is required for
@@ -3043,11 +3077,6 @@
 7   Add a history of recently accessed buffer.	Maybe make "2 CTRL-^" jump to
     the 2nd previously visited buffer, "3 CTRL-^" to the third, etc.  Or use
     "3 g CTRL-^" for this?
-7   Add an option to set the width of the 'number' column.  Eight positions is
-    often more than needed.  Or adjust the width to the length of the file?
-    Add patch that adds 'numberlen' option. (James Harvey)
-    Other patch with min and max from Emmanuel Renieris (2002 Jul 24)
-    Other patch without an option by Gilles Roy (2002 Jul 25)
 -   Add code to disable the CAPS key when going from Insert to Normal mode.
 -   Set date/protection/etc. of the patchfile the same as the original file.
 -   Use growarray for termcodes[] in term.c
@@ -3075,7 +3104,6 @@
 9   When using ":w <fname>" it's possible that this file is loaded in another
     buffer.  Give a warning right away, don't wait for a shell command.
 -   Make 'smartcase' work even though 'ic' isn't set (Webb).
-7   Add ":justify" command.  Patch from Vit Stradal 2002 Nov 25.
 7   When formatting text, allow to break the line at a number of characters.
     Use an option for this: 'breakchars'?  Useful for formatting Fortran code.
 -   Add flag to 'formatoptions' to be able to format book-style paragraphs
@@ -3101,8 +3129,6 @@
 -   Make "gq<CR>" work on the last line in the file.  Maybe for every operator?
 8   findmatchlimit() should be able to skip comments.  Solves problem of
     matching the '{' in /* if (foo) { */ (Fiveash)
--   findmatch() should be adjusted for Lisp.  See remark at get_lisp_indent().
-    Esp. \( and \) should be skipped. (Dorai Sitaram, incomplete patch Mar 18)
 -   Add more redirecting of Ex commands:
 	:redir @> register  (append)
 	:redir #  bufname
@@ -3335,11 +3361,6 @@
 -   Support mapping for replace mode and "r" command (Vi doesn't do this)?
 5   Add 'ignorefilecase' option: Ignore case when expanding file names.
     ":e ma<Tab>" would also find "Makefile" on Unix.
-8   Sorting of filenames for completion is wrong on systems that ignore case
-    of filenames.  Add 'ignorefncase' option.  When set, case in filenames is
-    ignored for sorting them. Patch by Mike Williams:
-    ~/vim/patches/ignorefncase.  Also change what matches?  Or use another
-    option name.
 8   Should be able to compile Vim in another directory, with $(srcdir) set to
     where the sources are. Add $(srcdir) in the Makefile in a lot of places.
     (Netherton)
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 252572d..8753bfa 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.0aa.  Last change: 2004 May 01
+*various.txt*   For Vim version 7.0aa.  Last change: 2004 Jun 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -431,7 +431,8 @@
 						*:verb* *:verbose*
 :[count]verb[ose] {command}
 			Execute {command} with 'verbose' set to [count].  If
-			[count] is omitted one is used.
+			[count] is omitted one is used. ":0verbose" can be
+			used to set 'verbose' to zero.
 			The additional use of ":silent" makes messages
 			generated but not displayed.
 			The combination of ":silent" and ":verbose" can be
diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim
index 3dbbe10..3c030f8 100644
--- a/runtime/indent/python.vim
+++ b/runtime/indent/python.vim
@@ -2,7 +2,7 @@
 " Language:	Python
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
 " Original Author:	David Bustos <bustos@caltech.edu>
-" Last Change:	2003 Sep 08
+" Last Change:	2004 Jun 15
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -36,7 +36,7 @@
 
   " If the start of the line is in a string don't change the indent.
   if has('syntax_items')
-	\ && synIDattr(synID(a:lnum, 1, 1), "name") == "pythonString"
+	\ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
     return -1
   endif
 
@@ -56,7 +56,7 @@
   let parlnum = searchpair('(', '', ')', 'nbW',
 	  \ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
 	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
-	  \ . " =~ 'python\\(Comment\\|String\\)'")
+	  \ . " =~ '\\(Comment\\|String\\)$'")
   if parlnum > 0
     let plindent = indent(parlnum)
     let plnumstart = parlnum
@@ -75,14 +75,14 @@
   let p = searchpair('(', '', ')', 'bW',
 	  \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
 	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
-	  \ . " =~ 'python\\(Comment\\|String\\)'")
+	  \ . " =~ '\\(Comment\\|String\\)$'")
   if p > 0
     if p == plnum
       " When the start is inside parenthesis, only indent one 'shiftwidth'.
       let pp = searchpair('(', '', ')', 'bW',
 	  \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
 	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
-	  \ . " =~ 'python\\(Comment\\|String\\)'")
+	  \ . " =~ '\\(Comment\\|String\\)$'")
       if pp > 0
 	return indent(plnum) + &sw
       endif
@@ -102,7 +102,7 @@
   let col = 0
   while col < pline_len
     if pline[col] == '#' && (!has('syntax_items')
-	    \ || synIDattr(synID(plnum, col + 1, 1), "name") == "pythonComment")
+	    \ || synIDattr(synID(plnum, col + 1, 1), "name") =~ "Comment$")
       let pline = strpart(pline, 0, col)
       break
     endif
diff --git a/runtime/lang/menu_ru_ru.koi8-r.vim b/runtime/lang/menu_ru_ru.koi8-r.vim
index 94d78a7..295b016 100644
--- a/runtime/lang/menu_ru_ru.koi8-r.vim
+++ b/runtime/lang/menu_ru_ru.koi8-r.vim
@@ -155,11 +155,12 @@
 menutrans Create\ &Fold<Tab>zf				óÏ&ÚÄÁÔØ\ ÓËÌÁÄËÕ<Tab>zf
 menutrans &Delete\ Fold<Tab>zd				õ&ÄÁÌÉÔØ\ ÓËÌÁÄËÕ<Tab>zd
 menutrans Delete\ &All\ Folds<Tab>zD			õÄÁÌÉÔØ\ ×Ó&Å\ ÓËÌÁÄËÉ<Tab>zD
-menutrans Fold\ column\ &width				&ûÉÒÉÎÁ\ ËÏÌÏÎËÉ\ ÓËÌÁÄÏË
+menutrans Fold\ col&umn\ width				&ûÉÒÉÎÁ\ ËÏÌÏÎËÉ\ ÓËÌÁÄÏË
 ">>>->>>----------- Tools/Folds/Fold Method
 menutrans M&anual					÷ÒÕ&ÞÎÕÀ
 menutrans I&ndent					ï&ÔÓÔÕÐ
 menutrans E&xpression					&÷ÙÒÁÖÅÎÉÅ
+menutrans S&yntax					&óÉÎÔÁËÓÉÓ
 menutrans Ma&rker					&íÁÒËÅÒÙ
 ">>>--------------- Tools/Diff
 menutrans &Update					ï&ÂÎÏ×ÉÔØ
@@ -177,6 +178,7 @@
 menutrans Set\ '&syntax'\ only				&éÚÍÅÎÑÔØ\ ÔÏÌØËÏ\ ÚÎÁÞÅÎÉÅ\ 'syntax'
 menutrans Set\ '&filetype'\ too				éÚÍÅÎÑÔØ\ &ÔÁËÖÅ\ ÚÎÁÞÅÎÉÅ\ 'filetype'
 menutrans &Off						&ïÔËÌÀÞÉÔØ
+menutrans &Manual					÷ÒÕ&ÞÎÕÀ
 menutrans A&utomatic					&á×ÔÏÍÁÔÉÞÅÓËÉ
 menutrans on/off\ for\ &This\ file			÷ËÌ/×ÙËÌ\ ÄÌÑ\ &ÜÔÏÇÏ\ ÆÁÊÌÁ
 menutrans Co&lor\ test					ðÒÏ×ÅÒËÁ\ &Ã×ÅÔÏ×
diff --git a/src/Makefile b/src/Makefile
index d59f32a..46a40ad 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -432,7 +432,7 @@
 #CONF_OPT_FEAT = --with-features=small
 #CONF_OPT_FEAT = --with-features=normal
 #CONF_OPT_FEAT = --with-features=big
-#CONF_OPT_FEAT = --with-features=huge
+CONF_OPT_FEAT = --with-features=huge
 
 # COMPILED BY - For including a specific e-mail address for ":version".
 #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
@@ -493,7 +493,7 @@
 
 # Often used for GCC: mixed optimizing, lot of optimizing, debugging
 #CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes
-#CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes
+CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes
 #CFLAGS = -O6 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes
 #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes
 #CFLAGS = -g -O2 -DSTARTUPTIME=\"vimstartup\" -fno-strength-reduce -Wall -Wmissing-prototypes
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 8ec8be7..3aa4633 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -431,8 +431,7 @@
 	vim_free(q);
 	if (p == NULL)
 	    return FAIL;
-	bp->dbg_name = fix_fname(p);
-	vim_free(p);
+	bp->dbg_name = p;
 #ifdef MACOS_CLASSIC
 	if (bp->dbg_name != NULL)
 	    slash_n_colon_adjust(bp->dbg_name);
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f1331e9..c4b9012 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -487,6 +487,62 @@
 static char_u	*get_while_line __ARGS((int c, void *cookie, int indent));
 static int	store_while_line __ARGS((garray_T *gap, char_u *line));
 static void	free_cmdlines __ARGS((garray_T *gap));
+
+/* Struct to save a few things while debugging.  Used in do_cmdline() only. */
+struct dbg_stuff
+{
+    int		trylevel;
+    int		force_abort;
+    except_T	*caught_stack;
+    char_u	*vv_exception;
+    char_u	*vv_throwpoint;
+    int		did_emsg;
+    int		got_int;
+    int		did_throw;
+    int		need_rethrow;
+    int		check_cstack;
+    except_T	*current_exception;
+};
+
+static void save_dbg_stuff __ARGS((struct dbg_stuff *dsp));
+static void restore_dbg_stuff __ARGS((struct dbg_stuff *dsp));
+
+    static void
+save_dbg_stuff(dsp)
+    struct dbg_stuff *dsp;
+{
+    dsp->trylevel	= trylevel;		trylevel = 0;
+    dsp->force_abort	= force_abort;		force_abort = FALSE;
+    dsp->caught_stack	= caught_stack;		caught_stack = NULL;
+    dsp->vv_exception	= v_exception(NULL);
+    dsp->vv_throwpoint	= v_throwpoint(NULL);
+
+    /* Necessary for debugging an inactive ":catch", ":finally", ":endtry" */
+    dsp->did_emsg	= did_emsg;		did_emsg     = FALSE;
+    dsp->got_int	= got_int;		got_int	     = FALSE;
+    dsp->did_throw	= did_throw;		did_throw    = FALSE;
+    dsp->need_rethrow	= need_rethrow;		need_rethrow = FALSE;
+    dsp->check_cstack	= check_cstack;		check_cstack = FALSE;
+    dsp->current_exception = current_exception;	current_exception = NULL;
+}
+
+    static void
+restore_dbg_stuff(dsp)
+    struct dbg_stuff *dsp;
+{
+    suppress_errthrow = FALSE;
+    trylevel = dsp->trylevel;
+    force_abort = dsp->force_abort;
+    caught_stack = dsp->caught_stack;
+    (void)v_exception(dsp->vv_exception);
+    (void)v_throwpoint(dsp->vv_throwpoint);
+    did_emsg = dsp->did_emsg;
+    got_int = dsp->got_int;
+    did_throw = dsp->did_throw;
+    need_rethrow = dsp->need_rethrow;
+    check_cstack = dsp->check_cstack;
+    current_exception = dsp->current_exception;
+}
 #endif
 
 
@@ -625,17 +681,7 @@
     char_u	*fname = NULL;		/* function or script name */
     linenr_T	*breakpoint = NULL;	/* ptr to breakpoint field in cookie */
     int		*dbg_tick = NULL;	/* ptr to dbg_tick field in cookie */
-    int		saved_trylevel = 0;
-    int		saved_force_abort = 0;
-    except_T	*saved_caught_stack = NULL;
-    char_u	*saved_vv_exception = NULL;
-    char_u	*saved_vv_throwpoint = NULL;
-    int		saved_did_emsg = 0;
-    int		saved_got_int = 0;
-    int		saved_did_throw = 0;
-    int		saved_need_rethrow = 0;
-    int		saved_check_cstack = 0;
-    except_T	*saved_current_exception = NULL;
+    struct dbg_stuff debug_saved;	/* saved things for debug mode */
     int		initial_trylevel;
     struct msglist	**saved_msg_list = NULL;
     struct msglist	*private_msg_list;
@@ -725,21 +771,7 @@
      * exception handling (used when debugging).
      */
     else if (flags & DOCMD_EXCRESET)
-    {
-	saved_trylevel		= trylevel;		trylevel = 0;
-	saved_force_abort	= force_abort;		force_abort = FALSE;
-	saved_caught_stack	= caught_stack;		caught_stack = NULL;
-	saved_vv_exception	= v_exception(NULL);
-	saved_vv_throwpoint	= v_throwpoint(NULL);
-	/* Necessary for debugging an inactive ":catch", ":finally", or
-	 * ":endtry": */
-	saved_did_emsg		= did_emsg,		did_emsg     = FALSE;
-	saved_got_int		= got_int,		got_int	     = FALSE;
-	saved_did_throw		= did_throw,		did_throw    = FALSE;
-	saved_need_rethrow	= need_rethrow,		need_rethrow = FALSE;
-	saved_check_cstack	= check_cstack,		check_cstack = FALSE;
-	saved_current_exception = current_exception;	current_exception=NULL;
-    }
+	save_dbg_stuff(&debug_saved);
 
     initial_trylevel = trylevel;
 
@@ -1326,22 +1358,7 @@
      * debugger).
      */
     if (flags & DOCMD_EXCRESET)
-    {
-	suppress_errthrow = FALSE;
-	trylevel = saved_trylevel;
-	force_abort = saved_force_abort;
-	caught_stack = saved_caught_stack;
-	(void)v_exception(saved_vv_exception);
-	(void)v_throwpoint(saved_vv_throwpoint);
-	/* Necessary for debugging an inactive ":catch", ":finally", or
-	 * ":endtry": */
-	did_emsg = saved_did_emsg;
-	got_int = saved_got_int;
-	did_throw = saved_did_throw;
-	need_rethrow = saved_need_rethrow;
-	check_cstack = saved_check_cstack;
-	current_exception = saved_current_exception;
-    }
+	restore_dbg_stuff(&debug_saved);
 
     msg_list = saved_msg_list;
 #endif /* FEAT_EVAL */
@@ -1545,8 +1562,7 @@
  */
 #if (_MSC_VER == 1200)
 /*
- * Optimisation bug in VC++ version 6.0
- * TODO: check this is still present after each service pack
+ * Avoid optimisation bug in VC++ version 6.0
  */
 # pragma optimize( "g", off )
 #endif
@@ -1738,8 +1754,9 @@
 			    break;
 			if (verbose_save < 0)
 			    verbose_save = p_verbose;
-			p_verbose = atoi((char *)ea.cmd);
-			if (p_verbose == 0)
+			if (vim_isdigit(*ea.cmd))
+			    p_verbose = atoi((char *)ea.cmd);
+			else
 			    p_verbose = 1;
 			ea.cmd = p;
 			continue;
diff --git a/src/fileio.c b/src/fileio.c
index 22339bf..e8d4e27 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -6060,12 +6060,9 @@
 	    }
 	    else
 	    {
-# ifdef VIMBUDDY
-		VimBuddyText(tbuf + 9, 2);
-# else
-#  ifdef FEAT_AUTOCMD
+# ifdef FEAT_AUTOCMD
 		if (!autocmd_busy)
-#  endif
+# endif
 		{
 		    msg_start();
 		    msg_puts_attr(tbuf, hl_attr(HLF_E) + MSG_HIST);
@@ -6077,9 +6074,9 @@
 		    if (emsg_silent == 0)
 		    {
 			out_flush();
-#  ifdef FEAT_GUI
+# ifdef FEAT_GUI
 			if (!focus)
-#  endif
+# endif
 			    /* give the user some time to think about it */
 			    ui_delay(1000L, TRUE);
 
@@ -6088,7 +6085,6 @@
 		    }
 		}
 		already_warned = TRUE;
-# endif
 	    }
 
 	    vim_free(path);
diff --git a/src/message.c b/src/message.c
index 405ae6e..950c6e4 100644
--- a/src/message.c
+++ b/src/message.c
@@ -557,14 +557,6 @@
 	else
 	    flush_buffers(FALSE);	/* flush internal buffers */
 	did_emsg = TRUE;		/* flag for DoOneCmd() */
-
-#ifdef VIMBUDDY
-	if (sourcing_name == NULL)
-	{
-	    VimBuddyText(s, 2);
-	    return TRUE;
-	}
-#endif
     }
 
     emsg_on_display = TRUE;	/* remember there is an error message */
@@ -2574,12 +2566,10 @@
 
     /* Don't want a hit-enter prompt here. */
     ++no_wait_return;
+
 #ifdef FEAT_EVAL
     set_vim_var_string(VV_WARNINGMSG, message, -1);
 #endif
-#ifdef VIMBUDDY
-    VimBuddyText(message, 1);
-#else
     vim_free(keep_msg);
     keep_msg = NULL;
     if (hl)
@@ -2591,7 +2581,7 @@
     msg_didout = FALSE;	    /* overwrite this message */
     msg_nowait = TRUE;	    /* don't wait for this message */
     msg_col = 0;
-#endif
+
     --no_wait_return;
 }
 
diff --git a/src/option.c b/src/option.c
index b87005e..ca95cc0 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2657,8 +2657,8 @@
 #ifdef FEAT_POSTSCRIPT
     /* 'printexpr' must be allocated to be able to evaluate it. */
     set_string_default("pexpr",
-# ifdef MSWIN
-	    (char_u *)"system('copy' . ' ' . v:fname_in . ' \"' . &printdevice . '\"') . delete(v:fname_in)"
+# if defined(MSWIN) || defined(MSDOS) || defined(OS2)
+	    (char_u *)"system('copy' . ' ' . v:fname_in . (&printdevice == '' ? ' LPT1:' : (' \"' . &printdevice . '\"'))) . delete(v:fname_in)"
 # else
 #  ifdef VMS
 	    (char_u *)"system('print/delete' . (&printdevice == '' ? '' : ' /queue=' . &printdevice) . ' ' . v:fname_in)"
diff --git a/src/po/ru.po b/src/po/ru.po
index b08bc02..7bd9d72 100644
--- a/src/po/ru.po
+++ b/src/po/ru.po
@@ -1,7 +1,7 @@
 # Russian translation for Vim
 # 
-# ï ÕÓÌÏ×ÉÑÈ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÞÉÔÁÊÔÅ × ÒÅÄÁËÔÏÒÅ Vim ":help uganda"
-# ï ÌÀÄÑÈ, ÄÅÌÁÀÝÉÈ Vim ÞÉÔÁÊÔÅ × ÒÅÄÁËÔÏÒÅ ":help Á×ÔÏÒÙ"
+# Об условиях использования читайте в редакторе Vim ":help uganda"
+# О людях, делающих Vim читайте в редакторе ":help авторы"
 #
 # vassily "vr" ragosin <vrr@users.sourceforge.net>, 2004
 #
@@ -9,360 +9,360 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 6.3a\n"
+"Project-Id-Version: Vim 6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-10 21:37+0400\n"
-"PO-Revision-Date: 2004-05-10 21:37+0400\n"
+"POT-Creation-Date: 2004-06-15 09:39+0400\n"
+"PO-Revision-Date: 2004-05-19 00:23+0400\n"
 "Last-Translator: vassily ragosin <vrr@users.sourceforge.net>\n"
 "Language-Team: vassily ragosin <vrr@users.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: buffer.c:102
 msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÐÁÍÑÔØ ÄÁÖÅ ÄÌÑ ÏÄÎÏÇÏ ÂÕÆÅÒÁ, ×ÙÈÏÄ..."
+msgstr "E82: Невозможно выделить память даже для одного буфера, выход..."
 
 #: buffer.c:105
 msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÐÁÍÑÔØ ÄÌÑ ÂÕÆÅÒÁ, ÉÓÐÏÌØÚÕÅÍ ÄÒÕÇÏÊ ÂÕÆÅÒ..."
+msgstr "E83: Невозможно выделить память для буфера, используем другой буфер..."
 
-#: buffer.c:805
+#: buffer.c:808
 #, c-format
 msgid "E515: No buffers were unloaded"
-msgstr "E515: îÉ ÏÄÉÎ ÂÕÆÅÒ ÎÅ ÂÙÌ ×ÙÇÒÕÖÅÎ ÉÚ ÐÁÍÑÔÉ"
+msgstr "E515: Ни один буфер не был выгружен из памяти"
 
-#: buffer.c:807
+#: buffer.c:810
 #, c-format
 msgid "E516: No buffers were deleted"
-msgstr "E516: îÉ ÏÄÉÎ ÂÕÆÅÒ ÎÅ ÂÙÌ ÕÄÁÌ£Î"
+msgstr "E516: Ни один буфер не был удалён"
 
-#: buffer.c:809
+#: buffer.c:812
 #, c-format
 msgid "E517: No buffers were wiped out"
-msgstr "E517: îÉ ÏÄÉÎ ÂÕÆÅÒ ÎÅ ÂÙÌ ÏÞÉÝÅÎ"
+msgstr "E517: Ни один буфер не был очищен"
 
-#: buffer.c:817
+#: buffer.c:820
 msgid "1 buffer unloaded"
-msgstr "ïÄÉÎ ÂÕÆÅÒ ×ÙÇÒÕÖÅÎ ÉÚ ÐÁÍÑÔÉ"
+msgstr "Один буфер выгружен из памяти"
 
-#: buffer.c:819
+#: buffer.c:822
 #, c-format
 msgid "%d buffers unloaded"
-msgstr "÷ÓÅÇÏ ×ÙÇÒÕÖÅÎÏ ÂÕÆÅÒÏ× ÉÚ ÐÁÍÑÔÉ: %d"
+msgstr "Всего выгружено буферов из памяти: %d"
 
-#: buffer.c:824
+#: buffer.c:827
 msgid "1 buffer deleted"
-msgstr "ïÄÉÎ ÂÕÆÅÒ ÕÄÁÌ£Î"
+msgstr "Один буфер удалён"
 
-#: buffer.c:826
+#: buffer.c:829
 #, c-format
 msgid "%d buffers deleted"
-msgstr "÷ÓÅÇÏ ÕÄÁÌÅÎÏ ÂÕÆÅÒÏ×: %d"
+msgstr "Всего удалено буферов: %d"
 
-#: buffer.c:831
+#: buffer.c:834
 msgid "1 buffer wiped out"
-msgstr "ïÄÉÎ ÂÕÆÅÒ ÏÞÉÝÅÎ"
+msgstr "Один буфер очищен"
 
-#: buffer.c:833
+#: buffer.c:836
 #, c-format
 msgid "%d buffers wiped out"
-msgstr "÷ÓÅÇÏ ÏÞÉÝÅÎÏ ÂÕÆÅÒÏ×: %d"
+msgstr "Всего очищено буферов: %d"
 
-#: buffer.c:894
+#: buffer.c:897
 msgid "E84: No modified buffer found"
-msgstr "E84: éÚÍÅΣÎÎÙÈ ÂÕÆÅÒÏ× ÎÅ ÏÂÎÁÒÕÖÅÎÏ"
+msgstr "E84: Изменённых буферов не обнаружено"
 
 #. back where we started, didn't find anything.
-#: buffer.c:933
+#: buffer.c:936
 msgid "E85: There is no listed buffer"
-msgstr "E85: âÕÆÅÒÙ × ÓÐÉÓËÅ ÏÔÓÕÔÓÔ×ÕÀÔ"
-
-#: buffer.c:945
-#, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: âÕÆÅÒ %ld ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
+msgstr "E85: Буферы в списке отсутствуют"
 
 #: buffer.c:948
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: Буфер %ld не существует"
+
+#: buffer.c:951
 msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: üÔÏ ÐÏÓÌÅÄÎÉÊ ÂÕÆÅÒ"
+msgstr "E87: Это последний буфер"
 
-#: buffer.c:950
+#: buffer.c:953
 msgid "E88: Cannot go before first buffer"
-msgstr "E88: üÔÏ ÐÅÒ×ÙÊ ÂÕÆÅÒ"
+msgstr "E88: Это первый буфер"
 
-#: buffer.c:988
+#: buffer.c:991
 #, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr "E89: éÚÍÅÎÅÎÉÑ × ÂÕÆÅÒÅ %ld ÎÅ ÓÏÈÒÁÎÅÎÙ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
+msgstr "E89: Изменения в буфере %ld не сохранены (!, чтобы обойти проверку)"
 
-#: buffer.c:1005
+#: buffer.c:1008
 msgid "E90: Cannot unload last buffer"
-msgstr "E90: îÅ×ÏÚÍÏÖÎÏ ×ÙÇÒÕÚÉÔØ ÉÚ ÐÁÍÑÔÉ ÐÏÓÌÅÄÎÉÊ ÂÕÆÅÒ"
+msgstr "E90: Невозможно выгрузить из памяти последний буфер"
 
-#: buffer.c:1538
+#: buffer.c:1544
 msgid "W14: Warning: List of file names overflow"
-msgstr "W14: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÅÒÅÐÏÌÎÅÎÉÅ ÓÐÉÓËÁ ÉͣΠÆÁÊÌÏ×"
+msgstr "W14: Предупреждение: переполнение списка имён файлов"
 
-#: buffer.c:1709
+#: buffer.c:1716
 #, c-format
 msgid "E92: Buffer %ld not found"
-msgstr "E92: âÕÆÅÒ %ld ÎÅ ÎÁÊÄÅÎ"
+msgstr "E92: Буфер %ld не найден"
 
-#: buffer.c:1940
+#: buffer.c:1947
 #, c-format
 msgid "E93: More than one match for %s"
-msgstr "E93: îÅÓËÏÌØËÏ ÓÏÏÔ×ÅÔÓÔ×ÉÊ ÄÌÑ %s"
+msgstr "E93: Несколько соответствий для %s"
 
-#: buffer.c:1942
+#: buffer.c:1949
 #, c-format
 msgid "E94: No matching buffer for %s"
-msgstr "E94: îÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ %s ÂÕÆÅÒÁ"
+msgstr "E94: Нет соответствующего %s буфера"
 
-#: buffer.c:2337
+#: buffer.c:2344
 #, c-format
 msgid "line %ld"
-msgstr "ÓÔÒÏËÁ %ld"
+msgstr "строка %ld"
 
-#: buffer.c:2420
+#: buffer.c:2429
 msgid "E95: Buffer with this name already exists"
-msgstr "E95: âÕÆÅÒ Ó ÔÁËÉÍ ÉÍÅÎÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
-
-#: buffer.c:2713
-msgid " [Modified]"
-msgstr " [éÚÍÅΣÎ]"
-
-#: buffer.c:2718
-msgid "[Not edited]"
-msgstr "[îÅ ÒÅÄÁËÔÉÒÏ×ÁÌÓÑ]"
-
-#: buffer.c:2723
-msgid "[New file]"
-msgstr "[îÏ×ÙÊ ÆÁÊÌ]"
+msgstr "E95: Буфер с таким именем уже существует"
 
 #: buffer.c:2724
+msgid " [Modified]"
+msgstr " [Изменён]"
+
+#: buffer.c:2729
+msgid "[Not edited]"
+msgstr "[Не редактировался]"
+
+#: buffer.c:2734
+msgid "[New file]"
+msgstr "[Новый файл]"
+
+#: buffer.c:2735
 msgid "[Read errors]"
-msgstr "[ïÛÉÂËÉ ÞÔÅÎÉÑ]"
+msgstr "[Ошибки чтения]"
 
-#: buffer.c:2726 fileio.c:2112
+#: buffer.c:2737 fileio.c:2124
 msgid "[readonly]"
-msgstr "[ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ]"
+msgstr "[только для чтения]"
 
-#: buffer.c:2747
+#: buffer.c:2758
 #, c-format
 msgid "1 line --%d%%--"
-msgstr "ïÄÎÁ ÓÔÒÏËÁ --%d%%--"
+msgstr "Одна строка --%d%%--"
 
-#: buffer.c:2749
+#: buffer.c:2760
 #, c-format
 msgid "%ld lines --%d%%--"
-msgstr "%ld ÓÔÒ. --%d%%--"
+msgstr "%ld стр. --%d%%--"
 
-#: buffer.c:2756
+#: buffer.c:2767
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
-msgstr "ÓÔÒ. %ld ÉÚ %ld --%d%%-- ËÏÌ. "
+msgstr "стр. %ld из %ld --%d%%-- кол. "
 
-#: buffer.c:2864
+#: buffer.c:2875
 msgid "[No file]"
-msgstr "[îÅÔ ÆÁÊÌÁ]"
+msgstr "[Нет файла]"
 
 #. must be a help buffer
-#: buffer.c:2904
+#: buffer.c:2915
 msgid "help"
-msgstr "ÓÐÒÁ×ËÁ"
+msgstr "справка"
 
-#: buffer.c:3463 screen.c:5075
+#: buffer.c:3474 screen.c:5079
 msgid "[help]"
-msgstr "[ÓÐÒÁ×ËÁ]"
+msgstr "[справка]"
 
-#: buffer.c:3495 screen.c:5081
+#: buffer.c:3506 screen.c:5085
 msgid "[Preview]"
-msgstr "[ðÒÅÄÐÒÏÓÍÏÔÒ]"
+msgstr "[Предпросмотр]"
 
-#: buffer.c:3775
+#: buffer.c:3786
 msgid "All"
-msgstr "÷ÅÓØ"
+msgstr "Весь"
 
-#: buffer.c:3775
+#: buffer.c:3786
 msgid "Bot"
-msgstr "÷ÎÉÚÕ"
+msgstr "Внизу"
 
-#: buffer.c:3777
+#: buffer.c:3788
 msgid "Top"
-msgstr "îÁ×ÅÒÈÕ"
+msgstr "Наверху"
 
-#: buffer.c:4523
+#: buffer.c:4536
 #, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
 msgstr ""
 "\n"
-"# óÐÉÓÏË ÂÕÆÅÒÏ×:\n"
+"# Список буферов:\n"
 
-#: buffer.c:4556
+#: buffer.c:4569
 msgid "[Error List]"
-msgstr "[óÐÉÓÏË ÏÛÉÂÏË]"
+msgstr "[Список ошибок]"
 
-#: buffer.c:4569 memline.c:1520
+#: buffer.c:4582 memline.c:1521
 msgid "[No File]"
-msgstr "[îÅÔ ÆÁÊÌÁ]"
+msgstr "[Нет файла]"
 
-#: buffer.c:4882
+#: buffer.c:4895
 msgid ""
 "\n"
 "--- Signs ---"
 msgstr ""
 "\n"
-"--- úÎÁÞËÉ ---"
+"--- Значки ---"
 
-#: buffer.c:4901
+#: buffer.c:4914
 #, c-format
 msgid "Signs for %s:"
-msgstr "úÎÁÞËÉ ÄÌÑ %s:"
+msgstr "Значки для %s:"
 
-#: buffer.c:4907
+#: buffer.c:4920
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
-msgstr "    ÓÔÒÏËÁ=%ld  id=%d  ÉÍÑ=%s"
+msgstr "    строка=%ld  id=%d  имя=%s"
 
 #: diff.c:139
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: óÌÅÄÉÔØ ÚÁ ÏÔÌÉÞÉÑÍÉ ÍÏÖÎÏ ÎÅ ÂÏÌÅÅ ÞÅÍ × %ld ÂÕÆÅÒÁÈ"
+msgstr "E96: Следить за отличиями можно не более чем в %ld буферах"
 
 #: diff.c:713
 msgid "E97: Cannot create diffs"
-msgstr "E97: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌÙ ÏÔÌÉÞÉÊ"
+msgstr "E97: Невозможно создать файлы отличий"
 
 #: diff.c:818
 msgid "Patch file"
-msgstr "æÁÊÌ-ÚÁÐÌÁÔËÁ"
+msgstr "Файл-заплатка"
 
 #: diff.c:1069
 msgid "E98: Cannot read diff output"
-msgstr "E98: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ×Ù×ÏÄ ËÏÍÁÎÄÙ diff"
+msgstr "E98: Невозможно прочитать вывод команды diff"
 
 #: diff.c:1819
 msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: áËÔÉ×ÎÙÊ ÂÕÆÅÒ ÎÅ ÎÁÈÏÄÉÔÓÑ × ÒÅÖÉÍÅ ÏÔÌÉÞÉÊ"
+msgstr "E99: Активный буфер не находится в режиме отличий"
 
 #: diff.c:1831
 msgid "E100: No other buffer in diff mode"
-msgstr "E100: âÏÌØÛÅ ÎÅÔ ÂÕÆÅÒÏ× × ÒÅÖÉÍÅ ÏÔÌÉÞÉÊ"
+msgstr "E100: Больше нет буферов в режиме отличий"
 
 #: diff.c:1839
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: ÷ ÒÅÖÉÍÅ ÏÔÌÉÞÉÊ ÂÏÌÅÅ Ä×ÕÈ ÂÕÆÅÒÏ×, ÎÅ ÍÏÇÕ ×ÙÂÒÁÔØ"
+msgstr "E101: В режиме отличий более двух буферов, не могу выбрать"
 
 #: diff.c:1862
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: îÅ ÍÏÇÕ ÎÁÊÔÉ ÂÕÆÅÒ \"%s\""
+msgstr "E102: Не могу найти буфер \"%s\""
 
 #: diff.c:1868
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: âÕÆÅÒ \"%s\" ÎÅ ÎÁÈÏÄÉÔÓÑ × ÒÅÖÉÍÅ ÏÔÌÉÞÉÊ"
+msgstr "E103: Буфер \"%s\" не находится в режиме отличий"
 
 #: digraph.c:2199
 msgid "E104: Escape not allowed in digraph"
-msgstr "E104: üËÒÁÎÉÒÕÀÝÉÊ ÓÉÍ×ÏÌ Escape ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ × ÄÉÇÒÁÆÅ"
+msgstr "E104: Экранирующий символ Escape нельзя использовать в диграфе"
 
 #: digraph.c:2384
 msgid "E544: Keymap file not found"
-msgstr "E544: æÁÊÌ Ó ÒÁÓËÌÁÄËÏÊ ËÌÁ×ÉÁÔÕÒÙ ÎÅ ÎÁÊÄÅÎ"
+msgstr "E544: Файл с раскладкой клавиатуры не найден"
 
 #: digraph.c:2411
 msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: ëÏÍÁÎÄÁ :loadkeymap ÐÒÉÍÅÎÅÎÁ ×ÎÅ ÆÁÊÌÁ ÓÃÅÎÁÒÉÑ"
+msgstr "E105: Команда :loadkeymap применена вне файла сценария"
 
 #: edit.c:40
 msgid " Keyword completion (^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á (^N^P)"
+msgstr " Автодополнение ключевого слова (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
 #: edit.c:41
 msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ^X (^E^Y^L^]^F^I^K^D^V^N^P)"
+msgstr " Автодополнение ^X (^E^Y^L^]^F^I^K^D^V^N^P)"
 
 #. Scroll has it's own msgs, in it's place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 #: edit.c:44
 msgid " Keyword Local completion (^N^P)"
-msgstr " íÅÓÔÎÏÅ Á×ÔÏÄÏÐÏÌÎÅÎÉÅ ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á (^N^P)"
+msgstr " Местное автодополнение ключевого слова (^N^P)"
 
 #: edit.c:45
 msgid " Whole line completion (^L^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ÃÅÌÏÊ ÓÔÒÏËÉ (^L^N^P)"
+msgstr " Автодополнение целой строки (^L^N^P)"
 
 #: edit.c:46
 msgid " File name completion (^F^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ÉÍÅÎÉ ÆÁÊÌÁ (^F^N^P)"
+msgstr " Автодополнение имени файла (^F^N^P)"
 
 #: edit.c:47
 msgid " Tag completion (^]^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ÍÅÔËÉ (^]^N^P)"
+msgstr " Автодополнение метки (^]^N^P)"
 
 #: edit.c:48
 msgid " Path pattern completion (^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ÛÁÂÌÏÎÁ ÐÕÔÉ (^N^P)"
+msgstr " Автодополнение шаблона пути (^N^P)"
 
 #: edit.c:49
 msgid " Definition completion (^D^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ÏÐÒÅÄÅÌÅÎÉÑ (^D^N^P)"
+msgstr " Автодополнение определения (^D^N^P)"
 
 #: edit.c:51
 msgid " Dictionary completion (^K^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ÐÏ ÓÌÏ×ÁÒÀ (^K^N^P)"
+msgstr " Автодополнение по словарю (^K^N^P)"
 
 #: edit.c:52
 msgid " Thesaurus completion (^T^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ÓÉÎÏÎÉÍÏ× (^T^N^P)"
+msgstr " Автодополнение синонимов (^T^N^P)"
 
 #: edit.c:53
 msgid " Command-line completion (^V^N^P)"
-msgstr " á×ÔÏÄÏÐÏÌÎÅÎÉÅ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ (^V^N^P)"
+msgstr " Автодополнение командной строки (^V^N^P)"
 
 #: edit.c:56
 msgid "Hit end of paragraph"
-msgstr "ëÏÎÅà ÁÂÚÁÃÁ"
+msgstr "Конец абзаца"
 
 #: edit.c:962
 msgid "'thesaurus' option is empty"
-msgstr "îÅ ÚÁÄÁÎÏ ÚÎÁÞÅÎÉÅ ÏÐÃÉÉ 'thesaurus'"
+msgstr "Не задано значение опции 'thesaurus'"
 
 #: edit.c:1166
 msgid "'dictionary' option is empty"
-msgstr "îÅ ÚÁÄÁÎÏ ÚÎÁÞÅÎÉÅ ÏÐÃÉÉ 'dictionary'"
+msgstr "Не задано значение опции 'dictionary'"
 
 #: edit.c:2162
 #, c-format
 msgid "Scanning dictionary: %s"
-msgstr "ðÒÏÓÍÏÔÒ ÓÌÏ×ÁÒÑ: %s"
+msgstr "Просмотр словаря: %s"
 
 #: edit.c:2368
 msgid " (insert) Scroll (^E/^Y)"
-msgstr " (×ÓÔÁ×ËÁ) ðÒÏËÒÕÔËÁ (^E/^Y)"
+msgstr " (вставка) Прокрутка (^E/^Y)"
 
 #: edit.c:2370
 msgid " (replace) Scroll (^E/^Y)"
-msgstr " (ÚÁÍÅÎÁ) ðÒÏËÒÕÔËÁ (^E/^Y)"
+msgstr " (замена) Прокрутка (^E/^Y)"
 
 #: edit.c:2684
 #, c-format
 msgid "Scanning: %s"
-msgstr "ðÒÏÓÍÏÔÒ: %s"
+msgstr "Просмотр: %s"
 
 #: edit.c:2719
 #, c-format
 msgid "Scanning tags."
-msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË ÓÒÅÄÉ ÍÅÔÏË."
+msgstr "Выполняется поиск среди меток."
 
 #: edit.c:3381
 msgid " Adding"
-msgstr " äÏÂÁ×ÌÅÎÉÅ"
+msgstr " Добавление"
 
 #. showmode might reset the internal line pointers, so it must
 #. * be called before line = ml_get(), or when this address is no
@@ -370,117 +370,117 @@
 #.
 #: edit.c:3430
 msgid "-- Searching..."
-msgstr "-- ðÏÉÓË..."
+msgstr "-- Поиск..."
 
 #: edit.c:3486
 msgid "Back at original"
-msgstr "éÓÈÏÄÎÏÅ ÓÌÏ×Ï"
+msgstr "Исходное слово"
 
 #: edit.c:3491
 msgid "Word from other line"
-msgstr "óÌÏ×Ï ÉÚ ÄÒÕÇÏÊ ÓÔÒÏËÉ"
+msgstr "Слово из другой строки"
 
 #: edit.c:3496
 msgid "The only match"
-msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÓÏÏÔ×ÅÔÓÔ×ÉÅ"
+msgstr "Единственное соответствие"
 
 #: edit.c:3555
 #, c-format
 msgid "match %d of %d"
-msgstr "ÓÏÏÔ×ÅÔÓÔ×ÉÅ %d ÉÚ %d"
+msgstr "соответствие %d из %d"
 
 #: edit.c:3558
 #, c-format
 msgid "match %d"
-msgstr "ÓÏÏÔ×ÅÔÓÔ×ÉÅ %d"
+msgstr "соответствие %d"
 
 #. Skip further arguments but do continue to
 #. * search for a trailing command.
 #: eval.c:1024
 #, c-format
 msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: îÅÉÚ×ÅÓÔÎÁÑ ÐÅÒÅÍÅÎÎÁÑ: \"%s\""
+msgstr "E106: Неизвестная переменная: \"%s\""
 
 #: eval.c:1320
 #, c-format
 msgid "E107: Missing braces: %s"
-msgstr "E107: ðÒÏÐÕÝÅÎÙ ÓËÏÂËÉ: %s"
+msgstr "E107: Пропущены скобки: %s"
 
 #: eval.c:1435 eval.c:1449
 #, c-format
 msgid "E108: No such variable: \"%s\""
-msgstr "E108: îÅÔ ÔÁËÏÊ ÐÅÒÅÍÅÎÎÏÊ: \"%s\""
+msgstr "E108: Нет такой переменной: \"%s\""
 
 #: eval.c:1705
 msgid "E109: Missing ':' after '?'"
-msgstr "E109: ðÒÏÐÕÝÅÎÏ ':' ÐÏÓÌÅ '?'"
+msgstr "E109: Пропущено ':' после '?'"
 
 #: eval.c:2327
 msgid "E110: Missing ')'"
-msgstr "E110: ðÒÏÐÕÝÅÎÁ ')'"
+msgstr "E110: Пропущена ')'"
 
 #: eval.c:2389
 msgid "E111: Missing ']'"
-msgstr "E111: ðÒÏÐÕÝÅÎÁ ']'"
+msgstr "E111: Пропущена ']'"
 
 #: eval.c:2466
 #, c-format
 msgid "E112: Option name missing: %s"
-msgstr "E112: îÅ ÕËÁÚÁÎÏ ÉÍÑ ÏÐÃÉÉ: %s"
+msgstr "E112: Не указано имя опции: %s"
 
 #: eval.c:2484
 #, c-format
 msgid "E113: Unknown option: %s"
-msgstr "E113: îÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ: %s"
+msgstr "E113: Неизвестная опция: %s"
 
 #: eval.c:2555
 #, c-format
 msgid "E114: Missing quote: %s"
-msgstr "E114: ðÒÏÐÕÝÅÎÁ ËÁ×ÙÞËÁ: %s"
+msgstr "E114: Пропущена кавычка: %s"
 
 #: eval.c:2698
 #, c-format
 msgid "E115: Missing quote: %s"
-msgstr "E115: ðÒÏÐÕÝÅÎÁ ËÁ×ÙÞËÁ: %s"
+msgstr "E115: Пропущена кавычка: %s"
 
 #: eval.c:3054
 #, c-format
 msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ðÁÒÁÍÅÔÒÙ ÄÌÑ ÆÕÎËÃÉÉ %s ÚÁÄÁÎÙ ÎÅ×ÅÒÎÏ"
+msgstr "E116: Параметры для функции %s заданы неверно"
 
 #: eval.c:3083
 #, c-format
 msgid "E117: Unknown function: %s"
-msgstr "E117: îÅÉÚ×ÅÓÔÎÁÑ ÆÕÎËÃÉÑ: %s"
+msgstr "E117: Неизвестная функция: %s"
 
 #: eval.c:3084
 #, c-format
 msgid "E118: Too many arguments for function: %s"
-msgstr "E118: óÌÉÛËÏÍ ÍÎÏÇÏ ÐÁÒÁÍÅÔÒÏ× ÄÌÑ ÆÕÎËÃÉÉ %s"
+msgstr "E118: Слишком много параметров для функции %s"
 
 #: eval.c:3085
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: îÅÄÏÓÔÁÔÏÞÎÏ ÐÁÒÁÍÅÔÒÏ× ÄÌÑ ÆÕÎËÃÉÉ %s"
+msgstr "E119: Недостаточно параметров для функции %s"
 
 #: eval.c:3086
 #, c-format
 msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ÉÓÐÏÌØÚÕÅÔÓÑ ×ÎÅ ÓÃÅÎÁÒÉÑ: %s"
+msgstr "E120: <SID> используется вне сценария: %s"
 
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #.
-#: eval.c:3687 gui.c:4382 gui_gtk.c:2059
+#: eval.c:3687 gui.c:4385 gui_gtk.c:2059
 msgid "&Ok"
 msgstr "&Ok"
 
 #: eval.c:4226
 #, c-format
 msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ÓÔÒÏË: "
+msgstr "+-%s%3ld строк: "
 
 #: eval.c:5477
 msgid ""
@@ -488,138 +488,138 @@
 "&Cancel"
 msgstr ""
 "&OK\n"
-"ï&ÔÍÅÎÁ"
+"О&тмена"
 
 #: eval.c:5517
 msgid "called inputrestore() more often than inputsave()"
-msgstr "æÕÎËÃÉÑ inputrestore() ×ÙÚÙ×ÁÅÔÓÑ ÞÁÝÅ, ÞÅÍ ÆÕÎËÃÉÑ inputsave()"
+msgstr "Функция inputrestore() вызывается чаще, чем функция inputsave()"
 
 #: eval.c:5977
 msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E656: óÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÉÞÅÓËÉÈ ÓÓÙÌÏË (ÃÉËÌ?)"
+msgstr "E656: Слишком много символических ссылок (цикл?)"
 
-#: eval.c:6609
+#: eval.c:6626
 msgid "E240: No connection to Vim server"
-msgstr "E240: îÅÔ Ó×ÑÚÉ Ó ÓÅÒ×ÅÒÏÍ Vim"
+msgstr "E240: Нет связи с сервером Vim"
 
-#: eval.c:6706
+#: eval.c:6724
 msgid "E277: Unable to read a server reply"
-msgstr "E227: óÅÒ×ÅÒ ÎÅ ÏÔ×ÅÞÁÅÔ"
+msgstr "E227: Сервер не отвечает"
 
-#: eval.c:6734
+#: eval.c:6752
 msgid "E258: Unable to send to client"
-msgstr "E258: îÅ ÍÏÇÕ ÏÔ×ÅÔÉÔØ ËÌÉÅÎÔÕ"
+msgstr "E258: Не могу ответить клиенту"
 
-#: eval.c:6782
+#: eval.c:6800
 #, c-format
 msgid "E241: Unable to send to %s"
-msgstr "E241: îÅ ÍÏÇÕ ÏÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ ÄÌÑ %s"
+msgstr "E241: Не могу отправить сообщение для %s"
 
-#: eval.c:6882
+#: eval.c:6900
 msgid "(Invalid)"
-msgstr "(îÅÐÒÁ×ÉÌØÎÏ)"
+msgstr "(Неправильно)"
 
-#: eval.c:8060
+#: eval.c:8078
 #, c-format
 msgid "E121: Undefined variable: %s"
-msgstr "E121: îÅÏÐÒÅÄÅÌÅÎÎÁÑ ÐÅÒÅÍÅÎÎÁÑ: %s"
+msgstr "E121: Неопределенная переменная: %s"
 
-#: eval.c:8492
+#: eval.c:8510
 #, c-format
 msgid "E461: Illegal variable name: %s"
-msgstr "E461: îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ: %s"
+msgstr "E461: Недопустимое имя переменной: %s"
 
-#: eval.c:8784
+#: eval.c:8802
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: æÕÎËÃÉÑ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ. äÏÂÁ×ØÔÅ !, ÞÔÏÂÙ ÚÁÍÅÎÉÔØ Å£."
+msgstr "E122: Функция %s уже существует. Добавьте !, чтобы заменить её."
 
-#: eval.c:8857
+#: eval.c:8875
 #, c-format
 msgid "E123: Undefined function: %s"
-msgstr "E123: îÅÏÐÒÅÄÅÌÅÎÎÁÑ ÆÕÎËÃÉÑ: %s"
+msgstr "E123: Неопределенная функция: %s"
 
-#: eval.c:8870
+#: eval.c:8888
 #, c-format
 msgid "E124: Missing '(': %s"
-msgstr "E124: ðÒÏÐÕÝÅÎÁ '(': %s"
+msgstr "E124: Пропущена '(': %s"
 
-#: eval.c:8903
+#: eval.c:8921
 #, c-format
 msgid "E125: Illegal argument: %s"
-msgstr "E125: îÅÄÏÐÕÓÔÉÍÙÊ ÐÁÒÁÍÅÔÒ: %s"
+msgstr "E125: Недопустимый параметр: %s"
 
-#: eval.c:8982
+#: eval.c:9000
 msgid "E126: Missing :endfunction"
-msgstr "E126: ðÒÏÐÕÝÅÎÁ ËÏÍÁÎÄÁ :endfunction"
+msgstr "E126: Пропущена команда :endfunction"
 
-#: eval.c:9089
+#: eval.c:9107
 #, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÏÐÒÅÄÅÌÉÔØ ÆÕÎËÃÉÀ %s, ÏÎÁ ÉÓÐÏÌØÚÕÅÔÓÑ"
+msgstr "E127: Невозможно переопределить функцию %s, она используется"
 
-#: eval.c:9159
+#: eval.c:9177
 msgid "E129: Function name required"
-msgstr "E129: ôÒÅÂÕÅÔÓÑ ÉÍÑ ÆÕÎËÃÉÉ"
+msgstr "E129: Требуется имя функции"
 
-#: eval.c:9210
+#: eval.c:9228
 #, c-format
 msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: éÍÑ ÆÕÎËÃÉÉ ÄÏÌÖÎÏ ÎÁÞÉÎÁÔØÓÑ Ó ÐÒÏÐÉÓÎÏÊ ÂÕË×Ù: %s"
+msgstr "E128: Имя функции должно начинаться с прописной буквы: %s"
 
-#: eval.c:9402
+#: eval.c:9420
 #, c-format
 msgid "E130: Undefined function: %s"
-msgstr "E130: æÕÎËÃÉÑ %s ÎÅ ÏÐÒÅÄÅÌÅÎÁ"
+msgstr "E130: Функция %s не определена"
 
-#: eval.c:9407
+#: eval.c:9425
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÆÕÎËÃÉÀ %s, ÏÎÁ ÉÓÐÏÌØÚÕÅÔÓÑ"
+msgstr "E131: Невозможно удалить функцию %s, она используется"
 
-#: eval.c:9455
+#: eval.c:9473
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: çÌÕÂÉÎÁ ×ÙÚÏ×Á ÆÕÎËÃÉÉ ÂÏÌØÛÅ, ÞÅÍ ÚÎÁÞÅÎÉÅ 'maxfuncdepth'"
+msgstr "E132: Глубина вызова функции больше, чем значение 'maxfuncdepth'"
 
 #. always scroll up, don't overwrite
-#: eval.c:9508
+#: eval.c:9526
 #, c-format
 msgid "calling %s"
-msgstr "×ÙÚÏ× %s"
+msgstr "вызов %s"
 
-#: eval.c:9570
+#: eval.c:9588
 #, c-format
 msgid "%s aborted"
-msgstr "%s ÐÒÅÒ×ÁÎÁ"
+msgstr "%s прервана"
 
-#: eval.c:9572
+#: eval.c:9590
 #, c-format
 msgid "%s returning #%ld"
-msgstr "%s ×ÏÚ×ÒÁÝÁÅÔ #%ld"
+msgstr "%s возвращает #%ld"
 
-#: eval.c:9579
+#: eval.c:9597
 #, c-format
 msgid "%s returning \"%s\""
-msgstr "%s ×ÏÚ×ÒÁÝÁÅÔ \"%s\""
+msgstr "%s возвращает \"%s\""
 
 #. always scroll up, don't overwrite
-#: eval.c:9595 ex_cmds2.c:2365
+#: eval.c:9613 ex_cmds2.c:2370
 #, c-format
 msgid "continuing in %s"
-msgstr "ÐÒÏÄÏÌÖÅÎÉÅ × %s"
+msgstr "продолжение в %s"
 
-#: eval.c:9621
+#: eval.c:9639
 msgid "E133: :return not inside a function"
-msgstr "E133: ËÏÍÁÎÄÁ :return ×ÎÅ ÆÕÎËÃÉÉ"
+msgstr "E133: команда :return вне функции"
 
-#: eval.c:9952
+#: eval.c:9970
 #, c-format
 msgid ""
 "\n"
 "# global variables:\n"
 msgstr ""
 "\n"
-"# ÇÌÏÂÁÌØÎÙÅ ÐÅÒÅÍÅÎÎÙÅ:\n"
+"# глобальные переменные:\n"
 
 #: ex_cmds.c:92
 #, c-format
@@ -638,77 +638,77 @@
 
 #: ex_cmds.c:430
 msgid "E134: Move lines into themselves"
-msgstr "E134: óÔÒÏËÉ ÐÅÒÅÍÅÝÁÀÔÓÑ ÓÁÍÉ ÎÁ ÓÅÂÑ"
+msgstr "E134: Строки перемещаются сами на себя"
 
 #: ex_cmds.c:499
 msgid "1 line moved"
-msgstr "ðÅÒÅÍÅÝÅÎÁ ÏÄÎÁ ÓÔÒÏËÁ"
+msgstr "Перемещена одна строка"
 
 #: ex_cmds.c:501
 #, c-format
 msgid "%ld lines moved"
-msgstr "ðÅÒÅÍÅÝÅÎÏ ÓÔÒÏË: %ld"
+msgstr "Перемещено строк: %ld"
 
 #: ex_cmds.c:924
 #, c-format
 msgid "%ld lines filtered"
-msgstr "ðÒÏÐÕÝÅÎÏ ÞÅÒÅÚ ÆÉÌØÔÒ ÓÔÒÏË: %ld"
+msgstr "Пропущено через фильтр строк: %ld"
 
 #: ex_cmds.c:952
 msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: á×ÔÏËÏÍÁÎÄÙ *Filter* ÎÅ ÄÏÌÖÎÙ ÉÚÍÅÎÑÔØ ÁËÔÉ×ÎÙÊ ÂÕÆÅÒ"
+msgstr "E135: Автокоманды *Filter* не должны изменять активный буфер"
 
 #: ex_cmds.c:1037
 msgid "[No write since last change]\n"
-msgstr "[éÚÍÅÎÅÎÉÑ ÎÅ ÓÏÈÒÁÎÅÎÙ]\n"
+msgstr "[Изменения не сохранены]\n"
 
 #: ex_cmds.c:1283
 #, c-format
 msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s × ÓÔÒÏËÅ: "
+msgstr "%sviminfo: %s в строке: "
 
 #: ex_cmds.c:1288
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr ""
-"E136: viminfo: óÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË, ÏÓÔÁÌØÎÁÑ ÞÁÓÔØ ÆÁÊÌÁ ÂÕÄÅÔ ÐÒÏÐÕÝÅÎÁ"
+"E136: viminfo: Слишком много ошибок, остальная часть файла будет пропущена"
 
 #: ex_cmds.c:1323
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "þÔÅÎÉÅ ÆÁÊÌÁ viminfo \"%s\"%s%s%s"
+msgstr "Чтение файла viminfo \"%s\"%s%s%s"
 
 #: ex_cmds.c:1324
 msgid " info"
-msgstr " ÉÎÆÏ"
+msgstr " инфо"
 
 #: ex_cmds.c:1325
 msgid " marks"
-msgstr " ÏÔÍÅÔÏË"
+msgstr " отметок"
 
 #: ex_cmds.c:1326
 msgid " FAILED"
-msgstr " îåõäáþîï"
+msgstr " НЕУДАЧНО"
 
 #: ex_cmds.c:1418
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: ðÒÁ×Á ÎÁ ÚÁÐÉÓØ ÆÁÊÌÁ viminfo ÏÔÓÕÔÓÔ×ÕÀÔ: %s"
+msgstr "E137: Права на запись файла viminfo отсутствуют: %s"
 
 #: ex_cmds.c:1543
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÆÁÊÌ viminfo %s!"
+msgstr "E138: Невозможно записать файл viminfo %s!"
 
 #: ex_cmds.c:1551
 #, c-format
 msgid "Writing viminfo file \"%s\""
-msgstr "úÁÐÉÓØ ÆÁÊÌÁ viminfo \"%s\""
+msgstr "Запись файла viminfo \"%s\""
 
 #. Write the info:
 #: ex_cmds.c:1649
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# üÔÏÔ ÆÁÊÌ viminfo Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÏÚÄÁÎ Vim %s.\n"
+msgstr "# Этот файл viminfo автоматически создан Vim %s.\n"
 
 #: ex_cmds.c:1651
 #, c-format
@@ -716,121 +716,121 @@
 "# You may edit it if you're careful!\n"
 "\n"
 msgstr ""
-"# åÇÏ ÍÏÖÎÏ (ÏÓÔÏÒÏÖÎÏ!) ÒÅÄÁËÔÉÒÏ×ÁÔØ.\n"
+"# Его можно (осторожно!) редактировать.\n"
 "\n"
 
 #: ex_cmds.c:1653
 #, c-format
 msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# úÎÁÞÅÎÉÅ ÏÐÃÉÉ 'encoding' × ÍÏÍÅÎÔ ÚÁÐÉÓÉ ÆÁÊÌÁ\n"
+msgstr "# Значение опции 'encoding' в момент записи файла\n"
 
 #: ex_cmds.c:1752
 msgid "Illegal starting char"
-msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ"
+msgstr "Недопустимый начальный символ"
 
-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
+#: ex_cmds.c:2097 ex_cmds2.c:761
 msgid "Save As"
-msgstr "óÏÈÒÁÎÉÔØ ËÁË"
+msgstr "Сохранить как"
 
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
 #: ex_cmds.c:2140
 msgid "E139: File is loaded in another buffer"
-msgstr "E139: æÁÊÌ ÚÁÇÒÕÖÅÎ × ÄÒÕÇÏÍ ÂÕÆÅÒÅ"
+msgstr "E139: Файл загружен в другом буфере"
 
 #: ex_cmds.c:2174
 msgid "Write partial file?"
-msgstr "úÁÐÉÓÁÔØ ÆÁÊÌ ÞÁÓÔÉÞÎÏ?"
+msgstr "Записать файл частично?"
 
 #: ex_cmds.c:2181
 msgid "E140: Use ! to write partial buffer"
-msgstr "E140: äÌÑ ÚÁÐÉÓÉ ÞÁÓÔÉ ÂÕÆÅÒÁ ÉÓÐÏÌØÚÕÊÔÅ !"
+msgstr "E140: Для записи части буфера используйте !"
 
 #: ex_cmds.c:2296
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
-msgstr "ðÅÒÅÐÉÓÁÔØ ÓÕÝÅÓÔ×ÕÀÝÉÊ ÆÁÊÌ \"%.*s\"?"
+msgstr "Переписать существующий файл \"%.*s\"?"
 
 #: ex_cmds.c:2367
 #, c-format
 msgid "E141: No file name for buffer %ld"
-msgstr "E141: âÕÆÅÒ %ld ÎÅ Ó×ÑÚÁÎ Ó ÉÍÅÎÅÍ ÆÁÊÌÁ"
+msgstr "E141: Буфер %ld не связан с именем файла"
 
-#: ex_cmds.c:2405
+#: ex_cmds.c:2406
 msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: æÁÊÌ ÎÅ ÓÏÈÒÁΣÎ: ÚÁÐÉÓØ ÏÔËÌÀÞÅÎÁ ÏÐÃÉÅÊ 'write'"
+msgstr "E142: Файл не сохранён: запись отключена опцией 'write'"
 
-#: ex_cmds.c:2425
+#: ex_cmds.c:2426
 #, c-format
 msgid ""
 "'readonly' option is set for \"%.*s\".\n"
 "Do you wish to write anyway?"
 msgstr ""
-"äÌÑ \"%.*s\" ×ËÌÀÞÅÎÁ ÏÐÃÉÑ 'readonly'.\n"
-"úÁÐÉÓÁÔØ?"
+"Для \"%.*s\" включена опция 'readonly'.\n"
+"Записать?"
 
-#: ex_cmds.c:2597
+#: ex_cmds.c:2599
 msgid "Edit File"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÁÊÌÁ"
+msgstr "Редактирование файла"
 
-#: ex_cmds.c:3205
+#: ex_cmds.c:3206
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: á×ÔÏËÏÍÁÎÄÙ ÎÅÏÖÉÄÁÎÎÏ ÕÂÉÌÉ ÎÏ×ÙÊ ÂÕÆÅÒ %s"
+msgstr "E143: Автокоманды неожиданно убили новый буфер %s"
 
-#: ex_cmds.c:3339
+#: ex_cmds.c:3340
 msgid "E144: non-numeric argument to :z"
-msgstr "E144: ðÁÒÁÍÅÔÒ ËÏÍÁÎÄÙ :z ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ"
+msgstr "E144: Параметр команды :z должен быть числом"
 
-#: ex_cmds.c:3424
+#: ex_cmds.c:3425
 msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: éÓÐÏÌØÚÏ×ÁÎÉÅ ËÏÍÁÎÄ ÏÂÏÌÏÞËÉ ÎÅ ÄÏÐÕÓËÁÅÔÓÑ × rvim."
+msgstr "E145: Использование команд оболочки не допускается в rvim."
 
-#: ex_cmds.c:3531
+#: ex_cmds.c:3532
 msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: òÅÇÕÌÑÒÎÙÅ ×ÙÒÁÖÅÎÉÑ ÎÅ ÍÏÇÕÔ ÒÁÚÄÅÌÑÔØÓÑ ÂÕË×ÁÍÉ"
+msgstr "E146: Регулярные выражения не могут разделяться буквами"
 
-#: ex_cmds.c:3877
+#: ex_cmds.c:3878
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "ÚÁÍÅÎÉÔØ ÎÁ %s? (y/n/a/q/l/^E/^Y)"
+msgstr "заменить на %s? (y/n/a/q/l/^E/^Y)"
 
-#: ex_cmds.c:4270
+#: ex_cmds.c:4271
 msgid "(Interrupted) "
-msgstr "(ðÒÅÒ×ÁÎÏ)"
+msgstr "(Прервано)"
 
-#: ex_cmds.c:4274
+#: ex_cmds.c:4275
 msgid "1 substitution"
-msgstr "ïÄÎÁ ÚÁÍÅÎÁ"
+msgstr "Одна замена"
 
-#: ex_cmds.c:4276
+#: ex_cmds.c:4277
 #, c-format
 msgid "%ld substitutions"
-msgstr "%ld ÚÁÍÅÎ"
+msgstr "%ld замен"
 
-#: ex_cmds.c:4279
+#: ex_cmds.c:4280
 msgid " on 1 line"
-msgstr " × ÏÄÎÏÊ ÓÔÒÏËÅ"
+msgstr " в одной строке"
 
-#: ex_cmds.c:4281
+#: ex_cmds.c:4282
 #, c-format
 msgid " on %ld lines"
-msgstr " × %ld ÓÔÒ."
+msgstr " в %ld стр."
 
-#: ex_cmds.c:4332
+#: ex_cmds.c:4333
 msgid "E147: Cannot do :global recursive"
-msgstr "E147: ëÏÍÁÎÄÁ :global ÎÅ ÍÏÖÅÔ ÂÙÔØ ÒÅËÕÒÓÉ×ÎÏÊ"
+msgstr "E147: Команда :global не может быть рекурсивной"
 
-#: ex_cmds.c:4367
+#: ex_cmds.c:4368
 msgid "E148: Regular expression missing from global"
-msgstr "E148: ÷ ËÏÍÁÎÄÅ :global ÐÒÏÐÕÝÅÎÏ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ"
+msgstr "E148: В команде :global пропущено регулярное выражение"
 
-#: ex_cmds.c:4416
+#: ex_cmds.c:4417
 #, c-format
 msgid "Pattern found in every line: %s"
-msgstr "óÏÏÔ×ÅÔÓÔ×ÉÅ ÛÁÂÌÏÎÕ ÎÁÊÄÅÎÏ ÎÁ ËÁÖÄÏÊ ÓÔÒÏËÅ: %s"
+msgstr "Соответствие шаблону найдено на каждой строке: %s"
 
-#: ex_cmds.c:4497
+#: ex_cmds.c:4498
 #, c-format
 msgid ""
 "\n"
@@ -838,1462 +838,1462 @@
 "$"
 msgstr ""
 "\n"
-"# ðÏÓÌÅÄÎÑÑ ÓÔÒÏËÁ ÄÌÑ ÚÁÍÅÎÙ:\n"
+"# Последняя строка для замены:\n"
 "$"
 
-#: ex_cmds.c:4598
+#: ex_cmds.c:4599
 msgid "E478: Don't panic!"
-msgstr "E478: óÐÏËÏÊÓÔ×ÉÅ, ÔÏÌØËÏ ÓÐÏËÏÊÓÔ×ÉÅ!"
+msgstr "E478: Спокойствие, только спокойствие!"
 
-#: ex_cmds.c:4650
+#: ex_cmds.c:4651
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: Ë ÓÏÖÁÌÅÎÉÀ, ÓÐÒÁ×ËÁ '%s' ÄÌÑ %s ÏÔÓÕÔÓÔ×ÕÅÔ"
+msgstr "E661: к сожалению, справка '%s' для %s отсутствует"
 
-#: ex_cmds.c:4653
+#: ex_cmds.c:4654
 #, c-format
 msgid "E149: Sorry, no help for %s"
-msgstr "E149: ë ÓÏÖÁÌÅÎÉÀ ÓÐÒÁ×ËÁ ÄÌÑ %s ÏÔÓÕÔÓÔ×ÕÅÔ"
+msgstr "E149: К сожалению справка для %s отсутствует"
 
-#: ex_cmds.c:4687
+#: ex_cmds.c:4688
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "éÚ×ÉÎÉÔÅ, ÆÁÊÌ ÓÐÒÁ×ËÉ \"%s\" ÎÅ ÎÁÊÄÅÎ"
+msgstr "Извините, файл справки \"%s\" не найден"
 
-#: ex_cmds.c:5170
+#: ex_cmds.c:5191
 #, c-format
 msgid "E150: Not a directory: %s"
-msgstr "E150: %s ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
+msgstr "E150: %s не является каталогом"
 
-#: ex_cmds.c:5309
+#: ex_cmds.c:5330
 #, c-format
 msgid "E152: Cannot open %s for writing"
-msgstr "E152: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÚÁÐÉÓÉ"
+msgstr "E152: Невозможно открыть %s для записи"
 
-#: ex_cmds.c:5345
+#: ex_cmds.c:5366
 #, c-format
 msgid "E153: Unable to open %s for reading"
-msgstr "E153: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ"
+msgstr "E153: Невозможно открыть %s для чтения"
 
-#: ex_cmds.c:5367
+#: ex_cmds.c:5388
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: æÁÊÌÙ ÓÐÒÁ×ËÉ ÉÓÐÏÌØÚÕÀÔ ÒÁÚÎÙÅ ËÏÄÉÒÏ×ËÉ ÄÌÑ ÏÄÎÏÇÏ ÑÚÙËÁ: %s"
+msgstr "E670: Файлы справки используют разные кодировки для одного языка: %s"
 
-#: ex_cmds.c:5445
+#: ex_cmds.c:5466
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: ðÏ×ÔÏÒÑÀÝÁÑÓÑ ÍÅÔËÁ \"%s\" × ÆÁÊÌÅ %s"
+msgstr "E154: Повторяющаяся метка \"%s\" в файле %s"
 
-#: ex_cmds.c:5557
+#: ex_cmds.c:5578
 #, c-format
 msgid "E160: Unknown sign command: %s"
-msgstr "E160: îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ ÚÎÁÞËÁ %s"
+msgstr "E160: Неизвестная команда значка %s"
 
-#: ex_cmds.c:5577
+#: ex_cmds.c:5598
 msgid "E156: Missing sign name"
-msgstr "E156: ðÒÏÐÕÝÅÎÏ ÉÍÑ ÚÎÁÞËÁ"
+msgstr "E156: Пропущено имя значка"
 
-#: ex_cmds.c:5623
+#: ex_cmds.c:5644
 msgid "E612: Too many signs defined"
-msgstr "E612: ïÐÒÅÄÅÌÅÎÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÚÎÁÞËÏ×"
+msgstr "E612: Определено слишком много значков"
 
-#: ex_cmds.c:5691
+#: ex_cmds.c:5712
 #, c-format
 msgid "E239: Invalid sign text: %s"
-msgstr "E239: îÅÐÒÁ×ÉÌØÎÙÊ ÔÅËÓÔ ÚÎÁÞËÁ: %s"
+msgstr "E239: Неправильный текст значка: %s"
 
-#: ex_cmds.c:5722 ex_cmds.c:5913
+#: ex_cmds.c:5743 ex_cmds.c:5934
 #, c-format
 msgid "E155: Unknown sign: %s"
-msgstr "E155: îÅÉÚ×ÅÓÔÎÙÊ ÚÎÁÞÏË: %s"
+msgstr "E155: Неизвестный значок: %s"
 
-#: ex_cmds.c:5771
+#: ex_cmds.c:5792
 msgid "E159: Missing sign number"
-msgstr "E159: ðÒÏÐÕÝÅÎ ÎÏÍÅÒ ÚÎÁÞËÁ"
+msgstr "E159: Пропущен номер значка"
 
-#: ex_cmds.c:5853
+#: ex_cmds.c:5874
 #, c-format
 msgid "E158: Invalid buffer name: %s"
-msgstr "E158: îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÂÕÆÅÒÁ: %s"
+msgstr "E158: Неправильное имя буфера: %s"
 
-#: ex_cmds.c:5892
+#: ex_cmds.c:5913
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: îÅÐÒÁ×ÉÌØÎÙÊ ID ÚÎÁÞËÁ: %ld"
+msgstr "E157: Неправильный ID значка: %ld"
 
-#: ex_cmds.c:5962
+#: ex_cmds.c:5983
 msgid " (NOT FOUND)"
-msgstr " (îå îáêäåîï)"
+msgstr " (НЕ НАЙДЕНО)"
 
-#: ex_cmds.c:5964
+#: ex_cmds.c:5985
 msgid " (not supported)"
-msgstr " (ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ)"
+msgstr " (не поддерживается)"
 
-#: ex_cmds.c:6063
+#: ex_cmds.c:6084
 msgid "[Deleted]"
-msgstr "[õÄÁÌÅÎÏ]"
+msgstr "[Удалено]"
 
 #: ex_cmds2.c:92
 msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "÷ËÌÀޣΠÒÅÖÉÍ ÏÔÌÁÄËÉ. äÌÑ ÐÒÏÄÏÌÖÅÎÉÑ ÎÁÂÅÒÉÔÅ \"cont\""
+msgstr "Включён режим отладки. Для продолжения наберите \"cont\""
 
-#: ex_cmds2.c:96 ex_docmd.c:966
+#: ex_cmds2.c:96 ex_docmd.c:968
 #, c-format
 msgid "line %ld: %s"
-msgstr "ÓÔÒÏËÁ %ld: %s"
+msgstr "строка %ld: %s"
 
 #: ex_cmds2.c:98
 #, c-format
 msgid "cmd: %s"
-msgstr "ËÏÍÁÎÄÁ: %s"
+msgstr "команда: %s"
 
 #: ex_cmds2.c:290
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "ôÏÞËÁ ÏÓÔÁÎÏ×ËÉ × \"%s%s\" ÓÔÒ. %ld"
+msgstr "Точка остановки в \"%s%s\" стр. %ld"
 
 #: ex_cmds2.c:540
 #, c-format
 msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ôÏÞËÁ ÏÓÔÁÎÏ×ËÉ ÎÅ ÎÁÊÄÅÎÁ: %s"
+msgstr "E161: Точка остановки не найдена: %s"
 
 #: ex_cmds2.c:566
 msgid "No breakpoints defined"
-msgstr "ôÏÞËÉ ÏÓÔÁÎÏ×ËÉ ÎÅ ÏÐÒÅÄÅÌÅÎÙ"
+msgstr "Точки остановки не определены"
 
 #: ex_cmds2.c:571
 #, c-format
 msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s ÓÔÒ. %ld"
+msgstr "%3d  %s %s стр. %ld"
 
 #: ex_cmds2.c:786
 #, c-format
 msgid "Save changes to \"%.*s\"?"
-msgstr "óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ × \"%.*s\"?"
+msgstr "Сохранить изменения в \"%.*s\"?"
 
-#: ex_cmds2.c:788 ex_docmd.c:9378
+#: ex_cmds2.c:788 ex_docmd.c:9398
 msgid "Untitled"
-msgstr "âÅÚ ÉÍÅÎÉ"
+msgstr "Без имени"
 
 #: ex_cmds2.c:915
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: îÅÓÏÈÒÁΣÎÎÙÅ ÉÚÍÅÎÅÎÉÑ × ÂÕÆÅÒÅ \"%s\""
+msgstr "E162: Несохранённые изменения в буфере \"%s\""
 
 #: ex_cmds2.c:984
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr ""
-"ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: îÅÏÖÉÄÁÎÎÙÊ ÐÅÒÅÈÏÄ × ÄÒÕÇÏÊ ÂÕÆÅÒ (ÐÒÏ×ÅÒØÔÅ Á×ÔÏËÏÍÁÎÄÙ)"
+"Предупреждение: Неожиданный переход в другой буфер (проверьте автокоманды)"
 
 #: ex_cmds2.c:1387
 msgid "E163: There is only one file to edit"
-msgstr "E163: äÌÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÄÏÓÔÕÐÅÎ ÔÏÌØËÏ ÏÄÉÎ ÆÁÊÌ"
+msgstr "E163: Для редактирования доступен только один файл"
 
 #: ex_cmds2.c:1389
 msgid "E164: Cannot go before first file"
-msgstr "E164: üÔÏ ÐÅÒ×ÙÊ ÆÁÊÌ"
+msgstr "E164: Это первый файл"
 
 #: ex_cmds2.c:1391
 msgid "E165: Cannot go beyond last file"
-msgstr "E165: üÔÏ ÐÏÓÌÅÄÎÉÊ ÆÁÊÌ"
+msgstr "E165: Это последний файл"
 
 #: ex_cmds2.c:1804
 #, c-format
 msgid "E666: compiler not supported: %s"
-msgstr "E666: ËÏÍÐÉÌÑÔÏÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ: %s"
+msgstr "E666: компилятор не поддерживается: %s"
 
-#: ex_cmds2.c:1897
+#: ex_cmds2.c:1901
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
-msgstr "ðÏÉÓË \"%s\" × \"%s\""
+msgstr "Поиск \"%s\" в \"%s\""
 
-#: ex_cmds2.c:1919
+#: ex_cmds2.c:1923
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "ðÏÉÓË \"%s\""
+msgstr "Поиск \"%s\""
 
-#: ex_cmds2.c:1940
+#: ex_cmds2.c:1945
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "ÎÅ ÎÁÊÄÅÎÏ × 'runtimepath': \"%s\""
+msgstr "не найдено в 'runtimepath': \"%s\""
 
-#: ex_cmds2.c:1974
+#: ex_cmds2.c:1979
 msgid "Source Vim script"
-msgstr "÷ÙÐÏÌÎÉÔØ ÓÃÅÎÁÒÉÊ Vim"
+msgstr "Выполнить сценарий Vim"
 
-#: ex_cmds2.c:2164
+#: ex_cmds2.c:2169
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "îÅÌØÚÑ ÓÞÉÔÁÔØ ËÁÔÁÌÏÇ: \"%s\""
+msgstr "Нельзя считать каталог: \"%s\""
 
-#: ex_cmds2.c:2202
+#: ex_cmds2.c:2207
 #, c-format
 msgid "could not source \"%s\""
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÞÉÔÁÔØ \"%s\""
+msgstr "невозможно считать \"%s\""
 
-#: ex_cmds2.c:2204
+#: ex_cmds2.c:2209
 #, c-format
 msgid "line %ld: could not source \"%s\""
-msgstr "ÓÔÒÏËÁ %ld: ÎÅ×ÏÚÍÏÖÎÏ ÓÞÉÔÁÔØ \"%s\""
+msgstr "строка %ld: невозможно считать \"%s\""
 
-#: ex_cmds2.c:2218
+#: ex_cmds2.c:2223
 #, c-format
 msgid "sourcing \"%s\""
-msgstr "ÓÞÉÔÙ×ÁÎÉÅ ÓÃÅÎÁÒÉÑ \"%s\""
+msgstr "считывание сценария \"%s\""
 
-#: ex_cmds2.c:2220
+#: ex_cmds2.c:2225
 #, c-format
 msgid "line %ld: sourcing \"%s\""
-msgstr "ÓÔÒÏËÁ %ld: ÓÞÉÔÙ×ÁÎÉÅ \"%s\""
+msgstr "строка %ld: считывание \"%s\""
 
-#: ex_cmds2.c:2363
+#: ex_cmds2.c:2368
 #, c-format
 msgid "finished sourcing %s"
-msgstr "ÓÞÉÔÙ×ÁÎÉÅ ÓÃÅÎÁÒÉÑ %s ÚÁ×ÅÒÛÅÎÏ"
+msgstr "считывание сценария %s завершено"
 
-#: ex_cmds2.c:2707
+#: ex_cmds2.c:2712
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr ""
-"W15: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅÐÒÁ×ÉÌØÎÙÊ ÒÁÚÄÅÌÉÔÅÌØ ÓÔÒÏËÉ. ÷ÏÚÍÏÖÎÏ ÐÒÏÐÕÝÅÎÏ ^M"
+"W15: Предупреждение: неправильный разделитель строки. Возможно пропущено ^M"
 
-#: ex_cmds2.c:2756
+#: ex_cmds2.c:2761
 msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ëÏÍÁÎÄÁ :scriptencoding ÉÓÐÏÌØÚÕÅÔÓÑ ×ÎÅ ÆÁÊÌÁ ÓÃÅÎÁÒÉÑ"
+msgstr "E167: Команда :scriptencoding используется вне файла сценария"
 
-#: ex_cmds2.c:2789
+#: ex_cmds2.c:2794
 msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ëÏÍÁÎÄÁ :finish ÉÓÐÏÌØÚÕÅÔÓÑ ×ÎÅ ÆÁÊÌÁ ÓÃÅÎÁÒÉÑ"
+msgstr "E168: Команда :finish используется вне файла сценария"
 
-#: ex_cmds2.c:3238
+#: ex_cmds2.c:3243
 #, c-format
 msgid "Page %d"
-msgstr "óÔÒÁÎÉÃÁ %d"
+msgstr "Страница %d"
 
-#: ex_cmds2.c:3394
+#: ex_cmds2.c:3399
 msgid "No text to be printed"
-msgstr "ðÅÞÁÔÁÔØ ÎÅÞÅÇÏ"
+msgstr "Печатать нечего"
 
-#: ex_cmds2.c:3472
+#: ex_cmds2.c:3477
 #, c-format
 msgid "Printing page %d (%d%%)"
-msgstr "ðÅÞÁÔØ ÓÔÒ. %d (%d%%)"
+msgstr "Печать стр. %d (%d%%)"
 
-#: ex_cmds2.c:3484
+#: ex_cmds2.c:3489
 #, c-format
 msgid " Copy %d of %d"
-msgstr " ëÏÐÉÑ %d ÉÚ %d"
+msgstr " Копия %d из %d"
 
-#: ex_cmds2.c:3542
+#: ex_cmds2.c:3547
 #, c-format
 msgid "Printed: %s"
-msgstr "îÁÐÅÞÁÔÁÎÏ: %s"
+msgstr "Напечатано: %s"
 
-#: ex_cmds2.c:3549
+#: ex_cmds2.c:3554
 #, c-format
 msgid "Printing aborted"
-msgstr "ðÅÞÁÔØ ÐÒÅËÒÁÝÅÎÁ"
+msgstr "Печать прекращена"
 
-#: ex_cmds2.c:3914
+#: ex_cmds2.c:3919
 msgid "E455: Error writing to PostScript output file"
-msgstr "E455: ïÛÉÂËÁ ÚÁÐÉÓÉ × ÆÁÊÌ PostScript"
+msgstr "E455: Ошибка записи в файл PostScript"
 
-#: ex_cmds2.c:4189
+#: ex_cmds2.c:4194
 #, c-format
 msgid "E624: Can't open file \"%s\""
-msgstr "E624: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ \"%s\""
+msgstr "E624: Невозможно открыть файл \"%s\""
 
-#: ex_cmds2.c:4199 ex_cmds2.c:4824
+#: ex_cmds2.c:4204 ex_cmds2.c:4829
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ ÒÅÓÕÒÓÏ× PostScript \"%s\""
+msgstr "E457: Невозможно прочитать файл ресурсов PostScript \"%s\""
 
-#: ex_cmds2.c:4207
+#: ex_cmds2.c:4212
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: ÆÁÊÌ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ ÒÅÓÕÒÓÏ× PostScript"
+msgstr "E618: файл \"%s\" не является файлом ресурсов PostScript"
 
-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
+#: ex_cmds2.c:4227 ex_cmds2.c:4247 ex_cmds2.c:4262 ex_cmds2.c:4284
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: ÆÁÊÌ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÙÍ ÆÁÊÌÏÍ ÒÅÓÕÒÓÏ× PostScript"
+msgstr "E619: файл \"%s\" не является допустимым файлом ресурсов PostScript"
 
-#: ex_cmds2.c:4309
+#: ex_cmds2.c:4314
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: ÆÁÊÌ ÒÅÓÕÒÓÏ× \"%s\" ÎÅÉÚ×ÅÓÔÎÏÊ ×ÅÒÓÉÉ"
+msgstr "E621: файл ресурсов \"%s\" неизвестной версии"
 
-#: ex_cmds2.c:4776
+#: ex_cmds2.c:4781
 msgid "E324: Can't open PostScript output file"
-msgstr "E324: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostScript"
+msgstr "E324: Невозможно открыть файл PostScript"
 
-#: ex_cmds2.c:4809
+#: ex_cmds2.c:4814
 #, c-format
 msgid "E456: Can't open file \"%s\""
-msgstr "E456: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ \"%s\""
+msgstr "E456: Невозможно открыть файл \"%s\""
 
-#: ex_cmds2.c:4928
+#: ex_cmds2.c:4933
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: æÁÊÌ ÒÅÓÕÒÓÏ× PostScript \"prolog.ps\" ÎÅ ÎÁÊÄÅÎ"
+msgstr "E456: Файл ресурсов PostScript \"prolog.ps\" не найден"
 
-#: ex_cmds2.c:4959
+#: ex_cmds2.c:4964
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: æÁÊÌ ÒÅÓÕÒÓÏ× PostScript \"%s.ps\" ÎÅ ÎÁÊÄÅÎ"
+msgstr "E456: Файл ресурсов PostScript \"%s.ps\" не найден"
 
-#: ex_cmds2.c:4977
+#: ex_cmds2.c:4982
 #, c-format
 msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
 msgstr ""
-"E620: ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÉÚ ÍÕÌØÔÉÂÁÊÔÎÙÈ ÓÉÍ×ÏÌÏ× × ËÏÄÉÒÏ×ËÕ \"%s\" ÎÅ×ÏÚÍÏÖÎÏ"
+"E620: Преобразование из мультибайтных символов в кодировку \"%s\" невозможно"
 
-#: ex_cmds2.c:5102
+#: ex_cmds2.c:5107
 msgid "Sending to printer..."
-msgstr "ïÔÐÒÁ×ËÁ ÎÁ ÐÅÞÁÔØ..."
+msgstr "Отправка на печать..."
 
-#: ex_cmds2.c:5106
+#: ex_cmds2.c:5111
 msgid "E365: Failed to print PostScript file"
-msgstr "E365: îÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ ÐÅÞÁÔØ ÆÁÊÌÁ PostScript"
+msgstr "E365: Не удалось выполнить печать файла PostScript"
 
-#: ex_cmds2.c:5108
+#: ex_cmds2.c:5113
 msgid "Print job sent."
-msgstr "úÁÄÁÎÉÅ ÎÁ ÐÅÞÁÔØ ÏÔÐÒÁ×ÌÅÎÏ."
+msgstr "Задание на печать отправлено."
 
-#: ex_cmds2.c:5618
+#: ex_cmds2.c:5623
 #, c-format
 msgid "Current %slanguage: \"%s\""
-msgstr "áËÔÉ×ÎÙÊ %sÑÚÙË: \"%s\""
+msgstr "Активный %sязык: \"%s\""
 
-#: ex_cmds2.c:5629
+#: ex_cmds2.c:5634
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: îÅ×ÏÚÍÏÖÎÏ ÓÍÅÎÉÔØ ÑÚÙË ÎÁ \"%s\""
+msgstr "E197: Невозможно сменить язык на \"%s\""
 
 #: ex_docmd.c:525
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "ðÅÒÅÈÏÄ × ÒÅÖÉÍ Ex. äÌÑ ÐÅÒÅÈÏÄÁ × ïÂÙÞÎÙÊ ÒÅÖÉÍ ÎÁÂÅÒÉÔÅ \"visual\""
+msgstr "Переход в режим Ex. Для перехода в Обычный режим наберите \"visual\""
 
 #. must be at EOF
 #: ex_docmd.c:561
 msgid "E501: At end-of-file"
-msgstr "E501: ÷ ËÏÎÃÅ ÆÁÊÌÁ"
+msgstr "E501: В конце файла"
 
-#: ex_docmd.c:669
+#: ex_docmd.c:670
 msgid "E169: Command too recursive"
-msgstr "E169: CÌÉÛËÏÍ ÒÅËÕÒÓÉ×ÎÁÑ ËÏÍÁÎÄÁ"
+msgstr "E169: Cлишком рекурсивная команда"
 
-#: ex_docmd.c:1229
+#: ex_docmd.c:1232
 #, c-format
 msgid "E605: Exception not caught: %s"
-msgstr "E605: éÓËÌÀÞÉÔÅÌØÎÁÑ ÓÉÔÕÁÃÉÑ ÎÅ ÏÂÒÁÂÏÔÁÎÁ: %s"
+msgstr "E605: Исключительная ситуация не обработана: %s"
 
-#: ex_docmd.c:1317
+#: ex_docmd.c:1320
 msgid "End of sourced file"
-msgstr "ëÏÎÅà ÓÞÉÔÁÎÎÏÇÏ ÆÁÊÌÁ"
+msgstr "Конец считанного файла"
 
-#: ex_docmd.c:1318
+#: ex_docmd.c:1321
 msgid "End of function"
-msgstr "ëÏÎÅà ÆÕÎËÃÉÉ"
+msgstr "Конец функции"
 
-#: ex_docmd.c:1907
+#: ex_docmd.c:1910
 msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: îÅÏÄÎÏÚÎÁÞÎÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ËÏÍÁÎÄÙ ÐÏÌØÚÏ×ÁÔÅÌÑ"
+msgstr "E464: Неоднозначное использование команды пользователя"
 
-#: ex_docmd.c:1921
+#: ex_docmd.c:1924
 msgid "E492: Not an editor command"
-msgstr "E492: üÔÏ ÎÅ ËÏÍÁÎÄÁ ÒÅÄÁËÔÏÒÁ"
+msgstr "E492: Это не команда редактора"
 
-#: ex_docmd.c:2028
+#: ex_docmd.c:2031
 msgid "E493: Backwards range given"
-msgstr "E493: úÁÄÁÎ ÏÂÒÁÔÎÙÊ ÄÉÁÐÁÚÏÎ"
+msgstr "E493: Задан обратный диапазон"
 
-#: ex_docmd.c:2037
+#: ex_docmd.c:2040
 msgid "Backwards range given, OK to swap"
-msgstr "úÁÄÁÎ ÏÂÒÁÔÎÙÊ ÄÉÁÐÁÚÏÎ, ÍÅÎÑÅÍ ÇÒÁÎÉÃÙ ÍÅÓÔÁÍÉ"
+msgstr "Задан обратный диапазон, меняем границы местами"
 
-#: ex_docmd.c:2160
+#: ex_docmd.c:2163
 msgid "E494: Use w or w>>"
-msgstr "E494: éÓÐÏÌØÚÕÊÔÅ w ÉÌÉ w>>"
+msgstr "E494: Используйте w или w>>"
 
-#: ex_docmd.c:3786
+#: ex_docmd.c:3789
 msgid "E319: Sorry, the command is not available in this version"
-msgstr "E319: éÚ×ÉÎÉÔÅ, ÜÔÁ ËÏÍÁÎÄÁ ÎÅÄÏÓÔÕÐÎÁ × ÄÁÎÎÏÊ ×ÅÒÓÉÉ"
+msgstr "E319: Извините, эта команда недоступна в данной версии"
 
-#: ex_docmd.c:3989
+#: ex_docmd.c:3992
 msgid "E172: Only one file name allowed"
-msgstr "E172: òÁÚÒÅÛÅÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ÏÄÎÏ ÉÍÑ ÆÁÊÌÁ"
-
-#: ex_docmd.c:4569
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "1 ÆÁÊÌ ÏÖÉÄÁÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ. ÷ÙÊÔÉ?"
+msgstr "E172: Разрешено использовать только одно имя файла"
 
 #: ex_docmd.c:4572
+msgid "1 more file to edit.  Quit anyway?"
+msgstr "1 файл ожидает редактирования. Выйти?"
+
+#: ex_docmd.c:4575
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
-msgstr "åÓÔØ ÎÅÏÔÒÅÄÁËÔÉÒÏ×ÁÎÎÙÅ ÆÁÊÌÙ (%d). ÷ÙÊÔÉ?"
+msgstr "Есть неотредактированные файлы (%d). Выйти?"
 
-#: ex_docmd.c:4579
+#: ex_docmd.c:4582
 msgid "E173: 1 more file to edit"
-msgstr "E173: 1 ÆÁÊÌ ÏÖÉÄÁÅÔ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ."
+msgstr "E173: 1 файл ожидает редактирования."
 
-#: ex_docmd.c:4581
+#: ex_docmd.c:4584
 #, c-format
 msgid "E173: %ld more files to edit"
-msgstr "E173: åÓÔØ ÎÅÏÔÒÅÄÁËÔÉÒÏ×ÁÎÎÙÅ ÆÁÊÌÙ (%d)."
+msgstr "E173: Есть неотредактированные файлы (%d)."
 
-#: ex_docmd.c:4676
+#: ex_docmd.c:4679
 msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: ëÏÍÁÎÄÁ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ. äÏÂÁ×ØÔÅ ! ÄÌÑ ÚÁÍÅÎÙ."
+msgstr "E174: Команда уже существует. Добавьте ! для замены."
 
-#: ex_docmd.c:4787
+#: ex_docmd.c:4790
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
 msgstr ""
 "\n"
-"    éÍÑ      ðÁÒÁÍ. äÉÁÐ. äÏÐÏÌÎ.    ïÐÒÅÄÅÌÅÎÉÅ"
+"    Имя      Парам. Диап. Дополн.    Определение"
 
-#: ex_docmd.c:4876
+#: ex_docmd.c:4879
 msgid "No user-defined commands found"
-msgstr "ëÏÍÁÎÄÙ, ÏÐÒÅÄÅÌ£ÎÎÙÅ ÐÏÌØÚÏ×ÁÔÅÌÅÍ, ÎÅ ÏÂÎÁÒÕÖÅÎÙ."
+msgstr "Команды, определённые пользователем, не обнаружены."
 
-#: ex_docmd.c:4908
+#: ex_docmd.c:4911
 msgid "E175: No attribute specified"
-msgstr "E175: ÐÁÒÁÍÅÔÒ ÎÅ ÚÁÄÁÎ"
+msgstr "E175: параметр не задан"
 
-#: ex_docmd.c:4960
+#: ex_docmd.c:4963
 msgid "E176: Invalid number of arguments"
-msgstr "E176: îÅÐÒÁ×ÉÌØÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÐÁÒÁÍÅÔÒÏ×"
+msgstr "E176: Неправильное количество параметров"
 
-#: ex_docmd.c:4975
+#: ex_docmd.c:4978
 msgid "E177: Count cannot be specified twice"
-msgstr "E177: þÉÓÌÏ-ÐÒÉÓÔÁ×ËÕ ÎÅÌØÚÑ ÕËÁÚÙ×ÁÔØ Ä×ÁÖÄÙ"
+msgstr "E177: Число-приставку нельзя указывать дважды"
 
-#: ex_docmd.c:4985
+#: ex_docmd.c:4988
 msgid "E178: Invalid default value for count"
-msgstr "E178: îÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÞÉÓÌÁ-ÐÒÉÓÔÁ×ËÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+msgstr "E178: Неправильное значение числа-приставки по умолчанию"
 
-#: ex_docmd.c:5016
+#: ex_docmd.c:5019
 msgid "E179: argument required for complete"
-msgstr "E179: ÄÌÑ ÚÁ×ÅÒÛÅÎÉÑ ÔÒÅÂÕÅÔÓÑ ÕËÁÚÁÔØ ÐÁÒÁÍÅÔÒ"
+msgstr "E179: для завершения требуется указать параметр"
 
-#: ex_docmd.c:5048
+#: ex_docmd.c:5051
 #, c-format
 msgid "E180: Invalid complete value: %s"
-msgstr "E180: îÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÄÏÐÏÌÎÅÎÉÑ: %s"
+msgstr "E180: Неправильное значение дополнения: %s"
 
-#: ex_docmd.c:5057
+#: ex_docmd.c:5060
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr ""
-"E468: ðÁÒÁÍÅÔÒ Á×ÔÏÄÏÐÏÌÎÅÎÉÑ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ Ó ÏÓÏÂÙÍ ÄÏÐÏÌÎÅÎÉÅÍ"
+"E468: Параметр автодополнения можно использовать только с особым дополнением"
 
-#: ex_docmd.c:5063
+#: ex_docmd.c:5066
 msgid "E467: Custom completion requires a function argument"
-msgstr "E467: ïÓÏÂÏÅ ÄÏÐÏÌÎÅÎÉÅ ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ ÐÁÒÁÍÅÔÒÁ ÆÕÎËÃÉÉ"
+msgstr "E467: Особое дополнение требует указания параметра функции"
 
-#: ex_docmd.c:5074
+#: ex_docmd.c:5077
 #, c-format
 msgid "E181: Invalid attribute: %s"
-msgstr "E181: îÅÐÒÁ×ÉÌØÎÙÊ ÁÔÒÉÂÕÔ: %s"
+msgstr "E181: Неправильный атрибут: %s"
 
-#: ex_docmd.c:5117
+#: ex_docmd.c:5120
 msgid "E182: Invalid command name"
-msgstr "E182: îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ËÏÍÁÎÄÙ"
+msgstr "E182: Неправильное имя команды"
 
-#: ex_docmd.c:5132
+#: ex_docmd.c:5135
 msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ëÏÍÁÎÄÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÏÌÖÎÁ ÎÁÞÉÎÁÔØÓÑ Ó ÚÁÇÌÁ×ÎÏÊ ÂÕË×Ù"
+msgstr "E183: Команда пользователя должна начинаться с заглавной буквы"
 
-#: ex_docmd.c:5203
+#: ex_docmd.c:5206
 #, c-format
 msgid "E184: No such user-defined command: %s"
-msgstr "E184: îÅÔ ÔÁËÏÊ ËÏÍÁÎÄÙ ÐÏÌØÚÏ×ÁÔÅÌÑ: %s"
+msgstr "E184: Нет такой команды пользователя: %s"
 
-#: ex_docmd.c:5664
+#: ex_docmd.c:5667
 #, c-format
 msgid "E185: Cannot find color scheme %s"
-msgstr "E185: ã×ÅÔÏ×ÁÑ ÓÈÅÍÁ %s ÎÅ ÎÁÊÄÅÎÁ"
+msgstr "E185: Цветовая схема %s не найдена"
 
-#: ex_docmd.c:5672
+#: ex_docmd.c:5675
 msgid "Greetings, Vim user!"
-msgstr "ðÒÉ×ÅÔ, ÐÏÌØÚÏ×ÁÔÅÌØ Vim!"
+msgstr "Привет, пользователь Vim!"
 
-#: ex_docmd.c:6389
+#: ex_docmd.c:6393
 msgid "Edit File in new window"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÆÁÊÌ × ÎÏ×ÏÍ ÏËÎÅ"
+msgstr "Редактировать файл в новом окне"
 
-#: ex_docmd.c:6684
+#: ex_docmd.c:6688
 msgid "No swap file"
-msgstr "âÅÚ Ó×ÏÐ-ÆÁÊÌÁ"
+msgstr "Без своп-файла"
 
-#: ex_docmd.c:6788
+#: ex_docmd.c:6792
 msgid "Append File"
-msgstr "äÏÂÁ×ÉÔØ ÆÁÊÌ"
+msgstr "Добавить файл"
 
-#: ex_docmd.c:6852
+#: ex_docmd.c:6856
 msgid "E186: No previous directory"
-msgstr "E186: îÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ËÁÔÁÌÏÇÁ"
+msgstr "E186: Нет предыдущего каталога"
 
-#: ex_docmd.c:6934
+#: ex_docmd.c:6938
 msgid "E187: Unknown"
-msgstr "E187: îÅÉÚ×ÅÓÔÎÏ"
+msgstr "E187: Неизвестно"
 
-#: ex_docmd.c:7019
+#: ex_docmd.c:7023
 msgid "E465: :winsize requires two number arguments"
-msgstr "E465: ËÏÍÁÎÄÁ :winsize ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ Ä×ÕÈ ÞÉÓÌÏ×ÙÈ ÐÁÒÁÍÅÔÒÏ×"
+msgstr "E465: команда :winsize требует указания двух числовых параметров"
 
-#: ex_docmd.c:7075
+#: ex_docmd.c:7079
 #, c-format
 msgid "Window position: X %d, Y %d"
-msgstr "ðÏÌÏÖÅÎÉÅ ÏËÎÁ: X %d, Y %d"
+msgstr "Положение окна: X %d, Y %d"
 
-#: ex_docmd.c:7080
+#: ex_docmd.c:7084
 msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: ÷ ÄÁÎÎÏÊ ÓÉÓÔÅÍÅ ÏÐÒÅÄÅÌÅÎÉÅ ÐÏÌÏÖÅÎÉÑ ÏËÎÁ ÎÅ ÒÁÂÏÔÁÅÔ"
+msgstr "E188: В данной системе определение положения окна не работает"
 
-#: ex_docmd.c:7090
+#: ex_docmd.c:7094
 msgid "E466: :winpos requires two number arguments"
-msgstr "E466: ËÏÍÁÎÄÁ :winpos ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ Ä×ÕÈ ÞÉÓÌÏ×ÙÈ ÐÁÒÁÍÅÔÒÏ×"
+msgstr "E466: команда :winpos требует указания двух числовых параметров"
 
-#: ex_docmd.c:7368
+#: ex_docmd.c:7372
 msgid "Save Redirection"
-msgstr "ðÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ ÚÁÐÉÓÉ"
+msgstr "Перенаправление записи"
 
-#: ex_docmd.c:7558
+#: ex_docmd.c:7562
 msgid "Save View"
-msgstr "óÏÈÒÁÎÅÎÉÅ ×ÉÄÁ"
+msgstr "Сохранение вида"
 
-#: ex_docmd.c:7559
+#: ex_docmd.c:7563
 msgid "Save Session"
-msgstr "óÏÈÒÁÎÅÎÉÅ ÓÅÁÎÓÁ"
+msgstr "Сохранение сеанса"
 
-#: ex_docmd.c:7561
+#: ex_docmd.c:7565
 msgid "Save Setup"
-msgstr "óÏÈÒÁÎÅÎÉÅ ÎÁÓÔÒÏÅË"
+msgstr "Сохранение настроек"
 
-#: ex_docmd.c:7713
+#: ex_docmd.c:7717
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\" ÓÕÝÅÓÔ×ÕÅÔ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
+msgstr "E189: \"%s\" существует (!, чтобы обойти проверку)"
 
-#: ex_docmd.c:7718
+#: ex_docmd.c:7722
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÄÌÑ ÚÁÐÉÓÉ \"%s\""
+msgstr "E190: Невозможно открыть для записи \"%s\""
 
 #. set mark
-#: ex_docmd.c:7742
+#: ex_docmd.c:7746
 msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ðÁÒÁÍÅÔÒ ÄÏÌÖÅÎ ÂÙÔØ ÐÒÑÍÏÊ/ÏÂÒÁÔÎÏÊ ËÁ×ÙÞËÏÊ ÉÌÉ ÂÕË×ÏÊ"
+msgstr "E191: Параметр должен быть прямой/обратной кавычкой или буквой"
 
-#: ex_docmd.c:7784
+#: ex_docmd.c:7788
 msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: óÌÉÛËÏÍ ÇÌÕÂÏËÁÑ ÒÅËÕÒÓÉÑ ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ ËÏÍÁÎÄÙ :normal"
+msgstr "E192: Слишком глубокая рекурсия при использовании команды :normal"
 
-#: ex_docmd.c:8302
+#: ex_docmd.c:8306
 msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: îÅÔ ÓÏÓÅÄÎÅÇÏ ÉÍÅÎÉ ÆÁÊÌÁ ÄÌÑ ÚÁÍÅÎÙ '#'"
+msgstr "E194: Нет соседнего имени файла для замены '#'"
 
-#: ex_docmd.c:8333
+#: ex_docmd.c:8337
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: îÅÔ Á×ÔÏËÏÍÁÎÄÎÏÇÏ ÉÍÅÎÉ ÆÁÊÌÁ ÄÌÑ ÚÁÍÅÎÙ \"<afile>\""
+msgstr "E495: Нет автокомандного имени файла для замены \"<afile>\""
 
-#: ex_docmd.c:8341
+#: ex_docmd.c:8345
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: îÅÔ Á×ÔÏËÏÍÁÎÄÎÏÇÏ ÎÏÍÅÒÁ ÂÕÆÅÒÁ ÄÌÑ ÚÁÍÅÎÙ \"<abuf>\""
+msgstr "E496: Нет автокомандного номера буфера для замены \"<abuf>\""
 
-#: ex_docmd.c:8352
+#: ex_docmd.c:8356
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: îÅÔ Á×ÔÏËÏÍÁÎÄÎÏÇÏ ÉÍÅÎÉ ÓÏÏÔ×ÅÔÓÔ×ÉÑ ÄÌÑ ÚÁÍÅÎÙ \"<amatch>\""
+msgstr "E497: Нет автокомандного имени соответствия для замены \"<amatch>\""
 
-#: ex_docmd.c:8362
+#: ex_docmd.c:8366
 msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: ÎÅÔ ÉÍÅÎÉ ÆÁÊÌÁ :source ÄÌÑ ÚÁÍÅÎÙ \"<sfile>\""
+msgstr "E498: нет имени файла :source для замены \"<sfile>\""
 
-#: ex_docmd.c:8403
+#: ex_docmd.c:8407
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: ðÕÓÔÏÅ ÉÍÑ ÆÁÊÌÁ ÄÌÑ '%' ÉÌÉ '#', ×ÏÚÍÏÖÎÏ ÔÏÌØËÏ c \":p:h\""
+msgstr "E499: Пустое имя файла для '%' или '#', возможно только c \":p:h\""
 
-#: ex_docmd.c:8405
+#: ex_docmd.c:8409
 msgid "E500: Evaluates to an empty string"
-msgstr "E500: òÅÚÕÌØÔÁÔÏÍ ×ÙÒÁÖÅÎÉÑ Ñ×ÌÑÅÔÓÑ ÐÕÓÔÁÑ ÓÔÒÏËÁ"
+msgstr "E500: Результатом выражения является пустая строка"
 
-#: ex_docmd.c:9360
+#: ex_docmd.c:9380
 msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ viminfo ÄÌÑ ÞÔÅÎÉÑ"
+msgstr "E195: Невозможно открыть файл viminfo для чтения"
 
-#: ex_docmd.c:9533
+#: ex_docmd.c:9553
 msgid "E196: No digraphs in this version"
-msgstr "E196: ÷ ÜÔÏÊ ×ÅÒÓÉÉ ÄÉÇÒÁÆÙ ÎÅ ÒÁÂÏÔÁÀÔ"
+msgstr "E196: В этой версии диграфы не работают"
 
 #: ex_eval.c:440
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr ""
-"E608: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ :throw ÄÌÑ ÉÓËÌÀÞÅÎÉÊ Ó ÐÒÉÓÔÁ×ËÏÊ 'Vim'"
+"E608: Невозможно выполнить команду :throw для исключений с приставкой 'Vim'"
 
 #. always scroll up, don't overwrite
 #: ex_eval.c:529
 #, c-format
 msgid "Exception thrown: %s"
-msgstr "éÓËÌÀÞÉÔÅÌØÎÁÑ ÓÉÔÕÁÃÉÑ: %s"
+msgstr "Исключительная ситуация: %s"
 
 #: ex_eval.c:576
 #, c-format
 msgid "Exception finished: %s"
-msgstr "úÁ×ÅÒÛÅÎÁ ÏÂÒÁÂÏÔËÁ ÉÓËÌÀÞÉÔÅÌØÎÏÊ ÓÉÔÕÁÃÉÉ: %s"
+msgstr "Завершена обработка исключительной ситуации: %s"
 
 #: ex_eval.c:577
 #, c-format
 msgid "Exception discarded: %s"
-msgstr "éÓËÌÀÞÉÔÅÌØÎÁÑ ÓÉÔÕÁÃÉÑ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÁ: %s"
+msgstr "Исключительная ситуация проигнорирована: %s"
 
 #: ex_eval.c:620 ex_eval.c:664
 #, c-format
 msgid "%s, line %ld"
-msgstr "%s, ÓÔÒÏËÁ %ld"
+msgstr "%s, строка %ld"
 
 #. always scroll up, don't overwrite
 #: ex_eval.c:638
 #, c-format
 msgid "Exception caught: %s"
-msgstr "ïÂÒÁÂÏÔËÁ ÉÓËÌÀÞÉÔÅÌØÎÏÊ ÓÉÔÕÁÃÉÉ: %s"
+msgstr "Обработка исключительной ситуации: %s"
 
 #: ex_eval.c:713
 #, c-format
 msgid "%s made pending"
-msgstr "%s ×ÙÐÏÌÎÑÅÔ ÏÖÉÄÁÎÉÅ"
+msgstr "%s выполняет ожидание"
 
 #: ex_eval.c:716
 #, c-format
 msgid "%s resumed"
-msgstr "%s ×ÏÚÏÂÎÏ×ÌÅÎÏ"
+msgstr "%s возобновлено"
 
 #: ex_eval.c:720
 #, c-format
 msgid "%s discarded"
-msgstr "%s ÐÒÏÐÕÝÅÎÏ"
+msgstr "%s пропущено"
 
 #: ex_eval.c:746
 msgid "Exception"
-msgstr "éÓËÌÀÞÉÔÅÌØÎÁÑ ÓÉÔÕÁÃÉÑ"
+msgstr "Исключительная ситуация"
 
 #: ex_eval.c:752
 msgid "Error and interrupt"
-msgstr "ïÛÉÂËÁ É ÐÒÅÒÙ×ÁÎÉÅ"
+msgstr "Ошибка и прерывание"
 
-#: ex_eval.c:754 gui.c:4381
+#: ex_eval.c:754 gui.c:4384
 msgid "Error"
-msgstr "ïÛÉÂËÁ"
+msgstr "Ошибка"
 
 #. if (pending & CSTP_INTERRUPT)
 #: ex_eval.c:756
 msgid "Interrupt"
-msgstr "ðÒÅÒÙ×ÁÎÉÅ"
+msgstr "Прерывание"
 
 #: ex_eval.c:830
 msgid "E579: :if nesting too deep"
-msgstr "E579: ÓÌÉÛËÏÍ ÇÌÕÂÏËÏ ×ÌÏÖÅÎÎÙÊ :if"
+msgstr "E579: слишком глубоко вложенный :if"
 
 #: ex_eval.c:867
 msgid "E580: :endif without :if"
-msgstr "E580: :endif ÂÅÚ :if"
+msgstr "E580: :endif без :if"
 
 #: ex_eval.c:911
 msgid "E581: :else without :if"
-msgstr "E581: :else ÂÅÚ :if"
+msgstr "E581: :else без :if"
 
 #: ex_eval.c:914
 msgid "E582: :elseif without :if"
-msgstr "E582: :elseif ÂÅÚ :if"
+msgstr "E582: :elseif без :if"
 
 #: ex_eval.c:921
 msgid "E583: multiple :else"
-msgstr "E583: ÏÂÎÁÒÕÖÅÎÏ ÎÅÓËÏÌØËÏ :else"
+msgstr "E583: обнаружено несколько :else"
 
 #: ex_eval.c:924
 msgid "E584: :elseif after :else"
-msgstr "E584: :elseif ÐÏÓÌÅ :else"
+msgstr "E584: :elseif после :else"
 
 #: ex_eval.c:991
 msgid "E585: :while nesting too deep"
-msgstr "E585: ÓÌÉÛËÏÍ ÇÌÕÂÏËÏ ×ÌÏÖÅÎÎÙÊ :while"
+msgstr "E585: слишком глубоко вложенный :while"
 
 #: ex_eval.c:1047
 msgid "E586: :continue without :while"
-msgstr "E586: :continue ÂÅÚ :while"
+msgstr "E586: :continue без :while"
 
 #: ex_eval.c:1087
 msgid "E587: :break without :while"
-msgstr "E587: :break ÂÅÚ :while"
+msgstr "E587: :break без :while"
 
 #: ex_eval.c:1286
 msgid "E601: :try nesting too deep"
-msgstr "E601: ÓÌÉÛËÏÍ ÇÌÕÂÏËÏ ×ÌÏÖÅÎÎÙÊ :try"
+msgstr "E601: слишком глубоко вложенный :try"
 
 #: ex_eval.c:1366
 msgid "E603: :catch without :try"
-msgstr "E603: :catch ÂÅÚ :try"
+msgstr "E603: :catch без :try"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
 #: ex_eval.c:1388
 msgid "E604: :catch after :finally"
-msgstr "E604: :catch ÂÅÚ :finally"
+msgstr "E604: :catch без :finally"
 
 #: ex_eval.c:1521
 msgid "E606: :finally without :try"
-msgstr "E606: :finally ÂÅÚ :try"
+msgstr "E606: :finally без :try"
 
 #. Give up for a multiple ":finally" and ignore it.
 #: ex_eval.c:1545
 msgid "E607: multiple :finally"
-msgstr "E607: ÏÂÎÁÒÕÖÅÎÏ ÎÅÓËÏÌØËÏ :finally"
+msgstr "E607: обнаружено несколько :finally"
 
 #: ex_eval.c:1654
 msgid "E602: :endtry without :try"
-msgstr "E602: :endtry ÂÅÚ :try"
+msgstr "E602: :endtry без :try"
 
 #: ex_eval.c:1986
 msgid "E193: :endfunction not inside a function"
-msgstr "E193: ËÏÍÁÎÄÁ :endfunction ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÔÏÌØËÏ ×ÎÕÔÒÉ ÆÕÎËÃÉÉ"
-
-#: ex_getln.c:3296
-msgid "tagname"
-msgstr "ÉÍÑ ÍÅÔËÉ"
+msgstr "E193: команда :endfunction может использоваться только внутри функции"
 
 #: ex_getln.c:3299
+msgid "tagname"
+msgstr "имя метки"
+
+#: ex_getln.c:3302
 msgid " kind file\n"
-msgstr " ÔÉÐ ÆÁÊÌÁ\n"
+msgstr " тип файла\n"
 
-#: ex_getln.c:4752
+#: ex_getln.c:4768
 msgid "'history' option is zero"
-msgstr "ÚÎÁÞÅÎÉÅ ÏÐÃÉÉ 'history' ÒÁ×ÎÏ ÎÕÌÀ"
+msgstr "значение опции 'history' равно нулю"
 
-#: ex_getln.c:5023
+#: ex_getln.c:5039
 #, c-format
 msgid ""
 "\n"
 "# %s History (newest to oldest):\n"
 msgstr ""
 "\n"
-"# %s, ÉÓÔÏÒÉÑ (ÎÁÞÉÎÁÑ ÏÔ Ó×ÅÖÅÇÏ Ë ÓÔÁÒÏÍÕ):\n"
+"# %s, история (начиная от свежего к старому):\n"
 
-#: ex_getln.c:5024
+#: ex_getln.c:5040
 msgid "Command Line"
-msgstr "ëÏÍÁÎÄÎÁÑ ÓÔÒÏËÁ"
+msgstr "Командная строка"
 
-#: ex_getln.c:5025
+#: ex_getln.c:5041
 msgid "Search String"
-msgstr "óÔÒÏËÁ ÐÏÉÓËÁ"
+msgstr "Строка поиска"
 
-#: ex_getln.c:5026
+#: ex_getln.c:5042
 msgid "Expression"
-msgstr "÷ÙÒÁÖÅÎÉÅ"
+msgstr "Выражение"
 
-#: ex_getln.c:5027
+#: ex_getln.c:5043
 msgid "Input Line"
-msgstr "óÔÒÏËÁ ××ÏÄÁ"
+msgstr "Строка ввода"
 
-#: ex_getln.c:5065
+#: ex_getln.c:5081
 msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar ÂÏÌØÛÅ ÄÌÉÎÙ ËÏÍÁÎÄÙ"
+msgstr "E198: cmd_pchar больше длины команды"
 
-#: ex_getln.c:5242
+#: ex_getln.c:5258
 msgid "E199: Active window or buffer deleted"
-msgstr "E199: õÄÁÌÅÎÏ ÁËÔÉ×ÎÏÅ ÏËÎÏ ÉÌÉ ÂÕÆÅÒ"
+msgstr "E199: Удалено активное окно или буфер"
 
-#: fileio.c:377
+#: fileio.c:378
 msgid "Illegal file name"
-msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ÆÁÊÌÁ"
+msgstr "Недопустимое имя файла"
 
-#: fileio.c:401 fileio.c:535 fileio.c:2913 fileio.c:2954
+#: fileio.c:402 fileio.c:540 fileio.c:2925 fileio.c:2966
 msgid "is a directory"
-msgstr "Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
+msgstr "является каталогом"
 
-#: fileio.c:403
+#: fileio.c:404
 msgid "is not a file"
-msgstr "ÎÅ Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ"
+msgstr "не является файлом"
 
-#: fileio.c:557 fileio.c:4131
+#: fileio.c:562 fileio.c:4143
 msgid "[New File]"
-msgstr "[îÏ×ÙÊ ÆÁÊÌ]"
+msgstr "[Новый файл]"
 
-#: fileio.c:590
+#: fileio.c:595
 msgid "[Permission Denied]"
-msgstr "[äÏÓÔÕÐ ÚÁÐÒÅÝ£Î]"
+msgstr "[Доступ запрещён]"
 
-#: fileio.c:694
+#: fileio.c:706
 msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: ÷ ÒÅÚÕÌØÔÁÔÅ ×ÙÐÏÌÎÅÎÉÑ Á×ÔÏËÏÍÁÎÄ *ReadPre ÆÁÊÌ ÓÔÁÌ ÎÅÞÉÔÁÅÍÙÍ"
+msgstr "E200: В результате выполнения автокоманд *ReadPre файл стал нечитаемым"
 
-#: fileio.c:696
+#: fileio.c:708
 msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: Á×ÔÏËÏÍÁÎÄÙ *ReadPre ÎÅ ÄÏÌÖÎÙ ÉÚÍÅÎÑÔØ ÁËÔÉ×ÎÙÊ ÂÕÆÅÒ"
+msgstr "E201: автокоманды *ReadPre не должны изменять активный буфер"
 
-#: fileio.c:717
+#: fileio.c:729
 msgid "Vim: Reading from stdin...\n"
-msgstr "Vim: ×ÙÐÏÌÎÑÅÔÓÑ ÞÔÅÎÉÅ ÉÚ ÓÔÁÎÄÁÒÔÎÏÇÏ ÐÏÔÏËÁ ××ÏÄÁ stdin...\n"
+msgstr "Vim: выполняется чтение из стандартного потока ввода stdin...\n"
 
-#: fileio.c:723
+#: fileio.c:735
 msgid "Reading from stdin..."
-msgstr "÷ÙÐÏÌÎÑÅÔÓÑ ÞÔÅÎÉÅ ÉÚ ÓÔÁÎÄÁÒÔÎÏÇÏ ÐÏÔÏËÁ ××ÏÄÁ stdin..."
+msgstr "Выполняется чтение из стандартного потока ввода stdin..."
 
 #. Re-opening the original file failed!
-#: fileio.c:1000
+#: fileio.c:1012
 msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ÷ ÒÅÚÕÌØÔÁÔÅ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÑ ÆÁÊÌ ÓÔÁÌ ÎÅÞÉÔÁÅÍÙÍ!"
+msgstr "E202: В результате преобразования файл стал нечитаемым!"
 
-#: fileio.c:2090
+#: fileio.c:2102
 msgid "[fifo/socket]"
-msgstr "[fifo/ÇÎÅÚÄÏ]"
+msgstr "[fifo/гнездо]"
 
-#: fileio.c:2097
+#: fileio.c:2109
 msgid "[fifo]"
 msgstr "[fifo]"
 
-#: fileio.c:2104
+#: fileio.c:2116
 msgid "[socket]"
-msgstr "[ÇÎÅÚÄÏ]"
+msgstr "[гнездо]"
 
-#: fileio.c:2112
+#: fileio.c:2124
 msgid "[RO]"
 msgstr "[RO]"
 
-#: fileio.c:2122
+#: fileio.c:2134
 msgid "[CR missing]"
-msgstr "[ÐÒÏÐÕÝÅÎÙ ÓÉÍ×ÏÌÙ CR]"
+msgstr "[пропущены символы CR]"
 
-#: fileio.c:2127
+#: fileio.c:2139
 msgid "[NL found]"
-msgstr "[ïÂÎÁÒÕÖÅÎÙ ÓÉÍ×ÏÌÙ NL]"
+msgstr "[Обнаружены символы NL]"
 
-#: fileio.c:2132
+#: fileio.c:2144
 msgid "[long lines split]"
-msgstr "[ÄÌÉÎÎÙÅ ÓÔÒÏËÉ ÒÁÚÂÉÔÙ]"
+msgstr "[длинные строки разбиты]"
 
-#: fileio.c:2138 fileio.c:4115
+#: fileio.c:2150 fileio.c:4127
 msgid "[NOT converted]"
-msgstr "[âåú ÐÒÅÏÂÒÁÚÏ×ÁÎÉÊ]"
+msgstr "[БЕЗ преобразований]"
 
-#: fileio.c:2143 fileio.c:4120
+#: fileio.c:2155 fileio.c:4132
 msgid "[converted]"
-msgstr "[ÐÅÒÅËÏÄÉÒÏ×ÁÎÏ]"
+msgstr "[перекодировано]"
 
-#: fileio.c:2150 fileio.c:4145
+#: fileio.c:2162 fileio.c:4157
 msgid "[crypted]"
-msgstr "[ÚÁÛÉÆÒÏ×ÁÎÏ]"
+msgstr "[зашифровано]"
 
-#: fileio.c:2157
+#: fileio.c:2169
 msgid "[CONVERSION ERROR]"
-msgstr "[ïûéâëá ðòåïâòáúï÷áîéñ]"
+msgstr "[ОШИБКА ПРЕОБРАЗОВАНИЯ]"
 
-#: fileio.c:2163
+#: fileio.c:2175
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
-msgstr "[îåäïðõóôéíùê âáêô × ÓÔÒÏËÅ %ld]"
+msgstr "[НЕДОПУСТИМЫЙ БАЙТ в строке %ld]"
 
-#: fileio.c:2170
+#: fileio.c:2182
 msgid "[READ ERRORS]"
-msgstr "[ïûéâëé þôåîéñ]"
+msgstr "[ОШИБКИ ЧТЕНИЯ]"
 
-#: fileio.c:2386
+#: fileio.c:2398
 msgid "Can't find temp file for conversion"
-msgstr "÷ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÄÌÑ ÐÅÒÅËÏÄÉÒÏ×ÁÎÉÑ ÎÅ ÎÁÊÄÅÎ"
+msgstr "Временный файл для перекодирования не найден"
 
-#: fileio.c:2393
+#: fileio.c:2405
 msgid "Conversion with 'charconvert' failed"
-msgstr "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ Ó ÐÏÍÏÝØÀ 'charconvert' ÎÅ ×ÙÐÏÌÎÅÎÏ"
+msgstr "Преобразование с помощью 'charconvert' не выполнено"
 
-#: fileio.c:2396
+#: fileio.c:2408
 msgid "can't read output of 'charconvert'"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ×Ù×ÏÄ 'charconvert'"
+msgstr "невозможно прочитать вывод 'charconvert'"
 
-#: fileio.c:2796
+#: fileio.c:2808
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr ""
-"E203: âÕÆÅÒ, ËÏÔÏÒÙÊ ÔÒÅÂÏ×ÁÌÏÓØ ÚÁÐÉÓÁÔØ, ÕÄẠ́ΠÉÌÉ ×ÙÇÒÕÖÅÎ Á×ÔÏËÏÍÁÎÄÏÊ"
+"E203: Буфер, который требовалось записать, удалён или выгружен автокомандой"
 
-#: fileio.c:2819
+#: fileio.c:2831
 msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: ëÏÌÉÞÅÓÔ×Ï ÓÔÒÏË ÉÚÍÅÎÅÎÏ Á×ÔÏËÏÍÁÎÄÏÊ ÎÅÏÖÉÄÁÎÎÙÍ ÏÂÒÁÚÏÍ"
+msgstr "E204: Количество строк изменено автокомандой неожиданным образом"
 
-#: fileio.c:2857
+#: fileio.c:2869
 msgid "NetBeans dissallows writes of unmodified buffers"
-msgstr "NetBeans ÎÅ ÐÏÚ×ÏÌÑÅÔ ×ÙÐÏÌÎÑÔØ ÚÁÐÉÓØ ÎÅÉÚÍÅΣÎÎÙÈ ÂÕÆÅÒÏ×"
+msgstr "NetBeans не позволяет выполнять запись неизменённых буферов"
 
-#: fileio.c:2865
+#: fileio.c:2877
 msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "þÁÓÔÉÞÎÁÑ ÚÁÐÉÓØ ÂÕÆÅÒÏ× NetBeans ÎÅ ÄÏÐÕÓËÁÅÔÓÑ"
+msgstr "Частичная запись буферов NetBeans не допускается"
 
-#: fileio.c:2919 fileio.c:2937
+#: fileio.c:2931 fileio.c:2949
 msgid "is not a file or writable device"
-msgstr "ÎÅ Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ ÉÌÉ ÕÓÔÒÏÊÓÔ×ÏÍ, ÄÏÓÔÕÐÎÙÍ ÄÌÑ ÚÁÐÉÓÉ"
+msgstr "не является файлом или устройством, доступным для записи"
 
-#: fileio.c:2989
+#: fileio.c:3001
 msgid "is read-only (add ! to override)"
-msgstr "ÏÔËÒÙÔ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
-
-#: fileio.c:3335
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: úÁÐÉÓØ × ÒÅÚÅÒ×ÎÙÊ ÆÁÊÌ ÎÅ×ÏÚÍÏÖÎÁ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
+msgstr "открыт только для чтения (!, чтобы обойти проверку)"
 
 #: fileio.c:3347
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: Запись в резервный файл невозможна (!, чтобы обойти проверку)"
+
+#: fileio.c:3359
 msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: ïÛÉÂËÁ ÚÁËÒÙÔÉÑ ÒÅÚÅÒ×ÎÏÇÏ ÆÁÊÌÁ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
+msgstr "E507: Ошибка закрытия резервного файла (!, чтобы обойти проверку)"
 
-#: fileio.c:3349
+#: fileio.c:3361
 msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÒÅÚÅÒ×ÎÙÊ ÆÁÊÌ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
+msgstr "E508: Невозможно прочитать резервный файл (!, чтобы обойти проверку)"
 
-#: fileio.c:3365
+#: fileio.c:3377
 msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÒÅÚÅÒ×ÎÙÊ ÆÁÊÌ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
+msgstr "E509: Невозможно создать резервный файл (!, чтобы обойти проверку)"
 
-#: fileio.c:3468
+#: fileio.c:3480
 msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÒÅÚÅÒ×ÎÙÊ ÆÁÊÌ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
+msgstr "E510: Невозможно создать резервный файл (!, чтобы обойти проверку)"
 
-#: fileio.c:3530
+#: fileio.c:3542
 msgid "E460: The resource fork would be lost (add ! to override)"
-msgstr "E460: ÷ÉÌËÁ ÒÅÓÕÒÓÁ ÂÕÄÅÔ ÐÏÔÅÒÑÎÁ (!, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
+msgstr "E460: Вилка ресурса будет потеряна (!, чтобы обойти проверку)"
 
-#: fileio.c:3640
+#: fileio.c:3652
 msgid "E214: Can't find temp file for writing"
-msgstr "E214: ÷ÒÅÍÅÎÎÙÊ ÆÁÊÌ ÄÌÑ ÚÁÐÉÓÉ ÎÅ ÎÁÊÄÅÎ"
+msgstr "E214: Временный файл для записи не найден"
 
-#: fileio.c:3658
+#: fileio.c:3670
 msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: ðÅÒÅËÏÄÉÒÏ×ËÁ ÎÅ×ÏÚÍÏÖÎÁ (! ÄÌÑ ÚÁÐÉÓÉ ÂÅÚ ÐÅÒÅËÏÄÉÒÏ×ËÉ)"
+msgstr "E213: Перекодировка невозможна (! для записи без перекодировки)"
 
-#: fileio.c:3693
+#: fileio.c:3705
 msgid "E166: Can't open linked file for writing"
-msgstr "E166: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ Ó×ÑÚÁÎÎÙÊ ÆÁÊÌ ÄÌÑ ÚÁÐÉÓÉ"
+msgstr "E166: Невозможно открыть связанный файл для записи"
 
-#: fileio.c:3697
+#: fileio.c:3709
 msgid "E212: Can't open file for writing"
-msgstr "E212: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÚÁÐÉÓÉ"
+msgstr "E212: Невозможно открыть файл для записи"
 
-#: fileio.c:3959
+#: fileio.c:3971
 msgid "E667: Fsync failed"
-msgstr "E667: îÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ ÆÕÎËÃÉÀ fsync()"
+msgstr "E667: Не удалось выполнить функцию fsync()"
 
-#: fileio.c:3966
+#: fileio.c:3978
 msgid "E512: Close failed"
-msgstr "E512: ïÐÅÒÁÃÉÑ ÚÁËÒÙÔÉÑ ÎÅ ÕÄÁÌÁÓØ"
+msgstr "E512: Операция закрытия не удалась"
 
-#: fileio.c:4037
+#: fileio.c:4049
 msgid "E513: write error, conversion failed"
-msgstr "E513: ïÛÉÂËÁ ÚÁÐÉÓÉ, ÐÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÎÅ ÕÄÁÌÏÓØ"
+msgstr "E513: Ошибка записи, преобразование не удалось"
 
-#: fileio.c:4043
+#: fileio.c:4055
 msgid "E514: write error (file system full?)"
-msgstr "E514: ÏÛÉÂËÁ ÚÁÐÉÓÉ (ÎÅÔ Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ?)"
+msgstr "E514: ошибка записи (нет свободного места?)"
 
-#: fileio.c:4110
+#: fileio.c:4122
 msgid " CONVERSION ERROR"
-msgstr " ïûéâëá ðòåïâòáúï÷áîéñ"
+msgstr " ОШИБКА ПРЕОБРАЗОВАНИЯ"
 
-#: fileio.c:4126
+#: fileio.c:4138
 msgid "[Device]"
-msgstr "[õÓÔÒÏÊÓÔ×Ï]"
+msgstr "[Устройство]"
 
-#: fileio.c:4131
+#: fileio.c:4143
 msgid "[New]"
-msgstr "[îÏ×ÙÊ]"
+msgstr "[Новый]"
 
-#: fileio.c:4153
+#: fileio.c:4165
 msgid " [a]"
 msgstr " [a]"
 
-#: fileio.c:4153
+#: fileio.c:4165
 msgid " appended"
-msgstr " ÄÏÂÁ×ÌÅÎÏ"
+msgstr " добавлено"
 
-#: fileio.c:4155
+#: fileio.c:4167
 msgid " [w]"
 msgstr " [w]"
 
-#: fileio.c:4155
+#: fileio.c:4167
 msgid " written"
-msgstr " ÚÁÐÉÓÁÎÏ"
+msgstr " записано"
 
-#: fileio.c:4205
+#: fileio.c:4217
 msgid "E205: Patchmode: can't save original file"
-msgstr "E205: òÅÖÉÍ ÚÁÐÌÁÔËÉ: ÎÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÅÎÉÅ ÉÓÈÏÄÎÏÇÏ ÆÁÊÌÁ"
+msgstr "E205: Режим заплатки: невозможно сохранение исходного файла"
 
-#: fileio.c:4227
+#: fileio.c:4239
 msgid "E206: patchmode: can't touch empty original file"
 msgstr ""
-"E206: òÅÖÉÍ ÚÁÐÌÁÔËÉ: ÎÅ×ÏÚÍÏÖÎÏ ÓÍÅÎÉÔØ ÐÁÒÁÍÅÔÒÙ ÐÕÓÔÏÇÏ ÉÓÈÏÄÎÏÇÏ ÆÁÊÌÁ"
+"E206: Режим заплатки: невозможно сменить параметры пустого исходного файла"
 
-#: fileio.c:4242
+#: fileio.c:4254
 msgid "E207: Can't delete backup file"
-msgstr "E207: îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÒÅÚÅÒ×ÎÙÊ ÆÁÊÌ"
+msgstr "E207: Невозможно удалить резервный файл"
 
-#: fileio.c:4306
+#: fileio.c:4318
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
 msgstr ""
 "\n"
-"ðòåäõðòåöäåîéå: éÓÈÏÄÎÙÊ ÆÁÊÌ ÍÏÖÅÔ ÂÙÔØ ÕÔÒÁÞÅÎ ÉÌÉ ÐÏ×ÒÅÖÄ£Î\n"
+"ПРЕДУПРЕЖДЕНИЕ: Исходный файл может быть утрачен или повреждён\n"
 
-#: fileio.c:4308
+#: fileio.c:4320
 msgid "don't quit the editor until the file is successfully written!"
-msgstr "ÎÅ ×ÙÈÏÄÉÔÅ ÉÚ ÒÅÄÁËÔÏÒÁ, ÐÏËÁ ÆÁÊÌ ÎÅ ÂÕÄÅÔ ÕÓÐÅÛÎÏ ÚÁÐÉÓÁÎ!"
+msgstr "не выходите из редактора, пока файл не будет успешно записан!"
 
-#: fileio.c:4397
+#: fileio.c:4409
 msgid "[dos]"
 msgstr "[dos]"
 
-#: fileio.c:4397
+#: fileio.c:4409
 msgid "[dos format]"
-msgstr "[ÆÏÒÍÁÔ dos]"
+msgstr "[формат dos]"
 
-#: fileio.c:4404
+#: fileio.c:4416
 msgid "[mac]"
 msgstr "[mac]"
 
-#: fileio.c:4404
+#: fileio.c:4416
 msgid "[mac format]"
-msgstr "[ÆÏÒÍÁÔ mac]"
+msgstr "[формат mac]"
 
-#: fileio.c:4411
+#: fileio.c:4423
 msgid "[unix]"
 msgstr "[unix]"
 
-#: fileio.c:4411
+#: fileio.c:4423
 msgid "[unix format]"
-msgstr "[ÆÏÒÍÁÔ unix]"
+msgstr "[формат unix]"
 
-#: fileio.c:4438
+#: fileio.c:4450
 msgid "1 line, "
-msgstr "1 ÓÔÒÏËÁ, "
+msgstr "1 строка, "
 
-#: fileio.c:4440
+#: fileio.c:4452
 #, c-format
 msgid "%ld lines, "
-msgstr "ÓÔÒÏË: %ld, "
-
-#: fileio.c:4443
-msgid "1 character"
-msgstr "1 ÓÉÍ×ÏÌ"
-
-#: fileio.c:4445
-#, c-format
-msgid "%ld characters"
-msgstr "ÓÉÍ×ÏÌÏ×: %ld"
+msgstr "строк: %ld, "
 
 #: fileio.c:4455
+msgid "1 character"
+msgstr "1 символ"
+
+#: fileio.c:4457
+#, c-format
+msgid "%ld characters"
+msgstr "символов: %ld"
+
+#: fileio.c:4467
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: fileio.c:4455
+#: fileio.c:4467
 msgid "[Incomplete last line]"
-msgstr "[îÅÚÁ×ÅÒÛ£ÎÎÁÑ ÐÏÓÌÅÄÎÑÑ ÓÔÒÏËÁ]"
+msgstr "[Незавершённая последняя строка]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: fileio.c:4474
+#: fileio.c:4486
 msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "ðòåäõðòåöäåîéå: æÁÊÌ ÉÚÍÅÎ£Î Ó ÍÏÍÅÎÔÁ ÞÔÅÎÉÑ!!!"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Файл изменён с момента чтения!!!"
 
-#: fileio.c:4476
+#: fileio.c:4488
 msgid "Do you really want to write to it"
-msgstr "óÅÒØ£ÚÎÏ ÈÏÔÉÔÅ ÚÁÐÉÓÁÔØ × ÜÔÏÔ ÆÁÊÌ"
+msgstr "Серьёзно хотите записать в этот файл"
 
-#: fileio.c:5726
+#: fileio.c:5738
 #, c-format
 msgid "E208: Error writing to \"%s\""
-msgstr "E208: ïÛÉÂËÁ ÚÁÐÉÓÉ × \"%s\""
+msgstr "E208: Ошибка записи в \"%s\""
 
-#: fileio.c:5733
+#: fileio.c:5745
 #, c-format
 msgid "E209: Error closing \"%s\""
-msgstr "E209: ïÛÉÂËÁ ÚÁËÒÙÔÉÑ \"%s\""
+msgstr "E209: Ошибка закрытия \"%s\""
 
-#: fileio.c:5736
+#: fileio.c:5748
 #, c-format
 msgid "E210: Error reading \"%s\""
-msgstr "E210: ïÛÉÂËÁ ÞÔÅÎÉÑ \"%s\""
+msgstr "E210: Ошибка чтения \"%s\""
 
-#: fileio.c:5970
+#: fileio.c:5982
 msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: âÕÆÅÒ ÕÄẠ́ΠÐÒÉ ×ÙÐÏÌÎÅÎÉÉ Á×ÔÏËÏÍÁÎÄÙ FileChangedShell"
+msgstr "E246: Буфер удалён при выполнении автокоманды FileChangedShell"
 
-#: fileio.c:5977
+#: fileio.c:5989
 #, c-format
 msgid "E211: Warning: File \"%s\" no longer available"
-msgstr "E211: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ \"%s\" ÂÏÌØÛÅ ÎÅ ÄÏÓÔÕÐÅÎ"
+msgstr "E211: Предупреждение: файл \"%s\" больше не доступен"
 
-#: fileio.c:5991
+#: fileio.c:6003
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr ""
-"W12: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ \"%s\" É ÂÕÆÅÒ Vim ÂÙÌÉ ÉÚÍÅÎÅÎÙ ÎÅÚÁ×ÉÓÉÍÏ ÄÒÕÇ "
-"ÏÔ ÄÒÕÇÁ"
-
-#: fileio.c:5994
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr ""
-"W11: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ \"%s\" ÂÙÌ ÉÚÍÅΣΠÐÏÓÌÅ ÎÁÞÁÌÁ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ"
-
-#: fileio.c:5996
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr ""
-"W16: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÒÅÖÉÍ ÄÏÓÔÕÐÁ Ë ÆÁÊÌÕ \"%s\" ÂÙÌ ÉÚÍÅΣΠÐÏÓÌÅ ÎÁÞÁÌÁ "
-"ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ"
+"W12: Предупреждение: файл \"%s\" и буфер Vim были изменены независимо друг "
+"от друга"
 
 #: fileio.c:6006
 #, c-format
+msgid "W11: Warning: File \"%s\" has changed since editing started"
+msgstr ""
+"W11: Предупреждение: файл \"%s\" был изменён после начала редактирования"
+
+#: fileio.c:6008
+#, c-format
+msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
+msgstr ""
+"W16: Предупреждение: режим доступа к файлу \"%s\" был изменён после начала "
+"редактирования"
+
+#: fileio.c:6018
+#, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr ""
-"W13: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÆÁÊÌ \"%s\" ÂÙÌ ÓÏÚÄÁÎ ÐÏÓÌÅ ÎÁÞÁÌÁ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ"
+"W13: Предупреждение: файл \"%s\" был создан после начала редактирования"
 
-#: fileio.c:6019
+#: fileio.c:6031
 msgid "See \":help W11\" for more info."
-msgstr "óÍ. ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ × \":help W11\"."
+msgstr "См. дополнительную информацию в \":help W11\"."
 
-#: fileio.c:6033
+#: fileio.c:6045
 msgid "Warning"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
+msgstr "Предупреждение"
 
-#: fileio.c:6034
+#: fileio.c:6046
 msgid ""
 "&OK\n"
 "&Load File"
 msgstr ""
 "&OK\n"
-"&úÁÇÒÕÚÉÔØ ÆÁÊÌ"
+"&Загрузить файл"
 
-#: fileio.c:6140
+#: fileio.c:6152
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: îÅ×ÏÚÍÏÖÎÏ ÐÏÄÇÏÔÏ×ÉÔØÓÑ Ë ÐÅÒÅÚÁÇÒÕÚËÅ \"%s\""
+msgstr "E462: Невозможно подготовиться к перезагрузке \"%s\""
 
-#: fileio.c:6159
+#: fileio.c:6171
 #, c-format
 msgid "E321: Could not reload \"%s\""
-msgstr "E321: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÐÅÒÅÚÁÇÒÕÚËÕ \"%s\""
+msgstr "E321: Невозможно выполнить перезагрузку \"%s\""
 
-#: fileio.c:6740
+#: fileio.c:6752
 msgid "--Deleted--"
-msgstr "--õÄÁÌÅÎÏ--"
+msgstr "--Удалено--"
 
 #. the group doesn't exist
-#: fileio.c:6900
+#: fileio.c:6912
 #, c-format
 msgid "E367: No such group: \"%s\""
-msgstr "E367: çÒÕÐÐÁ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
-
-#: fileio.c:7026
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: îÅÄÏÐÕÓÔÉÍÙÅ ÓÉÍ×ÏÌÙ ÐÏÓÌÅ *: %s"
+msgstr "E367: Группа \"%s\" не существует"
 
 #: fileio.c:7038
 #, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: îÅÓÕÝÅÓÔ×ÕÀÝÅÅ ÓÏÂÙÔÉÅ: %s"
+msgid "E215: Illegal character after *: %s"
+msgstr "E215: Недопустимые символы после *: %s"
 
-#: fileio.c:7040
+#: fileio.c:7050
+#, c-format
+msgid "E216: No such event: %s"
+msgstr "E216: Несуществующее событие: %s"
+
+#: fileio.c:7052
 #, c-format
 msgid "E216: No such group or event: %s"
-msgstr "E216: îÅÓÕÝÅÓÔ×ÕÀÝÁÑ ÇÒÕÐÐÁ ÉÌÉ ÓÏÂÙÔÉÅ: %s"
+msgstr "E216: Несуществующая группа или событие: %s"
 
 #. Highlight title
-#: fileio.c:7198
+#: fileio.c:7210
 msgid ""
 "\n"
 "--- Auto-Commands ---"
 msgstr ""
 "\n"
-"--- á×ÔÏËÏÍÁÎÄÙ ---"
+"--- Автокоманды ---"
 
-#: fileio.c:7469
+#: fileio.c:7481
 msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ Á×ÔÏËÏÍÁÎÄÙ ÄÌÑ ÷óåè ÓÏÂÙÔÉÊ"
+msgstr "E217: Невозможно выполнить автокоманды для ВСЕХ событий"
 
-#: fileio.c:7492
+#: fileio.c:7504
 msgid "No matching autocommands"
-msgstr "îÅÔ ÐÏÄÈÏÄÑÝÉÈ Á×ÔÏËÏÍÁÎÄ"
+msgstr "Нет подходящих автокоманд"
 
-#: fileio.c:7813
+#: fileio.c:7825
 msgid "E218: autocommand nesting too deep"
-msgstr "E218: ÓÌÉÛËÏÍ ÇÌÕÂÏËÏ ×ÌÏÖÅÎÎÙÅ Á×ÔÏËÏÍÁÎÄÙ"
+msgstr "E218: слишком глубоко вложенные автокоманды"
 
-#: fileio.c:8088
+#: fileio.c:8100
 #, c-format
 msgid "%s Auto commands for \"%s\""
-msgstr "%s á×ÔÏËÏÍÁÎÄÙ ÄÌÑ \"%s\""
+msgstr "%s Автокоманды для \"%s\""
 
-#: fileio.c:8096
+#: fileio.c:8108
 #, c-format
 msgid "Executing %s"
-msgstr "÷ÙÐÏÌÎÅÎÉÅ %s"
+msgstr "Выполнение %s"
 
 #. always scroll up, don't overwrite
-#: fileio.c:8164
+#: fileio.c:8176
 #, c-format
 msgid "autocommand %s"
-msgstr "Á×ÔÏËÏÍÁÎÄÁ %s"
+msgstr "автокоманда %s"
 
-#: fileio.c:8731
+#: fileio.c:8743
 msgid "E219: Missing {."
-msgstr "E219: ðÒÏÐÕÝÅÎÁ {."
+msgstr "E219: Пропущена {."
 
-#: fileio.c:8733
+#: fileio.c:8745
 msgid "E220: Missing }."
-msgstr "E220: ðÒÏÐÕÝÅÎÁ }."
+msgstr "E220: Пропущена }."
 
 #: fold.c:68
 msgid "E490: No fold found"
-msgstr "E490: óËÌÁÄÏË ÎÅ ÏÂÎÁÒÕÖÅÎÏ"
+msgstr "E490: Складок не обнаружено"
 
 #: fold.c:593
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr ""
-"E350: óËÌÁÄËÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓÏÚÄÁÎÁ Ó ÔÅËÕÝÉÍ ÚÎÁÞÅÎÉÅÍ ÏÐÃÉÉ 'foldmethod'"
+"E350: Складка не может быть создана с текущим значением опции 'foldmethod'"
 
 #: fold.c:595
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr ""
-"E351: óËÌÁÄËÁ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÄÁÌÅÎÁ Ó ÔÅËÕÝÉÍ ÚÎÁÞÅÎÉÅÍ ÏÐÃÉÉ 'foldmethod'"
+"E351: Складка не может быть удалена с текущим значением опции 'foldmethod'"
 
 #: getchar.c:248
 msgid "E222: Add to read buffer"
-msgstr "E222: äÏÂÁ×ÌÅÎÉÅ × ÂÕÆÅÒ ÞÔÅÎÉÑ"
+msgstr "E222: Добавление в буфер чтения"
 
-#: getchar.c:2198
+#: getchar.c:2208
 msgid "E223: recursive mapping"
-msgstr "E223: ÒÅËÕÒÓÉ×ÎÁÑ ÐÒÉ×ÑÚËÁ"
+msgstr "E223: рекурсивная привязка"
 
-#: getchar.c:3077
+#: getchar.c:3087
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: ÕÖÅ ÅÓÔØ ÇÌÏÂÁÌØÎÏÅ ÓÏËÒÁÝÅÎÉÅ ÄÌÑ %s"
+msgstr "E224: уже есть глобальное сокращение для %s"
 
-#: getchar.c:3080
+#: getchar.c:3090
 #, c-format
 msgid "E225: global mapping already exists for %s"
-msgstr "E225: ÕÖÅ ÅÓÔØ ÇÌÏÂÁÌØÎÁÑ ÐÒÉ×ÑÚËÁ ÄÌÑ %s"
+msgstr "E225: уже есть глобальная привязка для %s"
 
-#: getchar.c:3212
+#: getchar.c:3222
 #, c-format
 msgid "E226: abbreviation already exists for %s"
-msgstr "E226: ÕÖÅ ÅÓÔØ ÓÏËÒÁÝÅÎÉÅ ÄÌÑ %s"
+msgstr "E226: уже есть сокращение для %s"
 
-#: getchar.c:3215
+#: getchar.c:3225
 #, c-format
 msgid "E227: mapping already exists for %s"
-msgstr "E227: ÕÖÅ ÅÓÔØ ÐÒÉ×ÑÚËÁ ÄÌÑ %s"
+msgstr "E227: уже есть привязка для %s"
 
-#: getchar.c:3279
+#: getchar.c:3289
 msgid "No abbreviation found"
-msgstr "óÏËÒÁÝÅÎÉÑ ÎÅ ÎÁÊÄÅÎÙ"
+msgstr "Сокращения не найдены"
 
-#: getchar.c:3281
+#: getchar.c:3291
 msgid "No mapping found"
-msgstr "ðÒÉ×ÑÚËÉ ÎÅ ÎÁÊÄÅÎÙ"
+msgstr "Привязки не найдены"
 
-#: getchar.c:4173
+#: getchar.c:4183
 msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ"
+msgstr "E228: makemap: недопустимый режим"
 
 #: gui.c:220
 msgid "E229: Cannot start the GUI"
-msgstr "E229: îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × ÒÅÖÉÍ ÇÒÁÆÉÞÅÓËÏÇÏ ÉÎÔÅÒÆÅÊÓÁ"
+msgstr "E229: Невозможно перейти в режим графического интерфейса"
 
 #: gui.c:349
 #, c-format
 msgid "E230: Cannot read from \"%s\""
-msgstr "E230: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÞÔÅÎÉÅ \"%s\""
+msgstr "E230: Невозможно выполнить чтение \"%s\""
 
 #: gui.c:472
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr ""
-"E665: îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × ÒÅÖÉÍ ÇÒÁÆ. ÉÎÔÅÒÆÅÊÓÁ, ÎÅÐÒÁ×ÉÌØÎÏ ÚÁÄÁÎÙ ÛÒÉÆÔÙ"
+"E665: Невозможно перейти в режим граф. интерфейса, неправильно заданы шрифты"
 
 #: gui.c:477
 msgid "E231: 'guifontwide' invalid"
-msgstr "E231: ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÏÐÃÉÉ 'guifontwide'"
+msgstr "E231: неправильное значение опции 'guifontwide'"
 
 #: gui.c:547
 msgid "E599: Value of 'imactivatekey' is invalid"
-msgstr "E599: ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÏÐÃÉÉ 'imactivatekey'"
+msgstr "E599: неправильное значение опции 'imactivatekey'"
 
-#: gui.c:4061
+#: gui.c:4064
 #, c-format
 msgid "E254: Cannot allocate color %s"
-msgstr "E254: îÅ×ÏÚÍÏÖÎÏ ÎÁÚÎÁÞÉÔØ Ã×ÅÔ %s"
+msgstr "E254: Невозможно назначить цвет %s"
 
 #: gui_at_fs.c:300
 msgid "<cannot open> "
-msgstr "<ÎÅÌØÚÑ ÏÔËÒÙÔØ> "
+msgstr "<нельзя открыть> "
 
 #: gui_at_fs.c:1136
 #, c-format
 msgid "E616: vim_SelFile: can't get font %s"
-msgstr "E616: vim_SelFile: ÛÒÉÆÔ %s ÎÅ ÎÁÊÄÅÎ"
+msgstr "E616: vim_SelFile: шрифт %s не найден"
 
 #: gui_at_fs.c:2781
 msgid "E614: vim_SelFile: can't return to current directory"
-msgstr "E614: vim_SelFile: ×ÏÚ×ÒÁÔ × ÔÅËÕÝÉÊ ËÁÔÁÌÏÇ ÎÅ×ÏÚÍÏÖÅÎ"
+msgstr "E614: vim_SelFile: возврат в текущий каталог невозможен"
 
 #: gui_at_fs.c:2801
 msgid "Pathname:"
-msgstr "ðÕÔØ Ë ÆÁÊÌÕ:"
+msgstr "Путь к файлу:"
 
 #: gui_at_fs.c:2807
 msgid "E615: vim_SelFile: can't get current directory"
-msgstr "E615: vim_SelFile: ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÔÅËÕÝÉÊ ËÁÔÁÌÏÇ"
+msgstr "E615: vim_SelFile: не могу найти текущий каталог"
 
 #: gui_at_fs.c:2815 gui_motif.c:1623
 msgid "OK"
-msgstr "äÁ"
+msgstr "Да"
 
 #: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
 msgid "Cancel"
-msgstr "ïÔÍÅÎÁ"
+msgstr "Отмена"
 
 #: gui_at_sb.c:486
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "ðÏÌÏÓÁ ÐÒÏËÒÕÔËÉ: ÎÅ ÍÏÇÕ ÏÐÒÅÄÅÌÉÔØ ÇÅÏÍÅÔÒÉÀ ÐÏÌÚÕÎËÁ"
+msgstr "Полоса прокрутки: не могу определить геометрию ползунка"
 
 #: gui_athena.c:2047 gui_motif.c:1871
 msgid "Vim dialog"
-msgstr "äÉÁÌÏÇÏ×ÏÅ ÏËÎÏ Vim"
+msgstr "Диалоговое окно Vim"
 
-#: gui_beval.c:101 gui_w32.c:3829
+#: gui_beval.c:101 gui_w32.c:3978
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr ""
-"E232: \"ðÕÚÙÒØ\" ÄÌÑ ×ÙÞÉÓÌÅÎÉÊ, ×ËÌÀÞÁÀÝÉÊ É ÓÏÏÂÝÅÎÉÅ, É ÏÂÒÁÔÎÙÊ ×ÙÚÏ×, "
-"ÎÅ ÍÏÖÅÔ ÂÙÔØ ÓÏÚÄÁÎ"
+"E232: \"Пузырь\" для вычислений, включающий и сообщение, и обратный вызов, "
+"не может быть создан"
 
 #: gui_gtk.c:1607
 msgid "Vim dialog..."
-msgstr "äÉÁÌÏÇÏ×ÏÅ ÏËÎÏ Vim..."
+msgstr "Диалоговое окно Vim..."
 
-#: gui_gtk.c:2060 message.c:2993
+#: gui_gtk.c:2060 message.c:2999
 msgid ""
 "&Yes\n"
 "&No\n"
 "&Cancel"
 msgstr ""
-"&äÁ\n"
-"&îÅÔ\n"
-"ï&ÔÍÅÎÁ"
+"&Да\n"
+"&Нет\n"
+"О&тмена"
 
 #: gui_gtk.c:2268
 msgid "Input _Methods"
-msgstr "íÅÔÏÄÙ ÷×ÏÄÁ"
+msgstr "Методы Ввода"
 
 #: gui_gtk.c:2534 gui_motif.c:2768
 msgid "VIM - Search and Replace..."
-msgstr "VIM - ðÏÉÓË É ÚÁÍÅÎÁ..."
+msgstr "VIM - Поиск и замена..."
 
 #: gui_gtk.c:2542 gui_motif.c:2770
 msgid "VIM - Search..."
-msgstr "VIM - ðÏÉÓË..."
+msgstr "VIM - Поиск..."
 
 #: gui_gtk.c:2574 gui_motif.c:2888
 msgid "Find what:"
-msgstr "þÔÏ ÉÝÅÍ:"
+msgstr "Что ищем:"
 
 #: gui_gtk.c:2592 gui_motif.c:2920
 msgid "Replace with:"
-msgstr "îÁ ÞÔÏ ÚÁÍÅÎÑÅÍ:"
+msgstr "На что заменяем:"
 
 #. whole word only button
 #: gui_gtk.c:2624 gui_motif.c:3036
 msgid "Match whole word only"
-msgstr "ôÏÌØËÏ ÔÏÞÎÙÅ ÓÏÏÔ×ÅÔÓÔ×ÉÑ"
+msgstr "Только точные соответствия"
 
 #. match case button
 #: gui_gtk.c:2635 gui_motif.c:3048
 msgid "Match case"
-msgstr "òÅÇÉÓÔÒÏÚÁ×ÉÓÉÍÙÅ ÓÏÏÔ×ÅÔÓÔ×ÉÑ"
+msgstr "Регистрозависимые соответствия"
 
 #: gui_gtk.c:2645 gui_motif.c:2990
 msgid "Direction"
-msgstr "îÁÐÒÁ×ÌÅÎÉÅ"
+msgstr "Направление"
 
 #. 'Up' and 'Down' buttons
 #: gui_gtk.c:2657 gui_motif.c:3002
 msgid "Up"
-msgstr "÷×ÅÒÈ"
+msgstr "Вверх"
 
 #: gui_gtk.c:2661 gui_motif.c:3010
 msgid "Down"
-msgstr "÷ÎÉÚ"
+msgstr "Вниз"
 
 #: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
 msgid "Find Next"
-msgstr "îÁÊÔÉ ÓÌÅÄÕÀÝÅÅ"
+msgstr "Найти следующее"
 
 #: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
 msgid "Replace"
-msgstr "úÁÍÅÎÁ"
+msgstr "Замена"
 
 #: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
 msgid "Replace All"
-msgstr "úÁÍÅÎÉÔØ ×ÓÅ"
+msgstr "Заменить все"
 
 #: gui_gtk_x11.c:2327
 msgid "Vim: Received \"die\" request from session manager\n"
-msgstr "Vim: ðÏÌÕÞÅÎ ÚÁÐÒÏÓ ÎÁ ÐÒÅËÒÁÝÅÎÉÅ ÒÁÂÏÔÙ ÏÔ ÄÉÓÐÅÔÞÅÒÁ ÓÅÁÎÓÏ×\n"
+msgstr "Vim: Получен запрос на прекращение работы от диспетчера сеансов\n"
 
 #: gui_gtk_x11.c:3519
 msgid "Vim: Main window unexpectedly destroyed\n"
-msgstr "Vim: ïÓÎÏ×ÎÏÅ ÏËÎÏ ÂÙÌÏ ÎÅÏÖÉÄÁÎÎÏ ÚÁËÒÙÔÏ\n"
+msgstr "Vim: Основное окно было неожиданно закрыто\n"
 
 #: gui_gtk_x11.c:4138
 msgid "Font Selection"
-msgstr "÷ÙÂÏÒ ÛÒÉÆÔÁ"
+msgstr "Выбор шрифта"
 
 #: gui_gtk_x11.c:6035 ui.c:2120
 msgid "Used CUT_BUFFER0 instead of empty selection"
-msgstr "÷ÍÅÓÔÏ ÐÕÓÔÏÇÏ ×ÙÄÅÌÅÎÉÑ ÉÓÐÏÌØÚÕÅÔÓÑ CUT_BUFFER0"
+msgstr "Вместо пустого выделения используется CUT_BUFFER0"
 
 #: gui_motif.c:1617 gui_motif.c:1620
 msgid "Filter"
-msgstr "æÉÌØÔÒ"
+msgstr "Фильтр"
 
 #: gui_motif.c:1619
 msgid "Directories"
-msgstr "ëÁÔÁÌÏÇÉ"
+msgstr "Каталоги"
 
 #: gui_motif.c:1621
 msgid "Help"
-msgstr "óÐÒÁ×ËÁ"
+msgstr "Справка"
 
 #: gui_motif.c:1622
 msgid "Files"
-msgstr "æÁÊÌÙ"
+msgstr "Файлы"
 
 #: gui_motif.c:1624
 msgid "Selection"
-msgstr "÷ÙÄÅÌÅÎÉÅ"
+msgstr "Выделение"
 
 #: gui_motif.c:2835
 msgid "Undo"
-msgstr "ïÔÍÅÎÁ"
+msgstr "Отмена"
 
 #: gui_riscos.c:952
 #, c-format
 msgid "E610: Can't load Zap font '%s'"
-msgstr "E610: îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÛÒÉÆÔ Zap '%s'"
+msgstr "E610: Невозможно загрузить шрифт Zap '%s'"
 
 #: gui_riscos.c:1048
 #, c-format
 msgid "E611: Can't use font %s"
-msgstr "E611: îÅ×ÏÚÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÛÒÉÆÔ %s"
+msgstr "E611: Невозможно использовать шрифт %s"
 
 #: gui_riscos.c:3270
 msgid ""
@@ -2301,46 +2301,54 @@
 "Sending message to terminate child process.\n"
 msgstr ""
 "\n"
-"ïÔÐÒÁ×ËÁ ÓÏÏÂÝÅÎÉÑ ÄÌÑ ÕÎÉÞÔÏÖÅÎÉÑ ÐÒÏÃÅÓÓÁ-ÐÏÔÏÍËÁ.\n"
+"Отправка сообщения для уничтожения процесса-потомка.\n"
 
-#: gui_w32.c:829
+#: gui_w32.c:839
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: Окно с заголовком \"%s\" не обнаружено"
+
+#: gui_w32.c:847
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: ðÁÒÁÍÅÔÒ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ: \"-%s\"; ÉÓÐÏÌØÚÕÊÔÅ ×ÅÒÓÉÀ OLE."
+msgstr "E243: Параметр не поддерживается: \"-%s\"; используйте версию OLE."
 
-#: gui_w48.c:2090
+#: gui_w32.c:1100
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: Невозможно открыть окно внутри приложения MDI"
+
+#: gui_w48.c:2163
 msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "ðÏÉÓË ÓÔÒÏËÉ (ÉÓÐÏÌØÚÕÊÔÅ '\\\\' ÄÌÑ ÐÏÉÓËÁ '\\')"
+msgstr "Поиск строки (используйте '\\\\' для поиска '\\')"
 
-#: gui_w48.c:2115
+#: gui_w48.c:2188
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "ðÏÉÓË É ÚÁÍÅÎÁ (ÉÓÐÏÌØÚÕÊÔÅ '\\\\' ÄÌÑ ÐÏÉÓËÁ '\\')"
+msgstr "Поиск и замена (используйте '\\\\' для поиска '\\')"
 
 #: gui_x11.c:1537
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr ""
-"Vim E458: ÎÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÚÁÐÉÓØ × ÔÁÂÌÉÃÅ Ã×ÅÔÁ, ÎÅËÏÔÏÒÙÅ Ã×ÅÔÁÍÏÇÕÔ "
-"ÏÔÏÂÒÁÖÁÔØÓÑ ÎÅÐÒÁ×ÉÌØÎÏ"
+"Vim E458: невозможно выделить запись в таблице цвета, некоторые цветамогут "
+"отображаться неправильно"
 
 #: gui_x11.c:2118
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-msgstr "E250: × ÎÁÂÏÒÅ ÛÒÉÆÔÏ× %s ÏÔÓÕÔÓÔ×ÕÀÔ ÛÒÉÆÔÙ ÄÌÑ ÓÌÅÄÕÀÝÉÈ ËÏÄÉÒÏ×ÏË:"
+msgstr "E250: в наборе шрифтов %s отсутствуют шрифты для следующих кодировок:"
 
 #: gui_x11.c:2161
 #, c-format
 msgid "E252: Fontset name: %s"
-msgstr "E252: îÁÂÏÒ ÛÒÉÆÔÏ×: %s"
+msgstr "E252: Набор шрифтов: %s"
 
 #: gui_x11.c:2162
 #, c-format
 msgid "Font '%s' is not fixed-width"
-msgstr "ûÒÉÆÔ '%s' ÎÅ Ñ×ÌÑÅÔÓÑ ÍÏÎÏÛÉÒÉÎÎÙÍ"
+msgstr "Шрифт '%s' не является моноширинным"
 
 #: gui_x11.c:2181
 #, c-format
 msgid "E253: Fontset name: %s\n"
-msgstr "E253: îÁÂÏÒ ÛÒÉÆÔÏ×: %s\n"
+msgstr "E253: Набор шрифтов: %s\n"
 
 #: gui_x11.c:2182
 #, c-format
@@ -2353,13 +2361,14 @@
 msgstr "Font1: %s\n"
 
 #: gui_x11.c:2184
+#, c-format
 msgid "Font%ld width is not twice that of font0\n"
-msgstr "ûÉÒÉÎÁ ÛÒÉÆÔÁ font%ld ÄÏÌÖÎÁ ÂÙÔØ ×Ä×ÏÅ ÂÏÌØÛÅ ÛÉÒÉÎÙ ÛÒÉÆÔÁ font0\n"
+msgstr "Ширина шрифта font%ld должна быть вдвое больше ширины шрифта font0\n"
 
 #: gui_x11.c:2185
 #, c-format
 msgid "Font0 width: %ld\n"
-msgstr "ûÉÒÉÎÁ ÛÒÉÆÔÁ font0: %ld\n"
+msgstr "Ширина шрифта font0: %ld\n"
 
 #: gui_x11.c:2186
 #, c-format
@@ -2367,165 +2376,165 @@
 "Font1 width: %ld\n"
 "\n"
 msgstr ""
-"ûÉÒÉÎÁ ÛÒÉÆÔÁ font1: %ld\n"
+"Ширина шрифта font1: %ld\n"
 "\n"
 
 #: hangulin.c:610
 msgid "E256: Hangul automata ERROR"
-msgstr "õ256ö ïûéâëá Á×ÔÏÍÁÔÉËÉ èÁÎÇÙÌ"
+msgstr "У256Ж ОШИБКА автоматики Хангыл"
 
 #: if_cscope.c:77
 msgid "Add a new database"
-msgstr "äÏÂÁ×ÉÔØ ÎÏ×ÕÀ ÂÁÚÕ ÄÁÎÎÙÈ"
+msgstr "Добавить новую базу данных"
 
 #: if_cscope.c:79
 msgid "Query for a pattern"
-msgstr "úÁÐÒÏÓ ÐÏ ÛÁÂÌÏÎÕ"
+msgstr "Запрос по шаблону"
 
 #: if_cscope.c:81
 msgid "Show this message"
-msgstr "ðÏËÁÚÁÔØ ÜÔÏ ÓÏÏÂÝÅÎÉÅ"
+msgstr "Показать это сообщение"
 
 #: if_cscope.c:83
 msgid "Kill a connection"
-msgstr "õÂÉÔØ ÓÏÅÄÉÎÅÎÉÅ"
+msgstr "Убить соединение"
 
 #: if_cscope.c:85
 msgid "Reinit all connections"
-msgstr "úÁÎÏ×Ï ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ×ÓÅ ÓÏÅÄÉÎÅÎÉÑ"
+msgstr "Заново инициализировать все соединения"
 
 #: if_cscope.c:87
 msgid "Show connections"
-msgstr "ðÏËÁÚÁÔØ ÓÏÅÄÉÎÅÎÉÑ"
+msgstr "Показать соединения"
 
 #: if_cscope.c:95
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: éÓÐÏÌØÚÏ×ÁÎÉÅ: cs[cope] %s"
+msgstr "E560: Использование: cs[cope] %s"
 
 #: if_cscope.c:124
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "üÔÁ ËÏÍÁÎÄÁ cscope ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÁÚÄÅÌÅÎÉÅ ÏËÎÁ.\n"
+msgstr "Эта команда cscope не поддерживает разделение окна.\n"
 
 #: if_cscope.c:175
 msgid "E562: Usage: cstag <ident>"
-msgstr "E562: éÓÐÏÌØÚÏ×ÁÎÉÅ: cstag <ÉÍÑ>"
+msgstr "E562: Использование: cstag <имя>"
 
 #: if_cscope.c:231
 msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: ÍÅÔËÁ ÎÅ ÎÁÊÄÅÎÁ"
+msgstr "E257: cstag: метка не найдена"
 
 #: if_cscope.c:409
 #, c-format
 msgid "E563: stat(%s) error: %d"
-msgstr "ÏÛÉÂËÁ stat(%s): %d"
+msgstr "ошибка stat(%s): %d"
 
 #: if_cscope.c:419
 msgid "E563: stat error"
-msgstr "E563: ÏÛÉÂËÁ stat"
+msgstr "E563: ошибка stat"
 
 #: if_cscope.c:516
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ ÉÌÉ ÉÍÅÎÅÍ ÂÁÚÙ cscope"
+msgstr "E564: %s не является каталогом или именем базы cscope"
 
 #: if_cscope.c:534
 #, c-format
 msgid "Added cscope database %s"
-msgstr "äÏÂÁ×ÌÅÎÁ ÂÁÚÁ ÄÁÎÎÙÈ cscope %s"
+msgstr "Добавлена база данных cscope %s"
 
 #: if_cscope.c:589
 #, c-format
 msgid "E262: error reading cscope connection %ld"
-msgstr "E262: ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ ÏÔ ÓÏÅÄÉÎÅÎÉÑ cscope %d"
+msgstr "E262: ошибка получения информации от соединения cscope %d"
 
 #: if_cscope.c:694
 msgid "E561: unknown cscope search type"
-msgstr "E561: ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÐÏÉÓËÁ cscope"
+msgstr "E561: неизвестный тип поиска cscope"
 
 #: if_cscope.c:736
 msgid "E566: Could not create cscope pipes"
-msgstr "E566: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÔÒÕÂÕ ÄÌÑ cscope"
+msgstr "E566: Невозможно создать трубу для cscope"
 
 #: if_cscope.c:753
 msgid "E622: Could not fork for cscope"
-msgstr "E622: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ fork() ÄÌÑ cscope"
+msgstr "E622: Невозможно выполнить fork() для cscope"
 
 #: if_cscope.c:847 if_cscope.c:897
 msgid "cs_create_connection exec failed"
-msgstr "ÎÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ cs_create_connection"
+msgstr "не удалось выполнить cs_create_connection"
 
 #: if_cscope.c:898
 msgid "E623: Could not spawn cscope process"
-msgstr "E623: îÅ ÕÄÁÌÏÓØ ÚÁÐÕÓÔÉÔØ ÐÒÏÃÅÓÓ cscope"
+msgstr "E623: Не удалось запустить процесс cscope"
 
 #: if_cscope.c:911
 msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: ÎÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ fdopen ÄÌÑ to_fp"
+msgstr "cs_create_connection: не удалось выполнить fdopen для to_fp"
 
 #: if_cscope.c:913
 msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: ÎÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ fdopen ÄÌÑ fr_fp"
+msgstr "cs_create_connection: не удалось выполнить fdopen для fr_fp"
 
 #: if_cscope.c:951
 msgid "E567: no cscope connections"
-msgstr "E567: ÓÏÅÄÉÎÅÎÉÊ Ó cscope ÎÅ ÓÏÚÄÁÎÏ"
+msgstr "E567: соединений с cscope не создано"
 
 #: if_cscope.c:1025
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: ÎÅ ÎÁÊÄÅÎÏ ÓÏÏÔ×ÅÔÓÔ×ÉÊ ÐÏ ÚÁÐÒÏÓÕ cscope %s ÄÌÑ %s"
+msgstr "E259: не найдено соответствий по запросу cscope %s для %s"
 
 #: if_cscope.c:1082
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: ÎÅÐÒÁ×ÉÌØÎÙÊ ÆÌÁÇ cscopequickfix %c ÄÌÑ %c"
+msgstr "E469: неправильный флаг cscopequickfix %c для %c"
 
 #: if_cscope.c:1152
 msgid "cscope commands:\n"
-msgstr "ËÏÍÁÎÄÙ cscope:\n"
+msgstr "команды cscope:\n"
 
 #: if_cscope.c:1155
 #, c-format
 msgid "%-5s: %-30s (Usage: %s)"
-msgstr "%-5s: %-30s (éÓÐÏÌØÚÏ×ÁÎÉÅ: %s)"
+msgstr "%-5s: %-30s (Использование: %s)"
 
 #: if_cscope.c:1253
 #, c-format
 msgid "E625: cannot open cscope database: %s"
-msgstr "E625: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ cscope: %s"
+msgstr "E625: невозможно открыть базу данных cscope: %s"
 
 #: if_cscope.c:1271
 msgid "E626: cannot get cscope database information"
-msgstr "E626: ÉÎÆÏÒÍÁÃÉÑ Ï ÂÁÚÅ ÄÁÎÎÙÈ cscope ÎÅ ÄÏÓÔÕÐÎÁ"
+msgstr "E626: информация о базе данных cscope не доступна"
 
 #: if_cscope.c:1296
 msgid "E568: duplicate cscope database not added"
-msgstr "E568: ÄÁÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ cscope ÕÖÅ ÐÏÄÓÏÅÄÉÎÅÎÁ"
+msgstr "E568: данная база данных cscope уже подсоединена"
 
 #: if_cscope.c:1307
 msgid "E569: maximum number of cscope connections reached"
-msgstr "E569: ÄÏÓÔÉÇÎÕÔÏ ÍÁËÓÉÍÁÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÏÔËÒÙÔÙÈ ÓÏÅÄÉÎÅÎÉÊ Ó cscope"
+msgstr "E569: достигнуто максимальное значение открытых соединений с cscope"
 
 #: if_cscope.c:1424
 #, c-format
 msgid "E261: cscope connection %s not found"
-msgstr "E261: ÓÏÅÄÉÎÅÎÉÅ Ó cscope %s ÎÅ ÏÂÎÁÒÕÖÅÎÏ"
+msgstr "E261: соединение с cscope %s не обнаружено"
 
 #: if_cscope.c:1458
 #, c-format
 msgid "cscope connection %s closed"
-msgstr "ÓÏÅÄÉÎÅÎÉÅ Ó cscope ÚÁËÒÙÔÏ"
+msgstr "соединение с cscope закрыто"
 
 #. should not reach here
 #: if_cscope.c:1598
 msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: ËÒÉÔÉÞÅÓËÁÑ ÏÛÉÂËÁ × cs_manage_matches"
+msgstr "E570: критическая ошибка в cs_manage_matches"
 
 #: if_cscope.c:1848
 #, c-format
 msgid "Cscope tag: %s"
-msgstr "íÅÔËÁ cscope: %s"
+msgstr "Метка cscope: %s"
 
 #: if_cscope.c:1870
 msgid ""
@@ -2533,328 +2542,328 @@
 "   #   line"
 msgstr ""
 "\n"
-"   #   ÓÔÒÏËÁ"
+"   #   строка"
 
 #: if_cscope.c:1872
 msgid "filename / context / line\n"
-msgstr "ÉÍÑ ÆÁÊÌÁ / ËÏÎÔÅËÓÔ / ÓÔÒÏËÁ\n"
+msgstr "имя файла / контекст / строка\n"
 
 #: if_cscope.c:1990
 #, c-format
 msgid "E609: Cscope error: %s"
-msgstr "E609: ïÛÉÂËÁ cscope: %s"
+msgstr "E609: Ошибка cscope: %s"
 
 #: if_cscope.c:2176
 msgid "All cscope databases reset"
-msgstr "ðÅÒÅÚÁÇÒÕÚËÁ ×ÓÅÈ ÂÁÚ ÄÁÎÎÙÈ cscope"
+msgstr "Перезагрузка всех баз данных cscope"
 
 #: if_cscope.c:2244
 msgid "no cscope connections\n"
-msgstr "ÓÏÅÄÉÎÅÎÉÑ Ó cscope ÏÔÓÕÔÓÔ×ÕÀÔ\n"
+msgstr "соединения с cscope отсутствуют\n"
 
 #: if_cscope.c:2248
 msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    ÂÁÚÁ ÄÁÎÎÙÈ                         ÎÁÞÁÌØÎÙÊ ÐÕÔØ\n"
+msgstr " # pid    база данных                         начальный путь\n"
 
 #: if_python.c:436
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
 msgstr ""
-"E263: ë ÓÏÖÁÌÅÎÉÀ ÜÔÁ ËÏÍÁÎÄÁ ÎÅ ÒÁÂÏÔÁÅÔ, ÐÏÓËÏÌØËÕ ÎÅ ÚÁÇÒÕÖÅÎÁ ÂÉÂÌÉÏÔÅËÁ "
+"E263: К сожалению эта команда не работает, поскольку не загружена библиотека "
 "Python"
 
 #: if_python.c:500
 msgid "E659: Cannot invoke Python recursively"
-msgstr "E659: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÒÅËÕÒÓÉ×ÎÙÊ ×ÙÚÏ× Python"
+msgstr "E659: Невозможно выполнить рекурсивный вызов Python"
 
 #: if_python.c:701
 msgid "can't delete OutputObject attributes"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÁÔÒÉÂÕÔÙ OutputObject"
+msgstr "невозможно удалить атрибуты OutputObject"
 
 #: if_python.c:708
 msgid "softspace must be an integer"
-msgstr "ÚÎÁÞÅÎÉÅ softspace ÄÏÌÖÎÏ ÂÙÔØ ÃÅÌÙÍ ÞÉÓÌÏÍ"
+msgstr "значение softspace должно быть целым числом"
 
 #: if_python.c:716
 msgid "invalid attribute"
-msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÁÔÒÉÂÕÔ"
+msgstr "неправильный атрибут"
 
 #: if_python.c:755 if_python.c:769
 msgid "writelines() requires list of strings"
-msgstr "writelines() ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ ÓÐÉÓËÁ ÓÔÒÏË"
+msgstr "writelines() требует указания списка строк"
 
 #: if_python.c:895
 msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÏÂßÅËÔÏ× I/O"
+msgstr "E264: Python: Ошибка инициализации объектов I/O"
 
 #: if_python.c:1080 if_tcl.c:1402
 msgid "invalid expression"
-msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ×ÙÒÁÖÅÎÉÅ"
+msgstr "неправильное выражение"
 
 #: if_python.c:1094 if_tcl.c:1407
 msgid "expressions disabled at compile time"
-msgstr "×ÙÒÁÖÅÎÉÑ ÏÔËÌÀÞÅÎÙ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ"
+msgstr "выражения отключены при компиляции"
 
 #: if_python.c:1107
 msgid "attempt to refer to deleted buffer"
-msgstr "ÐÏÐÙÔËÁ ÓÏÓÌÁÔØÓÑ ÎÁ ÕÎÉÞÔÏÖÅÎÎÙÊ ÂÕÆÅÒ"
+msgstr "попытка сослаться на уничтоженный буфер"
 
 #: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
 msgid "line number out of range"
-msgstr "ÚÁÐÒÅÄÅÌØÎÙÊ ÎÏÍÅÒ ÓÔÒÏËÉ"
+msgstr "запредельный номер строки"
 
 #: if_python.c:1362
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
-msgstr "<ÏÂßÅËÔ ÂÕÆÅÒÁ (ÕÄÁÌÅÎ) × %8lX>"
+msgstr "<объект буфера (удален) в %8lX>"
 
 #: if_python.c:1453 if_tcl.c:836
 msgid "invalid mark name"
-msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÏÔÍÅÔËÉ"
+msgstr "неправильное имя отметки"
 
 #: if_python.c:1733
 msgid "no such buffer"
-msgstr "ÎÅÔ ÔÁËÏÇÏ ÂÕÆÅÒÁ"
+msgstr "нет такого буфера"
 
 #: if_python.c:1821
 msgid "attempt to refer to deleted window"
-msgstr "ÐÏÐÙÔËÁ ÓÏÓÌÁÔØÓÑ ÎÁ ÚÁËÒÙÔÏÅ ÏËÎÏ"
+msgstr "попытка сослаться на закрытое окно"
 
 #: if_python.c:1866
 msgid "readonly attribute"
-msgstr "ÁÔÒÉÂÕÔ ÄÏÓÔÕÐÅÎ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
+msgstr "атрибут доступен только для чтения"
 
 #: if_python.c:1879
 msgid "cursor position outside buffer"
-msgstr "ÐÏÚÉÃÉÑ ËÕÒÓÏÒÁ ÎÁÈÏÄÉÔÓÑ ×ÎÅ ÂÕÆÅÒÁ"
+msgstr "позиция курсора находится вне буфера"
 
 #: if_python.c:1956
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
-msgstr "<ÏÂßÅËÔ ÏËÎÁ (ÕÄÁÌÅÎ) × %.8lX>"
+msgstr "<объект окна (удален) в %.8lX>"
 
 #: if_python.c:1968
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
-msgstr "<ÏÂßÅËÔ ÏËÎÁ (ÎÅÉÚ×ÅÓÔÅÎ) × %.8lX>"
+msgstr "<объект окна (неизвестен) в %.8lX>"
 
 #: if_python.c:1970
 #, c-format
 msgid "<window %d>"
-msgstr "<ÏËÎÏ %d>"
+msgstr "<окно %d>"
 
 #: if_python.c:2046
 msgid "no such window"
-msgstr "ÎÅÔ ÔÁËÏÇÏ ÏËÎÁ"
+msgstr "нет такого окна"
 
 #: if_python.c:2307 if_python.c:2341 if_python.c:2396 if_python.c:2464
 #: if_python.c:2586 if_python.c:2638 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
 #: if_tcl.c:873 if_tcl.c:1999
 msgid "cannot save undo information"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÈÒÁÎÉÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÏÔÍÅÎÅ ÏÐÅÒÁÃÉÉ"
+msgstr "невозможно сохранить информацию об отмене операции"
 
 #: if_python.c:2309 if_python.c:2403 if_python.c:2475
 msgid "cannot delete line"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÓÔÒÏËÕ"
+msgstr "невозможно удалить строку"
 
 #: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
 msgid "cannot replace line"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÒÏËÕ"
+msgstr "невозможно заменить строку"
 
 #: if_python.c:2509 if_python.c:2588 if_python.c:2646
 msgid "cannot insert line"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÓÔÁ×ÉÔØ ÓÔÒÏËÕ"
+msgstr "невозможно вставить строку"
 
 #: if_python.c:2750
 msgid "string cannot contain newlines"
-msgstr "ÓÔÒÏËÁ ÎÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÓÉÍ×ÏÌ ÎÏ×ÏÊ ÓÔÒÏËÉ"
+msgstr "строка не может содержать символ новой строки"
 
 #: if_ruby.c:422
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
-"E266: ë ÓÏÖÁÌÅÎÉÀ ÜÔÁ ËÏÍÁÎÄÁ ÎÅ ÒÁÂÏÔÁÅÔ, ÐÏÓËÏÌØËÕ ÎÅ ÚÁÇÒÕÖÅÎÁ ÂÉÂÌÉÏÔÅËÁ "
+"E266: К сожалению эта команда не работает, поскольку не загружена библиотека "
 "Ruby."
 
 #: if_ruby.c:485
 #, c-format
 msgid "E273: unknown longjmp status %d"
-msgstr "E273: ÎÅÉÚ×ÅÓÔÎÏÅ ÓÏÓÔÏÑÎÉÅ longjmp %d"
+msgstr "E273: неизвестное состояние longjmp %d"
 
 #: if_sniff.c:67
 msgid "Toggle implementation/definition"
-msgstr "ðÅÒÅËÌÀÞÅÎÉÅ ÍÅÖÄÕ ÒÅÁÌÉÚÁÃÉÅÊ/ÏÐÒÅÄÅÌÅÎÉÅÍ"
+msgstr "Переключение между реализацией/определением"
 
 #: if_sniff.c:68
 msgid "Show base class of"
-msgstr "ðÏËÁÚÁÔØ ÂÁÚÏ×ÙÊ ËÌÁÓÓ "
+msgstr "Показать базовый класс "
 
 #: if_sniff.c:69
 msgid "Show overridden member function"
-msgstr "ðÏËÁÚÁÔØ ÐÅÒÅÇÒÕÖÅÎÎÙÅ ÆÕÎËÃÉÉ"
+msgstr "Показать перегруженные функции"
 
 #: if_sniff.c:70
 msgid "Retrieve from file"
-msgstr "ðÏÌÕÞÅÎÉÅ ÉÚ ÆÁÊÌÁ"
+msgstr "Получение из файла"
 
 #: if_sniff.c:71
 msgid "Retrieve from project"
-msgstr "ðÏÌÕÞÅÎÉÅ ÉÚ ÐÒÏÅËÔÁ"
+msgstr "Получение из проекта"
 
 #: if_sniff.c:73
 msgid "Retrieve from all projects"
-msgstr "ðÏÌÕÞÅÎÉÅ ÉÚ ×ÓÅÈ ÐÒÏÅËÔÏ×"
+msgstr "Получение из всех проектов"
 
 #: if_sniff.c:74
 msgid "Retrieve"
-msgstr "ðÏÌÕÞÅÎÉÅ"
+msgstr "Получение"
 
 #: if_sniff.c:75
 msgid "Show source of"
-msgstr "ðÏËÁÚÁÔØ ÉÓÈÏÄÎÙÊ ËÏÄ"
+msgstr "Показать исходный код"
 
 #: if_sniff.c:76
 msgid "Find symbol"
-msgstr "îÁÊÔÉ ÓÉÍ×ÏÌ"
+msgstr "Найти символ"
 
 #: if_sniff.c:77
 msgid "Browse class"
-msgstr "ðÒÏÓÍÏÔÒ ËÌÁÓÓÁ"
+msgstr "Просмотр класса"
 
 #: if_sniff.c:78
 msgid "Show class in hierarchy"
-msgstr "ðÏËÁÚÁÔØ ËÌÁÓÓ × ÉÅÒÁÒÈÉÉ"
+msgstr "Показать класс в иерархии"
 
 #: if_sniff.c:79
 msgid "Show class in restricted hierarchy"
-msgstr "ðÏËÁÚÁÔØ ËÌÁÓÓ × ÏÇÒÁÎÉÞÅÎÎÏÊ ÉÅÒÁÒÈÉÉ"
+msgstr "Показать класс в ограниченной иерархии"
 
 #: if_sniff.c:80
 msgid "Xref refers to"
-msgstr "Xref ÓÓÙÌÁÅÔÓÑ ÎÁ"
+msgstr "Xref ссылается на"
 
 #: if_sniff.c:81
 msgid "Xref referred by"
-msgstr "óÓÙÌËÁ ÎÁ xref ÉÚ"
+msgstr "Ссылка на xref из"
 
 #: if_sniff.c:82
 msgid "Xref has a"
-msgstr "Xref ÉÍÅÅÔ"
+msgstr "Xref имеет"
 
 #: if_sniff.c:83
 msgid "Xref used by"
-msgstr "Xref ÉÓÐÏÌØÚÕÅÔÓÑ"
+msgstr "Xref используется"
 
 #: if_sniff.c:84
 msgid "Show docu of"
-msgstr "ðÏËÁÚÁÔØ docu"
+msgstr "Показать docu"
 
 #: if_sniff.c:85
 msgid "Generate docu for"
-msgstr "óÏÚÄÁÔØ docu"
+msgstr "Создать docu"
 
 #: if_sniff.c:97
 msgid ""
 "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
 "$PATH).\n"
 msgstr ""
-"îÅ×ÏÚÍÏÖÎÏ ÐÏÄÓÏÅÄÉÎÉÔØÓÑ Ë SNiFF+. ðÒÏ×ÅÒØÔÅ ÎÁÓÔÒÏÊËÉ ÏËÒÕÖÅÎÉÑ."
-"(sniffemacs ÄÏÌÖÎÙ ÂÙÔØ ÕËÁÚÁÎÙ × ÐÅÒÅÍÅÎÎÏÊ $PATH).\n"
+"Невозможно подсоединиться к SNiFF+. Проверьте настройки окружения."
+"(sniffemacs должны быть указаны в переменной $PATH).\n"
 
 #: if_sniff.c:425
 msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: ïÛÉÂËÁ ×Ï ×ÒÅÍÑ ÞÔÅÎÉÑ. ïÔÓÏÅÄÉÎÅÎÉÅ"
+msgstr "E274: Sniff: Ошибка во время чтения. Отсоединение"
 
 #: if_sniff.c:553
 msgid "SNiFF+ is currently "
-msgstr "÷ ÎÁÓÔÏÑÝÉÊ ÍÏÍÅÎÔ SNiFF+ "
+msgstr "В настоящий момент SNiFF+ "
 
 #: if_sniff.c:555
 msgid "not "
-msgstr "ÎÅ "
+msgstr "не "
 
 #: if_sniff.c:556
 msgid "connected"
-msgstr "ÐÏÄÓÏÅÄÉΣÎ"
+msgstr "подсоединён"
 
 #: if_sniff.c:592
 #, c-format
 msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: îÅÉÚ×ÅÓÔÎÙÊ ÚÁÐÒÏÓ SNiFF+: %s"
+msgstr "E275: Неизвестный запрос SNiFF+: %s"
 
 #: if_sniff.c:605
 msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: ïÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ ÓÏ SNiFF+"
+msgstr "E276: Ошибка соединения со SNiFF+"
 
 #: if_sniff.c:1009
 msgid "E278: SNiFF+ not connected"
-msgstr "E278: SNiFF+ ÎÅ ÐÏÄÓÏÅÄÉΣÎ"
+msgstr "E278: SNiFF+ не подсоединён"
 
 #: if_sniff.c:1018
 msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: üÔÏ ÎÅ ÂÕÆÅÒ SNiFF+"
+msgstr "E279: Это не буфер SNiFF+"
 
 #: if_sniff.c:1083
 msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: ïÛÉÂËÁ ×Ï ×ÒÅÍÑ ÚÁÐÉÓÉ. ïÔÓÏÅÄÉÎÅÎÉÅ"
+msgstr "Sniff: Ошибка во время записи. Отсоединение"
 
 #: if_tcl.c:418
 msgid "invalid buffer number"
-msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ÎÏÍÅÒ ÂÕÆÅÒÁ"
+msgstr "неправильный номер буфера"
 
 #: if_tcl.c:464 if_tcl.c:931 if_tcl.c:1110
 msgid "not implemented yet"
-msgstr "ÐÏËÁ ÎÅ ÒÅÁÌÉÚÏ×ÁÎÏ"
+msgstr "пока не реализовано"
 
 #: if_tcl.c:501
 msgid "unknown option"
-msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ"
+msgstr "неизвестная опция"
 
 #. ???
 #: if_tcl.c:774
 msgid "cannot set line(s)"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÎÁÚÎÁÞÉÔØ ÓÔÒÏËÕ ÉÌÉ ÓÔÒÏËÉ"
+msgstr "невозможно назначить строку или строки"
 
 #: if_tcl.c:845
 msgid "mark not set"
-msgstr "ÏÔÍÅÔËÁ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ"
+msgstr "отметка не установлена"
 
 #: if_tcl.c:851 if_tcl.c:1066
 #, c-format
 msgid "row %d column %d"
-msgstr "ÒÑÄ %d ËÏÌÏÎËÁ %d"
+msgstr "ряд %d колонка %d"
 
 #: if_tcl.c:881
 msgid "cannot insert/append line"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ×ÓÔÁ×ÉÔØ ÉÌÉ ÄÏÂÁ×ÉÔØ ÓÔÒÏËÕ"
+msgstr "невозможно вставить или добавить строку"
 
 #: if_tcl.c:1268
 msgid "unknown flag: "
-msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÆÌÁÇ: "
+msgstr "неизвестный флаг: "
 
 #: if_tcl.c:1338
 msgid "unknown vimOption"
-msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ vimOption"
+msgstr "неизвестная vimOption"
 
 #: if_tcl.c:1423
 msgid "keyboard interrupt"
-msgstr "ËÌÁ×ÉÁÔÕÒÎÏÅ ÐÒÅÒÙ×ÁÎÉÅ"
+msgstr "клавиатурное прерывание"
 
 #: if_tcl.c:1428
 msgid "vim error"
-msgstr "ÏÛÉÂËÁ vim"
+msgstr "ошибка vim"
 
 #: if_tcl.c:1471
 msgid "cannot create buffer/window command: object is being deleted"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÏÍÁÎÄÕ ÂÕÆÅÒÁ ÉÌÉ ÏËÎÁ: ÏÂßÅËÔ × ÐÒÏÃÅÓÓÅ ÕÄÁÌÅÎÉÑ"
+msgstr "невозможно создать команду буфера или окна: объект в процессе удаления"
 
 #: if_tcl.c:1545
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr ""
-"ÎÅ×ÏÚÍÏÖÎÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ËÏÍÁÎÄÕ Ó ÏÂÒÁÔÎÙÍ ×ÙÚÏ×ÏÍ: ÂÕÆÅÒ ÉÌÉ ÏËÎÏ × "
-"ÐÒÏÃÅÓÓÅ ÕÄÁÌÅÎÉÑ"
+"невозможно зарегистрировать команду с обратным вызовом: буфер или окно в "
+"процессе удаления"
 
 #. This should never happen.  Famous last word?
 #: if_tcl.c:1562
@@ -2862,142 +2871,142 @@
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
 msgstr ""
-"E280: ëòéôéþåóëáñ ïûéâëá TCL: ÐÏ×ÒÅÖģΠÓÐÉÓÏË ÓÓÙÌÏË?! óÏÏÂÝÉÔÅ Ï ÜÔÏÍ ÐÏ "
-"ÁÄÒÅÓÕ vim-dev@vim.org"
+"E280: КРИТИЧЕСКАЯ ОШИБКА TCL: повреждён список ссылок?! Сообщите об этом по "
+"адресу vim-dev@vim.org"
 
 #: if_tcl.c:1563
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
-"ÎÅ×ÏÚÍÏÖÎÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ËÏÍÁÎÄÕ Ó ÏÂÒÁÔÎÙÍ ×ÙÚÏ×ÏÍ: ÓÓÙÌËÁ ÎÁ ÂÕÆÅÒ ÉÌÉ "
-"ÏËÎÏ ÎÅ ÏÂÎÁÒÕÖÅÎÁ"
+"невозможно зарегистрировать команду с обратным вызовом: ссылка на буфер или "
+"окно не обнаружена"
 
 #: if_tcl.c:1724
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
-"E571: ë ÓÏÖÁÌÅÎÉÀ ÜÔÁ ËÏÍÁÎÄÁ ÎÅ ÒÁÂÏÔÁÅÔ, ÐÏÓËÏÌØËÕ ÎÅ ÚÁÇÒÕÖÅÎÁ ÂÉÂÌÉÏÔÅËÁ "
+"E571: К сожалению эта команда не работает, поскольку не загружена библиотека "
 "Tcl"
 
 #: if_tcl.c:1886
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
 msgstr ""
-"E281: ïûéâëá TCL: ëÏÄ ×ÙÈÏÄÁ ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ?! óÏÏÂÝÉÔÅ Ï ÜÔÏÍ × "
+"E281: ОШИБКА TCL: Код выхода не является целым числом?! Сообщите об этом в "
 "vim-dev@vim.org"
 
 #: if_tcl.c:2007
 msgid "cannot get line"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÓÔÒÏËÕ"
+msgstr "невозможно получить строку"
 
 #: if_xcmdsrv.c:225
 msgid "Unable to register a command server name"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÉÍÑ ÓÅÒ×ÅÒÁ ËÏÍÁÎÄ"
+msgstr "Невозможно зарегистрировать имя сервера команд"
 
 #: if_xcmdsrv.c:473
 msgid "E248: Failed to send command to the destination program"
-msgstr "E248: ïÔÐÒÁ×ËÁ ËÏÍÁÎÄÙ × ÄÒÕÇÕÀ ÐÒÏÇÒÁÍÍÕ ÎÅ ÕÄÁÌÁÓØ"
+msgstr "E248: Отправка команды в другую программу не удалась"
 
 #: if_xcmdsrv.c:747
 #, c-format
 msgid "E573: Invalid server id used: %s"
-msgstr "E573: éÓÐÏÌØÚÕÅÔÓÑ ÎÅÐÒÁ×ÉÌØÎÙÊ id ÓÅÒ×ÅÒÁ: %s"
+msgstr "E573: Используется неправильный id сервера: %s"
 
 #: if_xcmdsrv.c:1110
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr ""
-"E251: îÅÐÒÁ×ÉÌØÎÏ ÓÆÏÒÍÉÒÏ×ÁÎÏ ÚÎÁÞÅÎÉÅ ÄÁÎÎÏÇÏ ÐÒÏÃÅÓÓÁ VIM × ÒÅÅÓÔÒÅ. "
-"õÄÁÌÅÎÏ!"
+"E251: Неправильно сформировано значение данного процесса VIM в реестре. "
+"Удалено!"
 
 #: main.c:60
 msgid "Unknown option"
-msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÒÇÕÍÅÎÔ"
+msgstr "Неизвестный аргумент"
 
 #: main.c:62
 msgid "Too many edit arguments"
-msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ"
+msgstr "Слишком много аргументов редактирования"
 
 #: main.c:64
 msgid "Argument missing after"
-msgstr "ðÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ ÐÏÓÌÅ"
+msgstr "Пропущен аргумент после"
 
 #: main.c:66
 msgid "Garbage after option"
-msgstr "íÕÓÏÒ ÐÏÓÌÅ ÁÒÇÕÍÅÎÔÁ"
+msgstr "Мусор после аргумента"
 
 #: main.c:68
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr ""
-"óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ× \"+ËÏÍÁÎÄÁ\", \"-c ËÏÍÁÎÄÁ\" ÉÌÉ \"--cmd ËÏÍÁÎÄÁ\""
+"Слишком много аргументов \"+команда\", \"-c команда\" или \"--cmd команда\""
 
 #: main.c:70
 msgid "Invalid argument for"
-msgstr "îÅÄÏÐÕÓÔÉÍÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ"
+msgstr "Недопустимые аргументы для"
 
-#: main.c:466
+#: main.c:469
 msgid "This Vim was not compiled with the diff feature."
 msgstr ""
-"äÁÎÎÙÊ Vim ÂÙÌ ÓËÏÍÐÉÌÉÒÏ×ÁÎ Ó ×ÙËÌÀÞÅÎÎÏÊ ÏÓÏÂÅÎÎÏÓÔØÀ ÐÒÏÓÍÏÔÒÁ ÏÔÌÉÞÉÊ"
+"Данный Vim был скомпилирован с выключенной особенностью просмотра отличий"
 
-#: main.c:932
+#: main.c:935
 msgid "Attempt to open script file again: \""
-msgstr "ðÏÐÙÔËÁ ÐÏ×ÔÏÒÎÏÇÏ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ÓÃÅÎÁÒÉÑ: \""
+msgstr "Попытка повторного открытия файла сценария: \""
 
-#: main.c:941
+#: main.c:944
 msgid "Cannot open for reading: \""
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÄÌÑ ÞÔÅÎÉÑ: \""
+msgstr "Невозможно открыть для чтения: \""
 
-#: main.c:985
+#: main.c:988
 msgid "Cannot open for script output: \""
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÄÌÑ ×Ù×ÏÄÁ ÓÃÅÎÁÒÉÑ: \""
+msgstr "Невозможно открыть для вывода сценария: \""
 
-#: main.c:1132
+#: main.c:1135
 #, c-format
 msgid "%d files to edit\n"
-msgstr "æÁÊÌÏ× ÄÌÑ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ: %d\n"
+msgstr "Файлов для редактирования: %d\n"
 
-#: main.c:1233
+#: main.c:1236
 msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÷Ù×ÏÄ ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ ÎÅ ÎÁ ÔÅÒÍÉÎÁÌ\n"
+msgstr "Vim: Предупреждение: Вывод осуществляется не на терминал\n"
 
-#: main.c:1235
+#: main.c:1238
 msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÷×ÏÄ ÐÒÏÉÓÈÏÄÉÔ ÎÅ Ó ÔÅÒÍÉÎÁÌÁ\n"
+msgstr "Vim: Предупреждение: Ввод происходит не с терминала\n"
 
 #. just in case..
-#: main.c:1297
+#: main.c:1306
 msgid "pre-vimrc command line"
-msgstr "ËÏÍÁÎÄÎÁÑ ÓÔÒÏËÁ ÐÅÒÅÄ ×ÙÐÏÌÎÅÎÉÅÍ vimrc"
+msgstr "командная строка перед выполнением vimrc"
 
-#: main.c:1338
+#: main.c:1347
 #, c-format
 msgid "E282: Cannot read from \"%s\""
-msgstr "E282: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÞÔÅÎÉÅ ÉÚ \"%s\""
+msgstr "E282: Невозможно выполнить чтение из \"%s\""
 
-#: main.c:2411
+#: main.c:2420
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
 msgstr ""
 "\n"
-"äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ: \"vim -h\"\n"
+"Дополнительная информация: \"vim -h\"\n"
 
-#: main.c:2444
+#: main.c:2453
 msgid "[file ..]       edit specified file(s)"
-msgstr "[ÆÁÊÌ ..] ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÕËÁÚÁÎÎÙÈ ÆÁÊÌÏ×"
+msgstr "[файл ..] редактирование указанных файлов"
 
-#: main.c:2445
+#: main.c:2454
 msgid "-               read text from stdin"
-msgstr "-                ÞÔÅÎÉÅ ÔÅËÓÔÁ ÉÚ ÐÏÔÏËÁ ××ÏÄÁ stdin"
+msgstr "-                чтение текста из потока ввода stdin"
 
-#: main.c:2446
+#: main.c:2455
 msgid "-t tag          edit file where tag is defined"
-msgstr "-t ÍÅÔËÁ         ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÁÊÌÁ Ó ÕËÁÚÁÎÎÏÊ ÍÅÔËÏÊ"
-
-#: main.c:2448
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [ÆÁÊÌ ÏÛÉÂÏË] ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÁÊÌÁ Ó ÐÅÒ×ÏÊ ÏÛÉÂËÏÊ"
+msgstr "-t метка         редактирование файла с указанной меткой"
 
 #: main.c:2457
+msgid "-q [errorfile]  edit file with first error"
+msgstr "-q [файл ошибок] редактирование файла с первой ошибкой"
+
+#: main.c:2466
 msgid ""
 "\n"
 "\n"
@@ -3005,21 +3014,21 @@
 msgstr ""
 "\n"
 "\n"
-"éÓÐÏÌØÚÏ×ÁÎÉÅ:"
+"Использование:"
 
-#: main.c:2460
+#: main.c:2469
 msgid " vim [arguments] "
-msgstr " vim [ÁÒÇÕÍÅÎÔÙ] "
+msgstr " vim [аргументы] "
 
-#: main.c:2464
+#: main.c:2473
 msgid ""
 "\n"
 "   or:"
 msgstr ""
 "\n"
-"   ÉÌÉ:"
+"   или:"
 
-#: main.c:2467
+#: main.c:2476
 msgid ""
 "\n"
 "\n"
@@ -3027,414 +3036,414 @@
 msgstr ""
 "\n"
 "\n"
-"áÒÇÕÍÅÎÔÙ:\n"
-
-#: main.c:2468
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\täÁÌÅÅ ÕËÁÚÙ×ÁÀÔÓÑ ÔÏÌØËÏ ÉÍÅÎÁ ÆÁÊÌÏ×"
-
-#: main.c:2470
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\tîÅ ×ÙÐÏÌÎÑÔØ ÐÏÄÓÔÁÎÏ×ËÕ ÐÏ ÍÁÓËÅ"
-
-#: main.c:2473
-msgid "-register\t\tRegister this gvim for OLE"
-msgstr "-register\t\túÁÒÅÇÉÓÔÒÉÒÏ×ÁÔØ ÜÔÏÔ gvim ÄÌÑ OLE"
-
-#: main.c:2474
-msgid "-unregister\t\tUnregister gvim for OLE"
-msgstr "-unregister\t\tïÔËÌÀÞÉÔØ ÒÅÇÉÓÔÒÁÃÉÀ ÄÁÎÎÏÇÏ gvim ÄÌÑ OLE"
+"Аргументы:\n"
 
 #: main.c:2477
-msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-msgstr "-g\t\t\túÁÐÕÓÔÉÔØ Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ (ËÁË \"gvim\")"
+msgid "--\t\t\tOnly file names after this"
+msgstr "--\t\t\tДалее указываются только имена файлов"
 
-#: main.c:2478
-msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-msgstr "-f  ÉÌÉ --nofork\t÷ ÁËÔÉ×ÎÏÊ ÚÁÄÁÞÅ: îÅ ×ÙÐÏÌÎÑÔØ fork ÐÒÉ ÚÁÐÕÓËÅ GUI"
-
-#: main.c:2480
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tòÅÖÉÍ Vi (ËÁË \"vi\")"
-
-#: main.c:2481
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tòÅÖÉÍ Ex (ËÁË \"ex\")"
+#: main.c:2479
+msgid "--literal\t\tDon't expand wildcards"
+msgstr "--literal\t\tНе выполнять подстановку по маске"
 
 #: main.c:2482
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\tôÉÈÉÊ (ÐÁËÅÔÎÙÊ) ÒÅÖÉÍ (ÔÏÌØËÏ ÄÌÑ \"ex\")"
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\t\tЗарегистрировать этот gvim для OLE"
 
-#: main.c:2484
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tòÅÖÉÍ ÏÔÌÉÞÉÊ (ËÁË \"vimdiff\")"
+#: main.c:2483
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\t\tОтключить регистрацию данного gvim для OLE"
 
 #: main.c:2486
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tðÒÏÓÔÏÊ ÒÅÖÉÍ (ËÁË \"evim\", ÂÅÚÒÅÖÉÍÎÙÊ)"
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\t\tЗапустить с графическим интерфейсом (как \"gvim\")"
 
 #: main.c:2487
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tôÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ (ËÁË \"view\")"
-
-#: main.c:2488
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\tïÇÒÁÎÉÞÅÎÎÙÊ ÒÅÖÉÍ (ËÁË \"rvim\")"
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f  или --nofork\tВ активной задаче: Не выполнять fork при запуске GUI"
 
 #: main.c:2489
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\tâÅÚ ×ÏÚÍÏÖÎÏÓÔÉ ÓÏÈÒÁÎÅÎÉÑ ÉÚÍÅÎÅÎÉÊ (ÚÁÐÉÓÉ ÆÁÊÌÏ×)"
+msgid "-v\t\t\tVi mode (like \"vi\")"
+msgstr "-v\t\t\tРежим Vi (как \"vi\")"
 
 #: main.c:2490
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tâÅÚ ×ÏÚÍÏÖÎÏÓÔÉ ×ÎÅÓÅÎÉÑ ÉÚÍÅÎÅÎÉÊ × ÔÅËÓÔ"
+msgid "-e\t\t\tEx mode (like \"ex\")"
+msgstr "-e\t\t\tРежим Ex (как \"ex\")"
 
 #: main.c:2491
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\tâÉÎÁÒÎÙÊ ÒÅÖÉÍ"
+msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
+msgstr "-s\t\t\tТихий (пакетный) режим (только для \"ex\")"
 
 #: main.c:2493
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tòÅÖÉÍ Lisp"
+msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
+msgstr "-d\t\t\tРежим отличий (как \"vimdiff\")"
 
 #: main.c:2495
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\tòÅÖÉÍ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó Vi: 'compatible'"
+msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
+msgstr "-y\t\t\tПростой режим (как \"evim\", безрежимный)"
 
 #: main.c:2496
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\tòÅÖÉÍ ÎÅÐÏÌÎÏÊ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó Vi: 'nocompatible'"
+msgid "-R\t\t\tReadonly mode (like \"view\")"
+msgstr "-R\t\t\tТолько для чтения (как \"view\")"
 
 #: main.c:2497
-msgid "-V[N]\t\tVerbose level"
-msgstr "-V[N]\t\tõÒÏ×ÅÎØ ÐÏÄÒÏÂÎÏÓÔÉ ÓÏÏÂÝÅÎÉÊ"
+msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
+msgstr "-Z\t\t\tОграниченный режим (как \"rvim\")"
 
 #: main.c:2498
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\tòÅÖÉÍ ÏÔÌÁÄËÉ"
+msgid "-m\t\t\tModifications (writing files) not allowed"
+msgstr "-m\t\t\tБез возможности сохранения изменений (записи файлов)"
 
 #: main.c:2499
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\tâÅÚ Ó×ÏÐ-ÆÁÊÌÁ, ÉÓÐÏÌØÚÕÅÔÓÑ ÔÏÌØËÏ ÐÁÍÑÔØ"
+msgid "-M\t\t\tModifications in text not allowed"
+msgstr "-M\t\t\tБез возможности внесения изменений в текст"
 
 #: main.c:2500
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t÷Ù×ÅÓÔÉ ÓÐÉÓÏË Ó×ÏÐ-ÆÁÊÌÏ× É ÚÁ×ÅÒÛÉÔØ ÒÁÂÏÔÕ"
-
-#: main.c:2501
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (Ó ÉÍÅÎÅÍ ÆÁÊÌÁ)\t÷ÏÓÓÔÁÎÏ×ÉÔØ Á×ÁÒÉÊÎÏ ÚÁ×ÅÒÛ£ÎÎÙÊ ÓÅÁÎÓ"
+msgid "-b\t\t\tBinary mode"
+msgstr "-b\t\t\tБинарный режим"
 
 #: main.c:2502
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tôÏ ÖÅ, ÞÔÏ É -r"
+msgid "-l\t\t\tLisp mode"
+msgstr "-l\t\t\tРежим Lisp"
 
 #: main.c:2504
-msgid "-f\t\t\tDon't use newcli to open window"
-msgstr "-f\t\t\tîÅ ÉÓÐÏÌØÚÏ×ÁÔØ newcli ÄÌÑ ÏÔËÒÙÔÉÑ ÏËÎÁ"
+msgid "-C\t\t\tCompatible with Vi: 'compatible'"
+msgstr "-C\t\t\tРежим совместимости с Vi: 'compatible'"
 
 #: main.c:2505
-msgid "-dev <device>\t\tUse <device> for I/O"
-msgstr "-dev <ÕÓÔÒÏÊÓÔ×Ï>\t\téÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ I/O ÕËÁÚÁÎÎÏÅ <ÕÓÔÒÏÊÓÔ×Ï>"
+msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
+msgstr "-N\t\t\tРежим неполной совместимости с Vi: 'nocompatible'"
+
+#: main.c:2506
+msgid "-V[N]\t\tVerbose level"
+msgstr "-V[N]\t\tУровень подробности сообщений"
+
+#: main.c:2507
+msgid "-D\t\t\tDebugging mode"
+msgstr "-D\t\t\tРежим отладки"
 
 #: main.c:2508
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\túÁÐÕÓË × áÒÁÂÓËÏÍ ÒÅÖÉÍÅ"
+msgid "-n\t\t\tNo swap file, use memory only"
+msgstr "-n\t\t\tБез своп-файла, используется только память"
+
+#: main.c:2509
+msgid "-r\t\t\tList swap files and exit"
+msgstr "-r\t\t\tВывести список своп-файлов и завершить работу"
+
+#: main.c:2510
+msgid "-r (with file name)\tRecover crashed session"
+msgstr "-r (с именем файла)\tВосстановить аварийно завершённый сеанс"
 
 #: main.c:2511
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\túÁÐÕÓË × ÒÅÖÉÍÅ \"é×ÒÉÔ\""
+msgid "-L\t\t\tSame as -r"
+msgstr "-L\t\t\tТо же, что и -r"
+
+#: main.c:2513
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\t\tНе использовать newcli для открытия окна"
 
 #: main.c:2514
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\túÁÐÕÓË × ÒÅÖÉÍÅ \"æÁÒÓÉ\""
-
-#: main.c:2516
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <ÔÅÒÍÉÎÁÌ>\tîÁÚÎÁÞÉÔØ ÕËÁÚÁÎÎÙÊ ÔÉÐ <ÔÅÒÍÉÎÁÌÁ>"
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <устройство>\t\tИспользовать для I/O указанное <устройство>"
 
 #: main.c:2517
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\téÓÐÏÌØÚÏ×ÁÔØ <vimrc> ×ÍÅÓÔÏ ÌÀÂÙÈ ÆÁÊÌÏ× .vimrc"
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\tЗапуск в Арабском режиме"
 
-#: main.c:2519
-msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-msgstr "-U <gvimrc>\t\téÓÐÏÌØÚÏ×ÁÔØ <gvimrc> ×ÍÅÓÔÏ ÌÀÂÙÈ ÆÁÊÌÏ× .gvimrc"
-
-#: main.c:2521
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\tîÅ ÚÁÇÒÕÖÁÔØ ÓÃÅÎÁÒÉÉ ÍÏÄÕÌÅÊ"
-
-#: main.c:2522
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\tïÔËÒÙÔØ N ÏËÏÎ (ÐÏ ÕÍÏÌÞÁÎÉÀ: ÐÏ ÏÄÎÏÍÕ ÎÁ ËÁÖÄÙÊ ÆÁÊÌ)"
+#: main.c:2520
+msgid "-H\t\t\tStart in Hebrew mode"
+msgstr "-H\t\t\tЗапуск в режиме \"Иврит\""
 
 #: main.c:2523
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\tôÏ ÖÅ, ÞÔÏ É -o, ÎÏ Ó ×ÅÒÔÉËÁÌØÎÙÍ ÒÁÚÄÅÌÅÎÉÅÍ ÏËÏÎ"
-
-#: main.c:2524
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\tîÁÞÁÔØ ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ × ËÏÎÃÅ ÆÁÊÌÁ"
+msgid "-F\t\t\tStart in Farsi mode"
+msgstr "-F\t\t\tЗапуск в режиме \"Фарси\""
 
 #: main.c:2525
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\tîÁÞÁÔØ ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ × ÓÔÒÏËÅ Ó ÎÏÍÅÒÏÍ <lnum>"
+msgid "-T <terminal>\tSet terminal type to <terminal>"
+msgstr "-T <терминал>\tНазначить указанный тип <терминала>"
 
-#: main.c:2527
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <ËÏÍÁÎÄÁ>\t÷ÙÐÏÌÎÉÔØ <ËÏÍÁÎÄÕ> ÐÅÒÅÄ ÚÁÇÒÕÚËÏÊ ÆÁÊÌÁ vimrc"
+#: main.c:2526
+msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
+msgstr "-u <vimrc>\t\tИспользовать <vimrc> вместо любых файлов .vimrc"
 
-#: main.c:2529
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <ËÏÍÁÎÄÁ>\t\t÷ÙÐÏÌÎÉÔØ <ËÏÍÁÎÄÕ> ÐÏÓÌÅ ÚÁÇÒÕÚËÉ ÐÅÒ×ÏÇÏ ÆÁÊÌÁ"
+#: main.c:2528
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\t\tИспользовать <gvimrc> вместо любых файлов .gvimrc"
 
 #: main.c:2530
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <ÓÅÁÎÓ>\t\tðÒÏÞÉÔÁÔØ ÓÃÅÎÁÒÉÊ <ÓÅÁÎÓÁ> ÐÏÓÌÅ ÚÁÇÒÕÚËÉ ÐÅÒ×ÏÇÏ ÆÁÊÌÁ"
+msgid "--noplugin\t\tDon't load plugin scripts"
+msgstr "--noplugin\t\tНе загружать сценарии модулей"
 
 #: main.c:2531
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <ÓÃÅÎÁÒÉÊ>\tðÒÏÞÉÔÁÔØ ËÏÍÁÎÄÙ ïÂÙÞÎÏÇÏ ÒÅÖÉÍÁ ÉÚ ÆÁÊÌÁ <ÓÃÅÎÁÒÉÑ>"
+msgid "-o[N]\t\tOpen N windows (default: one for each file)"
+msgstr "-o[N]\t\tОткрыть N окон (по умолчанию: по одному на каждый файл)"
 
 #: main.c:2532
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <ÓÃÅÎÁÒÉÊ>\täÏÂÁ×ÌÑÔØ ×ÓÅ ××ÅÄ£ÎÎÙÅ ËÏÍÁÎÄÙ × ÆÁÊÌ <ÓÃÅÎÁÒÉÑ>"
+msgid "-O[N]\t\tLike -o but split vertically"
+msgstr "-O[N]\t\tТо же, что и -o, но с вертикальным разделением окон"
 
 #: main.c:2533
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <ÓÃÅÎÁÒÉÊ>\túÁÐÉÓÁÔØ ×ÓÅ ××ÅÄ£ÎÎÙÅ ËÏÍÁÎÄÙ × ÆÁÊÌ <ÓÃÅÎÁÒÉÑ>"
+msgid "+\t\t\tStart at end of file"
+msgstr "+\t\t\tНачать редактирование в конце файла"
 
-#: main.c:2535
-msgid "-x\t\t\tEdit encrypted files"
-msgstr "-x\t\t\tòÅÄÁËÔÉÒÏ×ÁÎÉÅ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×"
+#: main.c:2534
+msgid "+<lnum>\t\tStart at line <lnum>"
+msgstr "+<lnum>\t\tНачать редактирование в строке с номером <lnum>"
+
+#: main.c:2536
+msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
+msgstr "--cmd <команда>\tВыполнить <команду> перед загрузкой файла vimrc"
+
+#: main.c:2538
+msgid "-c <command>\t\tExecute <command> after loading the first file"
+msgstr "-c <команда>\t\tВыполнить <команду> после загрузки первого файла"
 
 #: main.c:2539
-msgid "-display <display>\tConnect vim to this particular X-server"
-msgstr "-display <ÜËÒÁÎ>\tðÏÄÓÏÅÄÉÎÉÔØ vim Ë ÕËÁÚÁÎÎÏÍÕ ÓÅÒ×ÅÒÕ X"
+msgid "-S <session>\t\tSource file <session> after loading the first file"
+msgstr "-S <сеанс>\t\tПрочитать сценарий <сеанса> после загрузки первого файла"
+
+#: main.c:2540
+msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
+msgstr "-s <сценарий>\tПрочитать команды Обычного режима из файла <сценария>"
 
 #: main.c:2541
-msgid "-X\t\t\tDo not connect to X server"
-msgstr "-X\t\t\tîÅ ×ÙÐÏÌÎÑÔØ ÓÏÅÄÉÎÅÎÉÅ Ó ÓÅÒ×ÅÒÏÍ X"
+msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
+msgstr "-w <сценарий>\tДобавлять все введённые команды в файл <сценария>"
+
+#: main.c:2542
+msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
+msgstr "-W <сценарий>\tЗаписать все введённые команды в файл <сценария>"
 
 #: main.c:2544
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\tРедактирование зашифрованных файлов"
+
+#: main.c:2548
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <экран>\tПодсоединить vim к указанному серверу X"
+
+#: main.c:2550
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tНе выполнять соединение с сервером X"
+
+#: main.c:2553
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-msgstr "--remote <ÆÁÊÌÙ>\tðÏ ×ÏÚÍÏÖÎÏÓÔÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ <ÆÁÊÌÙ> ÎÁ ÓÅÒ×ÅÒÅ Vim"
+msgstr "--remote <файлы>\tПо возможности редактировать <файлы> на сервере Vim"
 
-#: main.c:2545
+#: main.c:2554
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
-msgstr "--remote-silent <ÆÁÊÌÙ>  ôÏ ÖÅ, ÎÏ ÂÅÚ ÖÁÌÏ ÎÁ ÏÔÓÕÔÓÔ×ÉÅ ÓÅÒ×ÅÒÁ"
+msgstr "--remote-silent <файлы>  То же, но без жалоб на отсутствие сервера"
 
-#: main.c:2546
+#: main.c:2555
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr ""
-"--remote-wait <ÆÁÊÌÙ>  ôÏ ÖÅ, ÞÔÏ É --remote, ÎÏ Ó ÏÖÉÄÁÎÉÅÍ ÚÁ×ÅÒÛÅÎÉÑ"
+"--remote-wait <файлы>  То же, что и --remote, но с ожиданием завершения"
 
-#: main.c:2547
+#: main.c:2556
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr ""
-"--remote-wait-silent <ÆÁÊÌÙ>  ôÏ ÖÅ, ÎÏ ÂÅÚ ÖÁÌÏ ÎÁ ÏÔÓÕÔÓÔ×ÉÅ ÓÅÒ×ÅÒÁ"
-
-#: main.c:2548
-msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-msgstr "--remote-send <ËÎÏÐËÉ>\tïÔÐÒÁ×ÉÔØ <ËÎÏÐËÉ> ÎÁ ÓÅÒ×ÅÒ Vim É ×ÙÊÔÉ"
-
-#: main.c:2549
-msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-msgstr "--remote-expr <×ÙÒÁÖ>\t÷ÙÞÉÓÌÉÔØ <×ÙÒÁÖ> ÎÁ ÓÅÒ×ÅÒÅ Vim É ÎÁÐÅÞÁÔÁÔØ"
-
-#: main.c:2550
-msgid "--serverlist\t\tList available Vim server names and exit"
-msgstr "--serverlist\t\tðÏËÁÚÁÔØ ÓÐÉÓÏË ÉͣΠÓÅÒ×ÅÒÏ× Vim É ÚÁ×ÅÒÛÉÔØ ÒÁÂÏÔÕ"
-
-#: main.c:2551
-msgid "--servername <name>\tSend to/become the Vim server <name>"
-msgstr ""
-"--servername <ÉÍÑ>\tïÔÐÒÁ×ÉÔØ ÎÁ/ÓÔÁÔØ ÓÅÒ×ÅÒÏÍ Vim Ó ÕËÁÚÁÎÎÙÍ <ÉÍÅÎÅÍ>"
-
-#: main.c:2554
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\téÓÐÏÌØÚÏ×ÁÔØ ×ÍÅÓÔÏ .viminfo ÆÁÊÌ <viminfo>"
-
-#: main.c:2556
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h ÉÌÉ --help\t÷Ù×ÅÓÔÉ ÓÐÒÁ×ËÕ (ÜÔÏ ÓÏÏÂÝÅÎÉÅ) É ÚÁ×ÅÒÛÉÔØ ÒÁÂÏÔÕ"
+"--remote-wait-silent <файлы>  То же, но без жалоб на отсутствие сервера"
 
 #: main.c:2557
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t÷Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ Vim É ÚÁ×ÅÒÛÉÔØ ÒÁÂÏÔÕ"
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <кнопки>\tОтправить <кнопки> на сервер Vim и выйти"
 
-#: main.c:2561
+#: main.c:2558
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr "--remote-expr <выраж>\tВычислить <выраж> на сервере Vim и напечатать"
+
+#: main.c:2559
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr "--serverlist\t\tПоказать список имён серверов Vim и завершить работу"
+
+#: main.c:2560
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr ""
+"--servername <имя>\tОтправить на/стать сервером Vim с указанным <именем>"
+
+#: main.c:2563
+msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
+msgstr "-i <viminfo>\t\tИспользовать вместо .viminfo файл <viminfo>"
+
+#: main.c:2565
+msgid "-h  or  --help\tPrint Help (this message) and exit"
+msgstr "-h или --help\tВывести справку (это сообщение) и завершить работу"
+
+#: main.c:2566
+msgid "--version\t\tPrint version information and exit"
+msgstr "--version\t\tВывести информацию о версии Vim и завершить работу"
+
+#: main.c:2570
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
 msgstr ""
 "\n"
-"áÒÇÕÍÅÎÔÙ ÄÌÑ gvim (×ÅÒÓÉÑ Motif):\n"
+"Аргументы для gvim (версия Motif):\n"
 
-#: main.c:2565
+#: main.c:2574
 msgid ""
 "\n"
 "Arguments recognised by gvim (neXtaw version):\n"
 msgstr ""
 "\n"
-"áÒÇÕÍÅÎÔÙ ÄÌÑ gvim (×ÅÒÓÉÑ neXtaw):\n"
+"Аргументы для gvim (версия neXtaw):\n"
 
-#: main.c:2567
+#: main.c:2576
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
 msgstr ""
 "\n"
-"áÒÇÕÍÅÎÔÙ ÄÌÑ gvim (×ÅÒÓÉÑ Athena):\n"
-
-#: main.c:2571
-msgid "-display <display>\tRun vim on <display>"
-msgstr "-display <ÄÉÓÐÌÅÊ>\túÁÐÕÓÔÉÔØ vim ÎÁ ÕËÁÚÁÎÎÏÍ <ÄÉÓÐÌÅÅ>"
-
-#: main.c:2572
-msgid "-iconic\t\tStart vim iconified"
-msgstr "-iconic\t\túÁÐÕÓÔÉÔØ vim × Ó×£ÒÎÕÔÏÍ ×ÉÄÅ"
-
-#: main.c:2574
-msgid "-name <name>\t\tUse resource as if vim was <name>"
-msgstr "-name <ÉÍÑ>\t\téÓÐÏÌØÚÏ×ÁÔØ ÒÅÓÕÒÓ, ËÁË ÅÓÌÉ ÂÙ vim ÂÙÌ <ÉÍÅÎÅÍ>"
-
-#: main.c:2575
-msgid "\t\t\t  (Unimplemented)\n"
-msgstr "\t\t\t  (îÅ ÒÅÁÌÉÚÏ×ÁÎÏ)\n"
-
-#: main.c:2577
-msgid "-background <color>\tUse <color> for the background (also: -bg)"
-msgstr ""
-"-background <Ã×ÅÔ>\téÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ <Ã×ÅÔ> ÄÌÑ ÆÏÎÁ (ÔÁËÖÅ: -bg)"
-
-#: main.c:2578
-msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-msgstr ""
-"-foreground <Ã×ÅÔ>\téÓÐÏÌØÚÏ×ÁÔØ <Ã×ÅÔ> ÄÌÑ ÏÂÙÞÎÏÇÏ ÔÅËÓÔÁ (ÔÁËÖÅ: -fg)"
-
-#: main.c:2579 main.c:2599
-msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-msgstr "-font <ÛÒÉÆÔ>\t\téÓÐÏÌØÚÏ×ÁÔØ <ÛÒÉÆÔ> ÄÌÑ ÏÂÙÞÎÏÇÏ ÔÅËÓÔÁ (ÔÁËÖÅ: -fn)"
+"Аргументы для gvim (версия Athena):\n"
 
 #: main.c:2580
-msgid "-boldfont <font>\tUse <font> for bold text"
-msgstr "-boldfont <ÛÒÉÆÔ>\téÓÐÏÌØÚÏ×ÁÔØ <ÛÒÉÆÔ> ÄÌÑ ÖÉÒÎÏÇÏ ÔÅËÓÔÁ"
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <дисплей>\tЗапустить vim на указанном <дисплее>"
 
 #: main.c:2581
-msgid "-italicfont <font>\tUse <font> for italic text"
-msgstr "-italicfont <ÛÒÉÆÔ>\téÓÐÏÌØÚÏ×ÁÔØ <ÛÒÉÆÔ> ÄÌÑ ÎÁËÌÏÎÎÏÇÏ ÔÅËÓÔÁ"
-
-#: main.c:2582 main.c:2600
-msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-msgstr ""
-"-geometry <ÇÅÏÍÅÔÒÉÑ>\téÓÐÏÌØÚÏ×ÁÔØ ÎÁÞÁÌØÎÕÀ <ÇÅÏÍÅÔÒÉÀ> (ÔÁËÖÅ: -geom)"
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\tЗапустить vim в свёрнутом виде"
 
 #: main.c:2583
-msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-msgstr "-borderwidth <ÛÉÒÉÎÁ>\téÓÐÏÌØÚÏ×ÁÔØ <ÛÉÒÉÎÕ> ÂÏÒÄÀÒÁ (ÔÁËÖÅ: -bw)"
+msgid "-name <name>\t\tUse resource as if vim was <name>"
+msgstr "-name <имя>\t\tИспользовать ресурс, как если бы vim был <именем>"
 
 #: main.c:2584
-msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-msgstr ""
-"-scrollbarwidth <ÛÉÒÉÎÁ> éÓÐÏÌØÚÏ×ÁÔØ ÛÉÒÉÎÕ ÐÏÌÏÓÙ ÐÒÏËÒÕÔËÉ (ÔÁËÖÅ: -sw)"
+msgid "\t\t\t  (Unimplemented)\n"
+msgstr "\t\t\t  (Не реализовано)\n"
 
 #: main.c:2586
-msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-msgstr "-menuheight <×ÙÓÏÔÁ>\téÓÐÏÌØÚÏ×ÁÔØ <×ÙÓÏÔÕ> ÍÅÎÀ (ÔÁËÖÅ: -mh)"
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr ""
+"-background <цвет>\tИспользовать указанный <цвет> для фона (также: -bg)"
 
-#: main.c:2588 main.c:2601
-msgid "-reverse\t\tUse reverse video (also: -rv)"
-msgstr "-reverse\t\téÓÐÏÌØÚÏ×ÁÔØ ÉÎ×ÅÒÓÎÙÊ ×ÉÄÅÏÒÅÖÉÍ (ÔÁËÖÅ: -rv)"
+#: main.c:2587
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr ""
+"-foreground <цвет>\tИспользовать <цвет> для обычного текста (также: -fg)"
+
+#: main.c:2588 main.c:2608
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <шрифт>\t\tИспользовать <шрифт> для обычного текста (также: -fn)"
 
 #: main.c:2589
-msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-msgstr "+reverse\t\tîÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÉÎ×ÅÒÓÎÙÊ ×ÉÄÅÏÒÅÖÉÍ (ÔÁËÖÅ: +rv)"
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <шрифт>\tИспользовать <шрифт> для жирного текста"
 
 #: main.c:2590
-msgid "-xrm <resource>\tSet the specified resource"
-msgstr "-xrm <ÒÅÓÕÒÓ>\tõÓÔÁÎÏ×ÉÔØ ÕËÁÚÁÎÎÙÊ <ÒÅÓÕÒÓ>"
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <шрифт>\tИспользовать <шрифт> для наклонного текста"
+
+#: main.c:2591 main.c:2609
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr ""
+"-geometry <геометрия>\tИспользовать начальную <геометрию> (также: -geom)"
+
+#: main.c:2592
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr "-borderwidth <ширина>\tИспользовать <ширину> бордюра (также: -bw)"
 
 #: main.c:2593
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <ширина> Использовать ширину полосы прокрутки (также: -sw)"
+
+#: main.c:2595
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr "-menuheight <высота>\tИспользовать <высоту> меню (также: -mh)"
+
+#: main.c:2597 main.c:2610
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\tИспользовать инверсный видеорежим (также: -rv)"
+
+#: main.c:2598
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\tНе использовать инверсный видеорежим (также: +rv)"
+
+#: main.c:2599
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <ресурс>\tУстановить указанный <ресурс>"
+
+#: main.c:2602
 msgid ""
 "\n"
 "Arguments recognised by gvim (RISC OS version):\n"
 msgstr ""
 "\n"
-"áÒÇÕÍÅÎÔÙ ÄÌÑ gvim (×ÅÒÓÉÑ RISC OS):\n"
+"Аргументы для gvim (версия RISC OS):\n"
 
-#: main.c:2594
+#: main.c:2603
 msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <ÞÉÓÌÏ>\tðÅÒ×ÏÎÁÞÁÌØÎÁÑ ÛÉÒÉÎÁ ÏËÎÁ × ËÏÌÏÎËÁÈ"
+msgstr "--columns <число>\tПервоначальная ширина окна в колонках"
 
-#: main.c:2595
+#: main.c:2604
 msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <ÞÉÓÌÏ>\tðÅÒ×ÏÎÁÞÁÌØÎÁÑ ×ÙÓÏÔÁ ÏËÎÁ × ÓÔÒÏËÁÈ"
+msgstr "--rows <число>\tПервоначальная высота окна в строках"
 
-#: main.c:2598
+#: main.c:2607
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
 msgstr ""
 "\n"
-"áÒÇÕÍÅÎÔÙ ÄÌÑ gvim (×ÅÒÓÉÑ GTK+):\n"
+"Аргументы для gvim (версия GTK+):\n"
 
-#: main.c:2602
+#: main.c:2611
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr ""
-"-display <ÄÉÓÐÌÅÊ>\túÁÐÕÓÔÉÔØ vim ÎÁ ÕËÁÚÁÎÎÏÍ <ÄÉÓÐÌÅÅ> (ÔÁËÖÅ: --display)"
+"-display <дисплей>\tЗапустить vim на указанном <дисплее> (также: --display)"
 
-#: main.c:2604
+#: main.c:2613
 msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr ""
-"--role <ÒÏÌØ>\tõÓÔÁÎÏ×ÉÔØ ÕÎÉËÁÌØÎÕÀ <ÒÏÌØ> ÄÌÑ ÉÄÅÎÔÉÆÉËÁÃÉÉ ÇÌÁ×ÎÏÇÏ ÏËÎÁ"
+"--role <роль>\tУстановить уникальную <роль> для идентификации главного окна"
 
-#: main.c:2606
+#: main.c:2615
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-msgstr "--socketid <xid>\tïÔËÒÙÔØ Vim ×ÎÕÔÒÉ ÄÒÕÇÏÇÏ ËÏÍÐÏÎÅÎÔÁ GTK"
+msgstr "--socketid <xid>\tОткрыть Vim внутри другого компонента GTK"
 
-#: main.c:2609
+#: main.c:2618
 msgid "-P <parent title>\tOpen Vim inside parent application"
-msgstr "-P <ÚÁÇÏÌÏ×ÏË ÒÏÄÉÔÅÌÑ>\tïÔËÒÙÔØ Vim × ÒÏÄÉÔÅÌØÓËÏÍ ÐÒÉÌÏÖÅÎÉÉ"
+msgstr "-P <заголовок родителя>\tОткрыть Vim в родительском приложении"
 
-#: main.c:2847
+#: main.c:2856
 msgid "No display"
-msgstr "îÅÔ ÄÉÓÐÌÅÑ"
+msgstr "Нет дисплея"
 
 #. Failed to send, abort.
-#: main.c:2862
+#: main.c:2871
 msgid ": Send failed.\n"
-msgstr ": ïÔÐÒÁ×ËÁ ÎÅ ÕÄÁÌÁÓØ.\n"
+msgstr ": Отправка не удалась.\n"
 
 #. Let vim start normally.
-#: main.c:2868
+#: main.c:2877
 msgid ": Send failed. Trying to execute locally\n"
-msgstr ": ïÔÐÒÁ×ËÁ ÎÅ ÕÄÁÌÁÓØ. ðÏÐÙÔËÁ ÍÅÓÔÎÏÇÏ ×ÙÐÏÌÎÅÎÉÑ\n"
+msgstr ": Отправка не удалась. Попытка местного выполнения\n"
 
-#: main.c:2906 main.c:2927
+#: main.c:2915 main.c:2936
 #, c-format
 msgid "%d of %d edited"
-msgstr "ÏÔÒÅÄÁËÔÉÒÏ×ÁÎÏ %d ÉÚ %d"
+msgstr "отредактировано %d из %d"
 
-#: main.c:2949
+#: main.c:2958
 msgid "No display: Send expression failed.\n"
-msgstr "îÅÔ ÄÉÓÐÌÅÑ: ÏÔÐÒÁ×ËÁ ×ÙÒÁÖÅÎÉÑ ÎÅ ÕÄÁÌÁÓØ.\n"
+msgstr "Нет дисплея: отправка выражения не удалась.\n"
 
-#: main.c:2961
+#: main.c:2970
 msgid ": Send expression failed.\n"
-msgstr ": ïÔÐÒÁ×ËÁ ×ÙÒÁÖÅÎÉÑ ÎÅ ÕÄÁÌÁÓØ.\n"
+msgstr ": Отправка выражения не удалась.\n"
 
 #: mark.c:709
 msgid "No marks set"
-msgstr "îÅÔ ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÏÔÍÅÔÏË"
+msgstr "Нет установленных отметок"
 
 #: mark.c:711
 #, c-format
 msgid "E283: No marks matching \"%s\""
-msgstr "E283: îÅÔ ÏÔÍÅÔÏË, ÓÏ×ÐÁÄÁÀÝÉÈ Ó \"%s\""
+msgstr "E283: Нет отметок, совпадающих с \"%s\""
 
 #. Highlight title
 #: mark.c:722
@@ -3443,7 +3452,7 @@
 "mark line  col file/text"
 msgstr ""
 "\n"
-"ÏÔÍÅÔ ÓÔÒ  ËÏÌ ÆÁÊÌ/ÔÅËÓÔ"
+"отмет стр  кол файл/текст"
 
 #. Highlight title
 #: mark.c:760
@@ -3452,7 +3461,7 @@
 " jump line  col file/text"
 msgstr ""
 "\n"
-"ÐÒÙÖÏË ÓÔÒ  ËÏÌ ÆÁÊÌ/ÔÅËÓÔ"
+"прыжок стр  кол файл/текст"
 
 #. Highlight title
 #: mark.c:805
@@ -3461,7 +3470,7 @@
 "change line  col text"
 msgstr ""
 "\n"
-"ÉÚÍÅÎ.  ÓÔÒ  ËÏÌ ÔÅËÓÔ"
+"измен.  стр  кол текст"
 
 #: mark.c:1281
 #, c-format
@@ -3470,7 +3479,7 @@
 "# File marks:\n"
 msgstr ""
 "\n"
-"# çÌÏÂÁÌØÎÙÅ ÏÔÍÅÔËÉ:\n"
+"# Глобальные отметки:\n"
 
 #. Write the jumplist with -'
 #: mark.c:1316
@@ -3480,7 +3489,7 @@
 "# Jumplist (newest first):\n"
 msgstr ""
 "\n"
-"# óÐÉÓÏË ÐÒÙÖËÏ× (ÓÎÁÞÁÌÁ ÂÏÌÅÅ Ó×ÅÖÉÅ):\n"
+"# Список прыжков (сначала более свежие):\n"
 
 #: mark.c:1412
 #, c-format
@@ -3489,476 +3498,476 @@
 "# History of marks within files (newest to oldest):\n"
 msgstr ""
 "\n"
-"# éÓÔÏÒÉÑ ÍÅÓÔÎÙÈ ÏÔÍÅÔÏË (ÏÔ ÂÏÌÅÅ Ó×ÅÖÉÈ Ë ÓÔÁÒÙÍ):\n"
+"# История местных отметок (от более свежих к старым):\n"
 
 #: mark.c:1501
 msgid "Missing '>'"
-msgstr "ðÒÏÐÕÝÅÎÁ '>'"
+msgstr "Пропущена '>'"
 
 #: mbyte.c:467
 msgid "E543: Not a valid codepage"
-msgstr "E543: îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ËÏÄÉÒÏ×ËÉ"
+msgstr "E543: Недопустимое имя кодировки"
 
 #: mbyte.c:4431
 msgid "E284: Cannot set IC values"
-msgstr "E284: îÅ×ÏÚÍÏÖÎÏ ÎÁÚÎÁÞÉÔØ ÚÎÁÞÅÎÉÑ ËÏÎÔÅËÓÔÁ ××ÏÄÁ"
+msgstr "E284: Невозможно назначить значения контекста ввода"
 
 #: mbyte.c:4583
 msgid "E285: Failed to create input context"
-msgstr "E285: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÏÎÔÅËÓÔ ××ÏÄÁ"
+msgstr "E285: Невозможно создать контекст ввода"
 
 #: mbyte.c:4741
 msgid "E286: Failed to open input method"
-msgstr "E286: îÅÕÄÁÞÎÁÑ ÐÏÐÙÔËÁ ÏÔËÒÙÔØ ÍÅÔÏÄ ××ÏÄÁ"
+msgstr "E286: Неудачная попытка открыть метод ввода"
 
 #: mbyte.c:4752
 msgid "E287: Warning: Could not set destroy callback to IM"
 msgstr ""
-"E287: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÚÎÁÞÉÔØ ÏÂÒ. ×ÙÚÏ× ÕÎÉÞÔÏÖÅÎÉÑ ÍÅÔÏÄÁ "
-"××ÏÄÁ"
+"E287: Предупреждение: невозможно назначить обр. вызов уничтожения метода "
+"ввода"
 
 #: mbyte.c:4758
 msgid "E288: input method doesn't support any style"
-msgstr "E288: ÍÅÔÏÄ ××ÏÄÁ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÓÔÉÌÉ"
+msgstr "E288: метод ввода не поддерживает стили"
 
 #: mbyte.c:4815
 msgid "E289: input method doesn't support my preedit type"
 msgstr ""
-"E289: ÍÅÔÏÄ ××ÏÄÁ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÍÏÊ ÔÉÐ ÐÒÅÄ×ÁÒÉÔÅÌØÎÏÇÏ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ"
+"E289: метод ввода не поддерживает мой тип предварительного редактирования"
 
 #: mbyte.c:4889
 msgid "E290: over-the-spot style requires fontset"
-msgstr "E290: ÓÔÉÌØ \"ÎÁÄ ÍÅÓÔÏÍ\" ÔÒÅÂÕÅÔ ÕËÁÚÁÎÉÑ ÛÒÉÆÔÏ×ÏÇÏ ÎÁÂÏÒÁ"
+msgstr "E290: стиль \"над местом\" требует указания шрифтового набора"
 
 #: mbyte.c:4925
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
 msgstr ""
-"E291: GTK+ ÂÏÌÅÅ ÒÁÎÎÅÊ ×ÅÒÓÉÉ, ÞÅÍ 1.2.3. ïÂÌÁÓÔØ ÓÏÓÔÏÑÎÉÑ ÎÅ ÒÁÂÏÔÁÅÔ."
+"E291: GTK+ более ранней версии, чем 1.2.3. Область состояния не работает."
 
 #: mbyte.c:5232
 msgid "E292: Input Method Server is not running"
-msgstr "E292: óÅÒ×ÅÒ ÍÅÔÏÄÁ ××ÏÄÁ ÎÅ ÚÁÐÕÝÅÎ"
+msgstr "E292: Сервер метода ввода не запущен"
 
 #: memfile.c:488
 msgid "E293: block was not locked"
-msgstr "E293: ÂÌÏË ÎÅ ÚÁÂÌÏËÉÒÏ×ÁÎ"
-
-#: memfile.c:1005
-msgid "E294: Seek error in swap file read"
-msgstr "E294: ïÛÉÂËÁ ÐÏÉÓËÁ ÐÒÉ ÞÔÅÎÉÉ Ó×ÏÐ-ÆÁÊÌÁ"
+msgstr "E293: блок не заблокирован"
 
 #: memfile.c:1010
+msgid "E294: Seek error in swap file read"
+msgstr "E294: Ошибка поиска при чтении своп-файла"
+
+#: memfile.c:1015
 msgid "E295: Read error in swap file"
-msgstr "E295: ïÛÉÂËÁ ÞÔÅÎÉÑ Ó×ÏÐ-ÆÁÊÌÁ"
+msgstr "E295: Ошибка чтения своп-файла"
 
-#: memfile.c:1062
+#: memfile.c:1067
 msgid "E296: Seek error in swap file write"
-msgstr "E296: ïÛÉÂËÁ ÐÏÉÓËÁ ÐÒÉ ÚÁÐÉÓÉ Ó×ÏÐ-ÆÁÊÌÁ"
+msgstr "E296: Ошибка поиска при записи своп-файла"
 
-#: memfile.c:1080
+#: memfile.c:1085
 msgid "E297: Write error in swap file"
-msgstr "E297: ïÛÉÂËÁ ÐÒÉ ÚÁÐÉÓÉ Ó×ÏÐ-ÆÁÊÌÁ"
+msgstr "E297: Ошибка при записи своп-файла"
 
-#: memfile.c:1277
+#: memfile.c:1282
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr ""
-"E300: ó×ÏÐ-ÆÁÊÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ (ÁÔÁËÁ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÓÉÍ×ÏÌØÎÏÊ ÓÓÙÌËÉ?)"
+"E300: Своп-файл уже существует (атака с использованием символьной ссылки?)"
 
 #: memline.c:275
 msgid "E298: Didn't get block nr 0?"
-msgstr "E298: îÅ ÐÏÌÕÞÅÎ ÂÌÏË ÎÏÍÅÒ 0?"
+msgstr "E298: Не получен блок номер 0?"
 
 #: memline.c:315
 msgid "E298: Didn't get block nr 1?"
-msgstr "E298: îÅ ÐÏÌÕÞÅÎ ÂÌÏË ÎÏÍÅÒ 1?"
+msgstr "E298: Не получен блок номер 1?"
 
 #: memline.c:333
 msgid "E298: Didn't get block nr 2?"
-msgstr "E298: îÅ ÐÏÌÕÞÅÎ ÂÌÏË ÎÏÍÅÒ 2?"
+msgstr "E298: Не получен блок номер 2?"
 
 #. could not (re)open the swap file, what can we do????
-#: memline.c:443
+#: memline.c:444
 msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ïÊ, ÐÏÔÅÒÑÌÓÑ Ó×ÏÐ-ÆÁÊÌ!!!"
+msgstr "E301: Ой, потерялся своп-файл!!!"
 
-#: memline.c:448
+#: memline.c:449
 msgid "E302: Could not rename swap file"
-msgstr "E302: îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÉÍÅÎÏ×ÁÔØ Ó×ÏÐ-ÆÁÊÌ"
+msgstr "E302: Невозможно переименовать своп-файл"
 
-#: memline.c:518
+#: memline.c:519
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr ""
-"E303: îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ Ó×ÏÐ-ÆÁÊÌ ÄÌÑ \"%s\", ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÎÅ×ÏÚÍÏÖÎÏ"
+"E303: Не удалось открыть своп-файл для \"%s\", восстановление невозможно"
 
-#: memline.c:617
+#: memline.c:618
 msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: îÅ ÐÏÌÕÞÅÎ ÂÌÏË 0??"
+msgstr "E304: ml_timestamp: Не получен блок 0??"
 
-#: memline.c:757
+#: memline.c:758
 #, c-format
 msgid "E305: No swap file found for %s"
-msgstr "E305: ó×ÏÐ-ÆÁÊÌ ÄÌÑ %s ÎÅ ÎÁÊÄÅÎ"
+msgstr "E305: Своп-файл для %s не найден"
 
-#: memline.c:767
+#: memline.c:768
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr ""
-"÷×ÅÄÉÔÅ ÎÏÍÅÒ Ó×ÏÐ-ÆÁÊÌÁ, ËÏÔÏÒÙÊ ÓÌÅÄÕÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ (0 ÄÌÑ ×ÙÈÏÄÁ): "
+"Введите номер своп-файла, который следует использовать (0 для выхода): "
 
-#: memline.c:812
+#: memline.c:813
 #, c-format
 msgid "E306: Cannot open %s"
-msgstr "E306: îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s"
+msgstr "E306: Не могу открыть %s"
 
-#: memline.c:834
+#: memline.c:835
 msgid "Unable to read block 0 from "
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÂÌÏË 0 ÉÚ "
+msgstr "Невозможно прочитать блок 0 из "
 
-#: memline.c:837
+#: memline.c:838
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"îÅÔ ÉÚÍÅÎÅÎÉÊ, ÉÌÉ Vim ÎÅ ÓÍÏÇ ÏÂÎÏ×ÉÔØ Ó×ÏÐ-ÆÁÊÌ"
+"Нет изменений, или Vim не смог обновить своп-файл"
 
-#: memline.c:847 memline.c:864
+#: memline.c:848 memline.c:865
 msgid " cannot be used with this version of Vim.\n"
-msgstr " ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ × ÄÁÎÎÏÊ ×ÅÒÓÉÉ Vim.\n"
+msgstr " нельзя использовать в данной версии Vim.\n"
 
-#: memline.c:849
+#: memline.c:850
 msgid "Use Vim version 3.0.\n"
-msgstr "éÓÐÏÌØÚÕÊÔÅ Vim ×ÅÒÓÉÉ 3.0.\n"
+msgstr "Используйте Vim версии 3.0.\n"
 
-#: memline.c:855
+#: memline.c:856
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s ÎÅ Ñ×ÌÑÅÔÓÑ Ó×ÏÐ-ÆÁÊÌÏÍ Vim"
+msgstr "E307: %s не является своп-файлом Vim"
 
-#: memline.c:868
+#: memline.c:869
 msgid " cannot be used on this computer.\n"
-msgstr " ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÎÁ ÜÔÏÍ ËÏÍÐØÀÔÅÒÅ.\n"
+msgstr " нельзя использовать на этом компьютере.\n"
 
-#: memline.c:870
+#: memline.c:871
 msgid "The file was created on "
-msgstr "æÁÊÌ ÂÙÌ ÓÏÚÄÁÎ "
+msgstr "Файл был создан "
 
-#: memline.c:874
+#: memline.c:875
 msgid ""
 ",\n"
 "or the file has been damaged."
 msgstr ""
 ",\n"
-"ÌÉÂÏ ÆÁÊÌ ÂÙÌ ÐÏ×ÒÅÖÄ£Î."
+"либо файл был повреждён."
 
-#: memline.c:903
+#: memline.c:904
 #, c-format
 msgid "Using swap file \"%s\""
-msgstr "éÓÐÏÌØÚÕÅÔÓÑ Ó×ÏÐ-ÆÁÊÌ \"%s\""
+msgstr "Используется своп-файл \"%s\""
 
-#: memline.c:909
+#: memline.c:910
 #, c-format
 msgid "Original file \"%s\""
-msgstr "éÓÈÏÄÎÙÊ ÆÁÊÌ \"%s\""
+msgstr "Исходный файл \"%s\""
 
-#: memline.c:922
+#: memline.c:923
 msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÉÓÈÏÄÎÙÊ ÆÁÊÌ ÍÏÇ ÂÙÔØ ÉÚÍÅΣÎ"
+msgstr "E308: Предупреждение: исходный файл мог быть изменён"
 
-#: memline.c:975
+#: memline.c:976
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÂÌÏË 1 ÉÚ %s"
+msgstr "E309: Невозможно прочитать блок 1 из %s"
 
-#: memline.c:979
+#: memline.c:980
 msgid "???MANY LINES MISSING"
-msgstr "???ïôóõôóô÷õåô íîïçï óôòïë"
+msgstr "???ОТСУТСТВУЕТ МНОГО СТРОК"
 
-#: memline.c:995
+#: memline.c:996
 msgid "???LINE COUNT WRONG"
-msgstr "???îåðòá÷éìøîïå úîáþåîéå óþåôþéëá óôòïë"
+msgstr "???НЕПРАВИЛЬНОЕ ЗНАЧЕНИЕ СЧЕТЧИКА СТРОК"
 
-#: memline.c:1002
+#: memline.c:1003
 msgid "???EMPTY BLOCK"
-msgstr "???ðõóôïê âìïë"
+msgstr "???ПУСТОЙ БЛОК"
 
-#: memline.c:1028
+#: memline.c:1029
 msgid "???LINES MISSING"
-msgstr "???ïôóõôóô÷õàô óôòïëé"
+msgstr "???ОТСУТСТВУЮТ СТРОКИ"
 
-#: memline.c:1060
+#: memline.c:1061
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: ÎÅÐÒÁ×ÉÌØÎÙÊ ÂÌÏË 1 ID (%s ÎÅ Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ .swp?)"
+msgstr "E310: неправильный блок 1 ID (%s не является файлом .swp?)"
 
-#: memline.c:1065
+#: memline.c:1066
 msgid "???BLOCK MISSING"
-msgstr "???ðòïðõýåî âìïë"
+msgstr "???ПРОПУЩЕН БЛОК"
 
-#: memline.c:1081
+#: memline.c:1082
 msgid "??? from here until ???END lines may be messed up"
-msgstr "???ÓÔÒÏËÉ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÒÞÅÎÙ ÏÔÓÀÄÁ ÄÏ ???ëïîãá"
+msgstr "???строки могут быть испорчены отсюда до ???КОНЦА"
 
-#: memline.c:1097
+#: memline.c:1098
 msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "???ÓÔÒÏËÉ ÍÏÇÌÉ ÂÙÔØ ×ÓÔÁ×ÌÅÎÙ ÉÌÉ ÕÄÁÌÅÎÙ ÏÔÓÀÄÁ ÄÏ ???ëïîãá"
+msgstr "???строки могли быть вставлены или удалены отсюда до ???КОНЦА"
 
-#: memline.c:1117
+#: memline.c:1118
 msgid "???END"
-msgstr "???ëïîåã"
+msgstr "???КОНЕЦ"
 
-#: memline.c:1143
+#: memline.c:1144
 msgid "E311: Recovery Interrupted"
-msgstr "E311: ÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÐÒÅÒ×ÁÎÏ"
+msgstr "E311: Восстановление прервано"
 
-#: memline.c:1148
+#: memline.c:1149
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
-"E312: ÷Ï ×ÒÅÍÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÏÂÎÁÒÕÖÅÎÙ ÏÛÉÂËÉ; ÓÍ. ÓÔÒÏËÉ, ÎÁÞÉÎÁÀÝÉÅÓÑ "
-"Ó ???"
+"E312: Во время восстановления обнаружены ошибки; см. строки, начинающиеся "
+"с ???"
 
-#: memline.c:1150
+#: memline.c:1151
 msgid "See \":help E312\" for more information."
-msgstr "óÍ. ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ × ÓÐÒÁ×ÏÞÎÉËÅ (\":help E312\")"
-
-#: memline.c:1155
-msgid "Recovery completed. You should check if everything is OK."
-msgstr "÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÚÁ×ÅÒÛÅÎÏ. ðÒÏ×ÅÒØÔÅ, ×Ó£ ÌÉ × ÐÏÒÑÄËÅ."
+msgstr "См. дополнительную информацию в справочнике (\":help E312\")"
 
 #: memline.c:1156
+msgid "Recovery completed. You should check if everything is OK."
+msgstr "Восстановление завершено. Проверьте, всё ли в порядке."
+
+#: memline.c:1157
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
 msgstr ""
 "\n"
-"(íÏÖÅÔÅ ÚÁÐÉÓÁÔØ ÆÁÊÌ ÐÏÄ ÄÒÕÇÉÍ ÉÍÅÎÅÍ É ÓÒÁ×ÎÉÔØ ÅÇÏ Ó ÉÓÈÏÄÎÙÍ\n"
-
-#: memline.c:1157
-msgid "and run diff with the original file to check for changes)\n"
-msgstr "ÆÁÊÌÏÍ ÐÒÉ ÐÏÍÏÝÉ ÐÒÏÇÒÁÍÍÙ diff).\n"
+"(Можете записать файл под другим именем и сравнить его с исходным\n"
 
 #: memline.c:1158
+msgid "and run diff with the original file to check for changes)\n"
+msgstr "файлом при помощи программы diff).\n"
+
+#: memline.c:1159
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
 msgstr ""
-"úÁÔÅÍ ÕÄÁÌÉÔÅ ÆÁÊÌ .swp.\n"
+"Затем удалите файл .swp.\n"
 "\n"
 
 #. use msg() to start the scrolling properly
-#: memline.c:1214
+#: memline.c:1215
 msgid "Swap files found:"
-msgstr "ïÂÎÁÒÕÖÅÎÙ Ó×ÏÐ-ÆÁÊÌÙ:"
+msgstr "Обнаружены своп-файлы:"
 
-#: memline.c:1392
+#: memline.c:1393
 msgid "   In current directory:\n"
-msgstr "   ÷ ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ:\n"
+msgstr "   В текущем каталоге:\n"
 
-#: memline.c:1394
+#: memline.c:1395
 msgid "   Using specified name:\n"
-msgstr "   ó ÕËÁÚÁÎÎÙÍ ÉÍÅÎÅÍ:\n"
+msgstr "   С указанным именем:\n"
 
-#: memline.c:1398
+#: memline.c:1399
 msgid "   In directory "
-msgstr "   ÷ ËÁÔÁÌÏÇÅ   "
+msgstr "   В каталоге   "
 
-#: memline.c:1416
+#: memline.c:1417
 msgid "      -- none --\n"
-msgstr "      -- ÎÅÔ --\n"
+msgstr "      -- нет --\n"
 
-#: memline.c:1488
+#: memline.c:1489
 msgid "          owned by: "
-msgstr "          ×ÌÁÄÅÌÅÃ: "
+msgstr "          владелец: "
 
-#: memline.c:1490
+#: memline.c:1491
 msgid "   dated: "
-msgstr "    ÄÁÔÁ: "
+msgstr "    дата: "
 
-#: memline.c:1494 memline.c:3684
+#: memline.c:1495 memline.c:3685
 msgid "             dated: "
-msgstr "              ÄÁÔÁ: "
+msgstr "              дата: "
 
-#: memline.c:1510
+#: memline.c:1511
 msgid "         [from Vim version 3.0]"
-msgstr "         [ÏÔ Vim ×ÅÒÓÉÉ 3.0]"
+msgstr "         [от Vim версии 3.0]"
 
-#: memline.c:1514
+#: memline.c:1515
 msgid "         [does not look like a Vim swap file]"
-msgstr "         [ÎÅ Ñ×ÌÑÅÔÓÑ Ó×ÏÐ-ÆÁÊÌÏÍ Vim]"
+msgstr "         [не является своп-файлом Vim]"
 
-#: memline.c:1518
+#: memline.c:1519
 msgid "         file name: "
-msgstr "         ÉÍÑ ÆÁÊÌÁ: "
+msgstr "         имя файла: "
 
-#: memline.c:1524
+#: memline.c:1525
 msgid ""
 "\n"
 "          modified: "
 msgstr ""
 "\n"
-"           ÉÚÍÅΣÎ: "
+"           изменён: "
 
-#: memline.c:1525
+#: memline.c:1526
 msgid "YES"
-msgstr "äá"
+msgstr "ДА"
 
-#: memline.c:1525
+#: memline.c:1526
 msgid "no"
-msgstr "ÎÅÔ"
+msgstr "нет"
 
-#: memline.c:1529
+#: memline.c:1530
 msgid ""
 "\n"
 "         user name: "
 msgstr ""
 "\n"
-"      ÐÏÌØÚÏ×ÁÔÅÌØ: "
+"      пользователь: "
 
-#: memline.c:1536
+#: memline.c:1537
 msgid "   host name: "
-msgstr "  ËÏÍÐØÀÔÅÒ: "
+msgstr "  компьютер: "
 
-#: memline.c:1538
+#: memline.c:1539
 msgid ""
 "\n"
 "         host name: "
 msgstr ""
 "\n"
-"         ËÏÍÐØÀÔÅÒ: "
+"         компьютер: "
 
-#: memline.c:1544
+#: memline.c:1545
 msgid ""
 "\n"
 "        process ID: "
 msgstr ""
 "\n"
-"           ÐÒÏÃÅÓÓ: "
+"           процесс: "
 
-#: memline.c:1550
+#: memline.c:1551
 msgid " (still running)"
-msgstr " (ÅÝ£ ×ÙÐÏÌÎÑÅÔÓÑ)"
+msgstr " (ещё выполняется)"
 
-#: memline.c:1562
+#: memline.c:1563
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
 msgstr ""
 "\n"
-"         [ÎÅ ÐÒÉÇÏÄÅÎ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ Ó ÄÁÎÎÏÊ ×ÅÒÓÉÅÊ Vim]"
+"         [не пригоден для использования с данной версией Vim]"
 
-#: memline.c:1565
+#: memline.c:1566
 msgid ""
 "\n"
 "         [not usable on this computer]"
 msgstr ""
 "\n"
-"         [ÎÅ ÐÒÉÇÏÄÅÎ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÎÁ ÜÔÏÍ ËÏÍÐØÀÔÅÒÅ]"
+"         [не пригоден для использования на этом компьютере]"
 
-#: memline.c:1570
+#: memline.c:1571
 msgid "         [cannot be read]"
-msgstr "         [ÎÅ ÞÉÔÁÅÔÓÑ]"
+msgstr "         [не читается]"
 
-#: memline.c:1574
+#: memline.c:1575
 msgid "         [cannot be opened]"
-msgstr "         [ÎÅ ÏÔËÒÙ×ÁÅÔÓÑ]"
+msgstr "         [не открывается]"
 
-#: memline.c:1764
+#: memline.c:1765
 msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: îÅ×ÏÚÍÏÖÎÏ ÏÂÎÏ×ÉÔØ Ó×ÏÐ-ÆÁÊÌ, ÐÏÓËÏÌØËÕ ÏÎ ÎÅ ÏÂÎÁÒÕÖÅÎ"
+msgstr "E313: Невозможно обновить своп-файл, поскольку он не обнаружен"
 
-#: memline.c:1817
+#: memline.c:1818
 msgid "File preserved"
-msgstr "ó×ÏÐ-ÆÁÊÌ ÏÂÎÏ×Ì£Î"
+msgstr "Своп-файл обновлён"
 
-#: memline.c:1819
+#: memline.c:1820
 msgid "E314: Preserve failed"
-msgstr "E314: îÅÕÄÁÞÎÁÑ ÐÏÐÙÔËÁ ÏÂÎÏ×ÌÅÎÉÑ Ó×ÏÐ-ÆÁÊÌÁ"
+msgstr "E314: Неудачная попытка обновления своп-файла"
 
-#: memline.c:1890
+#: memline.c:1891
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
-msgstr "E315: ml_get: ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ lnum: %ld"
+msgstr "E315: ml_get: неправильное значение lnum: %ld"
 
-#: memline.c:1916
+#: memline.c:1917
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: ÎÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÓÔÒÏËÕ %ld"
+msgstr "E316: ml_get: невозможно найти строку %ld"
 
-#: memline.c:2306
+#: memline.c:2307
 msgid "E317: pointer block id wrong 3"
-msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÕËÁÚÁÔÅÌÑ ÂÌÏËÁ 3"
+msgstr "неправильное значение указателя блока 3"
 
-#: memline.c:2386
+#: memline.c:2387
 msgid "stack_idx should be 0"
-msgstr "ÚÎÁÞÅÎÉÅ stack_idx ÄÏÌÖÎÏ ÂÙÔØ ÒÁ×ÎÏ 0"
+msgstr "значение stack_idx должно быть равно 0"
 
-#: memline.c:2448
+#: memline.c:2449
 msgid "E318: Updated too many blocks?"
-msgstr "E318: ïÂÎÏ×ÌÅÎÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÂÌÏËÏ×?"
+msgstr "E318: Обновлено слишком много блоков?"
 
-#: memline.c:2630
+#: memline.c:2631
 msgid "E317: pointer block id wrong 4"
-msgstr "E317: ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÕËÁÚÁÔÅÌÑ ÂÌÏËÁ 4"
+msgstr "E317: неправильное значение указателя блока 4"
 
-#: memline.c:2657
+#: memline.c:2658
 msgid "deleted block 1?"
-msgstr "ÕÄẠ́ΠÂÌÏË 1?"
+msgstr "удалён блок 1?"
 
-#: memline.c:2857
+#: memline.c:2858
 #, c-format
 msgid "E320: Cannot find line %ld"
-msgstr "E320: óÔÒÏËÁ %ld ÎÅ ÏÂÎÁÒÕÖÅÎÁ"
+msgstr "E320: Строка %ld не обнаружена"
 
-#: memline.c:3100
+#: memline.c:3101
 msgid "E317: pointer block id wrong"
-msgstr "E317: ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÕËÁÚÁÔÅÌÑ ÂÌÏËÁ"
+msgstr "E317: неправильное значение указателя блока"
 
-#: memline.c:3116
+#: memline.c:3117
 msgid "pe_line_count is zero"
-msgstr "ÚÎÁÞÅÎÉÅ pe_line_count ÒÁ×ÎÏ ÎÕÌÀ"
+msgstr "значение pe_line_count равно нулю"
 
-#: memline.c:3145
+#: memline.c:3146
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
-msgstr "E322: ÎÏÍÅÒ ÓÔÒÏËÉ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ: %ld"
+msgstr "E322: номер строки за пределами диапазона: %ld"
 
-#: memline.c:3149
+#: memline.c:3150
 #, c-format
 msgid "E323: line count wrong in block %ld"
-msgstr "E323: ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÓÞ£ÔÞÉËÁ ÓÔÒÏË × ÂÌÏËÅ %ld"
+msgstr "E323: неправильное значение счётчика строк в блоке %ld"
 
-#: memline.c:3198
+#: memline.c:3199
 msgid "Stack size increases"
-msgstr "òÁÚÍÅÒ ÓÔÅËÁ Õ×ÅÌÉÞÅÎ"
+msgstr "Размер стека увеличен"
 
-#: memline.c:3244
+#: memline.c:3245
 msgid "E317: pointer block id wrong 2"
-msgstr "E317: ÎÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÕËÁÚÁÔÅÌÑ ÂÌÏËÁ 2"
-
-#: memline.c:3674
-msgid "E325: ATTENTION"
-msgstr "E325: ÷îéíáîéå"
+msgstr "E317: неправильное значение указателя блока 2"
 
 #: memline.c:3675
+msgid "E325: ATTENTION"
+msgstr "E325: ВНИМАНИЕ"
+
+#: memline.c:3676
 msgid ""
 "\n"
 "Found a swap file by the name \""
 msgstr ""
 "\n"
-"ïÂÎÁÒÕÖÅÎ Ó×ÏÐ-ÆÁÊÌ Ó ÉÍÅÎÅÍ \""
+"Обнаружен своп-файл с именем \""
 
-#: memline.c:3679
+#: memline.c:3680
 msgid "While opening file \""
-msgstr "ðÒÉ ÏÔËÒÙÔÉÉ ÆÁÊÌÁ: \""
+msgstr "При открытии файла: \""
 
-#: memline.c:3688
+#: memline.c:3689
 msgid "      NEWER than swap file!\n"
-msgstr "                    âÏÌÅÅ ó÷åöéê, ÞÅÍ Ó×ÏÐ-ÆÁÊÌ!\n"
+msgstr "                    Более СВЕЖИЙ, чем своп-файл!\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
-#: memline.c:3692
+#: memline.c:3693
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.\n"
@@ -3966,63 +3975,63 @@
 "    different instances of the same file when making changes.\n"
 msgstr ""
 "\n"
-"(1) ÷ÏÚÍÏÖÎÏ, ÒÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÁÊÌÁ ×ÙÐÏÌÎÑÅÔÓÑ × ÄÒÕÇÏÊ ÐÒÏÇÒÁÍÍÅ.\n"
-"    åÓÌÉ ÜÔÏ ÔÁË, ÔÏ ÂÕÄØÔÅ ×ÎÉÍÁÔÅÌØÎÙ ÐÒÉ ×ÎÅÓÅÎÉÉ ÉÚÍÅÎÅÎÉÊ,\n"
-"    ÞÔÏÂÙ Õ ×ÁÓ ÎÅ ÐÏÑ×ÉÌÏÓØ Ä×Á ÒÁÚÎÙÈ ×ÁÒÉÁÎÔÁ ÏÄÎÏÇÏ É ÔÏÇÏ ÖÅ ÆÁÊÌÁ.\n"
-
-#: memline.c:3693
-msgid "    Quit, or continue with caution.\n"
-msgstr "    úÁ×ÅÒÛÉÔÅ ÒÁÂÏÔÕ ÉÌÉ ÐÒÏÄÏÌÖÁÊÔÅ Ó ÏÓÔÏÒÏÖÎÏÓÔØÀ.\n"
+"(1) Возможно, редактирование файла выполняется в другой программе.\n"
+"    Если это так, то будьте внимательны при внесении изменений,\n"
+"    чтобы у вас не появилось два разных варианта одного и того же файла.\n"
 
 #: memline.c:3694
+msgid "    Quit, or continue with caution.\n"
+msgstr "    Завершите работу или продолжайте с осторожностью.\n"
+
+#: memline.c:3695
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
 msgstr ""
 "\n"
-"(2) ðÒÅÄÙÄÕÝÉÊ ÓÅÁÎÓ ÒÅÄÁËÔÉÒÏ×ÁÎÉÑ ÜÔÏÇÏ ÆÁÊÌÁ ÚÁ×ÅÒۣΠÁ×ÁÒÉÊÎÏ.\n"
+"(2) Предыдущий сеанс редактирования этого файла завершён аварийно.\n"
 
-#: memline.c:3695
+#: memline.c:3696
 msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ÷ ÜÔÏÍ ÓÌÕÞÁÅ, ÉÓÐÏÌØÚÕÊÔÅ ËÏÍÁÎÄÕ \":recover\" ÉÌÉ \"vim -r "
+msgstr "    В этом случае, используйте команду \":recover\" или \"vim -r "
 
-#: memline.c:3697
+#: memline.c:3698
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
 "\"\n"
-"    ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÉÚÍÅÎÅÎÉÊ (ÓÍ. \":help ×ÏÓÓÔÁÎÏ×ÌÅÎÉÅ\").\n"
+"    для восстановления изменений (см. \":help восстановление\").\n"
 
-#: memline.c:3698
+#: memline.c:3699
 msgid "    If you did this already, delete the swap file \""
-msgstr "    åÓÌÉ ×Ù ÕÖÅ ×ÙÐÏÌÎÑÌÉ ÜÔÕ ÏÐÅÒÁÃÉÀ, ÕÄÁÌÉÔÅ Ó×ÏÐ-ÆÁÊÌ \""
+msgstr "    Если вы уже выполняли эту операцию, удалите своп-файл \""
 
-#: memline.c:3700
+#: memline.c:3701
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
 msgstr ""
 "\"\n"
-"    ÞÔÏÂÙ ÉÚÂÅÖÁÔØ ÐÏÑ×ÌÅÎÉÑ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ × ÂÕÄÕÝÅÍ.\n"
+"    чтобы избежать появления этого сообщения в будущем.\n"
 
-#: memline.c:3714 memline.c:3718
+#: memline.c:3715 memline.c:3719
 msgid "Swap file \""
-msgstr "ó×ÏÐ-ÆÁÊÌ \""
+msgstr "Своп-файл \""
 
-#: memline.c:3715 memline.c:3721
+#: memline.c:3716 memline.c:3722
 msgid "\" already exists!"
-msgstr "\" ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ!"
+msgstr "\" уже существует!"
 
-#: memline.c:3724
+#: memline.c:3725
 msgid "VIM - ATTENTION"
-msgstr "VIM - ÷îéíáîéå"
+msgstr "VIM - ВНИМАНИЕ"
 
-#: memline.c:3726
+#: memline.c:3727
 msgid "Swap file already exists!"
-msgstr "ó×ÏÐ-ÆÁÊÌ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ!"
+msgstr "Своп-файл уже существует!"
 
-#: memline.c:3730
+#: memline.c:3731
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4030,13 +4039,13 @@
 "&Quit\n"
 "&Abort"
 msgstr ""
-"&O ïÔËÒÙÔØ ÄÌÑ ÞÔÅÎÉÑ\n"
-"&E òÅÄÁËÔÉÒÏ×ÁÔØ\n"
-"&R ÷ÏÓÓÔÁÎÏ×ÉÔØ\n"
-"&Q ÷ÙÈÏÄ\n"
-"&A ðÒÅÒ×ÁÔØ"
+"&O Открыть для чтения\n"
+"&E Редактировать\n"
+"&R Восстановить\n"
+"&Q Выход\n"
+"&A Прервать"
 
-#: memline.c:3732
+#: memline.c:3733
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4045,40 +4054,40 @@
 "&Abort\n"
 "&Delete it"
 msgstr ""
-"&O ïÔËÒÙÔØ ÄÌÑ ÞÔÅÎÉÑ\n"
-"&E òÅÄÁËÔÉÒÏ×ÁÔØ\n"
-"&R ÷ÏÓÓÔÁÎÏ×ÉÔØ\n"
-"&Q ÷ÙÈÏÄ\n"
-"&A ðÒÅÒ×ÁÔØ\n"
-"&D õÄÁÌÉÔØ"
+"&O Открыть для чтения\n"
+"&E Редактировать\n"
+"&R Восстановить\n"
+"&Q Выход\n"
+"&A Прервать\n"
+"&D Удалить"
 
-#: memline.c:3789
+#: memline.c:3790
 msgid "E326: Too many swap files found"
-msgstr "E326: ïÂÎÁÒÕÖÅÎÏ ÓÌÉÛËÏÍ ÍÎÏÇÏ Ó×ÏÐ-ÆÁÊÌÏ×"
+msgstr "E326: Обнаружено слишком много своп-файлов"
 
 #: menu.c:64
 msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: ëÏÍÐÏÎÅÎÔ ÐÕÔÉ Ë ÜÌÅÍÅÎÔÕ ÍÅÎÀ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÏÄÍÅÎÀ"
+msgstr "E327: Компонент пути к элементу меню не является подменю"
 
 #: menu.c:65
 msgid "E328: Menu only exists in another mode"
-msgstr "E328: íÅÎÀ × ÜÔÏÍ ÒÅÖÉÍÅ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
+msgstr "E328: Меню в этом режиме не существует"
 
 #: menu.c:66
 msgid "E329: No menu of that name"
-msgstr "E329: îÅÔ ÍÅÎÀ Ó ÔÁËÉÍ ÉÍÅÎÅÍ"
+msgstr "E329: Нет меню с таким именем"
 
 #: menu.c:525
 msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: ðÕÔØ Ë ÍÅÎÀ ÎÅ ÄÏÌÖÅÎ ×ÅÓÔÉ Ë ÐÏÄÍÅÎÀ"
+msgstr "E330: Путь к меню не должен вести к подменю"
 
 #: menu.c:564
 msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: üÌÅÍÅÎÔÙ ÍÅÎÀ ÎÅÌØÚÑ ÄÏÂÁ×ÌÑÔØ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ × ÐÏÌÏÓËÕ ÍÅÎÀ"
+msgstr "E331: Элементы меню нельзя добавлять непосредственно в полоску меню"
 
 #: menu.c:570
 msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: òÁÚÄÅÌÉÔÅÌÉ ÎÅ ÍÏÇÕÔ ÂÙÔØ ËÏÍÐÏÎÅÎÔÏÍ ÐÕÔÉ Ë ÍÅÎÀ"
+msgstr "E332: Разделители не могут быть компонентом пути к меню"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
@@ -4088,91 +4097,91 @@
 "--- Menus ---"
 msgstr ""
 "\n"
-"--- íÅÎÀ ---"
+"--- Меню ---"
 
 #: menu.c:2019
 msgid "Tear off this menu"
-msgstr "ïÔÏÒ×ÁÔØ ÜÔÏ ÍÅÎÀ"
+msgstr "Оторвать это меню"
 
 #: menu.c:2084
 msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: ðÕÔØ Ë ÍÅÎÀ ÄÏÌÖÅÎ ×ÅÓÔÉ Ë ÜÌÅÍÅÎÔÕ ÍÅÎÀ"
+msgstr "E333: Путь к меню должен вести к элементу меню"
 
 #: menu.c:2104
 #, c-format
 msgid "E334: Menu not found: %s"
-msgstr "E334: íÅÎÀ ÎÅ ÎÁÊÄÅÎÏ: %s"
+msgstr "E334: Меню не найдено: %s"
 
 #: menu.c:2173
 #, c-format
 msgid "E335: Menu not defined for %s mode"
-msgstr "E335: íÅÎÀ ÎÅ ÏÐÒÅÄÅÌÅÎÏ ÄÌÑ ÒÅÖÉÍÁ %s"
+msgstr "E335: Меню не определено для режима %s"
 
 #: menu.c:2211
 msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: ðÕÔØ Ë ÍÅÎÀ ÄÏÌÖÅÎ ×ÅÓÔÉ Ë ÐÏÄÍÅÎÀ"
+msgstr "E336: Путь к меню должен вести к подменю"
 
 #: menu.c:2232
 msgid "E337: Menu not found - check menu names"
-msgstr "E337: íÅÎÀ ÎÅ ÎÁÊÄÅÎÏ -- ÐÒÏ×ÅÒØÔÅ ÉÍÅÎÁ ÍÅÎÀ"
+msgstr "E337: Меню не найдено -- проверьте имена меню"
 
 #: message.c:414
 #, c-format
 msgid "Error detected while processing %s:"
-msgstr "ïÂÎÁÒÕÖÅÎÁ ÏÛÉÂËÁ ÐÒÉ ÏÂÒÁÂÏÔËÅ %s:"
+msgstr "Обнаружена ошибка при обработке %s:"
 
 #: message.c:440
 #, c-format
 msgid "line %4ld:"
-msgstr "ÓÔÒÏËÁ %4ld:"
+msgstr "строка %4ld:"
 
 #: message.c:647
 msgid "[string too long]"
-msgstr "[ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ ÓÔÒÏËÁ]"
+msgstr "[слишком длинная строка]"
 
 #: message.c:797
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
 msgstr ""
-"ðÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÊ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË: ÷ÁÓÉÌÉÊ òÁÇÏÚÉÎ <vrr@users.sourceforge."
+"Перевод сообщений на русский язык: Василий Рагозин <vrr@users.sourceforge."
 "net>"
 
 #: message.c:1025
 msgid "Interrupt: "
-msgstr "ðÒÅÒÙ×ÁÎÉÅ: "
+msgstr "Прерывание: "
 
 #: message.c:1028
 msgid "Hit ENTER to continue"
-msgstr "äÌÑ ÐÒÏÄÏÌÖÅÎÉÑ ÎÁÖÍÉÔÅ ENTER"
+msgstr "Для продолжения нажмите ENTER"
 
 #: message.c:1030
 msgid "Hit ENTER or type command to continue"
-msgstr "äÌÑ ÐÒÏÄÏÌÖÅÎÉÑ ÎÁÖÍÉÔÅ ENTER ÉÌÉ ××ÅÄÉÔÅ ËÏÍÁÎÄÕ"
+msgstr "Для продолжения нажмите ENTER или введите команду"
 
 #: message.c:2351
 msgid "-- More --"
-msgstr "-- ðÒÏÄÏÌÖÅÎÉÅ ÓÌÅÄÕÅÔ --"
+msgstr "-- Продолжение следует --"
 
 #: message.c:2354
 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-msgstr " (RET/BS: ÓÔÒÏËÁ, SPACE/b: ÓÔÒÁÎÉÃÁ, d/u: ÐÏÌÓÔÒÁÎÉÃÙ, q: ×ÙÈÏÄ)"
+msgstr " (RET/BS: строка, SPACE/b: страница, d/u: полстраницы, q: выход)"
 
 #: message.c:2355
 msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-msgstr " (RET: ÓÔÒÏËÁ, SPACE: ÓÔÒÁÎÉÃÁ, d: ÐÏÌÓÔÒÁÎÉÃÙ, q: ×ÙÈÏÄ)"
+msgstr " (RET: строка, SPACE: страница, d: полстраницы, q: выход)"
 
-#: message.c:2976 message.c:2991
+#: message.c:2982 message.c:2997
 msgid "Question"
-msgstr "÷ÏÐÒÏÓ"
+msgstr "Вопрос"
 
-#: message.c:2978
+#: message.c:2984
 msgid ""
 "&Yes\n"
 "&No"
 msgstr ""
-"&äÁ\n"
-"&îÅÔ"
+"&Да\n"
+"&Нет"
 
-#: message.c:3011
+#: message.c:3017
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4180,65 +4189,65 @@
 "&Discard All\n"
 "&Cancel"
 msgstr ""
-"&äÁ\n"
-"&îÅÔ\n"
-"óÏÈÒÁÎÉÔØ &×ÓÅ\n"
-"&ðÏÔÅÒÑÔØ ×ÓÅ\n"
-"ï&ÔÍÅÎÁ"
+"&Да\n"
+"&Нет\n"
+"Сохранить &все\n"
+"&Потерять все\n"
+"О&тмена"
 
-#: message.c:3052
+#: message.c:3058
 msgid "Save File dialog"
-msgstr "óÏÈÒÁÎÅÎÉÅ ÆÁÊÌÁ"
+msgstr "Сохранение файла"
 
-#: message.c:3054
+#: message.c:3060
 msgid "Open File dialog"
-msgstr "ïÔËÒÙÔÉÅ ÆÁÊÌÁ"
+msgstr "Открытие файла"
 
 #. TODO: non-GUI file selector here
-#: message.c:3125
+#: message.c:3131
 msgid "E338: Sorry, no file browser in console mode"
 msgstr ""
-"E338: éÚ×ÉÎÉÔÅ, ÎÏ × ËÏÎÓÏÌØÎÏÍ ÒÅÖÉÍÅ ÎÅÔ ÐÒÏ×ÏÄÎÉËÁ ÐÏ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ"
+"E338: Извините, но в консольном режиме нет проводника по файловой системе"
 
 #: misc1.c:2773
 msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: éÚÍÅÎÅÎÉÅ ÆÁÊÌÁ Ó ÐÒÁ×ÁÍÉ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
+msgstr "W10: Предупреждение: Изменение файла с правами только для чтения"
 
 #: misc1.c:3021
 msgid "1 more line"
-msgstr "äÏÂÁ×ÌÅÎÁ ÏÄÎÁ ÓÔÒÏËÁ"
+msgstr "Добавлена одна строка"
 
 #: misc1.c:3023
 msgid "1 line less"
-msgstr "õÄÁÌÅÎÁ ÏÄÎÁ ÓÔÒÏËÁ"
+msgstr "Удалена одна строка"
 
 #: misc1.c:3028
 #, c-format
 msgid "%ld more lines"
-msgstr "äÏÂÁ×ÌÅÎÏ ÓÔÒÏË: %ld"
+msgstr "Добавлено строк: %ld"
 
 #: misc1.c:3030
 #, c-format
 msgid "%ld fewer lines"
-msgstr "õÄÁÌÅÎÏ ÓÔÒÏË: %ld"
+msgstr "Удалено строк: %ld"
 
 #: misc1.c:3033
 msgid " (Interrupted)"
-msgstr " (ðÒÅÒ×ÁÎÏ)"
+msgstr " (Прервано)"
 
 #: misc1.c:7588
 msgid "Vim: preserving files...\n"
-msgstr "Vim: ÓÏÈÒÁÎÑÀÔÓÑ ÆÁÊÌÙ...\n"
+msgstr "Vim: сохраняются файлы...\n"
 
 #. close all memfiles, without deleting
 #: misc1.c:7598
 msgid "Vim: Finished.\n"
-msgstr "Vim: çÏÔÏ×Ï.\n"
+msgstr "Vim: Готово.\n"
 
 #: misc2.c:695 misc2.c:711
 #, c-format
 msgid "ERROR: "
-msgstr "ïûéâëá: "
+msgstr "ОШИБКА: "
 
 #: misc2.c:715
 #, c-format
@@ -4247,7 +4256,7 @@
 "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
 msgstr ""
 "\n"
-"[ÂÁÊÔ] ×ÓÅÇÏ ×ÙÄÅÌ.-ÏÓ×ÏÂ. %lu-%lu, ÉÓÐÏÌØÚ. %lu, ÍÁËÓ. ÉÓÐÏÌØÚ. %lu\n"
+"[байт] всего выдел.-освоб. %lu-%lu, использ. %lu, макс. использ. %lu\n"
 
 #: misc2.c:717
 #, c-format
@@ -4255,59 +4264,59 @@
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
 "\n"
 msgstr ""
-"[×ÙÚÏ×Ù] re/malloc() ×ÓÅÇÏ %lu, free() ×ÓÅÇÏ %lu\n"
+"[вызовы] re/malloc() всего %lu, free() всего %lu\n"
 "\n"
 
 #: misc2.c:772
 msgid "E340: Line is becoming too long"
-msgstr "E340: óÔÒÏËÁ ÓÔÁÎÏ×ÉÔÓÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÊ"
+msgstr "E340: Строка становится слишком длинной"
 
 #: misc2.c:816
 #, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: lalloc(%ld, )"
+msgstr "E341: Внутренняя ошибка: lalloc(%ld, )"
 
 #: misc2.c:924
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
-msgstr "E342: îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ! (×ÙÄÅÌÑÅÔÓÑ %lu ÂÁÊÔ)"
+msgstr "E342: Не хватает памяти! (выделяется %lu байт)"
 
 #: misc2.c:2594
 #, c-format
 msgid "Calling shell to execute: \"%s\""
-msgstr "÷ÙÚÏ× ÏÂÏÌÏÞËÉ ÄÌÑ ÉÓÐÏÌÎÅÎÉÑ: \"%s\""
+msgstr "Вызов оболочки для исполнения: \"%s\""
 
 #: misc2.c:2816
 msgid "E545: Missing colon"
-msgstr "E545: ðÒÏÐÕÝÅÎÏ Ä×ÏÅÔÏÞÉÅ"
+msgstr "E545: Пропущено двоеточие"
 
 #: misc2.c:2818 misc2.c:2845
 msgid "E546: Illegal mode"
-msgstr "E546: îÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ"
+msgstr "E546: Недопустимый режим"
 
 #: misc2.c:2884
 msgid "E547: Illegal mouseshape"
-msgstr "E547: îÅÄÏÐÕÓÔÉÍÁÑ ÆÏÒÍÁ ËÕÒÓÏÒÁ"
+msgstr "E547: Недопустимая форма курсора"
 
 #: misc2.c:2924
 msgid "E548: digit expected"
-msgstr "E548: ÔÒÅÂÕÅÔÓÑ ××ÅÓÔÉ ÃÉÆÒÕ"
+msgstr "E548: требуется ввести цифру"
 
 #: misc2.c:2929
 msgid "E549: Illegal percentage"
-msgstr "E549: îÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ ÐÒÏÃÅÎÔÏ×"
+msgstr "E549: Недопустимое значение процентов"
 
 #: misc2.c:3239
 msgid "Enter encryption key: "
-msgstr "÷×ÅÄÉÔÅ ÐÁÒÏÌØ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ: "
+msgstr "Введите пароль для шифрования: "
 
 #: misc2.c:3240
 msgid "Enter same key again: "
-msgstr "        ðÏ×ÔÏÒÉÔÅ ××ÏÄ ÐÁÒÏÌÑ:"
+msgstr "        Повторите ввод пароля:"
 
 #: misc2.c:3250
 msgid "Keys don't match!"
-msgstr "÷×ÅÄ£ÎÎÙÅ ÐÁÒÏÌÉ ÎÅ ÓÏ×ÐÁÄÁÀÔ!"
+msgstr "Введённые пароли не совпадают!"
 
 #: misc2.c:3799
 #, c-format
@@ -4315,236 +4324,236 @@
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
 msgstr ""
-"E343: îÅÐÒÁ×ÉÌØÎÏ ÚÁÄÁÎ ÐÕÔØ: '**[ÞÉÓÌÏ]' ÄÏÌÖÎÏ ÂÙÔØ ÌÉÂÏ × ËÏÎÃÅ ÐÕÔÉ, "
-"ÌÉÂÏ ÚÁ ÎÉÍ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ '%s'"
+"E343: Неправильно задан путь: '**[число]' должно быть либо в конце пути, "
+"либо за ним должно следовать '%s'"
 
 #: misc2.c:5078
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: ëÁÔÁÌÏÇ \"%s\" ÎÅ ÎÁÊÄÅÎ × ÐÕÔÉ ÄÌÑ ÓÍÅÎÙ ËÁÔÁÌÏÇÁ"
+msgstr "E344: Каталог \"%s\" не найден в пути для смены каталога"
 
 #: misc2.c:5081
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: æÁÊÌ \"%s\" × ÉÚ×ÅÓÔÎÙÈ ËÁÔÁÌÏÇÁÈ ÎÅ ÎÁÊÄÅÎ"
+msgstr "E345: Файл \"%s\" в известных каталогах не найден"
 
 #: misc2.c:5087
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: ÷ ÐÕÔÉ ÓÍÅÎÙ ËÁÔÁÌÏÇÁ ÂÏÌØÛÅ ÎÅÔ ËÁÔÁÌÏÇÏ× \"%s\""
+msgstr "E346: В пути смены каталога больше нет каталогов \"%s\""
 
 #: misc2.c:5090
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: ÷ ÉÚ×ÅÓÔÎÙÈ ËÁÔÁÌÏÇÁÈ ÂÏÌØÛÅ ÎÅÔ ÆÁÊÌÏ× \"%s\""
+msgstr "E347: В известных каталогах больше нет файлов \"%s\""
 
 #: misc2.c:5324
 msgid "E550: Missing colon"
-msgstr "E550: ðÒÏÐÕÝÅÎÏ Ä×ÏÅÔÏÞÉÅ"
+msgstr "E550: Пропущено двоеточие"
 
 #: misc2.c:5336
 msgid "E551: Illegal component"
-msgstr "E551: îÅÄÏÐÕÓÔÉÍÙÊ ËÏÍÐÏÎÅÎÔ"
+msgstr "E551: Недопустимый компонент"
 
 #: misc2.c:5344
 msgid "E552: digit expected"
-msgstr "E552: ôÒÅÂÕÅÔÓÑ ÕËÁÚÁÔØ ÃÉÆÒÕ"
+msgstr "E552: Требуется указать цифру"
 
 #. Get here when the server can't be found.
 #: netbeans.c:396
 msgid "Cannot connect to Netbeans #2"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÅÄÉÎÉÔØÓÑ Ó Netbeans #2"
+msgstr "Невозможно соединиться с Netbeans #2"
 
 #: netbeans.c:404
 msgid "Cannot connect to Netbeans"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÅÄÉÎÉÔØÓÑ Ó NetBeans"
+msgstr "Невозможно соединиться с NetBeans"
 
 #: netbeans.c:450
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
-"E668: îÅÐÒÁ×ÉÌØÎÙÊ ÒÅÖÉÍ ÄÏÓÔÕÐÁ Ë ÉÎÆÏÒÍÁÃÉÉ Ï ÓÏÅÄÉÎÅÎÉÉ Ó NetBeans: \"%s\""
+"E668: Неправильный режим доступа к информации о соединении с NetBeans: \"%s\""
 
 #: netbeans.c:749
 msgid "read from Netbeans socket"
-msgstr "ÞÔÅÎÉÅ ÉÚ ÇÎÅÚÄÁ NetBeans"
+msgstr "чтение из гнезда NetBeans"
 
 #: netbeans.c:1643
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: ðÏÔÅÒÑÎÏ ÓÏÅÄÉÎÅÎÉÅ Ó NetBeans ÄÌÑ ÂÕÆÅÒÁ %ld"
+msgstr "E658: Потеряно соединение с NetBeans для буфера %ld"
 
-#: normal.c:2980
+#: normal.c:2983
 msgid "Warning: terminal cannot highlight"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÔÅÒÍÉÎÁÌ ÎÅ ÍÏÖÅÔ ×ÙÐÏÌÎÑÔØ ÐÏÄÓ×ÅÔËÕ"
+msgstr "Предупреждение: терминал не может выполнять подсветку"
 
-#: normal.c:3276
+#: normal.c:3279
 msgid "E348: No string under cursor"
-msgstr "E348: îÅÔ ÓÔÒÏËÉ × ÐÏÚÉÃÉÉ ËÕÒÓÏÒÁ"
+msgstr "E348: Нет строки в позиции курсора"
 
-#: normal.c:3278
+#: normal.c:3281
 msgid "E349: No identifier under cursor"
-msgstr "E349: îÅÔ ÉÍÅÎÉ × ÐÏÚÉÃÉÉ ËÕÒÓÏÒÁ"
+msgstr "E349: Нет имени в позиции курсора"
 
-#: normal.c:4519
+#: normal.c:4522
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr ""
-"E352: îÅ×ÏÚÍÏÖÎÏ ÓÔÅÒÅÔØ ÓËÌÁÄËÉ Ó ÔÅËÕÝÉÍ ÚÎÁÞÅÎÉÅÍ ÏÐÃÉÉ 'foldmethod'"
+"E352: Невозможно стереть складки с текущим значением опции 'foldmethod'"
 
-#: normal.c:6740
+#: normal.c:6743
 msgid "E664: changelist is empty"
-msgstr "E664: ÓÐÉÓÏË ÉÚÍÅÎÅÎÉÊ ÐÕÓÔÏÊ"
+msgstr "E664: список изменений пустой"
 
-#: normal.c:6742
+#: normal.c:6745
 msgid "E662: At start of changelist"
-msgstr "E662: ÷ ÎÁÞÁÌÅ ÓÐÉÓËÁ ÉÚÍÅÎÅÎÉÊ"
+msgstr "E662: В начале списка изменений"
 
-#: normal.c:6744
+#: normal.c:6747
 msgid "E663: At end of changelist"
-msgstr "E662: ÷ ËÏÎÃÅ ÓÐÉÓËÁ ÉÚÍÅÎÅÎÉÊ"
+msgstr "E662: В конце списка изменений"
 
-#: normal.c:8005
+#: normal.c:8009
 msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "÷×ÅÄÉÔÅ :quit<Enter>  ÄÌÑ ×ÙÈÏÄÁ ÉÚ Vim"
+msgstr "Введите :quit<Enter>  для выхода из Vim"
 
 #: ops.c:294
 #, c-format
 msgid "1 line %sed 1 time"
-msgstr "éÚÍÅÎÅÎÙ ÏÔÓÔÕÐÙ × 1 ÓÔÒÏËÅ (%s 1 ÒÁÚ)"
+msgstr "Изменены отступы в 1 строке (%s 1 раз)"
 
 #: ops.c:296
 #, c-format
 msgid "1 line %sed %d times"
-msgstr "éÚÍÅÎÅÎÙ ÏÔÓÔÕÐÙ × 1 ÓÔÒÏËÅ (%s %d ÒÁÚ)"
+msgstr "Изменены отступы в 1 строке (%s %d раз)"
 
 #: ops.c:301
 #, c-format
 msgid "%ld lines %sed 1 time"
-msgstr "éÚÍÅÎÅÎÙ ÏÔÓÔÕÐÙ, %ld ÓÔÒÏË (%s 1 ÒÁÚ)"
+msgstr "Изменены отступы, %ld строк (%s 1 раз)"
 
 #: ops.c:304
 #, c-format
 msgid "%ld lines %sed %d times"
-msgstr "éÚÍÅÎÅÎÙ ÏÔÓÔÕÐÙ, %ld ÓÔÒÏË (%s %d ÒÁÚ)"
+msgstr "Изменены отступы, %ld строк (%s %d раз)"
 
 #: ops.c:662
 #, c-format
 msgid "%ld lines to indent... "
-msgstr "éÚÍÅÎÑÀÔÓÑ ÏÔÓÔÕÐÙ ÓÔÒÏËÁÈ (%ld)..."
+msgstr "Изменяются отступы строках (%ld)..."
 
 #: ops.c:712
 msgid "1 line indented "
-msgstr "éÚÍÅΣΠÏÔÓÔÕÐ × ÏÄÎÏÊ ÓÔÒÏËÅ "
+msgstr "Изменён отступ в одной строке "
 
 #: ops.c:714
 #, c-format
 msgid "%ld lines indented "
-msgstr "éÚÍÅÎÅÎÙ ÏÔÓÔÕÐÙ × ÓÔÒÏËÁÈ (%ld) "
+msgstr "Изменены отступы в строках (%ld) "
 
 #. must display the prompt
-#: ops.c:1675
+#: ops.c:1688
 msgid "cannot yank; delete anyway"
-msgstr "ÓËÏÐÉÒÏ×ÁÔØ ÎÅ ÕÄÁÌÏÓØ, ÕÄÁÌÅÎÉÅ ×ÙÐÏÌÎÅÎÏ"
+msgstr "скопировать не удалось, удаление выполнено"
 
-#: ops.c:2261
+#: ops.c:2274
 msgid "1 line changed"
-msgstr "ÉÚÍÅÎÅÎÁ 1 ÓÔÒÏËÁ"
+msgstr "изменена 1 строка"
 
-#: ops.c:2263
+#: ops.c:2276
 #, c-format
 msgid "%ld lines changed"
-msgstr "ÉÚÍÅÎÅÎÏ ÓÔÒÏË: %ld"
+msgstr "изменено строк: %ld"
 
-#: ops.c:2647
+#: ops.c:2660
 #, c-format
 msgid "freeing %ld lines"
-msgstr "ÏÞÉÝÅÎÏ ÓÔÒÏË: %ld"
+msgstr "очищено строк: %ld"
 
-#: ops.c:2928
+#: ops.c:2941
 msgid "1 line yanked"
-msgstr "ÓËÏÐÉÒÏ×ÁÎÁ ÏÄÎÁ ÓÔÒÏËÁ"
+msgstr "скопирована одна строка"
 
-#: ops.c:2930
+#: ops.c:2943
 #, c-format
 msgid "%ld lines yanked"
-msgstr "ÓËÏÐÉÒÏ×ÁÎÏ ÓÔÒÏË: %ld"
+msgstr "скопировано строк: %ld"
 
-#: ops.c:3215
+#: ops.c:3228
 #, c-format
 msgid "E353: Nothing in register %s"
-msgstr "E353: ÷ ÒÅÇÉÓÔÒÅ %s ÎÉÞÅÇÏ ÎÅÔ"
+msgstr "E353: В регистре %s ничего нет"
 
 #. Highlight title
-#: ops.c:3766
+#: ops.c:3779
 msgid ""
 "\n"
 "--- Registers ---"
 msgstr ""
 "\n"
-"--- òÅÇÉÓÔÒÙ ---"
+"--- Регистры ---"
 
-#: ops.c:5075
+#: ops.c:5088
 msgid "Illegal register name"
-msgstr "îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ÒÅÇÉÓÔÒÁ"
+msgstr "Недопустимое имя регистра"
 
-#: ops.c:5163
+#: ops.c:5176
 #, c-format
 msgid ""
 "\n"
 "# Registers:\n"
 msgstr ""
 "\n"
-"# òÅÇÉÓÔÒÙ:\n"
+"# Регистры:\n"
 
-#: ops.c:5213
+#: ops.c:5226
 #, c-format
 msgid "E574: Unknown register type %d"
-msgstr "E574: îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÒÅÇÉÓÔÒÁ %d"
+msgstr "E574: Неизвестный тип регистра %d"
 
-#: ops.c:5698
+#: ops.c:5711
 #, c-format
 msgid "E354: Invalid register name: '%s'"
-msgstr "E354: îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ÒÅÇÉÓÔÒÁ: '%s'"
+msgstr "E354: Недопустимое имя регистра: '%s'"
 
-#: ops.c:6058
+#: ops.c:6071
 #, c-format
 msgid "%ld Cols; "
-msgstr "ëÏÌÏÎÏË: %ld; "
+msgstr "Колонок: %ld; "
 
-#: ops.c:6065
+#: ops.c:6078
 #, c-format
 msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "÷ÙÄÅÌÅÎÏ %s%ld ÉÚ %ld ÓÔÒÏË; %ld ÉÚ %ld ÓÌÏ×; %ld ÉÚ %ld ÂÁÊÔ"
+msgstr "Выделено %s%ld из %ld строк; %ld из %ld слов; %ld из %ld байт"
 
-#: ops.c:6081
+#: ops.c:6094
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "ëÏÌ. %s ÉÚ %s;  ÓÔÒ. %ld ÉÚ %ld; ÓÌÏ×Ï %ld ÉÚ %ld; ÂÁÊÔ %ld ÉÚ %ld"
+msgstr "Кол. %s из %s;  стр. %ld из %ld; слово %ld из %ld; байт %ld из %ld"
 
-#: ops.c:6092
+#: ops.c:6105
 #, c-format
 msgid "(+%ld for BOM)"
-msgstr "(+%ld Ó ÕÞ£ÔÏÍ BOM)"
+msgstr "(+%ld с учётом BOM)"
 
 #: option.c:1643
 msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=óÔÒ. %N"
+msgstr "%<%f%h%m%=Стр. %N"
 
 #: option.c:2092
 msgid "Thanks for flying Vim"
-msgstr "âÌÁÇÏÄÁÒÉÍ ÚÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ Vim"
+msgstr "Благодарим за использование Vim"
 
 #: option.c:3419 option.c:3535
 msgid "E518: Unknown option"
-msgstr "E518: îÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ"
+msgstr "E518: Неизвестная опция"
 
 #: option.c:3432
 msgid "E519: Option not supported"
-msgstr "E519: ïÐÃÉÑ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
+msgstr "E519: Опция не поддерживается"
 
 #: option.c:3457
 msgid "E520: Not allowed in a modeline"
-msgstr "E520: îÅ ÄÏÐÕÓËÁÅÔÓÑ × ÒÅÖÉÍÎÏÊ ÓÔÒÏËÅ"
+msgstr "E520: Не допускается в режимной строке"
 
 #: option.c:3522
 msgid ""
@@ -4552,319 +4561,319 @@
 "\tLast set from "
 msgstr ""
 "\n"
-"\t÷ ÐÏÓÌÅÄÎÉÊ ÒÁÚ ÏÐÃÉÑ ÉÚÍÅÎÅÎÁ × "
+"\tВ последний раз опция изменена в "
 
 #: option.c:3661
 msgid "E521: Number required after ="
-msgstr "E521: ðÏÓÌÅ = ÔÒÅÂÕÅÔÓÑ ÕËÁÚÁÔØ ÞÉÓÌÏ"
+msgstr "E521: После = требуется указать число"
 
 #: option.c:3989 option.c:4619
 msgid "E522: Not found in termcap"
-msgstr "E522: îÅ ÏÂÎÁÒÕÖÅÎÏ × termcap"
+msgstr "E522: Не обнаружено в termcap"
 
 #: option.c:4064
 #, c-format
 msgid "E539: Illegal character <%s>"
-msgstr "E539: îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ <%s>"
+msgstr "E539: Недопустимый символ <%s>"
 
 #: option.c:4611
 msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: úÎÁÞÅÎÉÅ ÏÐÃÉÉ 'term' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÕÓÔÏÊ ÓÔÒÏËÏÊ"
+msgstr "E529: Значение опции 'term' не может быть пустой строкой"
 
 #: option.c:4614
 msgid "E530: Cannot change term in GUI"
-msgstr "E530: ÷ ÇÒÁÆÉÞÅÓËÏÍ ÉÎÔÅÒÆÅÊÓÅ ÉÚÍÅÎÑÔØ ÔÅÒÍÉÎÁÌ ÎÅ×ÏÚÍÏÖÎÏ"
+msgstr "E530: В графическом интерфейсе изменять терминал невозможно"
 
 #: option.c:4616
 msgid "E531: Use \":gui\" to start the GUI"
-msgstr "E531: äÌÑ ÚÁÐÕÓËÁ ÇÒÁÆÉÞÅÓËÏÇÏ ÉÎÔÅÒÆÅÊÓÁ ÉÓÐÏÌØÚÕÊÔÅ \":gui\""
+msgstr "E531: Для запуска графического интерфейса используйте \":gui\""
 
 #: option.c:4645
 msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: ÚÎÁÞÅÎÉÑ ÏÐÃÉÊ 'backupext' É 'patchmode' ÒÁ×ÎÙ"
+msgstr "E589: значения опций 'backupext' и 'patchmode' равны"
 
 #: option.c:4860
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-msgstr "E617: îÅ ÍÏÖÅÔ ÂÙÔØ ÉÚÍÅÎÅÎÏ × ÇÒÁÆÉÞÅÓËÏÍ ÉÎÔÅÒÆÅÊÓÅ GTK+ 2"
+msgstr "E617: Не может быть изменено в графическом интерфейсе GTK+ 2"
 
 #: option.c:5016
 msgid "E524: Missing colon"
-msgstr "E524: ðÒÏÐÕÝÅÎÏ Ä×ÏÅÔÏÞÉÅ"
+msgstr "E524: Пропущено двоеточие"
 
 #: option.c:5018
 msgid "E525: Zero length string"
-msgstr "E525: óÔÒÏËÁ Ó ÎÕÌÅ×ÏÊ ÄÌÉÎÏÊ"
+msgstr "E525: Строка с нулевой длиной"
 
 #: option.c:5086
 #, c-format
 msgid "E526: Missing number after <%s>"
-msgstr "E526: ðÒÏÐÕÝÅÎÏ ÞÉÓÌÏ ÐÏÓÌÅ <%s>"
+msgstr "E526: Пропущено число после <%s>"
 
 #: option.c:5100
 msgid "E527: Missing comma"
-msgstr "E527: ðÒÏÐÕÝÅÎÁ ÚÁÐÑÔÁÑ"
+msgstr "E527: Пропущена запятая"
 
 #: option.c:5107
 msgid "E528: Must specify a ' value"
-msgstr "E528: îÅÏÂÈÏÄÉÍÏ ÕËÁÚÁÔØ ÚÎÁÞÅÎÉÅ ÄÌÑ '"
+msgstr "E528: Необходимо указать значение для '"
 
 #: option.c:5148
 msgid "E595: contains unprintable or wide character"
-msgstr "E595: ÓÏÄÅÒÖÉÔ ÎÅÐÅÞÁÔÎÙÊ ÓÉÍ×ÏÌ ÉÌÉ ÓÉÍ×ÏÌ Ä×ÏÊÎÏÊ ÛÉÒÉÎÙ"
+msgstr "E595: содержит непечатный символ или символ двойной ширины"
 
 #: option.c:5197
 msgid "E596: Invalid font(s)"
-msgstr "E596: îÅÐÒÁ×ÉÌØÎÙÅ ÛÒÉÆÔÙ"
+msgstr "E596: Неправильные шрифты"
 
 #: option.c:5205
 msgid "E597: can't select fontset"
-msgstr "E597: ÎÅ×ÏÚÍÏÖÎÏ ×ÙÂÒÁÔØ ÛÒÉÆÔÏ×ÏÊ ÎÁÂÏÒ"
+msgstr "E597: невозможно выбрать шрифтовой набор"
 
 #: option.c:5207
 msgid "E598: Invalid fontset"
-msgstr "E598: îÅÐÒÁ×ÉÌØÎÙÊ ÛÒÉÆÔÏ×ÏÊ ÎÁÂÏÒ"
+msgstr "E598: Неправильный шрифтовой набор"
 
 #: option.c:5214
 msgid "E533: can't select wide font"
-msgstr "E533: ÎÅ×ÏÚÍÏÖÎÏ ×ÙÂÒÁÔØ ÛÒÉÆÔ Ó ÓÉÍ×ÏÌÁÍÉ Ä×ÏÊÎÏÊ ÛÉÒÉÎÙ"
+msgstr "E533: невозможно выбрать шрифт с символами двойной ширины"
 
 #: option.c:5216
 msgid "E534: Invalid wide font"
-msgstr "E534: îÅÐÒÁ×ÉÌØÎÙÊ ÛÒÉÆÔ Ó ÓÉÍ×ÏÌÁÍÉ Ä×ÏÊÎÏÊ ÛÉÒÉÎÙ"
+msgstr "E534: Неправильный шрифт с символами двойной ширины"
 
 #: option.c:5486
 #, c-format
 msgid "E535: Illegal character after <%c>"
-msgstr "E535: îÅÐÒÁ×ÉÌØÎÙÊ ÓÉÍ×ÏÌ ÐÏÓÌÅ <%c>"
+msgstr "E535: Неправильный символ после <%c>"
 
 #: option.c:5597
 msgid "E536: comma required"
-msgstr "E536: ÔÒÅÂÕÅÔÓÑ ÚÁÐÑÔÁÑ"
+msgstr "E536: требуется запятая"
 
 #: option.c:5607
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr ""
-"E537: úÎÁÞÅÎÉÅ ÏÐÃÉÑ 'commentstring' ÄÏÌÖÎÏ ÂÙÔØ ÐÕÓÔÏÊ ÓÔÒÏËÏÊ ÉÌÉ "
-"ÓÏÄÅÒÖÁÔØ %s"
+"E537: Значение опция 'commentstring' должно быть пустой строкой или "
+"содержать %s"
 
-#: option.c:5679
+#: option.c:5682
 msgid "E538: No mouse support"
-msgstr "E538: íÙÛØ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
+msgstr "E538: Мышь не поддерживается"
 
-#: option.c:5947
+#: option.c:5950
 msgid "E540: Unclosed expression sequence"
-msgstr "E540: îÅÚÁËÒÙÔÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ×ÙÒÁÖÅÎÉÑ"
+msgstr "E540: Незакрытая последовательность выражения"
 
-#: option.c:5951
+#: option.c:5954
 msgid "E541: too many items"
-msgstr "E541: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÜÌÅÍÅÎÔÏ×"
+msgstr "E541: слишком много элементов"
 
-#: option.c:5953
+#: option.c:5956
 msgid "E542: unbalanced groups"
-msgstr "E542: ÎÅÓÂÁÌÁÎÓÉÒÏ×ÁÎÎÙÅ ÇÒÕÐÐÙ"
+msgstr "E542: несбалансированные группы"
 
-#: option.c:6193
+#: option.c:6196
 msgid "E590: A preview window already exists"
-msgstr "E590: ïËÎÏ ÐÒÅÄÐÒÏÓÍÏÔÒÁ ÕÖÅ ÅÓÔØ"
+msgstr "E590: Окно предпросмотра уже есть"
 
-#: option.c:6450
+#: option.c:6453
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
-"W17: áÒÁÂÓËÉÊ ÔÒÅÂÕÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÑ UTF-8, ××ÅÄÉÔÅ ':set encoding=utf-8'"
+"W17: Арабский требует использования UTF-8, введите ':set encoding=utf-8'"
 
-#: option.c:6783
+#: option.c:6786
 #, c-format
 msgid "E593: Need at least %d lines"
-msgstr "E593: îÕÖÎÏ ÈÏÔÑ ÂÙ %d ÓÔÒÏË"
+msgstr "E593: Нужно хотя бы %d строк"
 
-#: option.c:6793
+#: option.c:6796
 #, c-format
 msgid "E594: Need at least %d columns"
-msgstr "E594: îÕÖÎÏ ÈÏÔÑ ÂÙ %d ËÏÌÏÎÏË"
+msgstr "E594: Нужно хотя бы %d колонок"
 
-#: option.c:7100
+#: option.c:7103
 #, c-format
 msgid "E355: Unknown option: %s"
-msgstr "E355: îÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ: %s"
+msgstr "E355: Неизвестная опция: %s"
 
-#: option.c:7220
+#: option.c:7223
 msgid ""
 "\n"
 "--- Terminal codes ---"
 msgstr ""
 "\n"
-"--- ôÅÒÍÉÎÁÌØÎÙÅ ËÏÄÙ ---"
+"--- Терминальные коды ---"
 
-#: option.c:7222
+#: option.c:7225
 msgid ""
 "\n"
 "--- Global option values ---"
 msgstr ""
 "\n"
-"--- çÌÏÂÁÌØÎÙÅ ÚÎÁÞÅÎÉÑ ÏÐÃÉÊ ---"
+"--- Глобальные значения опций ---"
 
-#: option.c:7224
+#: option.c:7227
 msgid ""
 "\n"
 "--- Local option values ---"
 msgstr ""
 "\n"
-"--- íÅÓÔÎÙÅ ÚÎÁÞÅÎÉÑ ÏÐÃÉÊ ---"
+"--- Местные значения опций ---"
 
-#: option.c:7226
+#: option.c:7229
 msgid ""
 "\n"
 "--- Options ---"
 msgstr ""
 "\n"
-"--- ïÐÃÉÉ ---"
+"--- Опции ---"
 
-#: option.c:7932
+#: option.c:7935
 msgid "E356: get_varp ERROR"
-msgstr "E356: ïûéâëá get_varp"
+msgstr "E356: ОШИБКА get_varp"
 
-#: option.c:8903
+#: option.c:8906
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': îÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÓÉÍ×ÏÌÁ ÄÌÑ %s"
+msgstr "E357: 'langmap': Нет соответствующего символа для %s"
 
-#: option.c:8937
+#: option.c:8940
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': ìÉÛÎÉÅ ÓÉÍ×ÏÌÙ ÐÏÓÌÅ ÔÏÞËÉ Ó ÚÁÐÑÔÏÊ: %s"
+msgstr "E358: 'langmap': Лишние символы после точки с запятой: %s"
 
 #: os_amiga.c:280
 msgid "cannot open "
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ "
+msgstr "невозможно открыть "
 
 #: os_amiga.c:314
 msgid "VIM: Can't open window!\n"
-msgstr "VIM: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÏËÎÏ!\n"
+msgstr "VIM: Невозможно открыть окно!\n"
 
 #: os_amiga.c:338
 msgid "Need Amigados version 2.04 or later\n"
-msgstr "îÅÏÂÈÏÄÉÍÁ Amigados ×ÅÒÓÉÉ 2.04 ÉÌÉ ÂÏÌÅÅ ÐÏÚÄÎÅÊ\n"
+msgstr "Необходима Amigados версии 2.04 или более поздней\n"
 
 #: os_amiga.c:344
 #, c-format
 msgid "Need %s version %ld\n"
-msgstr "îÅÏÂÈÏÄÉÍÁ %s ×ÅÒÓÉÉ %ld\n"
+msgstr "Необходима %s версии %ld\n"
 
 #: os_amiga.c:416
 msgid "Cannot open NIL:\n"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ NIL:\n"
+msgstr "Невозможно открыть NIL:\n"
 
 #: os_amiga.c:427
 msgid "Cannot create "
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ "
+msgstr "Невозможно создать "
 
 #: os_amiga.c:905
 #, c-format
 msgid "Vim exiting with %d\n"
-msgstr "ðÒÅËÒÁÝÅÎÉÅ ÒÁÂÏÔÙ Vim Ó ËÏÄÏÍ %d\n"
+msgstr "Прекращение работы Vim с кодом %d\n"
 
-#: os_amiga.c:937
+#: os_amiga.c:941
 msgid "cannot change console mode ?!\n"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÍÅÎÉÔØ ÒÅÖÉÍ ËÏÎÓÏÌÉ?!\n"
+msgstr "невозможно сменить режим консоли?!\n"
 
-#: os_amiga.c:1003
+#: os_amiga.c:1012
 msgid "mch_get_shellsize: not a console??\n"
-msgstr "mch_get_shellsize: ÎÅ × ËÏÎÓÏÌÉ??\n"
+msgstr "mch_get_shellsize: не в консоли??\n"
 
 #. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1152
+#: os_amiga.c:1161
 msgid "E360: Cannot execute shell with -f option"
-msgstr "E360: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÏÂÏÌÏÞËÕ Ó ÁÒÇÕÍÅÎÔÏÍ -f"
+msgstr "E360: Невозможно выполнить оболочку с аргументом -f"
 
-#: os_amiga.c:1193 os_amiga.c:1283
+#: os_amiga.c:1202 os_amiga.c:1292
 msgid "Cannot execute "
-msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ "
+msgstr "Невозможно выполнить "
 
-#: os_amiga.c:1196 os_amiga.c:1293
+#: os_amiga.c:1205 os_amiga.c:1302
 msgid "shell "
-msgstr "ÏÂÏÌÏÞËÁ "
+msgstr "оболочка "
 
-#: os_amiga.c:1216 os_amiga.c:1318
+#: os_amiga.c:1225 os_amiga.c:1327
 msgid " returned\n"
-msgstr " ÚÁ×ÅÒÛÉÌÁ ÒÁÂÏÔÕ\n"
+msgstr " завершила работу\n"
 
-#: os_amiga.c:1459
+#: os_amiga.c:1468
 msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ÓÌÉÛËÏÍ ÍÁÌÁÑ ×ÅÌÉÞÉÎÁ ANCHOR_BUF_SIZE."
+msgstr "слишком малая величина ANCHOR_BUF_SIZE."
 
-#: os_amiga.c:1463
+#: os_amiga.c:1472
 msgid "I/O ERROR"
-msgstr "ïûéâëá ÷÷ïäá/÷ù÷ïäá"
+msgstr "ОШИБКА ВВОДА/ВЫВОДА"
 
-#: os_mswin.c:539
+#: os_mswin.c:548
 msgid "...(truncated)"
-msgstr "...(ÏÂÒÅÚÁÎÏ)"
+msgstr "...(обрезано)"
 
-#: os_mswin.c:641
+#: os_mswin.c:650
 msgid "'columns' is not 80, cannot execute external commands"
-msgstr "úÎÁÞÅÎÉÅ ÏÐÃÉÉ 'columns' ÎÅ ÒÁ×ÎÏ 80, ×ÎÅÛÎÉÅ ÐÒÏÇÒÁÍÍÙ ÎÅ ×ÙÐÏÌÎÑÀÔÓÑ"
+msgstr "Значение опции 'columns' не равно 80, внешние программы не выполняются"
 
-#: os_mswin.c:1973
+#: os_mswin.c:1982
 msgid "E237: Printer selection failed"
-msgstr "E327: îÅÕÄÁÞÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ ×ÙÂÏÒÁ ÐÒÉÎÔÅÒÁ"
+msgstr "E327: Неудачное завершение выбора принтера"
 
-#: os_mswin.c:2013
+#: os_mswin.c:2022
 #, c-format
 msgid "to %s on %s"
-msgstr "× %s ÎÁ %s"
+msgstr "в %s на %s"
 
-#: os_mswin.c:2028
+#: os_mswin.c:2037
 #, c-format
 msgid "E613: Unknown printer font: %s"
-msgstr "E613: îÅÉÚ×ÅÓÔÎÙÊ ÛÒÉÆÔ ÐÒÉÎÔÅÒÁ: %s"
+msgstr "E613: Неизвестный шрифт принтера: %s"
 
-#: os_mswin.c:2077 os_mswin.c:2087
+#: os_mswin.c:2086 os_mswin.c:2096
 #, c-format
 msgid "E238: Print error: %s"
-msgstr "E238: ïÛÉÂËÁ ÐÅÞÁÔÉ: %s"
+msgstr "E238: Ошибка печати: %s"
 
-#: os_mswin.c:2088
+#: os_mswin.c:2097
 msgid "Unknown"
-msgstr "îÅÉÚ×ÅÓÔÎÏ"
+msgstr "Неизвестно"
 
-#: os_mswin.c:2115
+#: os_mswin.c:2124
 #, c-format
 msgid "Printing '%s'"
-msgstr "ðÅÞÁÔØ '%s'"
+msgstr "Печать '%s'"
 
-#: os_mswin.c:3204
+#: os_mswin.c:3213
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-msgstr "E244: îÅÄÏÐÕÓÔÉÍÏÅ ÉÍÑ ËÏÄÉÒÏ×ËÉ \"%s\" × ÉÍÅÎÉ ÛÒÉÆÔÁ \"%s\""
+msgstr "E244: Недопустимое имя кодировки \"%s\" в имени шрифта \"%s\""
 
-#: os_mswin.c:3212
+#: os_mswin.c:3221
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
-msgstr "E245: îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ '%c' × ÉÍÅÎÉ ÛÒÉÆÔÁ \"%s\""
+msgstr "E245: Недопустимый символ '%c' в имени шрифта \"%s\""
 
 #: os_riscos.c:1259
 msgid "E366: Invalid 'osfiletype' option - using Text"
-msgstr "E366: îÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ ÏÐÃÉÉ 'osfiletype' -- ÉÓÐÏÌØÚÕÅÔÓÑ Text"
+msgstr "E366: Недопустимое значение опции 'osfiletype' -- используется Text"
 
 #: os_unix.c:927
 msgid "Vim: Double signal, exiting\n"
-msgstr "Vim: ä×ÏÊÎÏÊ ÓÉÇÎÁÌ, ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ\n"
+msgstr "Vim: Двойной сигнал, завершение работы\n"
 
 #: os_unix.c:933
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
-msgstr "Vim: ðÏÌÕÞÅÎ ÕÂÉÊÓÔ×ÅÎÎÙÊ ÓÉÇÎÁÌ %s\n"
+msgstr "Vim: Получен убийственный сигнал %s\n"
 
 #: os_unix.c:936
 #, c-format
 msgid "Vim: Caught deadly signal\n"
-msgstr "Vim: ðÏÌÕÞÅÎ ÕÂÉÊÓÔ×ÅÎÎÙÊ ÓÉÇÎÁÌ\n"
+msgstr "Vim: Получен убийственный сигнал\n"
 
 #: os_unix.c:1199
 #, c-format
 msgid "Opening the X display took %ld msec"
-msgstr "ïÔËÒÙÔÉÅ ÄÉÓÐÌÅÑ X ÚÁÎÑÌÏ %ld msec"
+msgstr "Открытие дисплея X заняло %ld msec"
 
 #: os_unix.c:1226
 msgid ""
@@ -4872,531 +4881,531 @@
 "Vim: Got X error\n"
 msgstr ""
 "\n"
-"Vim: ïÛÉÂËÁ X\n"
+"Vim: Ошибка X\n"
 
-#: os_unix.c:1334
+#: os_unix.c:1338
 msgid "Testing the X display failed"
-msgstr "ðÒÏ×ÅÒËÁ ÄÉÓÐÌÅÑ X ÚÁ×ÅÒÛÅÎÁ ÎÅÕÄÁÞÎÏ"
+msgstr "Проверка дисплея X завершена неудачно"
 
-#: os_unix.c:1473
+#: os_unix.c:1477
 msgid "Opening the X display timed out"
-msgstr "ïÔËÒÙÔÉÅ ÄÉÓÐÌÅÑ X ÎÅ ×ÙÐÏÌÎÅÎÏ × ÏÔ×ÅÄ£ÎÎÏÅ ×ÒÅÍÑ"
+msgstr "Открытие дисплея X не выполнено в отведённое время"
 
-#: os_unix.c:3227 os_unix.c:3907
+#: os_unix.c:3234 os_unix.c:3914
 msgid ""
 "\n"
 "Cannot execute shell "
 msgstr ""
 "\n"
-"îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ ÏÂÏÌÏÞËÕ "
+"Невозможно запустить оболочку "
 
-#: os_unix.c:3275
+#: os_unix.c:3282
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
 msgstr ""
 "\n"
-"îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ ÏÂÏÌÏÞËÕ sh\n"
+"Невозможно запустить оболочку sh\n"
 
-#: os_unix.c:3279 os_unix.c:3913
+#: os_unix.c:3286 os_unix.c:3920
 msgid ""
 "\n"
 "shell returned "
 msgstr ""
 "\n"
-"ïÂÏÌÏÞËÁ ÚÁ×ÅÒÛÉÌÁ ÒÁÂÏÔÕ "
+"Оболочка завершила работу "
 
-#: os_unix.c:3414
+#: os_unix.c:3421
 msgid ""
 "\n"
 "Cannot create pipes\n"
 msgstr ""
 "\n"
-"îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÔÒÕÂÙ\n"
+"Невозможно создать трубы\n"
 
-#: os_unix.c:3429
+#: os_unix.c:3436
 msgid ""
 "\n"
 "Cannot fork\n"
 msgstr ""
 "\n"
-"îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ fork()\n"
+"Невозможно выполнить fork()\n"
 
-#: os_unix.c:3920
+#: os_unix.c:3927
 msgid ""
 "\n"
 "Command terminated\n"
 msgstr ""
 "\n"
-"÷ÙÐÏÌÎÅÎÉÅ ËÏÍÁÎÄÙ ÐÒÅÒ×ÁÎÏ\n"
+"Выполнение команды прервано\n"
 
-#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975
+#: os_unix.c:4191 os_unix.c:4316 os_unix.c:5982
 msgid "XSMP lost ICE connection"
-msgstr "XSMP ÕÔÅÒÑÎÏ ÓÏÅÄÉÎÅÎÉÅ ICE"
+msgstr "XSMP утеряно соединение ICE"
 
-#: os_unix.c:5558
+#: os_unix.c:5565
 msgid "Opening the X display failed"
-msgstr "îÅÕÄÁÞÎÏÅ ÏÔËÒÙÔÉÅ ÄÉÓÐÌÅÑ X"
+msgstr "Неудачное открытие дисплея X"
 
-#: os_unix.c:5880
+#: os_unix.c:5887
 msgid "XSMP handling save-yourself request"
-msgstr "XSMP ÏÂÒÁÂÁÔÙ×ÁÅÔ ÚÁÐÒÏÓ ÓÁÍÏÓÏÈÒÁÎÅÎÉÑ"
+msgstr "XSMP обрабатывает запрос самосохранения"
 
-#: os_unix.c:5999
+#: os_unix.c:6006
 msgid "XSMP opening connection"
-msgstr "XSMP ÏÔËÒÙ×ÁÅÔ ÓÏÅÄÉÎÅÎÉÅ"
+msgstr "XSMP открывает соединение"
 
-#: os_unix.c:6018
+#: os_unix.c:6025
 msgid "XSMP ICE connection watch failed"
-msgstr "XSMP ÐÏÔÅÒÑÎÏ ÓÌÅÖÅÎÉÅ ÚÁ ÓÏÅÄÉÎÅÎÉÅÍ ICE"
+msgstr "XSMP потеряно слежение за соединением ICE"
 
-#: os_unix.c:6038
+#: os_unix.c:6045
 #, c-format
 msgid "XSMP SmcOpenConnection failed: %s"
-msgstr "XSMP ÎÅÕÄÁÞÎÏ ×ÙÐÏÌÎÅÎÏ SmcOpenConnection: %s"
+msgstr "XSMP неудачно выполнено SmcOpenConnection: %s"
 
 #: os_vms_mms.c:59
 msgid "At line"
-msgstr "÷ ÓÔÒÏËÅ"
+msgstr "В строке"
 
 #: os_w32exe.c:65
 msgid "Could not allocate memory for command line."
-msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÐÁÍÑÔØ ÄÌÑ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ."
+msgstr "Невозможно выделить память для командной строки."
 
 #: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
 msgid "VIM Error"
-msgstr "ïÛÉÂËÁ VIM"
+msgstr "Ошибка VIM"
 
 #: os_w32exe.c:89
 msgid "Could not load vim32.dll!"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ vim32.dll!"
+msgstr "Невозможно загрузить vim32.dll!"
 
 #: os_w32exe.c:99
 msgid "Could not fix up function pointers to the DLL!"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÉÓÐÒÁ×ÉÔØ ÕËÁÚÁÔÅÌÉ ÆÕÎËÃÉÊ ÄÌÑ DLL!"
+msgstr "Невозможно исправить указатели функций для DLL!"
 
-#: os_win16.c:342 os_win32.c:3216
+#: os_win16.c:342 os_win32.c:3248
 #, c-format
 msgid "shell returned %d"
-msgstr "ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ ÏÂÏÌÏÞËÉ Ó ËÏÄÏÍ %d"
+msgstr "завершение работы оболочки с кодом %d"
 
-#: os_win32.c:2674
+#: os_win32.c:2706
 #, c-format
 msgid "Vim: Caught %s event\n"
-msgstr "Vim: ðÅÒÅÈ×ÁÞÅÎÏ ÓÏÂÙÔÉÅ %s\n"
+msgstr "Vim: Перехвачено событие %s\n"
 
-#: os_win32.c:2676
+#: os_win32.c:2708
 msgid "close"
-msgstr "ÚÁËÒÙÔÉÅ"
+msgstr "закрытие"
 
-#: os_win32.c:2678
+#: os_win32.c:2710
 msgid "logoff"
-msgstr "ÏÔËÌÀÞÅÎÉÅ"
+msgstr "отключение"
 
-#: os_win32.c:2679
+#: os_win32.c:2711
 msgid "shutdown"
-msgstr "ÚÁ×ÅÒÛÅÎÉÅ"
+msgstr "завершение"
 
-#: os_win32.c:3169
+#: os_win32.c:3201
 msgid "E371: Command not found"
-msgstr "E371: ëÏÍÁÎÄÁ ÎÅ ÎÁÊÄÅÎÁ"
+msgstr "E371: Команда не найдена"
 
-#: os_win32.c:3182
+#: os_win32.c:3214
 msgid ""
 "VIMRUN.EXE not found in your $PATH.\n"
 "External commands will not pause after completion.\n"
 "See  :help win32-vimrun  for more information."
 msgstr ""
-"VIMRUN.EXE ÎÅ ÎÁÊÄÅÎ × ÐÕÔÉ, ÚÁÄÁÎÎÏÍ × $PATH.\n"
-"÷ÎÅÛÎÉÅ ËÏÍÁÎÄÙ ÎÅ ÂÕÄÕÔ ÏÓÔÁÎÁ×ÌÉ×ÁÔØÓÑ ÐÏÓÌÅ ×ÙÐÏÌÎÅÎÉÑ.\n"
-"äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ × :help win32-vimrun"
+"VIMRUN.EXE не найден в пути, заданном в $PATH.\n"
+"Внешние команды не будут останавливаться после выполнения.\n"
+"Дополнительная информация в :help win32-vimrun"
 
-#: os_win32.c:3185
+#: os_win32.c:3217
 msgid "Vim Warning"
-msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ Vim"
+msgstr "Предупреждение Vim"
 
 #: quickfix.c:258
 #, c-format
 msgid "E372: Too many %%%c in format string"
-msgstr "E372: ÷ ÓÔÒÏËÅ ÆÏÒÍÁÔÁ ÓÌÉÛËÏÍ ÍÎÏÇÏ %%%c"
+msgstr "E372: В строке формата слишком много %%%c"
 
 #: quickfix.c:271
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: îÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ %%%c × ÓÔÒÏËÅ ÆÏÒÍÁÔÁ"
+msgstr "E373: Неожиданный элемент %%%c в строке формата"
 
 #: quickfix.c:325
 msgid "E374: Missing ] in format string"
-msgstr "E374: ÷ ÓÔÒÏËÅ ÆÏÒÍÁÔÁ ÐÒÏÐÕÝÅÎÁ ]"
+msgstr "E374: В строке формата пропущена ]"
 
 #: quickfix.c:339
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: %%%c ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ × ÓÔÒÏËÅ ÆÏÒÍÁÔÁ"
+msgstr "E375: %%%c не поддерживается в строке формата"
 
 #: quickfix.c:357
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: îÅÄÏÐÕÓÔÉÍÙÊ %%%c × ÐÒÉÓÔÁ×ËÅ × ÓÔÒÏËÅ ÆÏÒÍÁÔÁ"
+msgstr "E376: Недопустимый %%%c в приставке в строке формата"
 
 #: quickfix.c:365
 #, c-format
 msgid "E377: Invalid %%%c in format string"
-msgstr "E377: îÅÄÏÐÕÓÔÉÍÙÊ %%%c × ÓÔÒÏËÅ ÆÏÒÍÁÔÁ"
+msgstr "E377: Недопустимый %%%c в строке формата"
 
 #: quickfix.c:391
 msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: ÷ ÚÎÁÞÅÎÉÉ ÏÐÃÉÉ 'errorformat' ÏÔÓÕÔÓÔ×ÕÅÔ ÛÁÂÌÏÎ"
+msgstr "E378: В значении опции 'errorformat' отсутствует шаблон"
 
 #: quickfix.c:501
 msgid "E379: Missing or empty directory name"
-msgstr "E379: ÉÍÑ ËÁÔÁÌÏÇÁ ÎÅ ÚÁÄÁÎÏ ÉÌÉ ÒÁ×ÎÏ ÐÕÓÔÏÊ ÓÔÒÏËÅ"
+msgstr "E379: имя каталога не задано или равно пустой строке"
 
 #: quickfix.c:990
 msgid "E553: No more items"
-msgstr "E553: âÏÌØÛÅ ÎÅÔ ÜÌÅÍÅÎÔÏ×"
+msgstr "E553: Больше нет элементов"
 
 #: quickfix.c:1229
 #, c-format
 msgid "(%d of %d)%s%s: "
-msgstr "(%d ÉÚ %d)%s%s: "
+msgstr "(%d из %d)%s%s: "
 
 #: quickfix.c:1231
 msgid " (line deleted)"
-msgstr " (ÓÔÒÏËÁ ÕÄÁÌÅÎÁ)"
+msgstr " (строка удалена)"
 
 #: quickfix.c:1444
 msgid "E380: At bottom of quickfix stack"
-msgstr "E380: ÷ÎÉÚÕ ÓÔÅËÁ ÂÙÓÔÒÙÈ ÉÓÐÒÁ×ÌÅÎÉÊ"
+msgstr "E380: Внизу стека быстрых исправлений"
 
 #: quickfix.c:1453
 msgid "E381: At top of quickfix stack"
-msgstr "E381: îÁ×ÅÒÈÕ ÓÔÅËÁ ÂÙÓÔÒÙÈ ÉÓÐÒÁ×ÌÅÎÉÊ"
+msgstr "E381: Наверху стека быстрых исправлений"
 
 #: quickfix.c:1465
 #, c-format
 msgid "error list %d of %d; %d errors"
-msgstr "ÓÐÉÓÏË ÏÛÉÂÏË %d ÉÚ %d; %d ÏÛÉÂÏË"
+msgstr "список ошибок %d из %d; %d ошибок"
 
 #: quickfix.c:1943
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr ""
-"E382: úÁÐÉÓØ ÎÅ×ÏÚÍÏÖÎÁ, ÚÎÁÞÅÎÉÅ ÏÐÃÉÉ 'buftype' ÎÅ Ñ×ÌÑÅÔÓÑ ÐÕÓÔÏÊ ÓÔÒÏËÏÊ"
+"E382: Запись невозможна, значение опции 'buftype' не является пустой строкой"
 
 #: regexp.c:319
 #, c-format
 msgid "E369: invalid item in %s%%[]"
-msgstr "E369: ÎÅÄÏÐÕÓÔÉÍÙÊ ÜÌÅÍÅÎÔ × %s%%[]"
+msgstr "E369: недопустимый элемент в %s%%[]"
 
 #: regexp.c:838
 msgid "E339: Pattern too long"
-msgstr "E339: óÌÉÛËÏÍ ÄÌÉÎÎÙÊ ÛÁÂÌÏÎ"
+msgstr "E339: Слишком длинный шаблон"
 
 #: regexp.c:1009
 msgid "E50: Too many \\z("
-msgstr "E50: óÌÉÛËÏÍ ÍÎÏÇÏ \\z("
+msgstr "E50: Слишком много \\z("
 
 #: regexp.c:1020
 #, c-format
 msgid "E51: Too many %s("
-msgstr "E51: óÌÉÛËÏÍ ÍÎÏÇÏ %s("
+msgstr "E51: Слишком много %s("
 
 #: regexp.c:1077
 msgid "E52: Unmatched \\z("
-msgstr "E52: îÅÔ ÐÁÒÙ ÄÌÑ \\z("
+msgstr "E52: Нет пары для \\z("
 
 #: regexp.c:1081
 #, c-format
 msgid "E53: Unmatched %s%%("
-msgstr "E53: îÅÔ ÐÁÒÙ ÄÌÑ %s%%("
+msgstr "E53: Нет пары для %s%%("
 
 #: regexp.c:1083
 #, c-format
 msgid "E54: Unmatched %s("
-msgstr "E54: îÅÔ ÐÁÒÙ ÄÌÑ %s("
+msgstr "E54: Нет пары для %s("
 
 #: regexp.c:1088
 #, c-format
 msgid "E55: Unmatched %s)"
-msgstr "E55: îÅÔ ÐÁÒÙ ÄÌÑ %s)"
+msgstr "E55: Нет пары для %s)"
 
 #: regexp.c:1258
 #, c-format
 msgid "E56: %s* operand could be empty"
-msgstr "E56: ×ÏÚÍÏÖÎÏ ÐÕÓÔÏÊ ÏÐÅÒÁÎÄ %s*"
+msgstr "E56: возможно пустой операнд %s*"
 
 #: regexp.c:1261
 #, c-format
 msgid "E57: %s+ operand could be empty"
-msgstr "E57: ×ÏÚÍÏÖÎÏ ÐÕÓÔÏÊ ÏÐÅÒÁÎÄ %s+"
+msgstr "E57: возможно пустой операнд %s+"
 
 #: regexp.c:1316
 #, c-format
 msgid "E59: invalid character after %s@"
-msgstr "E59: ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ ÐÏÓÌÅ %s@"
+msgstr "E59: недопустимый символ после %s@"
 
 #: regexp.c:1344
 #, c-format
 msgid "E58: %s{ operand could be empty"
-msgstr "E58: ×ÏÚÍÏÖÎÏ ÐÕÓÔÏÊ ÏÐÅÒÁÎÄ %s{"
+msgstr "E58: возможно пустой операнд %s{"
 
 #: regexp.c:1354
 #, c-format
 msgid "E60: Too many complex %s{...}s"
-msgstr "E60: óÌÉÛËÏÍ ÍÎÏÇÏ ÓÌÏÖÎÙÈ ËÏÎÓÔÒÕËÃÉÊ %s{...}"
+msgstr "E60: Слишком много сложных конструкций %s{...}"
 
 #: regexp.c:1370
 #, c-format
 msgid "E61: Nested %s*"
-msgstr "E61: ÷ÌÏÖÅÎÎÙÅ %s*"
+msgstr "E61: Вложенные %s*"
 
 #: regexp.c:1373
 #, c-format
 msgid "E62: Nested %s%c"
-msgstr "E62: ÷ÌÏÖÅÎÎÙÅ %s%c"
+msgstr "E62: Вложенные %s%c"
 
 #: regexp.c:1491
 msgid "E63: invalid use of \\_"
-msgstr "E63: ÎÅÄÏÐÕÓÔÉÍÏÅ ÉÓÐÏÌØÚÏ×ÁÎÉÅ \\_"
+msgstr "E63: недопустимое использование \\_"
 
 #: regexp.c:1536
 #, c-format
 msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c ÎÉ ÚÁ ÞÅÍ ÎÅ ÓÌÅÄÕÅÔ"
+msgstr "E64: %s%c ни за чем не следует"
 
 #: regexp.c:1592
 msgid "E65: Illegal back reference"
-msgstr "E65: îÅÄÏÐÕÓÔÉÍÁÑ ÏÂÒÁÔÎÁÑ ÓÓÙÌËÁ"
+msgstr "E65: Недопустимая обратная ссылка"
 
 #: regexp.c:1605
 msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÏ ÚÄÅÓØ"
+msgstr "E66: \\z( не может быть использовано здесь"
 
 #: regexp.c:1624
 msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 É Ô.Ð. ÎÅ ÍÏÇÕÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎÙ ÚÄÅÓØ"
+msgstr "E67: \\z1 и т.п. не могут быть использованы здесь"
 
 #: regexp.c:1635
 msgid "E68: Invalid character after \\z"
-msgstr "E68: îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ ÐÏÓÌÅ \\z"
+msgstr "E68: Недопустимый символ после \\z"
 
 #: regexp.c:1684
 #, c-format
 msgid "E69: Missing ] after %s%%["
-msgstr "E69: ðÒÏÐÕÝÅÎÁ ] ÐÏÓÌÅ %s%%["
+msgstr "E69: Пропущена ] после %s%%["
 
 #: regexp.c:1700
 #, c-format
 msgid "E70: Empty %s%%[]"
-msgstr "E70: ðÕÓÔÏÅ %s%%[]"
+msgstr "E70: Пустое %s%%[]"
 
 #: regexp.c:1760
 #, c-format
 msgid "E71: Invalid character after %s%%"
-msgstr "E71: îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ ÐÏÓÌÅ %s%%"
+msgstr "E71: Недопустимый символ после %s%%"
 
 #: regexp.c:2557
 #, c-format
 msgid "E554: Syntax error in %s{...}"
-msgstr "E554: óÉÎÔÁËÓÉÞÅÓËÁÑ ÏÛÉÂËÁ × %s{...}"
+msgstr "E554: Синтаксическая ошибка в %s{...}"
 
 #: regexp.c:2863 regexp.c:3016
 msgid "E361: Crash intercepted; regexp too complex?"
 msgstr ""
-"E361: ðÒÅÄÏÔ×ÒÁÝÅÎÏ Á×ÁÒÉÊÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ: ÓÌÉÛËÏÍ ÓÌÏÖÎÏÅ ÒÅÇÕÌÑÒÎÏÅ "
-"×ÙÒÁÖÅÎÉÅ?"
+"E361: Предотвращено аварийное завершение: слишком сложное регулярное "
+"выражение?"
 
 #: regexp.c:3004 regexp.c:3013
 msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: ÐÒÉÍÅÎÅÎÉÅ ÛÁÂÌÏÎÁ ÐÒÉ×ÅÌÏ Ë ÏÛÉÂËÅ ×ÙÈÏÄÁ ÚÁ ÐÒÅÄÅÌÙ ÓÔÅËÁ"
+msgstr "E363: применение шаблона привело к ошибке выхода за пределы стека"
 
 #: regexp.c:3258
 msgid "External submatches:\n"
-msgstr "÷ÎÅÛÎÉÅ ÐÏÄÓÏÏÔ×ÅÔÓÔ×ÉÑ:\n"
+msgstr "Внешние подсоответствия:\n"
 
 #: screen.c:2184
 #, c-format
 msgid "+--%3ld lines folded "
-msgstr "+--%3ld ÓÔÒÏË × ÓËÌÁÄËÅ"
-
-#: screen.c:7996
-msgid " VREPLACE"
-msgstr " ÷éòôõáìøîáñ úáíåîá"
+msgstr "+--%3ld строк в складке"
 
 #: screen.c:8000
+msgid " VREPLACE"
+msgstr " ВИРТУАЛЬНАЯ ЗАМЕНА"
+
+#: screen.c:8004
 msgid " REPLACE"
-msgstr " úáíåîá"
+msgstr " ЗАМЕНА"
 
-#: screen.c:8005
+#: screen.c:8009
 msgid " REVERSE"
-msgstr " ïâòáôîáñ"
+msgstr " ОБРАТНАЯ"
 
-#: screen.c:8007
+#: screen.c:8011
 msgid " INSERT"
-msgstr " ÷óôá÷ëá"
-
-#: screen.c:8010
-msgid " (insert)"
-msgstr " (×ÓÔÁ×ËÁ)"
-
-#: screen.c:8012
-msgid " (replace)"
-msgstr " (ÚÁÍÅÎÁ)"
+msgstr " ВСТАВКА"
 
 #: screen.c:8014
+msgid " (insert)"
+msgstr " (вставка)"
+
+#: screen.c:8016
+msgid " (replace)"
+msgstr " (замена)"
+
+#: screen.c:8018
 msgid " (vreplace)"
-msgstr " (×ÉÒÔÕÁÌØÎÁÑ ÚÁÍÅÎÁ)"
+msgstr " (виртуальная замена)"
 
-#: screen.c:8017
+#: screen.c:8021
 msgid " Hebrew"
-msgstr " é×ÒÉÔ"
+msgstr " Иврит"
 
-#: screen.c:8028
+#: screen.c:8032
 msgid " Arabic"
-msgstr " áÒÁÂÓËÉÊ"
-
-#: screen.c:8031
-msgid " (lang)"
-msgstr " (ÑÚÙË)"
+msgstr " Арабский"
 
 #: screen.c:8035
+msgid " (lang)"
+msgstr " (язык)"
+
+#: screen.c:8039
 msgid " (paste)"
-msgstr " (×ËÌÅÊËÁ)"
-
-#: screen.c:8048
-msgid " VISUAL"
-msgstr " ÷éúõáìøîùê òåöéí"
-
-#: screen.c:8049
-msgid " VISUAL LINE"
-msgstr " ÷éúõáìøîáñ óôòïëá"
-
-#: screen.c:8050
-msgid " VISUAL BLOCK"
-msgstr " ÷éúõáìøîùê âìïë"
-
-#: screen.c:8051
-msgid " SELECT"
-msgstr " ÷ùäåìåîéå"
+msgstr " (вклейка)"
 
 #: screen.c:8052
-msgid " SELECT LINE"
-msgstr " ÷ùäåìåîéå óôòïëé"
+msgid " VISUAL"
+msgstr " ВИЗУАЛЬНЫЙ РЕЖИМ"
 
 #: screen.c:8053
-msgid " SELECT BLOCK"
-msgstr " ÷ùäåìåîéå âìïëá"
+msgid " VISUAL LINE"
+msgstr " ВИЗУАЛЬНАЯ СТРОКА"
 
-#: screen.c:8068 screen.c:8131
+#: screen.c:8054
+msgid " VISUAL BLOCK"
+msgstr " ВИЗУАЛЬНЫЙ БЛОК"
+
+#: screen.c:8055
+msgid " SELECT"
+msgstr " ВЫДЕЛЕНИЕ"
+
+#: screen.c:8056
+msgid " SELECT LINE"
+msgstr " ВЫДЕЛЕНИЕ СТРОКИ"
+
+#: screen.c:8057
+msgid " SELECT BLOCK"
+msgstr " ВЫДЕЛЕНИЕ БЛОКА"
+
+#: screen.c:8072 screen.c:8135
 msgid "recording"
-msgstr "ÚÁÐÉÓØ"
+msgstr "запись"
 
 #: search.c:37
 msgid "search hit TOP, continuing at BOTTOM"
-msgstr "ÐÏÉÓË ÂÕÄÅÔ ÐÒÏÄÏÌÖÅÎ Ó ëïîãá ÄÏËÕÍÅÎÔÁ"
+msgstr "поиск будет продолжен с КОНЦА документа"
 
 #: search.c:38
 msgid "search hit BOTTOM, continuing at TOP"
-msgstr "ÐÏÉÓË ÂÕÄÅÔ ÐÒÏÄÏÌÖÅÎ Ó îáþáìá ÄÏËÕÍÅÎÔÁ"
+msgstr "поиск будет продолжен с НАЧАЛА документа"
 
 #: search.c:526
 #, c-format
 msgid "E383: Invalid search string: %s"
-msgstr "E383: îÅÐÒÁ×ÉÌØÎÁÑ ÓÔÒÏËÁ ÐÏÉÓËÁ: %s"
+msgstr "E383: Неправильная строка поиска: %s"
 
 #: search.c:853
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: ÐÏÉÓË ÚÁËÏÎÞÅÎ × îáþáìå ÄÏËÕÍÅÎÔÁ; %s ÎÅ ÎÁÊÄÅÎÏ"
+msgstr "E384: поиск закончен в НАЧАЛЕ документа; %s не найдено"
 
 #: search.c:856
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: ÐÏÉÓË ÚÁËÏÎÞÅÎ × ëïîãå ÄÏËÕÍÅÎÔÁ; %s ÎÅ ÎÁÊÄÅÎÏ"
+msgstr "E385: поиск закончен в КОНЦЕ документа; %s не найдено"
 
 #: search.c:1249
 msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: ðÏÓÌÅ ';' ÏÖÉÄÁÅÔÓÑ ××ÏÄ '?' ÉÌÉ '/'"
+msgstr "E386: После ';' ожидается ввод '?' или '/'"
 
-#: search.c:3759
+#: search.c:3768
 msgid " (includes previously listed match)"
-msgstr " (×ËÌÀÞÁÅÔ ÒÁÎÎÅÅ ÐÏËÁÚÁÎÎÙÅ ÓÏÏÔ×ÅÔÓÔ×ÉÑ)"
+msgstr " (включает раннее показанные соответствия)"
 
 #. cursor at status line
-#: search.c:3779
+#: search.c:3788
 msgid "--- Included files "
-msgstr "--- ÷ËÌÀÞ£ÎÎÙÅ ÆÁÊÌÙ "
+msgstr "--- Включённые файлы "
 
-#: search.c:3781
+#: search.c:3790
 msgid "not found "
-msgstr "ÎÅ ÎÁÊÄÅÎÏ "
+msgstr "не найдено "
 
-#: search.c:3782
+#: search.c:3791
 msgid "in path ---\n"
-msgstr "ÐÏ ÐÕÔÉ ---\n"
+msgstr "по пути ---\n"
 
-#: search.c:3839
+#: search.c:3848
 msgid "  (Already listed)"
-msgstr " (õÖÅ ÐÏËÁÚÁÎÏ)"
+msgstr " (Уже показано)"
 
-#: search.c:3841
+#: search.c:3850
 msgid "  NOT FOUND"
-msgstr " îå îáêäåîï"
+msgstr " НЕ НАЙДЕНО"
 
-#: search.c:3893
+#: search.c:3902
 #, c-format
 msgid "Scanning included file: %s"
-msgstr "ðÒÏÓÍÏÔÒ ×ËÌÀÞ£ÎÎÙÈ ÆÁÊÌÏ×: %s"
+msgstr "Просмотр включённых файлов: %s"
 
-#: search.c:4111
+#: search.c:4120
 msgid "E387: Match is on current line"
-msgstr "E387: óÏÏÔ×ÅÔÓÔ×ÉÅ × ÔÅËÕÝÅÊ ÓÔÒÏËÅ"
+msgstr "E387: Соответствие в текущей строке"
 
-#: search.c:4254
+#: search.c:4263
 msgid "All included files were found"
-msgstr "îÁÊÄÅÎÙ ×ÓÅ ×ËÌÀÞ£ÎÎÙÅ ÆÁÊÌÙ"
+msgstr "Найдены все включённые файлы"
 
-#: search.c:4256
+#: search.c:4265
 msgid "No included files"
-msgstr "÷ËÌÀÞ£ÎÎÙÈ ÆÁÊÌÏ× ÎÅÔ"
+msgstr "Включённых файлов нет"
 
-#: search.c:4272
+#: search.c:4281
 msgid "E388: Couldn't find definition"
-msgstr "E388: ïÐÒÅÄÅÌÅÎÉÅ ÎÅ ÎÁÊÄÅÎÏ"
+msgstr "E388: Определение не найдено"
 
-#: search.c:4274
+#: search.c:4283
 msgid "E389: Couldn't find pattern"
-msgstr "E389: ûÁÂÌÏÎ ÎÅ ÎÁÊÄÅÎ"
+msgstr "E389: Шаблон не найден"
 
 #: syntax.c:3050
 #, c-format
 msgid "E390: Illegal argument: %s"
-msgstr "E390: îÅÄÏÐÕÓÔÉÍÙÊ ÁÒÇÕÍÅÎÔ: %s"
+msgstr "E390: Недопустимый аргумент: %s"
 
 #: syntax.c:3230
 #, c-format
 msgid "E391: No such syntax cluster: %s"
-msgstr "E391: óÉÎÔÁËÓÉÞÅÓËÉÊ ËÌÁÓÔÅÒ %s ÎÅ ÎÁÊÄÅÎ"
+msgstr "E391: Синтаксический кластер %s не найден"
 
 #: syntax.c:3394
 msgid "No Syntax items defined for this buffer"
-msgstr "óÉÎÔÁËÓÉÞÅÓËÉÅ ÜÌÅÍÅÎÔÙ ÄÌÑ ÄÁÎÎÏÇÏ ÂÕÆÅÒÁ ÎÅ ÏÐÒÅÄÅÌÅÎÙ"
+msgstr "Синтаксические элементы для данного буфера не определены"
 
 #: syntax.c:3402
 msgid "syncing on C-style comments"
-msgstr "óÉÎÈÒÏÎÉÚÁÃÉÑ ÐÏ ËÏÍÍÅÎÔÁÒÉÑÍ × ÓÔÉÌÅ ÑÚÙËÁ C"
+msgstr "Синхронизация по комментариям в стиле языка C"
 
 #: syntax.c:3410
 msgid "no syncing"
-msgstr "ÂÅÚ ÓÉÎÈÒÏÎÉÚÁÃÉÉ"
+msgstr "без синхронизации"
 
 #: syntax.c:3413
 msgid "syncing starts "
-msgstr "ÓÉÎÈÒÏÎÉÚÁÃÉÑ ÎÁÞÁÔÁ "
+msgstr "синхронизация начата "
 
 #: syntax.c:3415 syntax.c:3490
 msgid " lines before top line"
-msgstr " ÓÔÒÏË ÐÅÒÅÄ ×ÅÒÈÎÅÊ ÓÔÒÏËÏÊ"
+msgstr " строк перед верхней строкой"
 
 #: syntax.c:3420
 msgid ""
@@ -5404,7 +5413,7 @@
 "--- Syntax sync items ---"
 msgstr ""
 "\n"
-"--- üÌÅÍÅÎÔÙ ÓÉÎÈÒÏÎÉÚÁÃÉÉ ÓÉÎÔÁËÓÉÓÁ ---"
+"--- Элементы синхронизации синтаксиса ---"
 
 #: syntax.c:3425
 msgid ""
@@ -5412,7 +5421,7 @@
 "syncing on items"
 msgstr ""
 "\n"
-"ÓÉÎÈÒÏÎÉÚÁÃÉÑ ÐÏ ÜÌÅÍÅÎÔÁÍ"
+"синхронизация по элементам"
 
 #: syntax.c:3431
 msgid ""
@@ -5420,214 +5429,214 @@
 "--- Syntax items ---"
 msgstr ""
 "\n"
-"--- óÉÎÔÁËÓÉÞÅÓËÉÅ ÜÌÅÍÅÎÔÙ ---"
+"--- Синтаксические элементы ---"
 
 #: syntax.c:3454
 #, c-format
 msgid "E392: No such syntax cluster: %s"
-msgstr "E392: óÉÎÔÁËÓÉÞÅÓËÉÊ ËÌÁÓÔÅÒ %s ÎÅ ÎÁÊÄÅÎ"
+msgstr "E392: Синтаксический кластер %s не найден"
 
 #: syntax.c:3480
 msgid "minimal "
-msgstr "ÍÉÎÉÍÕÍ "
+msgstr "минимум "
 
 #: syntax.c:3487
 msgid "maximal "
-msgstr "ÍÁËÓÉÍÕÍ "
+msgstr "максимум "
 
 #: syntax.c:3499
 msgid "; match "
-msgstr "; ÓÏÏÔ×ÅÔÓÔ×ÉÅ "
+msgstr "; соответствие "
 
 #: syntax.c:3501
 msgid " line breaks"
-msgstr " ÐÅÒÅÎÏÓÏ× ÓÔÒÏË"
+msgstr " переносов строк"
 
 #: syntax.c:4135
 msgid "E393: group[t]here not accepted here"
-msgstr "E393: ÚÄÅÓØ ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ group[t]here"
+msgstr "E393: здесь нельзя использовать group[t]here"
 
 #: syntax.c:4159
 #, c-format
 msgid "E394: Didn't find region item for %s"
-msgstr "E394: üÌÅÍÅÎÔ ÏÂÌÁÓÔÉ ÄÌÑ %s ÎÅ ÎÁÊÄÅÎ"
+msgstr "E394: Элемент области для %s не найден"
 
 #: syntax.c:4187
 msgid "E395: contains argument not accepted here"
-msgstr "E395: ÚÄÅÓØ ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÒÇÕÍÅÎÔ contains"
+msgstr "E395: здесь нельзя использовать аргумент contains"
 
 #: syntax.c:4198
 msgid "E396: containedin argument not accepted here"
-msgstr "E396: ÚÄÅÓØ ÎÅÌØÚÑ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÒÇÕÍÅÎÔ containedin"
+msgstr "E396: здесь нельзя использовать аргумент containedin"
 
 #: syntax.c:4276
 msgid "E397: Filename required"
-msgstr "E397: ôÒÅÂÕÅÔÓÑ ÕËÁÚÁÔØ ÉÍÑ ÆÁÊÌÁ"
+msgstr "E397: Требуется указать имя файла"
 
 #: syntax.c:4614
 #, c-format
 msgid "E398: Missing '=': %s"
-msgstr "E398: ðÒÏÐÕÝÅÎÏ '=': %s"
+msgstr "E398: Пропущено '=': %s"
 
 #: syntax.c:4772
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: îÅ È×ÁÔÁÅÔ ÁÒÇÕÍÅÎÔÏ×: ÓÉÎÔÁËÓÉÞÅÓËÉÊ ÒÅÇÉÏÎ %s"
+msgstr "E399: Не хватает аргументов: синтаксический регион %s"
 
 #: syntax.c:5103
 msgid "E400: No cluster specified"
-msgstr "E400: ëÌÁÓÔÅÒ ÎÅ ÕËÁÚÁÎ"
+msgstr "E400: Кластер не указан"
 
 #: syntax.c:5140
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: îÅ ÎÁÊÄÅÎ ÒÁÚÄÅÌÉÔÅÌØ ÛÁÂÌÏÎÏ×: %s"
+msgstr "E401: Не найден разделитель шаблонов: %s"
 
 #: syntax.c:5215
 #, c-format
 msgid "E402: Garbage after pattern: %s"
-msgstr "E402: íÕÓÏÒ ÐÏÓÌÅ ÛÁÂÌÏÎÁ: %s"
+msgstr "E402: Мусор после шаблона: %s"
 
 #: syntax.c:5305
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr ""
-"E403: ÓÉÎÈÒÏÎÉÚÁÃÉÑ ÓÉÎÔÁËÓÉÓÁ: ÛÁÂÌÏÎ ÐÒÏÄÏÌÖÅÎÉÊ ÓÔÒÏËÉ ÕËÁÚÁÎ Ä×ÁÖÄÙ"
+"E403: синхронизация синтаксиса: шаблон продолжений строки указан дважды"
 
 #: syntax.c:5362
 #, c-format
 msgid "E404: Illegal arguments: %s"
-msgstr "E404: îÅÄÏÐÕÓÔÉÍÙÅ ÁÒÇÕÍÅÎÔÙ: %s"
+msgstr "E404: Недопустимые аргументы: %s"
 
 #: syntax.c:5412
 #, c-format
 msgid "E405: Missing equal sign: %s"
-msgstr "E405: ðÒÏÐÕÝÅÎ ÚÎÁË ÒÁ×ÅÎÓÔ×Á: %s"
+msgstr "E405: Пропущен знак равенства: %s"
 
 #: syntax.c:5418
 #, c-format
 msgid "E406: Empty argument: %s"
-msgstr "E406: ðÕÓÔÏÊ ÁÒÇÕÍÅÎÔ: %s"
+msgstr "E406: Пустой аргумент: %s"
 
 #: syntax.c:5445
 #, c-format
 msgid "E407: %s not allowed here"
-msgstr "E407: %s ÎÅ ÄÏÐÕÓËÁÅÔÓÑ × ÜÔÏÍ ÍÅÓÔÅ"
+msgstr "E407: %s не допускается в этом месте"
 
 #: syntax.c:5452
 #, c-format
 msgid "E408: %s must be first in contains list"
-msgstr "E408: %s ÄÏÌÖÎÏ ÂÙÔØ ÐÅÒ×ÙÍ × ÓÐÉÓËÅ contains"
+msgstr "E408: %s должно быть первым в списке contains"
 
 #: syntax.c:5522
 #, c-format
 msgid "E409: Unknown group name: %s"
-msgstr "E409: îÅÉÚ×ÅÓÔÎÁÑ ÇÒÕÐÐÁ: %s"
+msgstr "E409: Неизвестная группа: %s"
 
 #: syntax.c:5755
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: îÅÐÒÁ×ÉÌØÎÁÑ ÐÏÄËÏÍÁÎÄÁ :syntax: %s"
+msgstr "E410: Неправильная подкоманда :syntax: %s"
 
 #: syntax.c:6136
 #, c-format
 msgid "E411: highlight group not found: %s"
-msgstr "E411: ÇÒÕÐÐÁ ÐÏÄÓ×ÅÔËÉ ÓÉÎÔÁËÓÉÓÁ %s ÎÅ ÎÁÊÄÅÎÁ"
+msgstr "E411: группа подсветки синтаксиса %s не найдена"
 
 #: syntax.c:6160
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: îÅ È×ÁÔÁÅÔ ÁÒÇÕÍÅÎÔÏ×: \":highlight link %s\""
+msgstr "E412: Не хватает аргументов: \":highlight link %s\""
 
 #: syntax.c:6167
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: óÌÉÛËÏÍ ÍÎÏÇÏ ÁÒÇÕÍÅÎÔÏ×: \":highlight link %s\""
+msgstr "E413: Слишком много аргументов: \":highlight link %s\""
 
 #: syntax.c:6187
 msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: Õ ÇÒÕÐÐÙ ÅÓÔØ ÓÏÂÓÔ×ÅÎÎÙÅ ÎÁÓÔÒÏÊËÉ, ÓÓÙÌËÁ ÉÇÎÏÒÉÒÕÅÔÓÑ"
+msgstr "E414: у группы есть собственные настройки, ссылка игнорируется"
 
 #: syntax.c:6316
 #, c-format
 msgid "E415: unexpected equal sign: %s"
-msgstr "E415: ÎÅÏÖÉÄÁÎÎÙÊ ÚÎÁË ÒÁ×ÅÎÓÔ×Á: %s"
+msgstr "E415: неожиданный знак равенства: %s"
 
 #: syntax.c:6352
 #, c-format
 msgid "E416: missing equal sign: %s"
-msgstr "E416: ÐÒÏÐÕÝÅÎ ÚÎÁË ÒÁ×ÅÎÓÔ×Á: %s"
+msgstr "E416: пропущен знак равенства: %s"
 
 #: syntax.c:6380
 #, c-format
 msgid "E417: missing argument: %s"
-msgstr "E417: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ: %s"
+msgstr "E417: пропущен аргумент: %s"
 
 #: syntax.c:6417
 #, c-format
 msgid "E418: Illegal value: %s"
-msgstr "E418: îÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ: %s"
+msgstr "E418: Недопустимое значение: %s"
 
 #: syntax.c:6536
 msgid "E419: FG color unknown"
-msgstr "E419: îÅÉÚ×ÅÓÔÎÙÊ Ã×ÅÔ ÔÅËÓÔÁ"
+msgstr "E419: Неизвестный цвет текста"
 
 #: syntax.c:6547
 msgid "E420: BG color unknown"
-msgstr "E420: îÅÉÚ×ÅÓÔÎÙÊ Ã×ÅÔ ÆÏÎÁ"
+msgstr "E420: Неизвестный цвет фона"
 
 #: syntax.c:6608
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: éÍÑ ÉÌÉ ÎÏÍÅÒ Ã×ÅÔÁ ÎÅ ÉÚ×ÅÓÔÎÏ: %s"
+msgstr "E421: Имя или номер цвета не известно: %s"
 
 #: syntax.c:6814
 #, c-format
 msgid "E422: terminal code too long: %s"
-msgstr "E422: ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ ËÏÄ ÔÅÒÍÉÎÁÌÁ: %s"
+msgstr "E422: слишком длинный код терминала: %s"
 
 #: syntax.c:6861
 #, c-format
 msgid "E423: Illegal argument: %s"
-msgstr "E423: îÅÄÏÐÕÓÔÉÍÙÊ ÁÒÇÕÍÅÎÔ: %s"
+msgstr "E423: Недопустимый аргумент: %s"
 
 #: syntax.c:7390
 msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: éÓÐÏÌØÚÕÅÔÓÑ ÓÌÉÛËÏÍ ÍÎÏÇÏ ÒÁÚÎÙÈ ÁÔÒÉÂÕÔÏ× ÐÏÄÓ×ÅÔËÉ ÓÉÎÔÁËÓÉÓÁ"
+msgstr "E424: Используется слишком много разных атрибутов подсветки синтаксиса"
 
 #: syntax.c:7911
 msgid "E669: Unprintable character in group name"
-msgstr "E669: îÅÐÅÞÁÔÎÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ ÇÒÕÐÐÙ"
+msgstr "E669: Непечатный символ в имени группы"
 
 #. This is an error, but since there previously was no check only
 #. * give a warning.
 #: syntax.c:7918
 msgid "W18: Invalid character in group name"
-msgstr "W18: îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ ÇÒÕÐÐÙ"
+msgstr "W18: Недопустимый символ в имени группы"
 
 #: tag.c:90
 msgid "E555: at bottom of tag stack"
-msgstr "E555: ×ÎÉÚÕ ÓÔÅËÁ ÍÅÔÏË"
+msgstr "E555: внизу стека меток"
 
 #: tag.c:91
 msgid "E556: at top of tag stack"
-msgstr "E556: ÎÁ×ÅÒÈÕ ÓÔÅËÁ ÍÅÔÏË"
+msgstr "E556: наверху стека меток"
 
 #: tag.c:412
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × ÐÏÚÉÃÉÀ ÄÏ ÐÅÒ×ÏÊ ÓÏ×ÐÁÄÁÀÝÅÊ ÍÅÔËÉ"
+msgstr "E425: Невозможно перейти в позицию до первой совпадающей метки"
 
 #: tag.c:550
 #, c-format
 msgid "E426: tag not found: %s"
-msgstr "E426: íÅÔËÁ ÎÅ ÎÁÊÄÅÎÁ: %s"
+msgstr "E426: Метка не найдена: %s"
 
 #: tag.c:583
 msgid "  # pri kind tag"
-msgstr "  # ÐÒÉ ÔÉÐ  ÍÅÔËÁ"
+msgstr "  # при тип  метка"
 
 #: tag.c:586
 msgid "file\n"
-msgstr "ÆÁÊÌ\n"
+msgstr "файл\n"
 
 #.
 #. * Ask to select a tag from the list.
@@ -5635,39 +5644,39 @@
 #.
 #: tag.c:744
 msgid "Enter nr of choice (<CR> to abort): "
-msgstr "÷ÙÂÅÒÉÔÅ ÎÕÖÎÙÊ ÎÏÍÅÒ (<CR> ÄÌÑ ÏÔËÁÚÁ):"
+msgstr "Выберите нужный номер (<CR> для отказа):"
 
 #: tag.c:784
 msgid "E427: There is only one matching tag"
-msgstr "E427: åÓÔØ ÔÏÌØËÏ ÏÄÎÁ ÓÏ×ÐÁÄÁÀÝÁÑ ÍÅÔËÁ"
+msgstr "E427: Есть только одна совпадающая метка"
 
 #: tag.c:786
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × ÐÏÚÉÃÉÀ ÚÁ ÐÏÓÌÅÄÎÅÊ ÓÏ×ÐÁÄÁÀÝÅÊ ÍÅÔËÏÊ"
+msgstr "E428: Невозможно перейти в позицию за последней совпадающей меткой"
 
 #: tag.c:810
 #, c-format
 msgid "File \"%s\" does not exist"
-msgstr "æÁÊÌ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
+msgstr "Файл \"%s\" не существует"
 
 #. Give an indication of the number of matching tags
 #: tag.c:823
 #, c-format
 msgid "tag %d of %d%s"
-msgstr "ÍÅÔËÁ %d ÉÚ %d%s"
+msgstr "метка %d из %d%s"
 
 #: tag.c:826
 msgid " or more"
-msgstr " É ÂÏÌÅÅ"
+msgstr " и более"
 
 #: tag.c:828
 msgid "  Using tag with different case!"
-msgstr " éÓÐÏÌØÚÕÅÔÓÑ ÍÅÔËÁ Ó ÓÉÍ×ÏÌÁÍÉ × ÄÒÕÇÏÍ ÒÅÇÉÓÔÒÅ!"
+msgstr " Используется метка с символами в другом регистре!"
 
 #: tag.c:872
 #, c-format
 msgid "E429: File \"%s\" does not exist"
-msgstr "E429: æÁÊÌ \"%s\" ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
+msgstr "E429: Файл \"%s\" не существует"
 
 #. Highlight title
 #: tag.c:941
@@ -5676,74 +5685,74 @@
 "  # TO tag         FROM line  in file/text"
 msgstr ""
 "\n"
-"  # ë  ÍÅÔËÅ       ïô   ÓÔÒ.  × ÆÁÊÌÅ/ÔÅËÓÔÅ"
+"  # К  метке       ОТ   стр.  в файле/тексте"
 
 #: tag.c:1363
 #, c-format
 msgid "Searching tags file %s"
-msgstr "ðÏÉÓË × ÆÁÊÌÅ ÍÅÔÏË %s"
+msgstr "Поиск в файле меток %s"
 
 #: tag.c:1550
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
-msgstr "E430: ðÕÔØ Ë ÆÁÊÌÕ ÍÅÔÏË %s ÏÂÒÅÚÁÎ\n"
+msgstr "E430: Путь к файлу меток %s обрезан\n"
 
 #: tag.c:2203
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: ïÛÉÂËÁ ÆÏÒÍÁÔÁ × ÆÁÊÌÅ ÍÅÔÏË \"%s\""
+msgstr "E431: Ошибка формата в файле меток \"%s\""
 
 #: tag.c:2207
 #, c-format
 msgid "Before byte %ld"
-msgstr "ðÅÒÅÄ ÂÁÊÔÏÍ %ld"
+msgstr "Перед байтом %ld"
 
 #: tag.c:2240
 #, c-format
 msgid "E432: Tags file not sorted: %s"
-msgstr "E432: æÁÊÌ ÍÅÔÏË ÎÅ ÏÔÓÏÒÔÉÒÏ×ÁÎ: %s"
+msgstr "E432: Файл меток не отсортирован: %s"
 
 #. never opened any tags file
 #: tag.c:2280
 msgid "E433: No tags file"
-msgstr "E433: æÁÊÌ ÍÅÔÏË ÎÅ ÏÂÎÁÒÕÖÅÎ"
+msgstr "E433: Файл меток не обнаружен"
 
 #: tag.c:3016
 msgid "E434: Can't find tag pattern"
-msgstr "E434: îÅ ÎÁÊÄÅÎ ÛÁÂÌÏÎ ÍÅÔËÉ"
+msgstr "E434: Не найден шаблон метки"
 
 #: tag.c:3027
 msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: íÅÔËÁ ÎÅ ÎÁÊÄÅÎÁ, ÐÙÔÁÅÍÓÑ ÕÇÁÄÁÔØ!"
+msgstr "E435: Метка не найдена, пытаемся угадать!"
 
 #: term.c:1759
 msgid "' not known. Available builtin terminals are:"
-msgstr "' ÎÅ ÉÚ×ÅÓÔÅÎ. äÏÓÔÕÐÎÙ ×ÓÔÒÏÅÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"
+msgstr "' не известен. Доступны встроенные терминалы:"
 
 #: term.c:1783
 msgid "defaulting to '"
-msgstr "ÐÏ ÕÍÏÌÞÁÎÉÀ '"
+msgstr "по умолчанию '"
 
 #: term.c:2141
 msgid "E557: Cannot open termcap file"
-msgstr "E557: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ termcap"
+msgstr "E557: Невозможно открыть файл termcap"
 
 #: term.c:2145
 msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: ÷ terminfo ÎÅÔ ÚÁÐÉÓÉ ÏÂ ÜÔÏÍ ÔÅÒÍÉÎÁÌÅ"
+msgstr "E558: В terminfo нет записи об этом терминале"
 
 #: term.c:2147
 msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: ÷ termcap ÎÅÔ ÚÁÐÉÓÉ ÏÂ ÜÔÏÍ ÔÅÒÍÉÎÁÌÅ"
+msgstr "E559: В termcap нет записи об этом терминале"
 
 #: term.c:2306
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: ÷ termcap ÎÅÔ ÚÁÐÉÓÉ \"%s\""
+msgstr "E436: В termcap нет записи \"%s\""
 
 #: term.c:2780
 msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: ÔÒÅÂÕÅÔÓÑ ÓÐÏÓÏÂÎÏÓÔØ ÔÅÒÍÉÎÁÌÁ \"cm\""
+msgstr "E437: требуется способность терминала \"cm\""
 
 #. Highlight title
 #: term.c:4990
@@ -5752,907 +5761,905 @@
 "--- Terminal keys ---"
 msgstr ""
 "\n"
-"--- ëÎÏÐËÉ ÔÅÒÍÉÎÁÌÁ ---"
+"--- Кнопки терминала ---"
 
 #: ui.c:258
 msgid "new shell started\n"
-msgstr "ÚÁÐÕÓË ÎÏ×ÏÊ ÏÂÏÌÏÞËÉ\n"
+msgstr "запуск новой оболочки\n"
 
 #: ui.c:1841
 msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: ïÛÉÂËÁ ÞÔÅÎÉÑ ××ÏÄÁ, ×ÙÈÏÄ...\n"
+msgstr "Vim: Ошибка чтения ввода, выход...\n"
 
 #. must display the prompt
 #: undo.c:405
 msgid "No undo possible; continue anyway"
-msgstr "ïÔÍÅÎÁ ÎÅ×ÏÚÍÏÖÎÁ; ÐÒÏÄÏÌÖÁÔØ ×ÙÐÏÌÎÅÎÉÅ"
+msgstr "Отмена невозможна; продолжать выполнение"
 
 #: undo.c:561
 msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: ÎÅÐÒÁ×ÉÌØÎÙÅ ÎÏÍÅÒÁ ÓÔÒÏË"
+msgstr "E438: u_undo: неправильные номера строк"
 
 #: undo.c:757
 msgid "1 change"
-msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÉÚÍÅÎÅÎÉÅ"
+msgstr "Единственное изменение"
 
 #: undo.c:759
 #, c-format
 msgid "%ld changes"
-msgstr "éÚÍÅÎÅÎÉÊ: %ld"
+msgstr "Изменений: %ld"
 
 #: undo.c:812
 msgid "E439: undo list corrupt"
-msgstr "E439: ðÏ×ÒÅÖģΠÓÐÉÓÏË ÏÔÍÅÎÙ"
+msgstr "E439: Повреждён список отмены"
 
 #: undo.c:844
 msgid "E440: undo line missing"
-msgstr "E440: ÐÏÔÅÒÑÎÁ ÓÔÒÏËÁ ÏÔÍÅÎÙ"
+msgstr "E440: потеряна строка отмены"
 
 #. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:721
+#: version.c:707
 msgid ""
 "\n"
 "MS-Windows 16/32 bit GUI version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ ÄÌÑ MS-Windows 16/32 ÂÉÔ"
+"Версия с графическим интерфейсом для MS-Windows 16/32 бит"
 
-#: version.c:723
+#: version.c:709
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ ÄÌÑ MS-Windows 32 ÂÉÔ"
+"Версия с графическим интерфейсом для MS-Windows 32 бит"
 
-#: version.c:726
+#: version.c:712
 msgid " in Win32s mode"
-msgstr " × ÒÅÖÉÍÅ Win32s"
+msgstr " в режиме Win32s"
 
-#: version.c:728
+#: version.c:714
 msgid " with OLE support"
-msgstr " Ó ÐÏÄÄÅÒÖËÏÊ OLE"
+msgstr " с поддержкой OLE"
 
-#: version.c:731
+#: version.c:717
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
 msgstr ""
 "\n"
-"ëÏÎÓÏÌØÎÁÑ ×ÅÒÓÉÑ ÄÌÑ MS-Windows 32 ÂÉÔ"
+"Консольная версия для MS-Windows 32 бит"
 
-#: version.c:735
+#: version.c:721
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ ÄÌÑ MS-Windows 16 ÂÉÔ"
+"Версия для MS-Windows 16 бит"
 
-#: version.c:739
+#: version.c:725
 msgid ""
 "\n"
 "32 bit MS-DOS version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ ÄÌÑ MS-DOS 32 ÂÉÔ"
+"Версия для MS-DOS 32 бит"
 
-#: version.c:741
+#: version.c:727
 msgid ""
 "\n"
 "16 bit MS-DOS version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ ÄÌÑ MS-DOS 16 ÂÉÔ"
+"Версия для MS-DOS 16 бит"
 
-#: version.c:747
+#: version.c:733
 msgid ""
 "\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ ÄÌÑ MacOS X (unix)"
+"Версия для MacOS X (unix)"
 
-#: version.c:749
+#: version.c:735
 msgid ""
 "\n"
 "MacOS X version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ ÄÌÑ MacOS X"
+"Версия для MacOS X"
 
-#: version.c:752
+#: version.c:738
 msgid ""
 "\n"
 "MacOS version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ ÄÌÑ MacOS"
+"Версия для MacOS"
 
-#: version.c:757
+#: version.c:743
 msgid ""
 "\n"
 "RISC OS version"
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ ÄÌÑ RISC OS"
+"Версия для RISC OS"
 
-#: version.c:767
+#: version.c:753
 msgid ""
 "\n"
 "Included patches: "
 msgstr ""
 "\n"
-"úÁÐÌÁÔËÉ: "
+"Заплатки: "
 
-#: version.c:793 version.c:1161
+#: version.c:779 version.c:1147
 msgid "Modified by "
-msgstr "ó ÉÚÍÅÎÅÎÉÑÍÉ, ×ÎÅÓ£ÎÎÙÍÉ "
+msgstr "С изменениями, внесёнными "
 
-#: version.c:800
+#: version.c:786
 msgid ""
 "\n"
 "Compiled "
 msgstr ""
 "\n"
-"óËÏÍÐÉÌÉÒÏ×ÁÎ "
+"Скомпилирован "
 
-#: version.c:803
+#: version.c:789
 msgid "by "
 msgstr " "
 
-#: version.c:815
+#: version.c:801
 msgid ""
 "\n"
 "Huge version "
 msgstr ""
 "\n"
-"ïÇÒÏÍÎÁÑ ×ÅÒÓÉÑ "
+"Огромная версия "
 
-#: version.c:818
+#: version.c:804
 msgid ""
 "\n"
 "Big version "
 msgstr ""
 "\n"
-"âÏÌØÛÁÑ ×ÅÒÓÉÑ "
+"Большая версия "
 
-#: version.c:821
+#: version.c:807
 msgid ""
 "\n"
 "Normal version "
 msgstr ""
 "\n"
-"ïÂÙÞÎÁÑ ×ÅÒÓÉÑ "
+"Обычная версия "
 
-#: version.c:824
+#: version.c:810
 msgid ""
 "\n"
 "Small version "
 msgstr ""
 "\n"
-"íÁÌÁÑ ×ÅÒÓÉÑ "
+"Малая версия "
 
-#: version.c:826
+#: version.c:812
 msgid ""
 "\n"
 "Tiny version "
 msgstr ""
 "\n"
-"÷ÅÒÓÉÑ \"ëÒÏÈÁ\" "
+"Версия \"Кроха\" "
 
-#: version.c:832
+#: version.c:818
 msgid "without GUI."
-msgstr "ÂÅÚ ÇÒÁÆÉÞÅÓËÏÇÏ ÉÎÔÅÒÆÅÊÓÁ."
+msgstr "без графического интерфейса."
 
-#: version.c:837
+#: version.c:823
 msgid "with GTK2-GNOME GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ GTK2-GNOME."
+msgstr "с графическим интерфейсом GTK2-GNOME."
 
-#: version.c:839
+#: version.c:825
 msgid "with GTK-GNOME GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ GTK-GNOME."
+msgstr "с графическим интерфейсом GTK-GNOME."
 
-#: version.c:843
+#: version.c:829
 msgid "with GTK2 GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ GTK2."
+msgstr "с графическим интерфейсом GTK2."
 
-#: version.c:845
+#: version.c:831
 msgid "with GTK GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ GTK."
+msgstr "с графическим интерфейсом GTK."
 
-#: version.c:850
+#: version.c:836
 msgid "with X11-Motif GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ X11-Motif."
+msgstr "с графическим интерфейсом X11-Motif."
 
-#: version.c:854
+#: version.c:840
 msgid "with X11-neXtaw GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ X11-neXtaw."
+msgstr "с графическим интерфейсом X11-neXtaw."
 
-#: version.c:856
+#: version.c:842
 msgid "with X11-Athena GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ X11-Athena."
+msgstr "с графическим интерфейсом X11-Athena."
 
-#: version.c:860
+#: version.c:846
 msgid "with BeOS GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ BeOS."
+msgstr "с графическим интерфейсом BeOS."
 
-#: version.c:863
+#: version.c:849
 msgid "with Photon GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ Photon."
+msgstr "с графическим интерфейсом Photon."
 
-#: version.c:866
+#: version.c:852
 msgid "with GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ."
+msgstr "с графическим интерфейсом."
 
-#: version.c:869
+#: version.c:855
 msgid "with Carbon GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ Carbon."
+msgstr "с графическим интерфейсом Carbon."
+
+#: version.c:858
+msgid "with Cocoa GUI."
+msgstr "с графическим интерфейсом Cocoa."
+
+#: version.c:861
+msgid "with (classic) GUI."
+msgstr "с классическим графическим интерфейсом."
 
 #: version.c:872
-msgid "with Cocoa GUI."
-msgstr "Ó ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ Cocoa."
-
-#: version.c:875
-msgid "with (classic) GUI."
-msgstr "Ó ËÌÁÓÓÉÞÅÓËÉÍ ÇÒÁÆÉÞÅÓËÉÍ ÉÎÔÅÒÆÅÊÓÏÍ."
-
-#: version.c:886
 msgid "  Features included (+) or not (-):\n"
-msgstr "  ÷ËÌÀÞ£ÎÎÙÅ (+) É ÏÔËÌÀÞ£ÎÎÙÅ (-) ÏÓÏÂÅÎÎÏÓÔÉ:\n"
+msgstr "  Включённые (+) и отключённые (-) особенности:\n"
 
-#: version.c:898
+#: version.c:884
 msgid "   system vimrc file: \""
-msgstr "            ÏÂÝÅÓÉÓÔÅÍÎÙÊ ÆÁÊÌ vimrc: \""
+msgstr "            общесистемный файл vimrc: \""
 
-#: version.c:903
+#: version.c:889
 msgid "     user vimrc file: \""
-msgstr "         ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÁÊÌ vimrc: \""
+msgstr "         пользовательский файл vimrc: \""
 
-#: version.c:908
+#: version.c:894
 msgid " 2nd user vimrc file: \""
-msgstr "  ×ÔÏÒÏÊ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÁÊÌ vimrc: \""
+msgstr "  второй пользовательский файл vimrc: \""
 
-#: version.c:913
+#: version.c:899
 msgid " 3rd user vimrc file: \""
-msgstr "  ÔÒÅÔÉÊ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÁÊÌ vimrc: \""
+msgstr "  третий пользовательский файл vimrc: \""
 
-#: version.c:918
+#: version.c:904
 msgid "      user exrc file: \""
-msgstr "          ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÁÊÌ exrc: \""
+msgstr "          пользовательский файл exrc: \""
+
+#: version.c:909
+msgid "  2nd user exrc file: \""
+msgstr "   второй пользовательский файл exrc: \""
+
+#: version.c:915
+msgid "  system gvimrc file: \""
+msgstr "           общесистемный файл gvimrc: \""
+
+#: version.c:919
+msgid "    user gvimrc file: \""
+msgstr "        пользовательский файл gvimrc: \""
 
 #: version.c:923
-msgid "  2nd user exrc file: \""
-msgstr "   ×ÔÏÒÏÊ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÁÊÌ exrc: \""
-
-#: version.c:929
-msgid "  system gvimrc file: \""
-msgstr "           ÏÂÝÅÓÉÓÔÅÍÎÙÊ ÆÁÊÌ gvimrc: \""
-
-#: version.c:933
-msgid "    user gvimrc file: \""
-msgstr "        ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÁÊÌ gvimrc: \""
-
-#: version.c:937
 msgid "2nd user gvimrc file: \""
-msgstr " ×ÔÏÒÏÊ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÁÊÌ gvimrc: \""
+msgstr " второй пользовательский файл gvimrc: \""
 
-#: version.c:942
+#: version.c:928
 msgid "3rd user gvimrc file: \""
-msgstr " ÔÒÅÔÉÊ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÁÊÌ gvimrc: \""
+msgstr " третий пользовательский файл gvimrc: \""
+
+#: version.c:935
+msgid "    system menu file: \""
+msgstr "             общесистемный файл меню: \""
+
+#: version.c:943
+msgid "  fall-back for $VIM: \""
+msgstr "          значение $VIM по умолчанию: \""
 
 #: version.c:949
-msgid "    system menu file: \""
-msgstr "             ÏÂÝÅÓÉÓÔÅÍÎÙÊ ÆÁÊÌ ÍÅÎÀ: \""
-
-#: version.c:957
-msgid "  fall-back for $VIM: \""
-msgstr "          ÚÎÁÞÅÎÉÅ $VIM ÐÏ ÕÍÏÌÞÁÎÉÀ: \""
-
-#: version.c:963
 msgid " f-b for $VIMRUNTIME: \""
-msgstr "   ÚÎÁÞÅÎÉÅ $VIMRUNTIME ÐÏ ÕÍÏÌÞÁÎÉÀ: \""
+msgstr "   значение $VIMRUNTIME по умолчанию: \""
 
-#: version.c:967
+#: version.c:953
 msgid "Compilation: "
-msgstr "ðÁÒÁÍÅÔÒÙ ËÏÍÐÉÌÑÃÉÉ: "
+msgstr "Параметры компиляции: "
 
-#: version.c:973
+#: version.c:959
 msgid "Compiler: "
-msgstr "ëÏÍÐÉÌÑÔÏÒ: "
+msgstr "Компилятор: "
 
-#: version.c:978
+#: version.c:964
 msgid "Linking: "
-msgstr "óÂÏÒËÁ: "
+msgstr "Сборка: "
 
-#: version.c:983
+#: version.c:969
 msgid "  DEBUG BUILD"
-msgstr "  ïôìáäïþîáñ óâïòëá"
+msgstr "  ОТЛАДОЧНАЯ СБОРКА"
+
+#: version.c:1008
+msgid "VIM - Vi IMproved"
+msgstr "VIM ::: Vi IMproved (Улучшенный Vi) ::: Русская версия"
+
+#: version.c:1010
+msgid "version "
+msgstr "версия "
+
+#: version.c:1011
+msgid "by Bram Moolenaar et al."
+msgstr "Брам Мооленаар и другие"
+
+#: version.c:1015
+msgid "Vim is open source and freely distributable"
+msgstr "Vim это свободно распространяемая программа с открытым кодом"
+
+#: version.c:1017
+msgid "Help poor children in Uganda!"
+msgstr "Бедным детям в Уганде нужна ваша помощь!"
+
+#: version.c:1018
+msgid "type  :help iccf<Enter>       for information "
+msgstr "наберите :help iccf<Enter>       для дополнительной информации"
+
+#: version.c:1020
+msgid "type  :q<Enter>               to exit         "
+msgstr "наберите :q<Enter>               чтобы выйти из программы     "
+
+#: version.c:1021
+msgid "type  :help<Enter>  or  <F1>  for on-line help"
+msgstr "наберите :help<Enter> или <F1>   для получения справки        "
 
 #: version.c:1022
-msgid "VIM - Vi IMproved"
-msgstr "VIM ::: Vi IMproved (õÌÕÞÛÅÎÎÙÊ Vi) ::: òÕÓÓËÁÑ ×ÅÒÓÉÑ"
-
-#: version.c:1024
-msgid "version "
-msgstr "×ÅÒÓÉÑ "
+msgid "type  :help version6<Enter>   for version info"
+msgstr "наберите :help version6<Enter>   чтобы узнать об этой версии  "
 
 #: version.c:1025
-msgid "by Bram Moolenaar et al."
-msgstr "âÒÁÍ íÏÏÌÅÎÁÁÒ É ÄÒÕÇÉÅ"
-
-#: version.c:1029
-msgid "Vim is open source and freely distributable"
-msgstr "Vim ÜÔÏ Ó×ÏÂÏÄÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÅÍÁÑ ÐÒÏÇÒÁÍÍÁ Ó ÏÔËÒÙÔÙÍ ËÏÄÏÍ"
-
-#: version.c:1031
-msgid "Help poor children in Uganda!"
-msgstr "âÅÄÎÙÍ ÄÅÔÑÍ × õÇÁÎÄÅ ÎÕÖÎÁ ×ÁÛÁ ÐÏÍÏÝØ!"
-
-#: version.c:1032
-msgid "type  :help iccf<Enter>       for information "
-msgstr "ÎÁÂÅÒÉÔÅ :help iccf<Enter>       ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ"
-
-#: version.c:1034
-msgid "type  :q<Enter>               to exit         "
-msgstr "ÎÁÂÅÒÉÔÅ :q<Enter>               ÞÔÏÂÙ ×ÙÊÔÉ ÉÚ ÐÒÏÇÒÁÍÍÙ     "
-
-#: version.c:1035
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "ÎÁÂÅÒÉÔÅ :help<Enter> ÉÌÉ <F1>   ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÒÁ×ËÉ        "
-
-#: version.c:1036
-msgid "type  :help version6<Enter>   for version info"
-msgstr "ÎÁÂÅÒÉÔÅ :help version6<Enter>   ÞÔÏÂÙ ÕÚÎÁÔØ Ï ÜÔÏÊ ×ÅÒÓÉÉ  "
-
-#: version.c:1039
 msgid "Running in Vi compatible mode"
-msgstr "òÁÂÏÔÁ × Vi-ÓÏ×ÍÅÓÔÉÍÏÍ ÒÅÖÉÍÅ"
+msgstr "Работа в Vi-совместимом режиме"
 
-#: version.c:1040
+#: version.c:1026
 msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "ÎÁÂÅÒÉÔÅ :set nocp<Enter>        ÄÌÑ ÐÅÒÅÈÏÄÁ × ÒÅÖÉÍ Vim     "
+msgstr "наберите :set nocp<Enter>        для перехода в режим Vim     "
 
-#: version.c:1041
+#: version.c:1027
 msgid "type  :help cp-default<Enter> for info on this"
-msgstr "ÎÁÂÅÒÉÔÅ :help cp-default<Enter> ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ"
+msgstr "наберите :help cp-default<Enter> для дополнительной информации"
 
-#: version.c:1056
+#: version.c:1042
 msgid "menu  Help->Orphans           for information    "
-msgstr "ÍÅÎÀ óÐÒÁ×ËÁ->óÉÒÏÔÙ             ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ     "
+msgstr "меню Справка->Сироты             для получения информации     "
 
-#: version.c:1058
+#: version.c:1044
 msgid "Running modeless, typed text is inserted"
-msgstr "âÅÚÒÅÖÉÍÎÁÑ ÒÁÂÏÔÙ, ×ÓÔÁ×ËÁ ××ÅÄ£ÎÎÏÇÏ ÔÅËÓÔÁ"
+msgstr "Безрежимная работы, вставка введённого текста"
 
-#: version.c:1059
+#: version.c:1045
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-msgstr "ÍÅÎÀ ðÒÁ×ËÁ->ïÂÝÉÅ îÁÓÔÒÏÊËÉ->òÅÖÉÍ ÷ÓÔÁ×ËÉ                     "
+msgstr "меню Правка->Общие Настройки->Режим Вставки                     "
 
-#: version.c:1060
+#: version.c:1046
 msgid "                              for two modes      "
-msgstr "                                 ÄÌÑ Ä×ÕÈ ÒÅÖÉÍÏ×               "
+msgstr "                                 для двух режимов               "
 
-#: version.c:1064
+#: version.c:1050
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-msgstr "ÍÅÎÀ ðÒÁ×ËÁ->ïÂÝÉÅ îÁÓÔÒÏÊËÉ->óÏ×ÍÅÓÔÉÍÏÓÔØ Ó Vi                "
+msgstr "меню Правка->Общие Настройки->Совместимость с Vi                "
 
-#: version.c:1065
+#: version.c:1051
 msgid "                              for Vim defaults   "
-msgstr "                                 ÄÌÑ ÐÅÒÅÈÏÄÁ × ÒÅÖÉÍ Vim       "
+msgstr "                                 для перехода в режим Vim       "
 
-#: version.c:1112
+#: version.c:1098
 msgid "Sponsor Vim development!"
-msgstr "ðÏÍÏÇÉÔÅ × ÒÁÚÒÁÂÏÔËÅ Vim!"
+msgstr "Помогите в разработке Vim!"
 
-#: version.c:1113
+#: version.c:1099
 msgid "Become a registered Vim user!"
-msgstr "óÔÁÎØÔÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÅÍ Vim!"
+msgstr "Станьте зарегистрированным пользователем Vim!"
 
-#: version.c:1116
+#: version.c:1102
 msgid "type  :help sponsor<Enter>    for information "
-msgstr "ÎÁÂÅÒÉÔÅ :help sponsor<Enter>    ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ     "
+msgstr "наберите :help sponsor<Enter>    для получения информации     "
 
-#: version.c:1117
+#: version.c:1103
 msgid "type  :help register<Enter>   for information "
-msgstr "ÎÁÂÅÒÉÔÅ :help register<Enter>   ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ     "
+msgstr "наберите :help register<Enter>   для получения информации     "
 
-#: version.c:1119
+#: version.c:1105
 msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "ÍÅÎÀ óÐÒÁ×ËÁ->ðÏÍÏÝØ/òÅÇÉÓÔÒÁÃÉÑ ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ       "
+msgstr "меню Справка->Помощь/Регистрация для получения информации       "
 
-#: version.c:1129
+#: version.c:1115
 msgid "WARNING: Windows 95/98/ME detected"
-msgstr "ðòåäõðòåöäåîéå: ÏÂÎÁÒÕÖÅÎÁ Windows 95/98/ME"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: обнаружена Windows 95/98/ME"
 
-#: version.c:1132
+#: version.c:1118
 msgid "type  :help windows95<Enter>  for info on this"
-msgstr "ÎÁÂÅÒÉÔÅ :help windows95<Enter>  ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÉÎÆÏÒÍÁÃÉÉ     "
+msgstr "наберите :help windows95<Enter>  для получения информации     "
 
 #: window.c:203
 msgid "E441: There is no preview window"
-msgstr "E441: ïËÎÏ ÐÒÅÄÐÒÏÓÍÏÔÒÁ ÏÔÓÕÔÓÔ×ÕÅÔ"
+msgstr "E441: Окно предпросмотра отсутствует"
 
 #: window.c:581
 msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ïËÎÏ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÓÌÅ×Á ××ÅÒÈÕ É ÓÐÒÁ×Á ×ÎÉÚÕ"
+msgstr "E442: Окно не может быть одновременно слева вверху и справа внизу"
 
 #: window.c:1340
 msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: îÅ×ÏÚÍÏÖÎÏ ÐÏÍÅÎÑÔØ ÍÅÓÔÁÍÉ, ÐÏËÁ ÄÒÕÇÏÅ ÏËÎÏ ÒÁÚÄÅÌÅÎÏ"
+msgstr "E443: Невозможно поменять местами, пока другое окно разделено"
 
 #: window.c:1836
 msgid "E444: Cannot close last window"
-msgstr "E444: îÅÌØÚÑ ÚÁËÒÙÔØ ÐÏÓÌÅÄÎÅÅ ÏËÎÏ"
+msgstr "E444: Нельзя закрыть последнее окно"
 
 #: window.c:2567
 msgid "Already only one window"
-msgstr "îÁ ÜËÒÁÎÅ ×ÓÅÇÏ ÏÄÎÏ ÏËÎÏ"
+msgstr "На экране всего одно окно"
 
 #: window.c:2614
 msgid "E445: Other window contains changes"
-msgstr "E445: ÷ ÄÒÕÇÏÍ ÏËÎÅ ÅÓÔØ ÎÅÓÏÈÒÁΣÎÎÙÅ ÉÚÍÅÎÅÎÉÑ"
+msgstr "E445: В другом окне есть несохранённые изменения"
 
 #: window.c:4480
 msgid "E446: No file name under cursor"
-msgstr "E446: îÅÔ ÉÍÅÎÉ ÆÁÊÌÁ × ÐÏÚÉÃÉÉ ËÕÒÓÏÒÁ"
+msgstr "E446: Нет имени файла в позиции курсора"
 
 #: window.c:4599
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: æÁÊÌ \"%s\" ÎÅ ÎÁÊÄÅÎ ÐÏ ÉÚ×ÅÓÔÎÙÍ ÐÕÔÑÍ"
+msgstr "E447: Файл \"%s\" не найден по известным путям"
 
-#: if_perl.xs:326 globals.h:1232
+#: if_perl.xs:326 globals.h:1241
 #, c-format
 msgid "E370: Could not load library %s"
-msgstr "E370: îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÂÉÂÌÉÏÔÅËÕ %s"
+msgstr "E370: Невозможно загрузить библиотеку %s"
 
 #: if_perl.xs:554
 msgid "Sorry, this command is disabled: the Perl library could not be loaded."
 msgstr ""
-"éÚ×ÉÎÉÔÅ, ÄÁÎÎÁÑ ËÏÍÁÎÄÁ ÏÔËÌÀÞÅÎÁ: ÎÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÂÉÂÌÉÏÔÅËÕ Perl"
+"Извините, данная команда отключена: невозможно загрузить библиотеку Perl"
 
 #: if_perl.xs:607
 msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
 msgstr ""
-"E299: îÅ ÄÏÐÕÓËÁÅÔÓÑ ×ÙÞÉÓÌÅÎÉÅ Perl × ÐÅÓÏÞÎÉÃÅ ÂÅÚ ÍÏÄÕÌÑ ÂÅÚÏÐÁÓÎÏÓÔÉ"
+"E299: Не допускается вычисление Perl в песочнице без модуля безопасности"
 
 #: GvimExt/gvimext.cpp:583
 msgid "Edit with &multiple Vims"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ × &ÒÁÚÎÙÈ Vim-ÁÈ"
+msgstr "Редактировать в &разных Vim-ах"
 
 #: GvimExt/gvimext.cpp:589
 msgid "Edit with single &Vim"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ × &ÏÄÎÏÍ Vim"
+msgstr "Редактировать в &одном Vim"
 
 #: GvimExt/gvimext.cpp:598
 msgid "&Diff with Vim"
-msgstr "&óÒÁ×ÎÉÔØ Ó ÐÏÍÏÝØÀ Vim"
+msgstr "&Сравнить с помощью Vim"
 
 #: GvimExt/gvimext.cpp:611
 msgid "Edit with &Vim"
-msgstr "òÅ&ÄÁËÔÉÒÏ×ÁÔØ Ó ÐÏÍÏÝØÀ Vim"
+msgstr "Ре&дактировать с помощью Vim"
 
 #. Now concatenate
 #: GvimExt/gvimext.cpp:633
 msgid "Edit with existing Vim - &"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ × ÚÁÐÕÝÅÎÎÏÍ Vim - &"
+msgstr "Редактировать в запущенном Vim - &"
 
 #: GvimExt/gvimext.cpp:746
 msgid "Edits the selected file(s) with Vim"
-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ×ÙÄÅÌÅÎÎÙÅ ÆÁÊÌÙ Ó ÐÏÍÏÝØÀ Vim"
+msgstr "Редактировать выделенные файлы с помощью Vim"
 
 #: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
 msgid "Error creating process: Check if gvim is in your path!"
-msgstr "ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÐÒÏÃÅÓÓÁ: ÐÒÏ×ÅÒØÔÅ ÄÏÓÔÕÐÎÏÓÔØ gvim × ÐÕÔÉ!"
+msgstr "Ошибка создания процесса: проверьте доступность gvim в пути!"
 
 #: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
 msgid "gvimext.dll error"
-msgstr "ÏÛÉÂËÁ gvimext.dll"
+msgstr "ошибка gvimext.dll"
 
 #: GvimExt/gvimext.cpp:899
 msgid "Path length too long!"
-msgstr "óÌÉÛËÏÍ ÄÌÉÎÎÙÊ ÐÕÔØ!"
+msgstr "Слишком длинный путь!"
 
-#: globals.h:1022
+#: globals.h:1031
 msgid "--No lines in buffer--"
-msgstr "-- îÅÔ ÓÔÒÏË × ÂÕÆÅÒÅ --"
+msgstr "-- Нет строк в буфере --"
 
 #.
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: globals.h:1185
-msgid "E470: Command aborted"
-msgstr "E470: ÷ÙÐÏÌÎÅÎÉÅ ËÏÍÁÎÄÙ ÐÒÅÒ×ÁÎÏ"
-
-#: globals.h:1186
-msgid "E471: Argument required"
-msgstr "E471: ôÒÅÂÕÅÔÓÑ ÕËÁÚÁÔØ ÐÁÒÁÍÅÔÒ"
-
-#: globals.h:1187
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: ðÏÓÌÅ \\ ÄÏÌÖÅÎ ÉÄÔÉ ÓÉÍ×ÏÌ /, ? ÉÌÉ &"
-
-#: globals.h:1189
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr ""
-"E11: îÅÄÏÐÕÓÔÉÍÏ × ÏËÎÅ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ; <CR> ×ÙÐÏÌÎÅÎÉÅ, CTRL-C ×ÙÈÏÄ"
-
-#: globals.h:1191
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: ëÏÍÁÎÄÁ ÎÅ ÄÏÐÕÓËÁÅÔÓÑ × exrc/vimrc × ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ ÉÌÉ ÐÏÉÓËÅ ÍÅÔÏË"
-
-#: globals.h:1193
-msgid "E171: Missing :endif"
-msgstr "E171: ïÔÓÕÔÓÔ×ÕÅÔ ËÏÍÁÎÄÁ :endif"
-
 #: globals.h:1194
-msgid "E600: Missing :endtry"
-msgstr "E600: ïÔÓÕÔÓÔ×ÕÅÔ ËÏÍÁÎÄÁ :endtry"
+msgid "E470: Command aborted"
+msgstr "E470: Выполнение команды прервано"
 
 #: globals.h:1195
-msgid "E170: Missing :endwhile"
-msgstr "E170: ïÔÓÕÔÓÔ×ÕÅÔ ËÏÍÁÎÄÁ :endwhile"
+msgid "E471: Argument required"
+msgstr "E471: Требуется указать параметр"
 
 #: globals.h:1196
-msgid "E588: :endwhile without :while"
-msgstr "E588: ëÏÍÁÎÄÁ :endwhile ÂÅÚ ÐÁÒÎÏÊ ËÏÍÁÎÄÙ :while"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: После \\ должен идти символ /, ? или &"
 
 #: globals.h:1198
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ (ÄÌÑ ÐÅÒÅÚÁÐÉÓÉ ÄÏÂÁ×ØÔÅ !)"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr ""
+"E11: Недопустимо в окне командной строки; <CR> выполнение, CTRL-C выход"
 
-#: globals.h:1199
-msgid "E472: Command failed"
-msgstr "E472: îÅ ÕÄÁÌÏÓØ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ"
+#: globals.h:1200
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: Команда не допускается в exrc/vimrc в текущем каталоге или поиске меток"
 
-#: globals.h:1201
-#, c-format
-msgid "E234: Unknown fontset: %s"
-msgstr "E234: îÅÉÚ×ÅÓÔÎÙÊ ÛÒÉÆÔÏ×ÏÊ ÎÁÂÏÒ: %s"
+#: globals.h:1202
+msgid "E171: Missing :endif"
+msgstr "E171: Отсутствует команда :endif"
+
+#: globals.h:1203
+msgid "E600: Missing :endtry"
+msgstr "E600: Отсутствует команда :endtry"
+
+#: globals.h:1204
+msgid "E170: Missing :endwhile"
+msgstr "E170: Отсутствует команда :endwhile"
 
 #: globals.h:1205
-#, c-format
-msgid "E235: Unknown font: %s"
-msgstr "E235: îÅÉÚ×ÅÓÔÎÙÊ ÛÒÉÆÔ: %s"
+msgid "E588: :endwhile without :while"
+msgstr "E588: Команда :endwhile без парной команды :while"
+
+#: globals.h:1207
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: Файл существует (для перезаписи добавьте !)"
 
 #: globals.h:1208
-#, c-format
-msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: ûÒÉÆÔ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ÍÏÎÏÛÉÒÉÎÎÙÍ ÛÒÉÆÔÏÍ"
+msgid "E472: Command failed"
+msgstr "E472: Не удалось выполнить команду"
 
 #: globals.h:1210
-msgid "E473: Internal error"
-msgstr "E473: ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ"
-
-#: globals.h:1211
-msgid "Interrupted"
-msgstr "ðÒÅÒ×ÁÎÏ"
-
-#: globals.h:1212
-msgid "E14: Invalid address"
-msgstr "E14: îÅÄÏÐÕÓÔÉÍÙÊ ÁÄÒÅÓ"
-
-#: globals.h:1213
-msgid "E474: Invalid argument"
-msgstr "E474: îÅÄÏÐÕÓÔÉÍÙÊ ÁÒÇÕÍÅÎÔ"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Неизвестный шрифтовой набор: %s"
 
 #: globals.h:1214
 #, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: îÅÄÏÐÕÓÔÉÍÙÊ ÁÒÇÕÍÅÎÔ: %s"
+msgid "E235: Unknown font: %s"
+msgstr "E235: Неизвестный шрифт: %s"
 
-#: globals.h:1216
+#: globals.h:1217
 #, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: îÅÄÏÐÕÓÔÉÍÏÅ ×ÙÒÁÖÅÎÉÅ: %s"
-
-#: globals.h:1218
-msgid "E16: Invalid range"
-msgstr "E16: îÅÄÏÐÕÓÔÉÍÙÊ ÄÉÁÐÁÚÏÎ"
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: Шрифт \"%s\" не является моноширинным шрифтом"
 
 #: globals.h:1219
-msgid "E476: Invalid command"
-msgstr "E476: îÅÄÏÐÕÓÔÉÍÁÑ ËÏÍÁÎÄÁ"
+msgid "E473: Internal error"
+msgstr "E473: Внутренняя ошибка"
+
+#: globals.h:1220
+msgid "Interrupted"
+msgstr "Прервано"
 
 #: globals.h:1221
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
+msgid "E14: Invalid address"
+msgstr "E14: Недопустимый адрес"
 
-#: globals.h:1224
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: ðÅÒÅÄ '=' ÏÂÎÁÒÕÖÅÎÙ ÎÅÏÖÉÄÁÎÎÙÅ ÓÉÍ×ÏÌÙ"
+#: globals.h:1222
+msgid "E474: Invalid argument"
+msgstr "E474: Недопустимый аргумент"
+
+#: globals.h:1223
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Недопустимый аргумент: %s"
+
+#: globals.h:1225
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: Недопустимое выражение: %s"
 
 #: globals.h:1227
+msgid "E16: Invalid range"
+msgstr "E16: Недопустимый диапазон"
+
+#: globals.h:1228
+msgid "E476: Invalid command"
+msgstr "E476: Недопустимая команда"
+
+#: globals.h:1230
 #, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: îÅÕÄÁÞÎÙÊ ×ÙÚÏ× ÆÕÎËÃÉÉ \"%s()\" ÉÚ ÂÉÂÌÉÏÔÅËÉ"
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" является каталогом"
 
 #: globals.h:1233
-#, c-format
-msgid "E448: Could not load library function %s"
-msgstr "E448: îÅ ÕÄÁÌÏÓØ ÚÁÇÒÕÚÉÔØ ÆÕÎËÃÉÀ %s ÉÚ ÂÉÂÌÉÏÔÅËÉ"
-
-#: globals.h:1235
-msgid "E19: Mark has invalid line number"
-msgstr "E19: ïÔÍÅÔËÁ ÕËÁÚÙ×ÁÅÔ ÎÁ ÎÅÐÒÁ×ÉÌØÎÙÊ ÎÏÍÅÒ ÓÔÒÏËÉ"
+msgid "E18: Unexpected characters before '='"
+msgstr "E18: Перед '=' обнаружены неожиданные символы"
 
 #: globals.h:1236
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Неудачный вызов функции \"%s()\" из библиотеки"
+
+#: globals.h:1242
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Не удалось загрузить функцию %s из библиотеки"
+
+#: globals.h:1244
+msgid "E19: Mark has invalid line number"
+msgstr "E19: Отметка указывает на неправильный номер строки"
+
+#: globals.h:1245
 msgid "E20: Mark not set"
-msgstr "ïÔÍÅÔËÁ ÎÅ ÏÐÒÅÄÅÌÅÎÁ"
-
-#: globals.h:1237
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: éÚÍÅÎÅÎÉÑ ÎÅ×ÏÚÍÏÖÎÙ, ÔÁË ËÁË ÏÔËÌÀÞÅÎÁ ÏÐÃÉÑ 'modifiable'"
-
-#: globals.h:1238
-msgid "E22: Scripts nested too deep"
-msgstr "E22: óÌÉÛËÏÍ ÇÌÕÂÏËÏ ×ÌÏÖÅÎÎÙÅ ÓÃÅÎÁÒÉÉ"
-
-#: globals.h:1239
-msgid "E23: No alternate file"
-msgstr "E23: óÏÓÅÄÎÉÊ ÆÁÊÌ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
-
-#: globals.h:1240
-msgid "E24: No such abbreviation"
-msgstr "E24: îÅÔ ÔÁËÏÇÏ ÓÏËÒÁÝÅÎÉÑ"
-
-#: globals.h:1241
-msgid "E477: No ! allowed"
-msgstr "E477: ! ÎÅ ÄÏÐÕÓËÁÅÔÓÑ"
-
-#: globals.h:1243
-msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr ""
-"E25: ÷ÏÚÍÏÖÎÏÓÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÇÒÁÆÉÞÅÓËÏÇÏ ÉÎÔÅÒÆÅÊÓÁ ×ÙËÌÀÞÅÎÁ ÐÒÉ "
-"ËÏÍÐÉÌÑÃÉÉ"
+msgstr "Отметка не определена"
 
 #: globals.h:1246
-msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: é×ÒÉÔ ×ÙËÌÀÞÅÎ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ\n"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: Изменения невозможны, так как отключена опция 'modifiable'"
+
+#: globals.h:1247
+msgid "E22: Scripts nested too deep"
+msgstr "E22: Слишком глубоко вложенные сценарии"
+
+#: globals.h:1248
+msgid "E23: No alternate file"
+msgstr "E23: Соседний файл не существует"
 
 #: globals.h:1249
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: æÁÒÓÉ ×ÙËÌÀÞÅÎÏ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ\n"
+msgid "E24: No such abbreviation"
+msgstr "E24: Нет такого сокращения"
+
+#: globals.h:1250
+msgid "E477: No ! allowed"
+msgstr "E477: ! не допускается"
 
 #: globals.h:1252
-msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-msgstr "E800: áÒÁÂÓËÉÊ ×ÙËÌÀÞÅÎ ÐÒÉ ËÏÍÐÉÌÑÃÉÉ\n"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr ""
+"E25: Возможность использования графического интерфейса выключена при "
+"компиляции"
 
 #: globals.h:1255
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: çÒÕÐÐÁ ÐÏÄÓ×ÅÔËÉ ÓÉÎÔÁËÓÉÓÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
-
-#: globals.h:1257
-msgid "E29: No inserted text yet"
-msgstr "E29: ðÏËÁ ÎÅÔ ×ÓÔÁ×ÌÅÎÎÏÇÏ ÔÅËÓÔÁ"
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: Иврит выключен при компиляции\n"
 
 #: globals.h:1258
-msgid "E30: No previous command line"
-msgstr "E30: ðÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ÎÅÔ"
-
-#: globals.h:1259
-msgid "E31: No such mapping"
-msgstr "E31: ôÁËÏÊ ÐÒÉ×ÑÚËÉ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
-
-#: globals.h:1260
-msgid "E479: No match"
-msgstr "E479: îÅÔ ÓÏÏÔ×ÅÔÓÔ×ÉÑ"
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: Фарси выключено при компиляции\n"
 
 #: globals.h:1261
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: îÅÔ ÓÏÏÔ×ÅÔÓÔ×ÉÑ: %s"
-
-#: globals.h:1262
-msgid "E32: No file name"
-msgstr "E32: îÅÔ ÉÍÅÎÉ ÆÁÊÌÁ"
-
-#: globals.h:1263
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: îÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ ÄÌÑ ÚÁÍÅÎÙ"
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: Арабский выключен при компиляции\n"
 
 #: globals.h:1264
-msgid "E34: No previous command"
-msgstr "E34: îÅÔ ÐÒÅÄÙÄÕÝÅÊ ËÏÍÁÎÄÙ"
-
-#: globals.h:1265
-msgid "E35: No previous regular expression"
-msgstr "E35: îÅÔ ÐÒÅÄÙÄÕÝÅÇÏ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: Группа подсветки синтаксиса %s не существует"
 
 #: globals.h:1266
-msgid "E481: No range allowed"
-msgstr "E481: éÓÐÏÌØÚÏ×ÁÎÉÅ ÄÉÁÐÁÚÏÎÁ ÎÅ ÄÏÐÕÓËÁÅÔÓÑ"
+msgid "E29: No inserted text yet"
+msgstr "E29: Пока нет вставленного текста"
+
+#: globals.h:1267
+msgid "E30: No previous command line"
+msgstr "E30: Предыдущей командной строки нет"
 
 #: globals.h:1268
-msgid "E36: Not enough room"
-msgstr "E36: îÅÄÏÓÔÁÔÏÞÎÏ ÍÅÓÔÁ"
+msgid "E31: No such mapping"
+msgstr "E31: Такой привязки не существует"
+
+#: globals.h:1269
+msgid "E479: No match"
+msgstr "E479: Нет соответствия"
+
+#: globals.h:1270
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: Нет соответствия: %s"
 
 #: globals.h:1271
-#, c-format
-msgid "E247: no registered server named \"%s\""
-msgstr "E247: ÓÅÒ×ÅÒ \"%s\" ÎÅ ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎ"
+msgid "E32: No file name"
+msgstr "E32: Нет имени файла"
+
+#: globals.h:1272
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: Нет предыдущего регулярного выражения для замены"
 
 #: globals.h:1273
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÆÁÊÌ %s"
+msgid "E34: No previous command"
+msgstr "E34: Нет предыдущей команды"
 
 #: globals.h:1274
-msgid "E483: Can't get temp file name"
-msgstr "E483: îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÉÍÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ"
+msgid "E35: No previous regular expression"
+msgstr "E35: Нет предыдущего регулярного выражения"
 
 #: globals.h:1275
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s"
-
-#: globals.h:1276
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ %s"
+msgid "E481: No range allowed"
+msgstr "E481: Использование диапазона не допускается"
 
 #: globals.h:1277
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: éÚÍÅÎÅÎÉÑ ÎÅ ÓÏÈÒÁÎÅÎÙ (ÄÏÂÁ×ØÔÅ !, ÞÔÏÂÙ ÏÂÏÊÔÉ ÐÒÏ×ÅÒËÕ)"
-
-#: globals.h:1278
-msgid "E38: Null argument"
-msgstr "E38: îÕÌÅ×ÏÊ ÁÒÇÕÍÅÎÔ"
+msgid "E36: Not enough room"
+msgstr "E36: Недостаточно места"
 
 #: globals.h:1280
-msgid "E39: Number expected"
-msgstr "E39: ôÒÅÂÕÅÔÓÑ ÞÉÓÌÏ"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: сервер \"%s\" не зарегистрирован"
+
+#: globals.h:1282
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: Невозможно создать файл %s"
 
 #: globals.h:1283
+msgid "E483: Can't get temp file name"
+msgstr "E483: Невозможно получить имя временного файла"
+
+#: globals.h:1284
 #, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ ÆÁÊÌ ÏÛÉÂÏË %s"
+msgid "E484: Can't open file %s"
+msgstr "E484: Невозможно открыть файл %s"
+
+#: globals.h:1285
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Невозможно прочитать файл %s"
 
 #: globals.h:1286
-msgid "E233: cannot open display"
-msgstr "E233: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÄÉÓÐÌÅÊ"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Изменения не сохранены (добавьте !, чтобы обойти проверку)"
 
-#: globals.h:1288
-msgid "E41: Out of memory!"
-msgstr "E41: îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ!"
+#: globals.h:1287
+msgid "E38: Null argument"
+msgstr "E38: Нулевой аргумент"
 
-#: globals.h:1290
-msgid "Pattern not found"
-msgstr "ûÁÂÌÏÎ ÎÅ ÎÁÊÄÅÎ"
+#: globals.h:1289
+msgid "E39: Number expected"
+msgstr "E39: Требуется число"
 
 #: globals.h:1292
 #, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: ûÁÂÌÏÎ ÎÅ ÎÁÊÄÅÎ: %s"
-
-#: globals.h:1293
-msgid "E487: Argument must be positive"
-msgstr "E487: ðÁÒÁÍÅÔÒ ÄÏÌÖÅÎ ÂÙÔØ ÐÏÌÏÖÉÔÅÌØÎÙÍ ÞÉÓÌÏÍ"
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: Не удалось открыть файл ошибок %s"
 
 #: globals.h:1295
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: ÷ÏÚ×ÒÁÔ × ÐÒÅÄÙÄÕÝÉÊ ËÁÔÁÌÏÇ ÎÅ×ÏÚÍÏÖÅÎ"
+msgid "E233: cannot open display"
+msgstr "E233: невозможно открыть дисплей"
+
+#: globals.h:1297
+msgid "E41: Out of memory!"
+msgstr "E41: Не хватает памяти!"
 
 #: globals.h:1299
-msgid "E42: No Errors"
-msgstr "E42: ïÛÉÂÏË ÎÅÔ"
+msgid "Pattern not found"
+msgstr "Шаблон не найден"
 
 #: globals.h:1301
-msgid "E43: Damaged match string"
-msgstr "E43: ðÏ×ÒÅÖÄÅÎÁ ÓÔÒÏËÁ ÓÏÏÔ×ÅÔÓÔ×ÉÑ"
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Шаблон не найден: %s"
 
 #: globals.h:1302
-msgid "E44: Corrupted regexp program"
-msgstr "E44: ðÒÏÇÒÁÍÍÁ ÏÂÒÁÂÏÔËÉ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ ÐÏ×ÒÅÖÄÅÎÁ"
+msgid "E487: Argument must be positive"
+msgstr "E487: Параметр должен быть положительным числом"
 
-#: globals.h:1303
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr ""
-"E45: ÷ËÌÀÞÅÎÁ ÏÐÃÉÑ 'readonly' (ÄÏÂÁ×ØÔÅ !, ÞÔÏÂÙ ÎÅ ÏÂÒÁÝÁÔØ ×ÎÉÍÁÎÉÑ)"
-
-#: globals.h:1305
-#, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÄÏÓÔÕÐÎÕÀ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ ÐÅÒÅÍÅÎÎÕÀ \"%s\""
+#: globals.h:1304
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: Возврат в предыдущий каталог невозможен"
 
 #: globals.h:1308
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÆÁÊÌÁ ÏÛÉÂÏË"
+msgid "E42: No Errors"
+msgstr "E42: Ошибок нет"
+
+#: globals.h:1310
+msgid "E43: Damaged match string"
+msgstr "E43: Повреждена строка соответствия"
 
 #: globals.h:1311
+msgid "E44: Corrupted regexp program"
+msgstr "E44: Программа обработки регулярных выражений повреждена"
+
+#: globals.h:1312
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr ""
+"E45: Включена опция 'readonly' (добавьте !, чтобы не обращать внимания)"
+
+#: globals.h:1314
+#, c-format
+msgid "E46: Cannot set read-only variable \"%s\""
+msgstr "E46: Невозможно изменить доступную только для чтения переменную \"%s\""
+
+#: globals.h:1317
+msgid "E47: Error while reading errorfile"
+msgstr "E47: Ошибка при чтении файла ошибок"
+
+#: globals.h:1320
 msgid "E48: Not allowed in sandbox"
-msgstr "E48: îÅ ÄÏÐÕÓËÁÅÔÓÑ × ÐÅÓÏÞÎÉÃÅ"
+msgstr "E48: Не допускается в песочнице"
 
-#: globals.h:1313
+#: globals.h:1322
 msgid "E523: Not allowed here"
-msgstr "E523: úÄÅÓØ ÎÅ ÒÁÚÒÅÛÅÎÏ"
-
-#: globals.h:1316
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: äÁÎÎÙÊ ÒÅÖÉÍ ÜËÒÁÎÁ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
-
-#: globals.h:1318
-msgid "E49: Invalid scroll size"
-msgstr "E49: îÅÄÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ ÐÒÏËÒÕÔËÉ"
-
-#: globals.h:1319
-msgid "E91: 'shell' option is empty"
-msgstr "E91: úÎÁÞÅÎÉÅÍ ÏÐÃÉÉ 'shell' Ñ×ÌÑÅÔÓÑ ÐÕÓÔÁÑ ÓÔÒÏËÁ"
-
-#: globals.h:1321
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÄÁÎÎÙÅ Ï ÚÎÁÞËÁÈ!"
-
-#: globals.h:1323
-msgid "E72: Close error on swap file"
-msgstr "E72: ïÛÉÂËÁ ÚÁËÒÙÔÉÑ Ó×ÏÐ-ÆÁÊÌÁ"
-
-#: globals.h:1324
-msgid "E73: tag stack empty"
-msgstr "E73: óÔÅË ÍÅÔÏË ÐÕÓÔÏÊ"
+msgstr "E523: Здесь не разрешено"
 
 #: globals.h:1325
-msgid "E74: Command too complex"
-msgstr "E74: óÌÉÛËÏÍ ÓÌÏÖÎÁÑ ËÏÍÁÎÄÁ"
-
-#: globals.h:1326
-msgid "E75: Name too long"
-msgstr "E75: óÌÉÛËÏÍ ÄÌÉÎÎÏÅ ÉÍÑ"
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Данный режим экрана не поддерживается"
 
 #: globals.h:1327
-msgid "E76: Too many ["
-msgstr "E76: óÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× ["
+msgid "E49: Invalid scroll size"
+msgstr "E49: Недопустимый размер прокрутки"
 
 #: globals.h:1328
-msgid "E77: Too many file names"
-msgstr "E77: óÌÉÛËÏÍ ÍÎÏÇÏ ÉͣΠÆÁÊÌÏ×"
-
-#: globals.h:1329
-msgid "E488: Trailing characters"
-msgstr "E488: ìÉÛÎÉÅ ÓÉÍ×ÏÌÙ ÎÁ È×ÏÓÔÅ"
+msgid "E91: 'shell' option is empty"
+msgstr "E91: Значением опции 'shell' является пустая строка"
 
 #: globals.h:1330
-msgid "E78: Unknown mark"
-msgstr "E78: îÅÉÚ×ÅÓÔÎÁÑ ÏÔÍÅÔËÁ"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Невозможно прочитать данные о значках!"
 
-#: globals.h:1331
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÐÏÄÓÔÁÎÏ×ËÕ ÐÏ ÍÁÓËÅ"
+#: globals.h:1332
+msgid "E72: Close error on swap file"
+msgstr "E72: Ошибка закрытия своп-файла"
 
 #: globals.h:1333
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr ""
-"E591: úÎÁÞÅÎÉÅ ÏÐÃÉÉ 'winheight' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÍÅÎØÛÅ ÚÎÁÞÅÎÉÑ 'winminheight'"
+msgid "E73: tag stack empty"
+msgstr "E73: Стек меток пустой"
+
+#: globals.h:1334
+msgid "E74: Command too complex"
+msgstr "E74: Слишком сложная команда"
 
 #: globals.h:1335
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr ""
-"E592: úÎÁÞÅÎÉÅ ÏÐÃÉÉ 'winwidth' ÎÅ ÍÏÖÅÔ ÂÙÔØ ÍÅÎØÛÅ ÚÎÁÞÅÎÉÑ 'winminwidth'"
+msgid "E75: Name too long"
+msgstr "E75: Слишком длинное имя"
+
+#: globals.h:1336
+msgid "E76: Too many ["
+msgstr "E76: Слишком много символов ["
+
+#: globals.h:1337
+msgid "E77: Too many file names"
+msgstr "E77: Слишком много имён файлов"
 
 #: globals.h:1338
-msgid "E80: Error while writing"
-msgstr "E80: ïÛÉÂËÁ ÐÒÉ ÚÁÐÉÓÉ"
+msgid "E488: Trailing characters"
+msgstr "E488: Лишние символы на хвосте"
 
 #: globals.h:1339
-msgid "Zero count"
-msgstr "îÕÌÅ×ÏÅ ÚÎÁÞÅÎÉÅ ÓÞ£ÔÞÉËÁ"
+msgid "E78: Unknown mark"
+msgstr "E78: Неизвестная отметка"
 
-#: globals.h:1341
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: éÓÐÏÌØÚÏ×ÁÎÉÅ <SID> ×ÎÅ ËÏÎÔÅËÓÔÁ ÓÃÅÎÁÒÉÑ"
+#: globals.h:1340
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: Невозможно выполнить подстановку по маске"
+
+#: globals.h:1342
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr ""
+"E591: Значение опции 'winheight' не может быть меньше значения 'winminheight'"
 
 #: globals.h:1344
-msgid "E449: Invalid expression received"
-msgstr "E449: ðÏÌÕÞÅÎÏ ÎÅÄÏÐÕÓÔÉÍÏÅ ×ÙÒÁÖÅÎÉÅ"
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr ""
+"E592: Значение опции 'winwidth' не может быть меньше значения 'winminwidth'"
 
 #: globals.h:1347
-msgid "E463: Region is guarded, cannot modify"
-msgstr "E463: îÅ×ÏÚÍÏÖÎÏ ÉÚÍÅÎÉÔØ ÏÈÒÁÎÑÅÍÕÀ ÏÂÌÁÓÔØ"
+msgid "E80: Error while writing"
+msgstr "E80: Ошибка при записи"
 
-#~ msgid "\"\n"
-#~ msgstr "\"\n"
+#: globals.h:1348
+msgid "Zero count"
+msgstr "Нулевое значение счётчика"
+
+#: globals.h:1350
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: Использование <SID> вне контекста сценария"
+
+#: globals.h:1353
+msgid "E449: Invalid expression received"
+msgstr "E449: Получено недопустимое выражение"
+
+#: globals.h:1356
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Невозможно изменить охраняемую область"
+
diff --git a/src/search.c b/src/search.c
index 924f9e4..9c6cc6d 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1138,10 +1138,11 @@
 	/*
 	 * If there is a character offset, subtract it from the current
 	 * position, so we don't get stuck at "?pat?e+2" or "/pat/s-2".
+	 * Skip this if pos.col is near MAXCOL (closed fold).
 	 * This is not done for a line offset, because then we would not be vi
 	 * compatible.
 	 */
-	if (!spats[0].off.line && spats[0].off.off)
+	if (!spats[0].off.line && spats[0].off.off && pos.col < MAXCOL - 2)
 	{
 	    if (spats[0].off.off > 0)
 	    {
@@ -1209,7 +1210,7 @@
 
 		retval = 2;	    /* pattern found, line offset added */
 	    }
-	    else
+	    else if (pos.col < MAXCOL - 2)	/* just in case */
 	    {
 		/* to the right, check for end of file */
 		if (spats[0].off.off > 0)
@@ -4404,7 +4405,7 @@
 	if (lp[3] == 'L')
 	    off_line = TRUE;
 	if (lp[4] == 'E')
-	    off_end = TRUE;
+	    off_end = SEARCH_END;
 	lp += 5;
 	off = getdigits(&lp);
     }
diff --git a/src/structs.h b/src/structs.h
index ac0a795..0edd729 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -56,7 +56,7 @@
 {
     int	    ga_len;		    /* current number of items used */
     int	    ga_room;		    /* number of unused items at the end */
-    int	    ga_itemsize;	    /* sizeof one item */
+    int	    ga_itemsize;	    /* sizeof(item) */
     int	    ga_growsize;	    /* number of items to grow each time */
     void    *ga_data;		    /* pointer to the first item */
 } garray_T;