From 0f2d02569cd41e1ffac4195ec47b1ca9b3f08418 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Fri, 23 Jan 2015 10:36:54 +0100
Subject: [PATCH] vim-patch:31f7581

Update runtime files and translations.

https://code.google.com/p/vim/source/detail?r=31f7581068a9c3119e3bd2cd74160eb8282c3c6e
---
 runtime/doc/map.txt      | 10 +++--
 runtime/doc/todo.txt     | 83 +++++++++++++++++++++++-----------------
 runtime/filetype.vim     |  8 ++--
 runtime/optwin.vim       |  4 +-
 runtime/syntax/j.vim     | 42 +++++++++++---------
 runtime/syntax/rst.vim   | 13 +++++--
 src/nvim/po/ru.cp1251.po | 65 ++++++++++++++++++++++++-------
 src/nvim/po/ru.po        | 63 +++++++++++++++++++++++-------
 8 files changed, 195 insertions(+), 93 deletions(-)

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 5f1c4a6261..1be2827c2c 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4.  Last change: 2014 Sep 30
+*map.txt*       For Vim version 7.4.  Last change: 2014 Oct 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -923,9 +923,11 @@ Examples: ({CURSOR} is where you type a non-keyword character) >
 <		"test;;"	  is not expanded
 		"test ;;"	  is expanded to "test <endofline>"
 
-To avoid the abbreviation in insert mode: Type part of the abbreviation, exit
-insert mode with <Esc>, re-enter insert mode with "a" and type the rest.  Or
-type CTRL-V before the character after the abbreviation.
+To avoid the abbreviation in Insert mode: Type CTRL-V before the character
+that would trigger the abbreviation.  E.g. CTRL-V <Space>.  Or type part of
+the abbreviation, exit insert mode with <Esc>, re-enter insert mode with "a"
+and type the rest.
+
 To avoid the abbreviation in Command-line mode: Type CTRL-V twice somewhere in
 the abbreviation to avoid it to be replaced.  A CTRL-V in front of a normal
 character is mostly ignored otherwise.
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index b885b041d1..bfe67c2757 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2014 Oct 02
+*todo.txt*      For Vim version 7.4.  Last change: 2014 Oct 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -35,6 +35,8 @@ not be repeated below, unless there is extra information.
 -------------------- Known bugs and current work -----------------------
 
 Regexp problems:
+- The NFA engine does not implement the time limit passed to
+  nfa_regexec_multi()
 - Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@<!\.$'
   (Lech Lorens, 2014 Feb 3)
 - Issue 164: freeze on regexp search.
@@ -58,15 +60,6 @@ Patch to make getregtype() return the right size for non-linux systems.
 (Yasuhiro Matsumoto, 2014 Jul 8)
 Breaks test_eval.  Inefficient, can we only compute y_width when needed?
 
-Patch to fix 'linebreak' when applying an operator.  And fix the test not
-actually testing. (Christian Brabandt, 2014 Sep 23)
-
-patch to fix issue 26. (Christian)
-
-Test 11 and 100 do not work properly on Windows.
-Patch by Ken Takata (2014 Sep 25)
-Alternative patch Oct 1.
-
 Problem that a previous silent ":throw" causes a following try/catch not to
 work. (ZyX, 2013 Sep 28)
 
@@ -74,15 +67,9 @@ Patch to avoid problems with encoding conversion with diff.vim.
 (Yasuhiro Matsumoto, 2014 Sep 1.
 Depends on current language, language of file can be different.
 
-Add books from Steve Oualline to Vim website. (2014 Sep 25)
-
 ":cd C:\Windows\System32\drivers\etc*" does not work, even though the
 directory exists. (Sergio Gallelli, 2013 Dec 29)
 
-Patch to have the fold and sign column and at the last line of the buffer.
-(Marco Hinz, 2014 Sep 25)
-Alternate suggestion: let all columns continue, also number column.
-
 Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
 14, Aug 30)
     Make ":1close" close the first window.
@@ -90,28 +77,31 @@ Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
     Make ":-1close" close the previous window.
 Doesn't look right, asked for updates.
 
-Patch to handle multi-byte printer name on MS-Windows. (Yasuhiro Matsumoto,
-2014 Sept 28)
-
-Two patches by Christian, 2014 Sep 29:
-- Combination of precedes listchar and 'showbreak' doesn't work well.
-- Moving cursor is off when 'nu' and 'sbr' are set.
-
 The entries added by matchaddpos() are returned by getmatches() but can't be
 set with setmatches(). (lcd47, 2014 Jun 29)
 
