1. ZyX_I
  2. vim

Commits

Bram Moolenaar  committed e362db8

Update runtime files.

  • Participants
  • Parent commits 37438fa
  • Branches default

Comments (0)

Files changed (17)

File runtime/doc/cmdline.txt

View file
-*cmdline.txt*   For Vim version 7.3.  Last change: 2012 Oct 11
+*cmdline.txt*   For Vim version 7.3.  Last change: 2013 Jan 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 Visual Mode and Range					*v_:*
 
 {Visual}:	Starts a command-line with the Visual selected lines as a
-		range.  The code ":'<,'>" is used for this range, which makes
+		range.  The code `:'<,'>` is used for this range, which makes
 		it possible to select a similar line from the command-line
 		history for repeating a command on different Visually selected
 		lines.
+		When Visual mode was already ended, a short way to use the
+		Visual area for a range is `:*`.  This requires that "*" does
+		not appear in 'cpo', see |cpo-star|.  Otherwise you will have
+		to type `:'<,'>`
+
 
 ==============================================================================
 5. Ex command-line flags				*ex-flags*

File runtime/doc/eval.txt

View file
-*eval.txt*	For Vim version 7.3.  Last change: 2012 Dec 05
+*eval.txt*	For Vim version 7.3.  Last change: 2013 Jan 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
 		If there are no matching tags, then an empty list is returned.
 
 		To get an exact tag match, the anchors '^' and '$' should be
-		used in {expr}.  Refer to |tag-regexp| for more information
-		about the tag search regular expression pattern.
+		used in {expr}.  This also make the function work faster.
+		Refer to |tag-regexp| for more information about the tag
+		search regular expression pattern.
 
 		Refer to |'tags'| for information about how the tags file is
 		located by Vim. Refer to |tags-file-format| for the format of

File runtime/doc/help.txt

View file
-*help.txt*	For Vim version 7.3.  Last change: 2010 Jul 20
+*help.txt*	For Vim version 7.3.  Last change: 2012 Dec 06
 
 			VIM - main help file
 									 k
 						*standard-plugin-list*
 Standard plugins ~
 |pi_getscript.txt| Downloading latest version of Vim scripts
-|pi_gzip.txt|	   Reading and writing compressed files
-|pi_netrw.txt|	   Reading and writing files over a network
-|pi_paren.txt|	   Highlight matching parens
-|pi_tar.txt|	   Tar file explorer
+|pi_gzip.txt|      Reading and writing compressed files
+|pi_netrw.txt|     Reading and writing files over a network
+|pi_paren.txt|     Highlight matching parens
+|pi_tar.txt|       Tar file explorer
 |pi_vimball.txt|   Create a self-installing Vim script
-|pi_zip.txt|	   Zip archive explorer
+|pi_zip.txt|       Zip archive explorer
 
 LOCAL ADDITIONS:				*local-additions*
 

File runtime/doc/if_pyth.txt

View file
-*if_pyth.txt*   For Vim version 7.3.  Last change: 2012 Sep 23
+*if_pyth.txt*   For Vim version 7.3.  Last change: 2013 Jan 30
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
 	EOF
 	endfunction
 <
-Note: Python is very sensitive to the indenting.  Also make sure the "class"
-line and "EOF" do not have any indent.
+Note: Python is very sensitive to the indenting.  Make sure the "class" line
+and "EOF" do not have any indent.
 
 							*:pyfile* *:pyf*
 :[range]pyf[ile] {file}

File runtime/doc/insert.txt

View file
-*insert.txt*    For Vim version 7.3.  Last change: 2012 Jul 10
+*insert.txt*    For Vim version 7.3.  Last change: 2013 Jan 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 end of the line, it will be put on the last character in the line.  In
 mappings it's often better to use <Esc> (first put an "x" in the text, <Esc>
 will then always put the cursor on it).  Or use CTRL-\ CTRL-O, but then
-beware of the cursor possibly being beyond the end of the line.
+beware of the cursor possibly being beyond the end of the line.  Note that the
+command following CTRL-\ CTRL-O can still move the cursor, it is not restored
+to its original position.
 
 The CTRL-O command takes you to Normal mode.  If you then use a command enter
 Insert mode again it normally doesn't nest.  Thus when typing "a<C-O>a" and

File runtime/doc/options.txt

View file
-*options.txt*	For Vim version 7.3.  Last change: 2012 Oct 21
+*options.txt*	For Vim version 7.3.  Last change: 2013 Jan 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
 
 	Windows +multibyte only:		*guifontwide_win_mbyte*
 
-	If set and vaild, 'guifontwide' is used for IME instead of 'guifont'.
+	If set and valid, 'guifontwide' is used for IME instead of 'guifont'.
 
 						*'guiheadroom'* *'ghr'*
 'guiheadroom' 'ghr'	number	(default 50)
 	|hl-ModeMsg|	 M  Mode (e.g., "-- INSERT --")
 	|hl-LineNr|	 n  line number for ":number" and ":#" commands, and
 			    when 'number' or 'relativenumber' option is set.
-	|hl-CursorLineNr|  N like n for when 'cursorline' is set.
+	|hl-CursorLineNr|  N like n for when 'cursorline' or 'relativenumber' is
+			    set.
 	|hl-Question|	 r  |hit-enter| prompt and yes/no questions
 	|hl-StatusLine|	 s  status line of current window |status-line|
 	|hl-StatusLineNC| S  status lines of not-current windows
 			local to buffer
 			{not in Vi}
 	Characters that form pairs.  The |%| command jumps from one to the
-	other.  Currently only single byte character pairs are allowed, and
-	they must be different.  The characters must be separated by a colon.
+	other.
+	Only character pairs are allowed that are different, thus you cannot
+	jump between two double quotes.
+	The characters must be separated by a colon.
 	The pairs must be separated by a comma.  Example for including '<' and
 	'>' (HTML): >
 		:set mps+=<:>

File runtime/doc/pattern.txt

View file
-*pattern.txt*   For Vim version 7.3.  Last change: 2012 May 18
+*pattern.txt*   For Vim version 7.3.  Last change: 2013 Jan 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 	[xyz]		any 'x', 'y' or 'z'
 	[a-zA-Z]$	any alphabetic character at the end of a line
 	\c[a-z]$	same
+	[А-яЁё]		Russian alphabet (with utf-8 and cp1251)
+
 								*/[\n]*
 	With "\_" prepended the collection also includes the end-of-line.
 	The same can be done by including "\n" in the collection.  The

File runtime/doc/syntax.txt

View file
-*syntax.txt*	For Vim version 7.3.  Last change: 2012 Nov 28
+*syntax.txt*	For Vim version 7.3.  Last change: 2013 Jan 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
 These extra regular expression items are available in region patterns:
 
 						*/\z(* */\z(\)* *E50* *E52*
-    \z(\)	Marks the sub-expression as "external", meaning that it is can
-		be accessed from another pattern match.  Currently only usable
-		in defining a syntax region start pattern.
+    \z(\)	Marks the sub-expression as "external", meaning that it can be
+		accessed from another pattern match.  Currently only usable in
+		defining a syntax region start pattern.
 
 					*/\z1* */\z2* */\z3* */\z4* */\z5*
     \z1  ...  \z9			*/\z6* */\z7* */\z8* */\z9* *E66* *E67*
 LineNr		Line number for ":number" and ":#" commands, and when 'number'
 		or 'relativenumber' option is set.
 							*hl-CursorLineNr*
-CursorLineNr	Like LineNr when 'cursorline' is set for the cursor line.
+CursorLineNr	Like LineNr when 'cursorline' or 'relativenumber' is set for
+		the cursor line.
 							*hl-MatchParen*
 MatchParen	The character under the cursor or just before it, if it
 		is a paired bracket, and its match. |pi_paren.txt|

File runtime/doc/todo.txt

View file
-*todo.txt*      For Vim version 7.3.  Last change: 2012 Dec 05
+*todo.txt*      For Vim version 7.3.  Last change: 2013 Jan 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-On external command get the message: 
-     SIGCHLD handler called (some thread has SIGCHLD unblocked)
-From MzScheme
+Several syntax file match "^\s*" which may get underlined if that's in the
+highlight group.  Add a "\zs" after it?
 
 Go through more coverity reports.
 
 - The word that was selected (empty if abandoned complete)
 - Type of completion: tag, omnifunc, user func.
 
-Patch for matchit.vim. (Mike Morearty, 2012 Nov 28)
-
-Patch to fix that the QuitPre autocommand clears the quitmore flag. (Techlive
-Zheng, 2012 Nov 28)
-
-":gundo" command: global undo.  Undoes changes spread over multiple files in
-the order they were made.  Also ":gredo".  Both with a count.  Useful when
-tests fail after making changes and you forgot in which files.
-
-Patch to make updating tabline faster. (Arseny Kapoulkine, 2012 Oct 3)
-Also remove the "rc" variable.
-
-Patch to make "- register not always used. (Christian Brabandt, 2012 Nov 28)
-
-Crash with vimdiff. (Don Cruickshank, 2012 Sep 23)
-
-Patch to support subdirectories for help files. (Charles Campbell, 2012 Nov
-21)
-
 Patch for mzscheme.  (Sergey Khorev, 2012 Nov 19)
-What about ignoring SEGV?
-
-Win32: use 'guifontwide' for IME composition. (Taro Muraoka, 2012 Sep 30)
-Update Oct 2.
+Updated patch 2013 Jan 28.
 
 Patch to fix :s command with confirm and typing "a". (Christian Brabandt, 2012
 Oct 28)
 Patch to make multibyte input work on Win32 console when codepage differs from
 'encoding'. (Ken Takata, 2012 Sep 29)
 
-It's possible to defined an input() function that overrides the built-in one.
+Patch for building with Ruby and Cygwin. (Ken Takata, 2013 Jan 9)
+
+Patch to make 'relativenumber' show the current lnum instead of zero.
+(Nazri Ramliy, 2013 Jan 29)
+
+It's possible to define an input() function that overrides the built-in one.
 (ZyX, 2012 Sep 28)
 
+Patch to add sha256() function. (Tyru, 2013 Jan 8)
+
+Patch to make pyeval() print error messages. (ZyX, 2013 Jan 12)
+
 Win32: When a directory name contains an exclamation mark, completion doesn't
 complete the contents of the directory.  No escaping for the "!"? (Jan
 Stocker, 2012 Jan 5)
 
+Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
+    Sutcliffe says it works well.
+    Update 2007 May 22 for Vim 7.1
+    Update 2008 Dec 2008 for Vim 7.2.xx (Sharonov)
+    Update by Ken Takata (2012 Dec 31, 2013 Jan 4, 2013 Jan 26)
+
 Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
 Patch by Christian Brabandt, Nov 22.  Tests in another patch, Nov 23.
 
+Patch to add default value to getbufvar() et al. (Hirohito Higashi, 2013 Jan 1)
+
 Problem caused by patch 7.3.638: window->open does not update window
 correctly. Issue 91.
 
+Patch to fix compiler warnings for MingW 4.5.3. (Ken Takata, 2013 Jan 26)
+
 Do allow real tags above the !_TAG entries. Undo older patch. Issue 90.
 
 Patch to support 'u' in interactive substitute. (Christian Brabandt, 2012 Sep
 28)  With tests: Oct 9.
 
+Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
+
 Patch for IME handling, adds 'imactivatefunc' and 'imstatusfunc' option.
 (Yukihiro Nakadaira, 2012 Aug 16)
 Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18)
 It's probably a good idea to make a negative value for 'sts' use the value of
 'sw'.  Patch by So8res, Oct 3 2012
 
+patch to add "combine" flag to  syntax commands. (so8res, 2012 Dec 6)
+
 Syntax update problem in one buffer opened in two windows, bottom window is
 not correctly updated. (Paul Harris, 2012 Feb 27)
 
 Patch to add getsid(). (Tyru, 2011 Oct 2)  Do we want this?  Update Oct 4.
 Or use expand('<sid>')?
 
+Patch to make confirm() display colors. (Christian Brabandt, 2012 Nov 9)
+
+Patch to add functions for signs. (Christian Brabandt,, 2013 Jan 27)
+
+Patch to use directX to draw text on Windows.  Adds the 'directx' option.
+(Taro Muraoka, 2013 Jan 25)
+
+b:undo_ftplugin cannot call a script-local function. (Boris Danilov, 2013 Jan
+7)
+
 Patch for :tabcloseleft, after closing a tab go to left tab. (William Bowers,
 2012 Aug 4)
 
+Patch to improve equivalence classes in regexp patterns.
+(Christian Brabandt, 2013 Jan 16, update Jan 17)
+
 Patch with suggestions for starting.txt. (Tony Mechelynck, 2012 Oct 24)
 But use Gnome instead of GTK?
 
 
 MS-Windows ACL support doesn't work well.  Patch from Ken Takata, 2012 Aug 29.
 Update Aug 31.
+Another patch for MingW, 2012 Dec 29.
 
 MS-Windows resizing problems:
 - Windows window on screen positioning: Patch by Yukihiro Nakadaira, 2012 Jun
 
 Patch to add ":py3do". (Lilydjwg, 2012 Apr 7)
 
-`[ moves to character after insert, instead of the last inserted character.
+`] moves to character after insert, instead of the last inserted character.
 (Yukihiro Nakadaira, 2011 Dec 9)
 
 Plugin for Modeleasy. (Massimiliano Tripoli, 2011 Nov 29)
 
 Make 'formatprg' global-local. (Sung Pae)
 
+When a buffer-local mapping is used, but a global mapping starts with the same
+characters, Vim currently waits for the next typed character to find out if
+the global mapping matches.  It is probably better to let the local mapping
+win and not wait. (discussion with Andy Wokula, 2013 Jan 30)
+
 When doing "redir => s:foo" in a script and then "redir END" somewhere else
 (e.g. in a function) it can't find s:foo.
 
 Assume the system converts between the actual encoding of the filesystem to
 the system encoding (usually utf-8).
 
+Patch to add GUI colors to the terminal, when it supports it. (ZyX, 2013 Jan
+26)
+
 Problem producing tags file when hebrew.frx is present.  It has a BOM.
 Results in E670. (Tony Mechelynck, 2010 May 2)
 
 Patch for displaying 0x200c and 0x200d. (Ali Gholami Rudi, 2009 May 6)
 Probably needs a bit of work.
 
-List of encoding aliases. (Takao Fujiware, 2009 Jul 18)
+List of encoding aliases. (Takao Fujiwara, 2009 Jul 18)
 Are they all OK?  Update Jul 22.
 
 Win32: Improved Makefile for MSVC. (Leonardo Valeri Manera, 2010 Aug 18)
 When starting Vim with "gvim -f -u non_existent_file > foo.txt" there are a
 few control characters in the output. (Dale Wiles, 2009 May 28)
 
-'cmdwinheight is only used in last window when 'winheight' is a large value.
+'cmdwinheight' is only used in last window when 'winheight' is a large value.
 (Tony Mechelynck, 2009 Apr 15)
 
 Status line containing winnr() isn't updated when splitting the window (Clark
 Changes for Win32 makefile. (Mike Williams, 2007 Jan 22, Alexei Alexandrov,
 2007 Feb 8)
 
-Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
-    Sutcliffe says it works well.
-    Update 2007 May 22 for Vim 7.1
-    Update 2008 Dec 2008 for Vim 7.2.xx (Sharonov)
-
 Win32: Can't complete shell command names.  Why is setting xp_context in
 set_one_cmd_context() inside #ifndef BACKSLASH_IN_FILENAME?
 
 2010 Jun 30)
 
 