-Patch to fix window title for a command window on MS-Windows. (Yasuhiro
-Matsumoto, 2014 Sep 28)
-
 Patch to fix that 0x80 in abbreviation isn't handled correctly.
 (Christian Brabandt, 2014 Oct 1)
 
+Check for valid yank reg seems wrong.  Patch by Zyx, 2014 Oct 12.
+
+":sign-jump" uses first window in buffer instead of current window.
+Patch by James McCoy, 2013 Nov 22.  Update 2014 Oct 5.
+
 Patch to fix issue 57, on the issue.
 
 Patch for issue 101, maintainer unreachable.
 
+Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab.
+
+Patch to fix that last_changedtick is not update on saving. (Christian
+Brabandt, 2014 Oct 10, second one)
+
+substitute() can be slow with long strings.  Patch by Ozaki Kiichi, 2014 Oct
+12.
+
 Remove restriction in NSIS installer that the end of the path must be "Vim".
-(Tim Lebedkov, 2014 Sep 24)
+(Tim Lebedkov, 2014 Sep 24) Again Oct 12.
 
 Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
 
@@ -119,6 +109,14 @@ Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
 
 'foldexpr' applies to help. (Paul Marshall, 2014 Sep 24)
 
+Patch to fix issue 203. (Christian Brabandt, 2014 Oct 8)
+
+Patch to fix issue 253. (Christian Brabandt, 2014 Oct 8)
+
+Patch to fix issue 78. (Christian Brabandt, 2014 Oct 8)
+
+Patch to fix leak in map() with error. (Christian Brabandt, 2014 Oct 11)
+
 Value returned by virtcol() changes depending on how lines wrap.  This is
 inconsistent with the documentation.
 
@@ -142,9 +140,19 @@ Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
 
 Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12)
 
+Patch for building a 32bit Vim with 64bit MingW compiler.
+(Michael Soyka, 2014 Oct 15)
+
+Delete old code in os_msdos.c, mch_FullName().
+
 "hi link" does not respect groups with GUI settings only. (Mark Lodato, 2014
 Jun 8)
 
+Patch to switch to the BT regexp engine when the NFA engine uses many states.
+(Christian Brabandt, 2014 Oct 3)
+
+Patch to add argument to :cquit. (Thinca, 2014 Oct 12)
+
 No error for missing endwhile. (ZyX, 2014 Mar 20)
 
 start_global_changes() plus end_global_changes() causes problem for
@@ -333,9 +341,6 @@ buffer. (2013 Dec 9)
 Patch for drag&drop reordering of GUI tab pages reordering.
 (Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
 
-":sign-jump" uses first window in buffer instead of current window.
-Patch by James McCoy, 2013 Nov 22.
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
@@ -409,7 +414,7 @@ Patch to allow setting w:quickfix_title via setqflist() and setloclist()
 functions. (Christian Brabandt, 2013 May 8, update May 21)
 Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
 Second one. Update May 22.
-Update by Daniel Hahler, 2014 Jul 4, Aug 14.
+Update by Daniel Hahler, 2014 Jul 4, Aug 14, Oct 14, Oct 15.
 
 Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
 
@@ -546,6 +551,10 @@ URXVT:
 - Use urxvt mouse support also in xterm.  Explanations:
   http://www.midnight-commander.org/ticket/2662
 
+Patch to have the fold and sign column and at the last line of the buffer.
+(Marco Hinz, 2014 Sep 25)
+Alternate suggestion: let all columns continue, also the number column.
+
 Patch to add tests for if_xcmdsrv.c., Jul 8, need some more work. (Brian Burns)
 New tests Jul 13.   Update Jul 17.  Discussion Jul 18.
 
@@ -1002,6 +1011,12 @@ to avoid changing 'eventignore'?
 Patch for displaying 0x200c and 0x200d. (Ali Gholami Rudi, 2009 May 6)
 Probably needs a bit of work.
 
+Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
+Added test, updates, June 23.
+Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
+With modification for Tatweel character: https://dpaste.de/VmFw
+Remark from Ameretat Reith (2014 Oct 13)
+
 List of encoding aliases. (Takao Fujiwara, 2009 Jul 18)
 Are they all OK?  Update Jul 22.
 
@@ -1020,10 +1035,6 @@ on the first character. (John Beckett, 2010 Aug 7)
 Setting 'tags' to "tagsdir/*" does not find "tagsdir/tags". (Steven K. Wong,
 2009 Jul 18)
 
-Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
-Added test, updates, June 23.
-Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
-
 Patch to add "focusonly" to 'scrollopt', so that scrollbind also applies in
 window that doesn't have focus. (Jonathon Mah, 2009 Jan 12)
 Needs more work.
@@ -1944,7 +1955,7 @@ More patches:
 -   testdir/Make_dos_sh.mak for running tests with MingW. (Bill Mccarthy, 2008
     Sep 13)
 -   Patch for adding "space" item in 'listchars'. (Jérémie Roquet, 2009 Oct 29,
-    Docs patch Oct 30, update David Burgin (glts) 2013 Aug 24)
+    Docs patch Oct 30, update David Burgin (glts) 2013 Aug 24, 2014 Oct 10)
 -   Replace ccomplete.vim by cppcomplete.vim from www.vim.org?  script 1520 by
     Vissale Neang.  (Martin Stubenschrott) Asked Vissale to make the scripts
     more friendly for the Vim distribution.
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 3fc109ac0d..127cf86349 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 Sep 05
+" Last Change:	2014 Oct 09
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1147,7 +1147,7 @@ au BufNewFile,BufRead *.mv,*.mpl,*.mws		setf maple
 au BufNewFile,BufRead *.map			setf map
 
 " Markdown