-At next release:
+At next release 7.4:
+-   Build a huge version by default.
 -   Rename src/Makefile and create a new one like toplevel Makefile that
     creates auto/config.mk when it's not there? (Ben Schmidt, 2011 Feb 11)
 -   Improve plugin handling: Automatic updates, handle dependencies?
 
 
 Searching:
+9   Should have an option for :vimgrep to find lines without a match.
 8   Add "g/" and "gb" to search for a pattern in the Visually selected text?
     "g?" is already used for rot13.
     The vis.vim script has a ":S" command that does something like this.
 
 
 Undo:
+9   ":gundo" command: global undo.  Undoes changes spread over multiple files
+    in the order they were made.  Also ":gredo".  Both with a count.  Useful
+    when tests fail after making changes and you forgot in which files.
 9   After undo/redo, in the message show whether the buffer is modified or
     not.
 8   Use timestamps for undo, so that a version a certain time ago can be found
 7   There is 'titleold', why is there no 'iconold'? (Chazelas)
 7   Make 'scrolloff' a global-local option, so that it can be different in the
     quickfix window, for example. (Gary Holloway)
+    Also do 'sidescrolloff'.
 
 
 External commands:

File runtime/doc/various.txt

View file
-*various.txt*   For Vim version 7.3.  Last change: 2012 Dec 05
+*various.txt*   For Vim version 7.3.  Last change: 2012 Dec 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 			the command-line.  {commands} are executed like they
 			are typed.  For undo all commands are undone together.
 			Execution stops when an error is encountered.
+
 			If the [!] is given, mappings will not be used.
+			Without it, when this command is called from a
+			non-remappable mapping (|:noremap|), the argument can
+			be mapped anyway.
+
 			{commands} should be a complete command.  If
 			{commands} does not finish a command, the last one
 			will be aborted as if <Esc> or <C-C> was typed.
-			The display isn't updated while ":normal" is busy.
 			This implies that an insert command must be completed
 			(to start Insert mode, see |:startinsert|).  A ":"
 			command must be completed as well.  And you can't use
 			"Q" or "gQ" to start Ex mode.
+
+			The display is not updated while ":normal" is busy.
+
 			{commands} cannot start with a space.  Put a count of
 			1 (one) before it, "1 " is one space.
+
 			The 'insertmode' option is ignored for {commands}.
+
 			This command cannot be followed by another command,
 			since any '|' is considered part of the command.
+
 			This command can be used recursively, but the depth is
 			limited by 'maxmapdepth'.
-			When this command is called from a non-remappable
-			mapping |:noremap|, the argument can be mapped anyway.
+
 			An alternative is to use |:execute|, which uses an
 			expression as argument.  This allows the use of
 			printable characters to represent special characters.
+
 			Example: >
 				:exe "normal \<c-w>\<c-w>"
 <			{not in Vi, of course}

File runtime/indent/sqlanywhere.vim

View file
 " Vim indent file
 " Language:    SQL
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Last Change: 2012 Dec 05
+" Last Change: 2012 Dec 06
 " Version:     3.0
 " Download:    http://vim.sourceforge.net/script.php?script_id=495
 
 endif
 let b:did_indent     = 1
 let b:current_indent = "sqlanywhere"
-let s:keepcpo= &cpo
-set cpo&vim
 
 setlocal indentkeys-=0{
 setlocal indentkeys-=0}
 " in the indentkeys is typed
 setlocal indentexpr=GetSQLIndent()
 
+" Only define the functions once.
+if exists("*GetSQLIndent")
+    finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
 " List of all the statements that start a new block.
 " These are typically words that start a line.
 " IS is excluded, since it is difficult to determine when the

File runtime/menu.vim

View file
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Oct 21
+" Last Change:	2012 Dec 06
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
 an 10.620 &File.E&xit<Tab>:qa			:confirm qa<CR>
 
 func! <SID>SelectAll()
-  exe "norm gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
+  exe "norm! gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
 endfunc
 
 func! s:FnameEscape(fname)

File runtime/syntax/c.vim

View file
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 May 03
+" Last Change:	2012 Dec 14
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
 
 " This should be before cErrInParen to avoid problems with #define ({ xxx })
 if exists("c_curly_error")
-  syntax match cCurlyError "}"
-  syntax region	cBlock		start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold
+  syn match cCurlyError "}"
+  syn region	cBlock		start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold
 else
-  syntax region	cBlock		start="{" end="}" transparent fold
+  syn region	cBlock		start="{" end="}" transparent fold
 endif
 
 "catch errors caused by wrong parenthesis and brackets
 " also accept <% for {, %> for }, <: for [ and :> for ] (C99)
 " But avoid matching <::.
-syn cluster	cParenGroup	contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
+syn cluster	cParenGroup	contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
 if exists("c_no_curly_error")
   syn region	cParen		transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cCppString,@Spell
   " cCppParen: same as cParen but ends at end-of-line; used in cDefine

File runtime/syntax/php.vim

View file
 " Vim syntax file
 " Language: php PHP 3/4/5
 " Maintainer: Jason Woofenden <jason@jasonwoof.com>
-" Last Change: Oct 20, 2011
+" Last Change: Dec 11, 2012
 " URL: https://gitorious.org/jasonwoof/vim-syntax/blobs/master/php.vim
 " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
 "         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 syn keyword phpFunctions  ingres_autocommit ingres_close ingres_commit ingres_connect ingres_fetch_array ingres_fetch_object ingres_fetch_row ingres_field_length ingres_field_name ingres_field_nullable ingres_field_precision ingres_field_scale ingres_field_type ingres_num_fields ingres_num_rows ingres_pconnect ingres_query ingres_rollback  contained
 syn keyword phpFunctions  ircg_channel_mode ircg_disconnect ircg_fetch_error_msg ircg_get_username ircg_html_encode ircg_ignore_add ircg_ignore_del ircg_is_conn_alive ircg_join ircg_kick ircg_lookup_format_messages ircg_msg ircg_nick ircg_nickname_escape ircg_nickname_unescape ircg_notice ircg_part ircg_pconnect ircg_register_format_messages ircg_set_current ircg_set_file ircg_set_on_die ircg_topic ircg_whois  contained
 syn keyword phpFunctions  java_last_exception_clear java_last_exception_get contained
+syn keyword phpFunctions  json_decode json_encode json_last_error contained
 syn keyword phpFunctions  ldap_8859_to_t61 ldap_add ldap_bind ldap_close ldap_compare ldap_connect ldap_count_entries ldap_delete ldap_dn2ufn ldap_err2str ldap_errno ldap_error ldap_explode_dn ldap_first_attribute ldap_first_entry ldap_first_reference ldap_free_result ldap_get_attributes ldap_get_dn ldap_get_entries ldap_get_option ldap_get_values_len ldap_get_values ldap_list ldap_mod_add ldap_mod_del ldap_mod_replace ldap_modify ldap_next_attribute ldap_next_entry ldap_next_reference ldap_parse_reference ldap_parse_result ldap_read ldap_rename ldap_search ldap_set_option ldap_set_rebind_proc ldap_sort ldap_start_tls ldap_t61_to_8859 ldap_unbind  contained
 syn keyword phpFunctions  lzf_compress lzf_decompress lzf_optimized_for contained
 syn keyword phpFunctions  ezmlm_hash mail contained

File src/po/de.po

View file
 msgstr "-Z\t\t\tEingeschr�nkter Modus (wie \"rvim\")"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\tModifikatioen (beim Schreiben von Dateien) sind nicht erlaubt"
+msgstr "-m\t\t\tModifikationen (beim Schreiben von Dateien) sind nicht erlaubt"
 
 msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tModifikatioen im Text nicht erlaubt"