-au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,README.md  setf markdown
+au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md  setf markdown
 
 " Mason
 au BufNewFile,BufRead *.mason,*.mhtml,*.comp	setf mason
@@ -1239,8 +1239,8 @@ au BufNewFile,BufRead *.mod
 	\   setf modsim3 |
 	\ endif
 
-" Modula 2
-au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.md,*.mi setf modula2
+" Modula 2  (.md removed in favor of Markdown)
+au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.mi	setf modula2
 
 " Modula 3 (.m3, .i3, .mg, .ig)
 au BufNewFile,BufRead *.[mi][3g]		setf modula3
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index aebe02fe00..eb96bb7da3 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 Aug 06
+" Last Change:	2014 Oct 09
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -724,6 +724,7 @@ call <SID>OptionG("km", &km)
 
 call <SID>Header("editing text")
 call append("$", "undolevels\tmaximum number of changes that can be undone")
+call append("$", "\t(global or local to buffer)")
 call append("$", " \tset ul=" . &ul)
 call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload")
 call append("$", " \tset ur=" . &ur)
@@ -969,6 +970,7 @@ call <SID>BinOptionG("bk", &bk)
 call append("$", "backupskip\tpatterns that specify for which files a backup is not made")
 call append("$", " \tset bsk=" . &bsk)
 call append("$", "backupcopy\twhether to make the backup as a copy or rename the existing file")
+call append("$", "\t(global or local to buffer)")
 call append("$", " \tset bkc=" . &bkc)
 call append("$", "backupdir\tlist of directories to put backup files in")
 call <SID>OptionG("bdir", &bdir)
diff --git a/runtime/syntax/j.vim b/runtime/syntax/j.vim
index bde954506e..0cdd59b887 100644
--- a/runtime/syntax/j.vim
+++ b/runtime/syntax/j.vim
@@ -2,7 +2,7 @@
 " Language:	J
 " Maintainer:	David Bürgin <676c7473@gmail.com>
 " URL:		https://github.com/glts/vim-j
-" Last Change:	2014-05-25
+" Last Change:	2014-10-05
 
 if exists('b:current_syntax')
   finish
@@ -12,7 +12,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 syntax case match
-syntax sync minlines=50
+syntax sync minlines=100
 
 syntax cluster jStdlibItems contains=jStdlibNoun,jStdlibAdverb,jStdlibConjunction,jStdlibVerb
 syntax cluster jPrimitiveItems contains=jNoun,jAdverb,jConjunction,jVerb,jCopula
@@ -30,26 +30,32 @@ syntax keyword jStdlibVerb AND Endian IFDEF Note OR XOR alpha17 alpha27 anddf an
 syntax match jStdlibNoun /\<\%(adverb\|conjunction\|dyad\|monad\|noun\|verb\)\>/
 syntax match jStdlibVerb /\<\%(assert\|break\|do\)\>\.\@!/
 
-" Numbers. Matching J numbers is difficult. The regular expression used for
-" the general case roughly embodies this grammar sketch:
+" Numbers. Matching J numbers is difficult. In fact, the job cannot be done
+" with regular expressions alone. Below is a sketch of the pattern used. It
+" accepts most well-formed numbers and rejects most of the ill-formed ones.
+" See http://www.jsoftware.com/help/dictionary/dcons.htm for reference.
 "
-"     BASE     := /_?\d+(\.\d*)?([eE]_?\d+)?/
-"     RATIONAL := BASE  |  BASE r BASE
-"     COMPLEX  := BASE  |  BASE (j|a[dr]) BASE
-"     JNUMBER  := RATIONAL  |  RATIONAL [px] RATIONAL  |  COMPLEX  |  COMPLEX [px] COMPLEX
+" "double1" and "double2" patterns:
+"     (_?\d+(\.\d*)?|_\.\d+)([eE]_?\d+)?
+"     (_?\d+(\.\d*)?|_\.\d+|\.\d+)([eE]_?\d+)?
 "
-" The grammar is implemented as shown in this pseudo-regexp:
+" "rational1" and "rational2" patterns:
+"     \k<double1>(r\k<double2>)?|__?
+"     \k<double2>(r\k<double2>)?|__?
 "
-"        base         rational                       complex                       remainder
-"     /\< B  (  [r]B ([px]B([r]B)?)?  |  (j|a[dr])B ([px]B((j|a[dr])B)?)?  |  [px]B ((j|a[dr]|r)B)?  )?/
+" "complex1" and "complex2" patterns:
+"     \k<rational1>((j|a[dr])\k<rational2>)?
+"     \k<rational2>((j|a[dr])\k<rational2>)?
 "