+msgstr "-M\t\t\tModifikationen im Text nicht erlaubt"
 
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tBin�rmodus"
 
 msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tList Modus"
+msgstr "-l\t\t\tLisp Modus"
 
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tKompatibel zu Vi: 'compatible'"

File src/po/uk.cp1251.po

View file
 msgstr ""
 "Project-Id-Version: vim 7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 12:13+0300\n"
+"POT-Creation-Date: 2013-01-17 10:06+0200\n"
 "PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator: ������� ����� <sakhnik@gmail.com>\n"
 "Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp1251\n"
 "Content-Transfer-Encoding: 8bit\n"
 msgid "[Quickfix List]"
 msgstr "[������ ����������]"
 
+msgid "E855: Autocommands caused command to abort"
+msgstr "E855: ����������� �������� �� ���������� �������"
+
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: ���� ��������� ��������� ��� ���� �����, ���������� ������..."
 
 msgid "Top"
 msgstr "����"
 
-#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �� ������� ������ ����� \"%s\""
+msgstr "E102: �� ������� ������ ����� �%s�"
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: ����� \"%s\" �� � ����� ���������"
+msgstr "E103: ����� �%s� �� � ����� ���������"
 
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: ����� ���������� �������"
 msgid "Hit end of paragraph"
 msgstr "�������� ����� ���������"
 
+# msgstr "E443: "
+msgid "E839: Completion function changed window"
+msgstr "E839: ������� ���������� ������ ����"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: ������� ���������� ������� �����"
+
 msgid "'dictionary' option is empty"
 msgstr "����� 'dictionary' �������"
 
 msgstr "E711: ������ �� ����������� ��������"
 
 msgid "E690: Missing \"in\" after :for"
-msgstr "E690: ��������� \"in\" ���� :for"
+msgstr "E690: ��������� �in� ���� :for"
 
 #, c-format
 msgid "E107: Missing parentheses: %s"
 
 #, c-format
 msgid "E108: No such variable: \"%s\""
-msgstr "E108: ����� ����: \"%s\""
+msgstr "E108: ����� ����: �%s�"
 
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: ����� �� �������� �������� ��� ���� ��-/��������."
 
 #, c-format
 msgid "E114: Missing quote: %s"
-msgstr "E114: ����� '\"': %s"
+msgstr "E114: ����� �����: %s"
 
 #, c-format
 msgid "E115: Missing quote: %s"
-msgstr "E115: ����� \"'\": %s"
+msgstr "E115: ����� �����: %s"
 
 # msgstr "E404: "
 #, c-format
 
 #, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: ���������� ����� � ��������: \"%s\""
+msgstr "E721: ���������� ����� � ��������: �%s�"
 
 # msgstr "E235: "
 #, c-format
 msgid "E808: Number or Float required"
 msgstr "E808: ����� ������� Number �� Float"
 
+# msgstr "E14: "
+msgid "add() argument"
+msgstr "�������� add()"
+
 msgid "E699: Too many arguments"
 msgstr "E699: �������� ���������"
 
 msgid "&Ok"
 msgstr "&O:������"
 
+# msgstr "E14: "
+msgid "extend() argument"
+msgstr "�������� extend()"
+
 # msgstr "E226: "
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: ���� ��� ����: %s"
 
+# msgstr "E14: "
+msgid "map() argument"
+msgstr "�������� map()"
+
+# msgstr "E14: "
+msgid "filter() argument"
+msgstr "�������� filter()"
+
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld �����: "
 msgid "called inputrestore() more often than inputsave()"
 msgstr "������� �� inputrestore() ������, �� �� inputsave()"
 
+# msgstr "E14: "
+msgid "insert() argument"
+msgstr "�������� insert()"
+
 # msgstr "E406: "
 msgid "E786: Range not allowed"
 msgstr "E786: �������� �� ���������"
 msgid "E277: Unable to read a server reply"
 msgstr "E277: �� ������� ��������� ������� �������"
 
+# msgstr "E14: "
+msgid "remove() argument"
+msgstr "�������� remove()"
+
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: �������� ���������� �������� (����?)"
 
+# msgstr "E14: "
+msgid "reverse() argument"
+msgstr "�������� reverse()"
+
 msgid "E258: Unable to send to client"
 msgstr "E258: �� ������� �������� �볺���"
 
+# msgstr "E14: "
+msgid "sort() argument"
+msgstr "�������� sort()"
+
 # msgstr "E364: "
 msgid "E702: Sort compare function failed"
 msgstr "E702: ������� � ������� ���������"
 msgstr "E806: Float ����� �� String"
 
 #, c-format
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: ������������ ��� �����: %s"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: �� ����� ������� ����� %s"
+
+#, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: ����� ����� Funcref �� ���������� � ������ �����: %s"
 
 msgstr "E705: ����� ����� ������� � �������� ��������: %s"
 
 #, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: ������������ ��� �����: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: �� ����� ������� ����� %s"
-
-#, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: �������� ��������: %s"
 
 msgid "E125: Illegal argument: %s"
 msgstr "E125: ������������ ��������: %s"
 
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: ����� ��������� ������������: %s"
+
 msgid "E126: Missing :endfunction"
 msgstr "E126: ����� :endfunction"
 
 msgstr "������� ������� �����"
 
 msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "����� ������������.  ��� ���������� ������ \"cont\"."
+msgstr "����� ������������.  ��� ���������� ������ cont."
 
 #, c-format
 msgid "line %ld: %s"
 
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "����� ������� � \"%s%s\" ����� %ld"
+msgstr "����� ������� � %s%s ����� %ld"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "%3d %s %s   ����� %ld"
 
 msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: �������� ������ \":profile start {����}\""
+msgstr "E750: �������� ������ :profile start {����}"
 
 msgid "Save As"
 msgstr "�������� ��"
 
 #, c-format
 msgid "Save changes to \"%s\"?"
-msgstr "�������� ���� � \"%s\"?"
+msgstr "�������� ���� � �%s�?"
 
 msgid "Untitled"
 msgstr "����������"
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ����� \"%s\" �� ���������� ����"
+msgstr "E162: ����� �%s� �� ���������� ����"
 
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr ""
 # msgstr "E195: "
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
-msgstr "����� \"%s\" � \"%s\""
+msgstr "����� �%s� � �%s�"
 
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "����� \"%s\""
+msgstr "����� �%s�"
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "� 'runtimepath' �� �������� \"%s\""
+msgstr "� 'runtimepath' �� �������� �%s�"
 
 msgid "Source Vim script"
 msgstr "��������� ������ Vim"
 
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "�� ������� ��������� �������: \"%s\""
+msgstr "�� ������� ��������� �������: �%s�"
 
 #, c-format
 msgid "could not source \"%s\""
-msgstr "�� ������� �������� \"%s\""
+msgstr "�� ������� �������� �%s�"
 
 #, c-format
 msgid "line %ld: could not source \"%s\""
-msgstr "����� %ld: �� ������� �������� \"%s\""
+msgstr "����� %ld: �� ������� �������� �%s�"
 
 #, c-format
 msgid "sourcing \"%s\""
-msgstr "���������� \"%s\""
+msgstr "���������� �%s�"
 
 #, c-format
 msgid "line %ld: sourcing \"%s\""
-msgstr "����� %ld: ���������� \"%s\""
+msgstr "����� %ld: ���������� �%s�"
 
 #, c-format
 msgid "finished sourcing %s"
 
 #, c-format
 msgid "Current %slanguage: \"%s\""
-msgstr "���� (%s): \"%s\""
+msgstr "���� (%s): �%s�"
 
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: �� ������� ���������� ���� \"%s\""
+msgstr "E197: �� ������� ���������� ���� �%s�"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "��������� ���� viminfo: \"%s\"%s%s%s"
+msgstr "��������� ���� viminfo: �%s�%s%s%s"
 
 msgid " info"
 msgstr " ����������"
 #. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: �� ��������� ����� � ���� viminfo: \"%s\""
+msgstr "E137: �� ��������� ����� � ���� viminfo: %s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 
 #, c-format
 msgid "Writing viminfo file \"%s\""
-msgstr "���������� ���� viminfo \"%s\""
+msgstr "���������� ���� viminfo �%s�"
 
 #. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# ��� ���� ����������� ��������� Vim %s.\n"
 
-#, c-format
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
 "# ������ ����������, ��� ��������!\n"
 "\n"
 
-#, c-format
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# �������� 'encoding' �� ��� ��������� ����� �����\n"
 
 
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
-msgstr "���������� �������� ���� \"%s\"?"
+msgstr "���������� �������� ���� �%s�?"
 
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "���� ����� \"%s\" ����, ������������?"
+msgstr "���� ����� �%s� ����, ������������?"
 
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 "'readonly' option is set for \"%s\".\n"
 "Do you wish to write anyway?"
 msgstr ""
-"��� \"%s\" ����������� 'readonly'.\n"
+"��� �%s� ����������� 'readonly'.\n"
 "������ ��� ���� ���������� �����?"
 
 #, c-format
 "It may still be possible to write it.\n"
 "Do you wish to try?"
 msgstr ""
-"���� \"%s\" ��������� ����� ������.\n"
+"���� �%s� ��������� ����� ������.\n"
 "�����, �������, ���� ����� ��������.\n"
 "������ ����������?"
 
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: \"%s\" ����� ��� ������� (! ��� �� �������)"
+msgstr "E505: �%s� ����� ��� ������� (! ��� �� �������)"
 
 msgid "Edit File"
 msgstr "���������� ����"
 msgid "Pattern found in every line: %s"
 msgstr "������ �������� � ������� �����: %s"
 
-#, c-format
 msgid ""
 "\n"
 "# Last Substitute String:\n"
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "�������, ���� �������� \"%s\" �� ��������"
+msgstr "�������, ���� �������� �%s� �� ��������"
 
 #, c-format
 msgid "E150: Not a directory: %s"
 
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: ���������� ��� \"%s\" � ���� %s/%s"
+msgstr "E154: ���������� ��� �%s� � ���� %s/%s"
 
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "[�������]"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "����� Ex. ��� ���������� �� ����������� ������ ��������� \"visual\""
+msgstr "����� Ex. ��� ���������� �� ����������� ������ ��������� visual"
 
 msgid "E501: At end-of-file"
 msgstr "E501: ʳ���� �����"
 msgstr "E493: �������� ������ ��������"
 
 msgid "Backwards range given, OK to swap"
-msgstr "�������� ������ ��������, ��� ������� ������ -- ������"
+msgstr "�������� ������ ��������, ��� ������� ������  ������"
 
 msgid "E494: Use w or w>>"
 msgstr "E494: ��������� w ��� w>>"
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: ������� ����������� ������ ���������� � ������ �����"
 
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: ������������� �����, �� ����� ����������� ��� ������������� �������"
+
 # msgstr "E183: "
 #, c-format
 msgid "E184: No such user-defined command: %s"
 
 # msgstr "E184: "
 #, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: �� ������� ������ ����� ������� %s"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: �� ������� ������ ����� ������� �%s�"
 
 msgid "Greetings, Vim user!"
 msgstr "³�����, ����������� Vim!"
 
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: ���� \"%s\" ���� (! ��� �� �������)"
+msgstr "E189: ���� �%s� ���� (! ��� �� �������)"
 
 # msgstr "E189: "
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: �� ������� ������� \"%s\" ��� ������"
+msgstr "E190: �� ������� ������� �%s� ��� ������"
 
 # msgstr "E190: "
 #. set mark
 msgstr "E194: ���� ����� ���������� ����� ��� ����� '#'"
 
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: ���� ����� ����� ����������� ��� ����� \"<afile>\""
+msgstr "E495: ���� ����� ����� ����������� ��� ����� <afile>"
 
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: ���� ������ ������ ����������� ��� ����� \"<abuf>\""
+msgstr "E496: ���� ������ ������ ����������� ��� ����� <abuf>"
 
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: ���� ����� ���� ����������� ��� ����� \"<amatch>\""
+msgstr "E497: ���� ����� ���� ����������� ��� ����� <amatch>"
 
 msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: ���� ����� ����� :source ��� ����� \"<sfile>\""
+msgstr "E498: ���� ����� ����� :source ��� ����� �<sfile>�"
+
+msgid "E842: no line number to use for \"<slnum>\""
+msgstr "E842: ���� ������ �����, ��� ����������� � �<sfile>�"
 
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: ����� ����� ��� '%' �� '#' �������, ������ ���� � \":p:h\""
+msgstr "E499: ����� ����� ��� '%' �� '#' �������, ������ ���� � :p:h"
 
 msgid "E500: Evaluates to an empty string"
-msgstr "E500: ��������� -- ������� �����"
+msgstr "E500: ���������  ������� �����"
 
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: �� ������� ��������� ���� viminfo"
 msgid "[converted]"
 msgstr "[������������]"
 
+msgid "[blowfish]"
+msgstr "[blowfish]"
+
 msgid "[crypted]"
 msgstr "[�����������]"
 
 
 #, c-format
 msgid "E208: Error writing to \"%s\""
-msgstr "E208: ������� ������ � \"%s\""
+msgstr "E208: ������� ������ � �%s�"
 
 #, c-format
 msgid "E209: Error closing \"%s\""
-msgstr "E209: ������� �������� \"%s\""
+msgstr "E209: ������� �������� �%s�"
 
 #, c-format
 msgid "E210: Error reading \"%s\""
-msgstr "E210: ������� ������� \"%s\""
+msgstr "E210: ������� ������� �%s�"
 
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: ����������� FileChangedShell ������� �����"
 
 #, c-format
 msgid "E211: File \"%s\" no longer available"
-msgstr "E211: ���� \"%s\" ����� �� ��������"
+msgstr "E211: ���� �%s� ����� �� ��������"
 
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
-msgstr "W12: ������������: ���� \"%s\" �������, ��� � ����� � Vim �����"
+msgstr "W12: ������������: ���� �%s� �������, ��� � ����� � Vim �����"
 
 msgid "See \":help W12\" for more info."
-msgstr "���. \":help W12\" ��� ���������."
+msgstr "���. :help W12 ��� ���������."
 
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ������������: ���� \"%s\" ������� ���� ������� �����������"
+msgstr "W11: ������������: ���� �%s� ������� ���� ������� �����������"
 
 msgid "See \":help W11\" for more info."
-msgstr "���. \":help W11\" ��� ���������."
+msgstr "���. :help W11 ��� ���������."
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr ""
-"W16: ������������: ����� ����� \"%s\" ������� ���� ������� �����������"
+"W16: ������������: ����� ����� �%s� ������� ���� ������� �����������"
 
 msgid "See \":help W16\" for more info."
-msgstr "���. \":help W16\" ��� ���������."
+msgstr "���. :help W16 ��� ���������."
 
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ������������: ���� \"%s\" ���� �������� ���� ������� �����������"
+msgstr "W13: ������������: ���� �%s� ���� �������� ���� ������� �����������"
 
 msgid "Warning"
 msgstr "������������"
 
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: �� ������� ���������� \"%s\" ��� ����������"
+msgstr "E462: �� ������� ���������� �%s�, ��� ����������"
 
 #, c-format
 msgid "E321: Could not reload \"%s\""
-msgstr "E321: �� ������� ���������� \"%s\""
+msgstr "E321: �� ������� ���������� �%s�"
 
 msgid "--Deleted--"
 msgstr "--�������--"
 #. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