-" All in all, a compromise between correctness and practicality had to be
-" made. See http://www.jsoftware.com/help/dictionary/dcons.htm for reference.
-syntax match jNumber /\<_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\|r\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\)\=/
-syntax match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+\%(\.[0-9a-z]\+\)\=/
-syntax match jNumber /\<__\=\>/
-syntax match jNumber /\<_\./
-syntax match jNumber /\<_\=\d\+x\>/
+" "basevalue" pattern:
+"     _?[0-9a-z]+(\.[0-9a-z]*)?|_?\.[0-9a-z]+
+"
+" all numbers:
+"     \b\k<complex1>([px]\k<complex2>)?(b\k<basevalue>)?(?![0-9A-Za-z_.])
+syntax match jNumber /\<_\.[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<_\=\d\+x[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<\%(__\=r_\=\d\+\|_\=\d\+r__\=\)[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\%(\%(j\|a[dr]\)\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\)\=\%([px]\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\%(\%(j\|a[dr]\)\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\)\=\)\=\%(b\%(_\=[0-9a-z]\+\%(\.[0-9a-z]*\)\=\|_\=\.[0-9a-z]\+\)\)\=[0-9A-Za-z_.]\@!/
 
 syntax region jString oneline start=/'/ skip=/''/ end=/'/
 
diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index fce9e5dd3e..c1f25699e7 100644
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
-" Language:         reStructuredText documentation format
-" Maintainer:       Marshall Ward <marshall.ward@gmail.com>
+" Language: reStructuredText documentation format
+" Maintainer: Marshall Ward <marshall.ward@gmail.com>
 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2014-08-23
+" Latest Revision: 2014-10-03
 
 if exists("b:current_syntax")
   finish
@@ -150,12 +150,19 @@ endif
 
 for code in g:rst_syntax_code_list
     unlet! b:current_syntax
+    " guard against setting 'isk' option which might cause problems (issue #108)
+    let prior_isk = &l:iskeyword
     exe 'syn include @rst'.code.' syntax/'.code.'.vim'
     exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold '
                 \.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# '
                 \.'skip=#^$# '
                 \.'end=#^\z1\@!# contains=@NoSpell,@rst'.code
     exe 'syn cluster rstDirectives add=rstDirective'.code
+    " reset 'isk' setting, if it has been changed
+    if &l:iskeyword !=# prior_isk
+        let &l:iskeyword = prior_isk
+    endif
+    unlet! prior_isk
 endfor
 
 " TODO: Use better syncing.
diff --git a/src/nvim/po/ru.cp1251.po b/src/nvim/po/ru.cp1251.po
index df1bf7873a..4dd4cec235 100644
--- a/src/nvim/po/ru.cp1251.po
+++ b/src/nvim/po/ru.cp1251.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim_7.4_ru\n"
+"Project-Id-Version: vim_ru\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2013-08-31 21:11+0400\n"
+"PO-Revision-Date: 2014-10-10 12:00+0400\n"
 "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
 "Language-Team: \n"
 "Language: Russian\n"
@@ -820,18 +820,17 @@ msgid "sort() argument"
 msgstr "��������� sort()"
 
 #: ../eval.c:13721
-#, fuzzy
 msgid "uniq() argument"
-msgstr "��������� add()"
+msgstr "��������� uniq()"
 
 #: ../eval.c:13776
 msgid "E702: Sort compare function failed"
 msgstr "E702: ��������� ���������� ������� ��������� ��� ����������"
 
 #: ../eval.c:13806
-#, fuzzy
 msgid "E882: Uniq compare function failed"
-msgstr "E702: ��������� ���������� ������� ��������� ��� ����������"
+msgstr ""
+"E882: ��������� ���������� ������� ��������� ��� �������� ��������������"
 
 #: ../eval.c:14085
 msgid "(Invalid)"
@@ -957,18 +956,14 @@ msgid "E129: Function name required"
 msgstr "E129: ��������� ��� �������"
 
 #: ../eval.c:17824
-#, fuzzy, c-format
+#, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: ��� ������� ������ ���������� � ��������� ����� ��� ��������� "
-"���������: %s"
+msgstr "E128: ��� ������� ������ ���������� � ��������� ����� ��� \"s:\": %s"
 
 #: ../eval.c:17833
-#, fuzzy, c-format
+#, c-format
 msgid "E884: Function name cannot contain a colon: %s"
-msgstr ""
-"E128: ��� ������� ������ ���������� � ��������� ����� ��� ��������� "
-"���������: %s"
+msgstr "E884: ��� ������� �� ����� ��������� ���������: %s"
 
 #: ../eval.c:18336
 #, c-format
@@ -1116,6 +1111,10 @@ msgstr "E138: 
 msgid "Writing viminfo file \"%s\""
 msgstr "������ ����� viminfo \"%s\""
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: ���������� ������������� ���� viminfo � %s!"
+
 #. Write the info:
 #: ../ex_cmds.c:1720
 #, c-format
@@ -1358,6 +1357,10 @@ msgstr "E158: 
 msgid "E157: Invalid sign ID: %<PRId64>"
 msgstr "E157: ������������ ID ������: %<PRId64>"
 
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: ���������� �������� ������ %s"
+
 #: ../ex_cmds.c:6066
 msgid " (not supported)"
 msgstr " (�� ��������������)"
@@ -2003,6 +2006,9 @@ msgstr "E344: 
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: ���� \"%s\" � ��������� ��������� �� ������"
 
+msgid "List or number required"
+msgstr "��������� ������ ��� �����"
+
 #: ../file_search.c:1512
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
@@ -4533,6 +4539,13 @@ msgstr ""
 msgid "E574: Unknown register type %d"
 msgstr "E574: ����������� ��� �������� %d"
 
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: ������ ������ � ������� ��������� �� ����� ��������� ���� ��� ����� "
+"�����"
+
 #: ../ops.c:5089
 #, c-format
 msgid "%<PRId64> Cols; "
@@ -4796,6 +4809,19 @@ msgstr ""
 "\n"
 "���������� ���������� �������� ������������ ��� "
 
+msgid "Could not set security context "
+msgstr "���������� ���������� �������� ������������ "
+
+msgid " for "
+msgstr " ��� "
+
+#. no enough size OR unexpected error
+msgid "Could not get security context "
+msgstr "���������� �������� �������� ������������ "
+
+msgid ". Removing it!\n"
+msgstr ". ����� �����!\n"
+
 #: ../os_unix.c:1558 ../os_unix.c:1647
 #, c-format
 msgid "dlerror = \"%s\""
@@ -5008,6 +5034,10 @@ msgstr "E554: 
 msgid "External submatches:\n"
 msgstr "������� ���������������:\n"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (���. ��������� ���) ���������� ��������� %s"
+
 #: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
@@ -8243,3 +8273,10 @@ msgstr "E446: 
 #~ msgstr ""
 #~ "������ ��� ��������� ����: sys.path �� �������� �������\n"
 #~ "������� �������� vim.VIM_SPECIAL_PATH � sys.path"
+
+#~ msgid ""
+#~ "E887: Sorry, this command is disabled, the Python's site module could not be "
+#~ "loaded."
+#~ msgstr ""
+#~ "E887: � ��������� ��� ������� �� ��������, ��������� �� �������� ������ "
+#~ "Python site."
diff --git a/src/nvim/po/ru.po b/src/nvim/po/ru.po
index 0028cbfccd..5bdbc33801 100644
--- a/src/nvim/po/ru.po
+++ b/src/nvim/po/ru.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim_7.4_ru\n"
+"Project-Id-Version: vim_ru\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2013-08-31 21:11+0400\n"
+"PO-Revision-Date: 2014-10-10 12:00+0400\n"
 "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
 "Language-Team: \n"
 "Language: Russian\n"
@@ -820,18 +820,17 @@ msgid "sort() argument"
 msgstr "параметра sort()"
 
 #: ../eval.c:13721
-#, fuzzy
 msgid "uniq() argument"
-msgstr "параметра add()"
+msgstr "параметра uniq()"
 
 #: ../eval.c:13776
 msgid "E702: Sort compare function failed"
 msgstr "E702: Неудачное завершение функции сравнения при сортировке"
 
 #: ../eval.c:13806
-#, fuzzy
 msgid "E882: Uniq compare function failed"
-msgstr "E702: Неудачное завершение функции сравнения при сортировке"
+msgstr ""
+"E882: Неудачное завершение функции сравнения при проверке единственности"
 
 #: ../eval.c:14085
 msgid "(Invalid)"
@@ -957,18 +956,15 @@ msgid "E129: Function name required"
 msgstr "E129: Требуется имя функции"
 
 #: ../eval.c:17824
-#, fuzzy, c-format
+#, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: Имя функции должно начинаться с заглавной буквы или содержать "
+msgstr "E128: Имя функции должно начинаться с заглавной буквы или \"s:\": %s"
 "двоеточие: %s"
 
 #: ../eval.c:17833
-#, fuzzy, c-format
+#, c-format
 msgid "E884: Function name cannot contain a colon: %s"
-msgstr ""
-"E128: Имя функции должно начинаться с заглавной буквы или содержать "
-"двоеточие: %s"
+msgstr "E884: Имя функции не может содержать двоеточие: %s"
 
 #: ../eval.c:18336
 #, c-format
@@ -1116,6 +1112,10 @@ msgstr "E138: Невозможно записать файл viminfo %s!"
 msgid "Writing viminfo file \"%s\""
 msgstr "Запись файла viminfo \"%s\""
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: Невозможно переименовать файл viminfo в %s!"
+
 #. Write the info:
 #: ../ex_cmds.c:1720
 #, c-format
@@ -1358,6 +1358,10 @@ msgstr "E158: Неправильное имя буфера: %s"
 msgid "E157: Invalid sign ID: %<PRId64>"
 msgstr "E157: Неправильный ID значка: %<PRId64>"
 
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Невозможно изменить значок %s"
+
 #: ../ex_cmds.c:6066
 msgid " (not supported)"
 msgstr " (не поддерживается)"
@@ -4533,6 +4537,12 @@ msgstr ""
 msgid "E574: Unknown register type %d"
 msgstr "E574: Неизвестный тип регистра %d"
 
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: шаблон поиска и регистр выражения не могут содержать двух или более "
+
 #: ../ops.c:5089
 #, c-format
 msgid "%<PRId64> Cols; "
@@ -4801,11 +4811,27 @@ msgstr ""
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
+msgid "Could not set security context "
+msgstr "Невозможно установить контекст безопасности "
+
+msgid " for "
+msgstr " для "
+
+msgid ". Removing it!\n"
+msgstr ". Будет удалён!\n"
+
+#. no enough size OR unexpected error
+msgid "Could not get security context "
+msgstr "Невозможно получить контекст безопасности "
+
 #: ../path.c:1449
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: Файл \"%s\" не найден по известным путям"
 
+msgid "List or number required"
+msgstr "Требуется список или число"
+
 #: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
@@ -4999,6 +5025,10 @@ msgstr "E678: Недопустимый символ после %s%%[dxouU]"
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Недопустимый символ после %s%%"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (рег. выражение НКА) невозможно повторить %s"
+
 #: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
@@ -8243,3 +8273,10 @@ msgstr "E446: Нет имени файла в позиции курсора"
 #~ msgstr ""
 #~ "Ошибка при установке пути: sys.path не является списком\n"
 #~ "Следует добавить vim.VIM_SPECIAL_PATH в sys.path"
+
+#~ msgid ""
+#~ "E887: Sorry, this command is disabled, the Python's site module could not be "
+#~ "loaded."
+#~ msgstr ""
+#~ "E887: К сожалению эта команда не работает, поскольку не загружен модуль "
+#~ "Python site."