-msgstr "E367: ���� ���� �����: \"%s\""
+msgstr "E367: ���� ���� �����: �%s�"
 
 #, c-format
 msgid "E215: Illegal character after *: %s"
 # msgstr "E218: "
 #, c-format
 msgid "%s Auto commands for \"%s\""
-msgstr "����������� %s ��� \"%s\""
+msgstr "����������� %s ��� �%s�"
 
 #, c-format
 msgid "Executing %s"
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: �� ������� �������� BalloonEval � ������������ � ��������"
 
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: �� ������� �������� ����� ������ ��� GUI"
+
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: ������� ������ �� ��� ��������� GUI"
+
 # msgstr "E228: "
 msgid "E229: Cannot start the GUI"
 msgstr "E229: �� ������� ��������� GUI"
 # msgstr "E229: "
 #, c-format
 msgid "E230: Cannot read from \"%s\""
-msgstr "E230: �� ������� ��������� � \"%s\""
+msgstr "E230: �� ������� ��������� � �%s�"
 
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr "E665: �� ������� ��������� GUI, �� �������� �����"
 msgstr "������� ��"
 
 msgid "Vim: Received \"die\" request from session manager\n"
-msgstr "Vim: ������� ����� \"die\" �� ��������� ����\n"
+msgstr "Vim: ������� ����� die �� ��������� ����\n"
 
 msgid "Close"
 msgstr "�������"
 
 #, c-format
 msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: �� ������� ������ ���� \"%s\""
+msgstr "E671: �� ������� ������ ���� �%s�"
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: �������� �� �����������: \"-%s\"; ������������ ����� � OLE."
+msgstr "E243: �������� �� �����������: -%s; ������������ ����� � OLE."
 
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: �� ������� ������� ���� �������� �������� MDI"
 
 #, c-format
 msgid "E624: Can't open file \"%s\""
-msgstr "E624: �� ������� ������� ���� \"%s\""
+msgstr "E624: �� ������� ������� ���� �%s�"
 
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: �� ������� ��������� ���� ������� PostScript \"%s\""
+msgstr "E457: �� ������� ��������� ���� ������� PostScript �%s�"
 
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: \"%s\" �� � ������ ������� PostScript"
+msgstr "E618: �%s� �� � ������ ������� PostScript"
 
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: \"%s\" �� � ������������ ������ ������� PostScript"
+msgstr "E619: �%s� �� � ������������ ������ ������� PostScript"
 
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: ����������� ����� ����� ������� \"%s\""
+msgstr "E621: ����������� ����� ����� ������� �%s�"
 
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: ������� ������������� ��������� � ���� �������."
 
 #, c-format
 msgid "E456: Can't open file \"%s\""
-msgstr "E456: �� ������� ������� ���� \"%s\""
+msgstr "E456: �� ������� ������� ���� �%s�"
 
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript \"prolog.ps\""
+msgstr "E456: �� ������� ������ ���� ������� PostScript prolog.ps"
 
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript \"cidfont.ps\""
+msgstr "E456: �� ������� ������ ���� ������� PostScript cidfont.ps"
 
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript \"%s.ps\""
+msgstr "E456: �� ������� ������ ���� ������� PostScript %s.ps"
 
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: �� ������� ����������� �� ��������� ����� \"%s\""
+msgstr "E620: �� ������� ����������� �� ��������� ����� �%s�"
 
 msgid "Sending to printer..."
 msgstr "³��������� �� �������..."
 "       g: Find this definition\n"
 "       i: Find files #including this file\n"
 "       s: Find this C symbol\n"
-"       t: Find assignments to\n"
+"       t: Find this text string\n"
 msgstr ""
 "\n"
 "       c: ������ �������, �� ���������� �� �������\n"
 "       g: ������ �� ����������\n"
 "       i: ������ �����, �� ��������� � ���� ��� ����\n"
 "       s: ������ ��� ������ C\n"
-"       t: ������ ��������� �����\n"
+"       t: ������ ��� �����\n"
 
 #, c-format
 msgid "E625: cannot open cscope database: %s"
 msgid "not allowed in the Vim sandbox"
 msgstr "�� ��������� � �������� Vim"
 
-msgid "E836: This Vim cannot execute :python after using :py3"
-msgstr "E836: Python: �� ����� ����������� :py � :py3 � ������ �����"
-
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: Python: �� ����� ����������� :py � :py3 � ������ �����"
 
+msgid "only string keys are allowed"
+msgstr "��������� ����� ������� �����"
+
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
 "E263: �������, �� ������� ��������, �������� Python �� ���� ���� "
 "�����������."
 
-msgid "can't delete OutputObject attributes"
-msgstr "�� ������� ������� �������� OutputObject"
-
-msgid "softspace must be an integer"
-msgstr "softspace �� ���� �����"
-
-# msgstr "E180: "
-msgid "invalid attribute"
-msgstr "������������ �������"
+msgid "E860: Eval did not return a valid python 3 object"
+msgstr "E860: Eval �� �������� ������ �ᒺ�� python 3"
+
+msgid "E861: Failed to convert returned python 3 object to vim value"
+msgstr "E861: �� ������� ����������� �ᒺ�� python 3 � �������� vim"
 
 #, c-format
 msgid "<buffer object (deleted) at %p>"
 msgstr "<��'��� ������ (�������) �� ������� %p>"
 
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Python: �� ����� ����������� :py � :py3 � ������ �����"
+
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: �� ����� ���������� ��������� Python"
 
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval �� �������� ������ �ᒺ�� python"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: �� ������� ����������� �ᒺ�� python � �������� vim"
+
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ �� ���� ����������� String"
 
 msgstr ""
 "E571: �������, �� ������� ��������, �������� Tcl �� ���� ���� �����������."
 
-msgid ""
-"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr ""
-"E281: ������� TCL: ��� ������ �� � �����!? ���� �����, �������� � vim-"
-"dev@vim.org"
-
 #, c-format
 msgid "E572: exit code %d"
 msgstr "E572: ��� ������ %d"
 msgstr "�� ������� ������������ ����� ������� ������"
 
 msgid "E248: Failed to send command to the destination program"
-msgstr "E248: �� ������� ������� ������� �� ��������-�����������"
+msgstr "E248: �� ������� ������� ������� �� ��������-���"
 
 #, c-format
 msgid "E573: Invalid server id used: %s"
 
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr ""
-"�������� ��������� � \"+�������\", \"-c �������\" ��� \"--cmd �������\""
+"�������� ��������� � +�������, �-c ������� ��� --cmd �������"
 
 # msgstr "E14: "
 msgid "Invalid argument for"
 
 #, c-format
 msgid "E282: Cannot read from \"%s\""
-msgstr "E282: �� ������� ��������� � \"%s\""
+msgstr "E282: �� ������� ��������� � �%s�"
 
 # msgstr "E282: "
 msgid ""
 "More info with: \"vim -h\"\n"
 msgstr ""
 "\n"
-"ij�������� �����: \"vim -h\"\n"
+"ij�������� �����: vim -h\n"
 
 msgid "[file ..]       edit specified file(s)"
 msgstr "[���� ..]       ���������� ������ �����"
 msgstr "-unregister\t\t��������� ��������� ����� gvim ��� OLE"
 
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-msgstr "-g\t\t\t��������� GUI (��� \"gvim\")"
+msgstr "-g\t\t\t��������� GUI (��� gvim)"
 
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f  ��  --nofork\t������� ����: ������� ������� ���� ������� GUI"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\t����� Vi (��� \"vi\")"
+msgstr "-v\t\t\t����� Vi (��� �vi�)"
 
 msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\t����� Ex (��� \"ex\")"
+msgstr "-e\t\t\t����� Ex (��� �ex�)"
+
+msgid "-E\t\t\tImproved Ex mode"
+msgstr "-E\t\t\t���������� ����� Ex"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t��������� (��������) ����� (���� ��� \"ex\")"
+msgstr "-s\t\t\t��������� (��������) ����� (���� ��� �ex�)"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\t����� ��������� (��� \"vimdiff\")"
+msgstr "-d\t\t\t����� ��������� (��� vimdiff)"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t������� ����� (��� \"evim\", ��� ������)"
+msgstr "-y\t\t\t������� ����� (��� evim, ��� ������)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\t����� ��������� (��� \"view\")"
+msgstr "-R\t\t\t����� ��������� (��� view)"
 
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t��������� ����� (��� \"rvim\")"
+msgstr "-Z\t\t\t��������� ����� (��� rvim)"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t���� (����� �����) �� ���������"
 
 msgid ""
 "\n"
-"Arguments recognised by gvim (RISC OS version):\n"
-msgstr ""
-"\n"
-"��������� gvim (����� RISC OS):\n"
-
-msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <�������>\t��������� ������� ������� ����"
-
-msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <�������>\t��������� ������� ����� ����"
-
-msgid ""
-"\n"
 "Arguments recognised by gvim (GTK+ version):\n"
 msgstr ""
 "\n"
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t³������ Vim � ������ ������� ���������� GTK"
 
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\t��� gvim ������� ������������ ���� �� stdout"
+
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <��������� ������>\t³������ Vim �������� ������������ ����"
 
 
 #, c-format
 msgid "E283: No marks matching \"%s\""
-msgstr "E283: ������ \"%s\" �� ��������"
+msgstr "E283: ������ �%s� �� ��������"
 
 # msgstr "E283: "
 #. Highlight title
 "������ ���. �����. �����"
 
 # TODO
-#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
 "# ������:\n"
 
 #. Write the jumplist with -'
-#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
 "# ������ �������� (�� ���������):\n"
 
 # TODO
-#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: ���� ����� 2?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: ������� ���������� ���������� ����� �����"
+
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ��, �������� ���� �����!!!"
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr ""
-"E303: �� ������� ��������� ���� ����� ��� \"%s\", ���������� ���������"
+"E303: �� ������� ��������� ���� ����� ��� �%s�, ���������� ���������"
 
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): ���� ����� 0??"
 
 #, c-format
 msgid "Using swap file \"%s\""
-msgstr "��������������� ���� ����� \"%s\""
+msgstr "��������������� ���� ����� �%s�"
 
 #, c-format
 msgid "Original file \"%s\""
-msgstr "���������� ���� \"%s\""
+msgstr "���������� ���� �%s�"
 
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: ������������: �������, ���������� ���� ���� ������"
 
 #, c-format
 msgid "Swap file is encrypted: \"%s\""
-msgstr "���� ����� ������������: \"%s\""
+msgstr "���� ����� ������������: �%s�"
 
 msgid ""
 "\n"
 "����������� � ???"
 
 msgid "See \":help E312\" for more information."
-msgstr "���. \":help E312\" ��� ���������."
+msgstr "���. :help E312 ��� ���������."
 
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "³��������� ��������, �������� �� ��� ������."
 
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: ������ �������� ��������� \"%s\""
+msgstr "E773: ������ �������� ��������� �%s�"
 
 # msgstr "E317: "
 msgid "E325: ATTENTION"
 #. * other languages.
 msgid ""
 "\n"
-"(1) Another program may be editing the same file.\n"
-"    If this is the case, be careful not to end up with two\n"
-"    different instances of the same file when making changes.\n"
+"(1) Another program may be editing the same file.  If this is the case,\n"
+"    be careful not to end up with two different instances of the same\n"
+"    file when making changes."
 msgstr ""
 "\n"
-"(1) �������, ���� �������� ��� ������ ��� ����� ����.\n"
-"    ������ �������, ��� �� ���������� ��� ��� ����������\n"
-"    ������ � ���� ������ ����� ���� ���.\n"
-
-msgid "    Quit, or continue with caution.\n"
-msgstr "    ������, ��� ����������� ��������.\n"
-
-msgid ""
-"\n"
-"(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) ����� ����������� ����� ����� ������ �����.\n"
+"(1) �������, ���� �������� ��� ������ ��� ����� ����. ���� �� ���,\n"
+"    ������ �������, ��� �� ���������� ��� ��� ����������\n"
+"    ������ � ���� ������ ����� ���� ���."
+
+msgid "  Quit, or continue with caution.\n"
+msgstr "  ������ ��� ����������� ��������.\n"
+
+msgid "(2) An edit session for this file crashed.\n"
+msgstr "(2) ����� ����������� ����� ����� ������ �����.\n"
 
 msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ���� �� ������ ���������, ��������� \":recover\" ��� \"vim -r "
+msgstr "    ���� �� ������ ���������, ��������� :recover ��� vim -r "
 
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
-"\"\n"
-"    ��� �������� ���� (���. \":help recovery\").\n"
+"�\n"
+"    ��� �������� ���� (���. �:help recovery�).\n"
 
 msgid "    If you did this already, delete the swap file \""
-msgstr "    ���� �� ��� �� �������, ������� ���� ����� \""
+msgstr "    ���� �� ��� �� �������, ������� ���� ����� "
 
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
 msgstr ""
-"\"\n"
+"�,\n"
 "    ��� ��������� ����� �����������.\n"
 "\n"
 
 msgid "Swap file \""
-msgstr "���� ����� \""
+msgstr "���� ����� "
 
 msgid "\" already exists!"
-msgstr "\" ��� ����!"
+msgstr " ��� ����!"
 
 msgid "VIM - ATTENTION"
-msgstr "VIM -- �����"
+msgstr "VIM  �����"
 
 msgid "Swap file already exists!"
 msgstr "���� ����� ��� ����!"
 # msgstr "E328: "
 #, c-format
 msgid "E329: No menu \"%s\""
-msgstr "E329: ���� ���� \"%s\""
+msgstr "E329: ���� ���� �%s�"
 
 #. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
 
 # msgstr "E336: "
 msgid "E337: Menu not found - check menu names"
-msgstr "E337: ���� �� �������� -- �������� �����"
+msgstr "E337: ���� �� ��������  �������� �����"
 
 # msgstr "E337: "
 #, c-format
 msgid "Vim: Finished.\n"
 msgstr "Vim: ���������.\n"
 
-#, c-format
 msgid "ERROR: "
 msgstr "�������: "
 
 # msgstr "E342: "
 #, c-format
 msgid "Calling shell to execute: \"%s\""
-msgstr "����������� �������� ��� ��������: \"%s\""
+msgstr "����������� �������� ��� ��������: �%s�"
 
 msgid "E545: Missing colon"
 msgstr "E545: ��������� ���������"
 msgid "Keys don't match!"
 msgstr "����� �� �������!"
 
+msgid "E854: path too long for completion"
+msgstr "E854: ���� ������� ������ ��� ����������"
+
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 # msgstr "E343: "
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: �� ������� ������ ������� \"%s\" � cdpath"
+msgstr "E344: �� ������� ������ ������� �%s� � cdpath"
 
 # msgstr "E344: "
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: �� ������� ������ ���� \"%s\" � path"
+msgstr "E345: �� ������� ������ ���� �%s� � path"
 
 # msgstr "E345: "
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: � cdpath ���� ����� �������� \"%s\""
+msgstr "E346: � cdpath ���� ����� �������� �%s�"
 
 # msgstr "E346: "
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: � ����� ������ ����� ���� ����� \"%s\""
+msgstr "E347: � ����� ������ ����� ���� ����� �%s�"
 
 msgid "Cannot connect to Netbeans #2"
 msgstr "�� ������� �'�������� �� Netbeans #2"
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: ������������ ����� ������� �� ����� ���������� ��� �'������� � "
-"NetBenans: \"%s\""
+"NetBenans: �%s�"
 
 msgid "read from Netbeans socket"
 msgstr "�������� � ������ Netbeans"
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: �������� ��'���� �� NetBeans ��� ������ %ld"
 
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans �� ����������� � ��� GUI"
+
 msgid "E511: netbeans already connected"
 msgstr "E511: netbeans ��� ��'������"
 
-msgid "E505: "
-msgstr "E505: "
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s ����� ��� ������� (! ��� �� �������)"
 
 # msgstr "E348: "
 msgid "E349: No identifier under cursor"
 "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
 "%ld"
 msgstr ""
-"������� %s � %s; ����� %ld � %ld; ����� %ld � %ld; ������ %ld of %ld; ���� %"
-"ld � %ld"
+"������� %s � %s; ����� %ld � %ld; ����� %ld � %ld; ������ %ld of %ld; ���� "
+"%ld � %ld"
 
 #, c-format
 msgid "(+%ld for BOM)"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: �� ��������� � modeline"
 
+msgid "E846: Key code not set"
+msgstr "E846: ��� ����� �� �����������"
+
 msgid "E521: Number required after ="
 msgstr "E521: ϳ��� = ������� ������� �����"
 
 msgstr "E530: �� ������� ������ term � GUI"
 
 msgid "E531: Use \":gui\" to start the GUI"
-msgstr "E531: ���������� \":gui\" ��� ������� GUI"
+msgstr "E531: ���������� :gui ��� ������� GUI"
 
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: ����� 'backupext' � 'patchmode' �������"
 
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-msgstr "E244: ���������� ����� ������ ������� \"%s\" � ���� ������ \"%s\""
+msgstr "E244: ���������� ����� ������ ������� �%s� � ���� ������ �%s�"
 
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
-msgstr "E245: ���������� ������ %c � ���� ������ \"%s\""
+msgstr "E245: ���������� ������ %c � ���� ������ �%s�"
 
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: ���� �������� ������, �����\n"
 
 #, c-format
 msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
+msgstr "dlerror = �%s�"
 
 msgid "Opening the X display failed"
 msgstr "�� ������� ������� ������� X"
 
 #, c-format
 msgid "Cannot open file \"%s\""
-msgstr "�� ������� ������� ���� \"%s\""
+msgstr "�� ������� ������� ���� �%s�"
 
 msgid "E681: Buffer is not loaded"
 msgstr "E681: ����� �� �����������"
 msgstr "E756: �������� �������� �� ���������"
 
 #, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr "������������: �� ������� ������ ������ ��� �%s_%s.spl� �� �%s_ascii.spl�"
+
+#, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr ""
-"������������: �� ������� ������ ������ ��� \"%s.%s.spl\" �� \"%s.ascii.spl\""
+"������������: �� ������� ������ ������ ��� %s.%s.spl �� %s.ascii.spl"
 
 #, c-format
 msgid "Reading spell file \"%s\""
-msgstr "�������� ���� �������� \"%s\""
+msgstr "�������� ���� �������� �%s�"
 
 msgid "E757: This does not look like a spell file"
 msgstr "E757: �� ����� �� ���� ��������"
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "������������ %d ��� �� ��-ASCII ���������"
 
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: ����������� �����, ������ ��� ���� ��������"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "�������� %d � %d �����; ���������� %d (%d%%)"
 #. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
-msgstr "������� \"%.*s\" ��:"
+msgstr "������� %.*s ��:"
 
 #, c-format
 msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
+msgstr " < %.*s"
 
 # msgstr "E34: "
 msgid "E752: No previous spell replacement"
 msgid "E395: contains argument not accepted here"
 msgstr "E395: ̳����� ���������� ��� ���������"
 
+# msgstr "E14: "
+msgid "E844: invalid cchar value"
+msgstr "E844: ���������� �������� cchar"
+
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: group[t]hete ��� ������������"
 
 msgid "E397: Filename required"
 msgstr "E397: ������� ����� �����"
 
+msgid "E847: Too many syntax includes"
+msgstr "E847: �������� ������������ ��������"
+
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ��������� ']': %s"
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: ����� ���������: ������������ ����� %s"
 
+msgid "E848: Too many syntax clusters"
+msgstr "E848: �������� ������������ ��������"
+
 msgid "E400: No cluster specified"
 msgstr "E400: ������� �� �������"
 
 # msgstr "E411: "
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: ����������� ���������: \":highlight link %s\""
+msgstr "E412: ����������� ���������: :highlight link %s"
 
 # msgstr "E412: "
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: �������� ���������: \":highlight link %s\""
+msgstr "E413: �������� ���������: :highlight link %s"
 
 # msgstr "E413: "
 msgid "E414: group has settings, highlight link ignored"
 msgid "W18: Invalid character in group name"
 msgstr "W18: ����������� ������ � ���� �����"
 
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: �������� ���� ����������� � ����������"
+
 # msgstr "E424: "
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ʳ���� ����� �崳�"
 
 # msgstr "E426: "
 msgid "  # pri kind tag"
-msgstr "  # �� ���  ��"
+msgstr "  # �� ��� ��"
 
 msgid "file\n"
 msgstr "����\n"
 
 msgid "E427: There is only one matching tag"
-msgstr "E427: ���� ���� ��������� ��"
+msgstr "E427: ���� ���� ��������� ��"
 
 # msgstr "E427: "
 msgid "E428: Cannot go beyond last matching tag"
 # msgstr "E428: "
 #, c-format
 msgid "File \"%s\" does not exist"
-msgstr "���� \"%s\" �� ����"
+msgstr "���� �%s� �� ����"
 
 #. Give an indication of the number of matching tags
 #, c-format
 
 #, c-format
 msgid "E429: File \"%s\" does not exist"
-msgstr "E429: ���� \"%s\" �� ����"
+msgstr "E429: ���� �%s� �� ����"
 
 # msgstr "E429: "
 #. Highlight title
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: ���� ����� �崳� ��������� �� %s\n"
 
+msgid "Ignoring long line in tags file"
+msgstr "���������� ������ ����� � ���� � ����������"
+
 # msgstr "E430: "
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: ������� ������� � ���� �崳� \"%s\""
+msgstr "E431: ������� ������� � ���� �崳� �%s�"
 
 # msgstr "E431: "
 #, c-format
 msgid "E433: No tags file"
 msgstr "E433: ���� ����� �崳�"
 
-msgid "Ignoring long line in tags file"
-msgstr "���������� ������ ����� � ���� � ����������"
-
 # msgstr "E433: "
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �� ������� ������ ������ ���"
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: ���� ������ \"%s\" ��� ��������� ��������"
+msgstr "E436: ���� ������ �%s� ��� ��������� ��������"
 
 msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: ������� ��������� �������� \"cm\""
+msgstr "E437: ������� ��������� �������� �cm�"
 
 #. Highlight title
 msgid ""
 msgid "Nothing to undo"
 msgstr "���� ����� �����������"
 
-msgid "number changes  time            saved"
-msgstr "�����  ���     ���             ���������"
+msgid "number changes  when               saved"
+msgstr "�����  ����    ���             ���������"
 
 #, c-format
 msgid "%ld seconds ago"
 
 msgid ""
 "\n"
-"RISC OS version"
-msgstr ""
-"\n"
-"����� ��� RISC OS"
-
-msgid ""
-"\n"
 "OpenVMS version"
 msgstr ""
 "\n"
 msgstr "�����: Bram Moolenaar �� ��."
 
 msgid "Vim is open source and freely distributable"
-msgstr "Vim -- �� ������� � ����� ��������������� ��������"
+msgstr "Vim  �� ������� � ����� ��������������� ��������"
 
 msgid "Help poor children in Uganda!"
 msgstr "��������� ������� � ������!"
 # msgstr "E446: "
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: ���� \"%s\" �� �������� � ����� ������"
+msgstr "E447: ���� �%s� �� �������� � ����� ������"
 
 #, c-format