changeset 18615:c4cdc715cb68

Update runtime files Commit: https://github.com/vim/vim/commit/574ee7bc1246070dba598f9561a2776aa1a10d07 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Nov 13 23:04:29 2019 +0100 Update runtime files
author Bram Moolenaar <Bram@vim.org>
date Wed, 13 Nov 2019 23:15:04 +0100
parents aa72fe337d7a
children 8eeed64a6325
files runtime/doc/intro.txt runtime/doc/pi_netrw.txt runtime/doc/popup.txt runtime/doc/sign.txt runtime/doc/textprop.txt runtime/doc/todo.txt runtime/doc/vi_diff.txt runtime/gvim.desktop runtime/lang/menu_tr.cp1254.vim runtime/lang/menu_tr_tr.cp1254.vim runtime/syntax/vim.vim runtime/tutor/tutor.tr.iso9 runtime/tutor/tutor.tr.utf-8 runtime/tutor/tutor.vim runtime/vim.desktop src/po/eo.po src/po/gvim.desktop.in src/po/ja.euc-jp.po src/po/ja.po src/po/ja.sjis.po src/po/ru.cp1251.po src/po/ru.po src/po/tr.po src/po/vim.desktop.in
diffstat 24 files changed, 7848 insertions(+), 6758 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 8.1.  Last change: 2019 Aug 16
+*intro.txt*     For Vim version 8.1.  Last change: 2019 Nov 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -234,7 +234,7 @@ Vim would never have become what it is n
 	Sung-Hyun Nam		Work on multi-byte versions
 	Vince Negri		Win32 GUI and generic console enhancements
 	Steve Oualline		Author of the first Vim book |frombook|
-	Dominique Pelle		valgrind reports and many fixes
+	Dominique Pelle		Valgrind reports and many fixes
 	A.Politz		Many bug reports and some fixes
 	George V. Reilly	Win32 port, Win32 GUI start-off
 	Stephen Riehm		bug collector
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 8.1.  Last change: 2019 Nov 07
+*pi_netrw.txt*  For Vim version 8.1.  Last change: 2019 Nov 10
 
 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
@@ -3512,7 +3512,7 @@ 10. Problems and Fixes					*netrw-proble
 			- Click "Add..."
 			- Set External Editor (adjust path as needed, include
 			  the quotes and !.! at the end):
-			    "c:\Program Files\Vim\vim70\gvim.exe" !.!
+			    "c:\Program Files\Vim\vim881\gvim.exe" !.!
 			- Check that the filetype in the box below is
 			  {asterisk}.{asterisk} (all files), or whatever types
 			  you want (cec: change {asterisk} to * ; I had to
@@ -3762,8 +3762,8 @@ by obtaining a copy of the latest (often
 
 The <netrw.vim> script is typically installed on systems as something like:
 >
-	/usr/local/share/vim/vim7x/plugin/netrwPlugin.vim
-	/usr/local/share/vim/vim7x/autoload/netrw.vim
+	/usr/local/share/vim/vim8x/plugin/netrwPlugin.vim
+	/usr/local/share/vim/vim8x/autoload/netrw.vim
 		(see output of :echo &rtp)
 <
 which is loaded automatically at startup (assuming :set nocp).  If you
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.1.  Last change: 2019 Nov 09
+*popup.txt*  For Vim version 8.1.  Last change: 2019 Nov 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 8.1.  Last change: 2019 Sep 06
+*sign.txt*      For Vim version 8.1.  Last change: 2019 Nov 12
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -48,8 +48,8 @@ When signs are defined for a file, Vim w
 characters to display them in.  When the last sign is unplaced the column
 disappears again.  This behavior can be changed with the 'signcolumn' option.
 
-The color of the column is set with the SignColumn group |hl-SignColumn|.
-Example to set the color: >
+The color of the column is set with the SignColumn highlight group
+|hl-SignColumn|.  Example to set the color: >
 
 	:highlight SignColumn guibg=darkgrey
 <
@@ -71,6 +71,8 @@ placed in the named group. The sign iden
 sign group allows Vim plugins to use unique signs without interfering with
 other plugins using signs.
 
+The group name "popupmenu" is used by popup windows where 'cursorline' is set.
+
 							*sign-priority*
 Each placed sign is assigned a priority value. When multiple signs are placed
 on the same line, the attributes of the sign with the highest priority is used
--- a/runtime/doc/textprop.txt
+++ b/runtime/doc/textprop.txt
@@ -1,4 +1,4 @@
-*textprop.txt*  For Vim version 8.1.  Last change: 2019 Nov 09
+*textprop.txt*  For Vim version 8.1.  Last change: 2019 Nov 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -48,8 +48,8 @@ Property Types ~
 A text property normally has the name of a property type, which defines 
 how to highlight the text.  The property type can have these entries:
 	"highlight"	name of the highlight group to use
-	"combine"	when TRUE the text property highlighting is combined
-			with any syntax highlighting; when omitted or FALSE the
+	"combine"	when omitted or TRUE the text property highlighting is
+			combined with any syntax highlighting; when FALSE the
 			text property highlighting replaces the syntax
 			highlighting
 	"priority"	when properties overlap, the one with the highest
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.1.  Last change: 2019 Nov 10
+*todo.txt*      For Vim version 8.1.  Last change: 2019 Nov 13
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,6 +38,12 @@ browser use: https://github.com/vim/vim/
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Add a function to fetch the mouse_lnum and mouse_col values?  Can be used in a
+mapping.  Remove setting v:mouse_lnum etc. from the popup filter, the values
+are wrong.
+
+Problem with cursor in wrong position: #5214
+
 Don't use javascriptreact but javascript.jsx?  #4830
 Although there is a good argument against using ".jsx".
 
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 8.1.  Last change: 2019 Oct 12
+*vi_diff.txt*   For Vim version 8.1.  Last change: 2019 Nov 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1323,6 +1323,11 @@ Set the $VIM_POSIX environment variable 
 flags when Vim starts up.  This makes Vim run as POSIX as it can.  That's
 a bit different from being Vi compatible.
 
+You can find the Posix specification for Vi here:
+https://pubs.opengroup.org/onlinepubs/9699919799/utilities/vi.html
+And the related Ex specification:
+https://pubs.opengroup.org/onlinepubs/9699919799/utilities/ex.html
+
 This is where Vim does not behave as POSIX specifies and why:
 
 							*posix-screen-size*
--- a/runtime/gvim.desktop
+++ b/runtime/gvim.desktop
@@ -4,19 +4,22 @@
 # Translators: This is the Application Name used in the GVim desktop file
 Name[de]=GVim
 Name[eo]=GVim
+Name[ru]=GVim
 Name[tr]=GVim
 Name=GVim
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
 GenericName[ja]=テキストエディタ
+GenericName[ru]=Текстовый редактор
 GenericName[tr]=Metin Düzenleyici
 GenericName=Text Editor
 # Translators: This is the comment used in the Vim desktop file
 Comment[de]=Textdateien bearbeiten
 Comment[eo]=Redakti tekstajn dosierojn
 Comment[ja]=テキストファイルを編集します
-Comment[tr]=Metin dosyaları düzenle
+Comment[ru]=Редактирование текстовых файлов
+Comment[tr]=Metin dosyaları düzenleyin
 Comment=Edit text files
 # The translations should come from the po file. Leave them here for now, they will
 # be overwritten by the po file when generating the desktop.file!
@@ -75,7 +78,6 @@ Comment[pl]=Edytuj pliki tekstowe
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
-Comment[ru]=Редактор текстовых файлов
 Comment[sk]=Úprava textových súborov
 Comment[sl]=Urejanje datotek z besedili
 Comment[sq]=Përpuno files teksti
@@ -98,11 +100,13 @@ Type=Application
 Keywords[de]=Text;Editor;
 Keywords[eo]=Teksto;redaktilo;
 Keywords[ja]=テキスト;エディタ;
+Keywords[ru]=текст;текстовый редактор
 Keywords[tr]=Metin;düzenleyici;
 Keywords=Text;editor;
 # Translators: This is the Icon file name. Do NOT translate
 Icon[de]=gvim
 Icon[eo]=gvim
+Icon[ru]=gvim
 Icon=gvim
 Categories=Utility;TextEditor;
 StartupNotify=true
new file mode 100644
--- /dev/null
+++ b/runtime/lang/menu_tr.cp1254.vim
@@ -0,0 +1,3 @@
+" Menu Translations:	Turkish
+
+source <sfile>:p:h/menu_tr_tr.iso_8859-9.vim
new file mode 100644
--- /dev/null
+++ b/runtime/lang/menu_tr_tr.cp1254.vim
@@ -0,0 +1,3 @@
+" Menu Translations:	Turkish
+
+source <sfile>:p:h/menu_tr_tr.iso_8859-9.vim
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Vim 8.0 script
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	October 31, 2019
+" Last Change:	Nov 10, 2019
 " Version:	8.0-27
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
 " Automatically generated keyword lists: {{{1
@@ -236,7 +236,7 @@ endif
 " Functions : Tag is provided for those who wish to highlight tagged functions {{{2
 " =========
 syn cluster	vimFuncList	contains=vimCommand,vimFunctionError,vimFuncKey,Tag,vimFuncSID
-syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSearch,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
+syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLetHereDoc,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSearch,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
 syn match	vimFunction	"\<fu\%[nction]!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
 
 if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
@@ -379,8 +379,7 @@ syn match	vimSetMod	contained	"&vim\=\|[
 " Let: {{{2
 " ===
 syn keyword	vimLet	let	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
-VimFoldh syn region vimLetHereDoc	matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z([^a-z]\S*\)'	matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'	contains=vimComment
-syn cluster vimFuncBodyList add=vimLetHereDoc
+VimFoldh syn region vimLetHereDoc	matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)'	matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'	contains=vimComment
 
 " Abbreviations: {{{2
 " =============
--- a/runtime/tutor/tutor.tr.iso9
+++ b/runtime/tutor/tutor.tr.iso9
@@ -1,6 +1,6 @@
-===============================================================================
-=    V I M   T u t o r ' a   h o    g e l d i n i z !   -     Srm 1.7      =
-===============================================================================
+================================================================================
+=     V I M   T u t o r ' a   h o    g e l d i n i z !    --    Srm 1.7     =
+================================================================================
 
   Vim, byle bir eitmen ile aklanmas gereken ok fazla komut barndran,
   olduka kuvvetli bir metin dzenleyicidir. Bu eitmen Vim'i ok amal bir
@@ -22,7 +22,7 @@
   imdi Caps Lock dmenizin basl olmadna emin olun ve Ders 1.1'in
   ekran tamamen doldurmas iin j dmesine yeterli miktarda basn.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.1: MLEC HAREKET ETTRMEK
 
 
@@ -47,7 +47,7 @@
   NOT: Ok dmeleri de ayn ie yarar. Ancak hjkl dmelerini kullanarak ok
        daha hzl hareket edebilirsiniz. Gerekten.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.2: VM'DEN IKI
 
 
@@ -65,7 +65,7 @@
 
   5. mleci Ders 1.3'e tayn.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.3: METN DZENLEME - METN SLME
 
 
@@ -85,7 +85,7 @@
 
   NOT: Bu eitmende ilerledike ezberlemeye almayn, deneyerek renin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.4: METN DZENLEME - METN GRME
 
 
@@ -106,7 +106,7 @@
 
   5. Artk yapabildiinizi dnyorsanz bir sonraki blme gein.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.5: METN DZENLEME - METN EKLEME
 
 
@@ -129,7 +129,7 @@
 
   5. Artk rahata metin ekleyebildiinizi dnyorsanz Ders 1.6'ya gein.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.6: DOSYA DZENLEME
 
 
@@ -154,7 +154,7 @@
 
   6. Yukardaki admlar okuduktan ve anladktan sonra YAPIN.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1: ZET
 
 
@@ -185,7 +185,7 @@
 
   imdi Ders 2 ile bu eitmeni srdrn.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.1: SLME KOMUTLARI
 
 
@@ -207,7 +207,7 @@
 
   5. Tmce dzelene kadar adm 3 ve 4' tekrar edin ve Ders 2.2'ye gein.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.2: DAHA FAZLA SLME KOMUTLARI
 
 
@@ -229,7 +229,7 @@
 
   5. Neler olduunu anlamak iin Ders 2.3'e gidin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.3: LELER VE HAREKETLER
 
 
@@ -254,7 +254,7 @@
   NOT: Normal kipte hibir hareket olmadan yalnzca ileci girmek imleci
        yukarda belirtildii gibi hareket ettirir.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.4: BR HAREKET LE BRLKTE SAYIM KULLANMAK
 
 
@@ -274,7 +274,7 @@
 
   6. Ders 2.5'e gein.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.5: BR SAYIM KULLANARAK DAHA FAZLA SLME LEM
 
 
@@ -295,7 +295,7 @@
 
 ---> Bu ABC DE satrdaki FG HI JKLM NO PRST szckler U VY temizlenmitir.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.6: SATIRLARDA LEM YAPMA
 
 
@@ -321,7 +321,7 @@
 ---> 6) eker tatldr
 ---> 7) Ve sen de ylesin
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.7: GER AL KOMUTU
 
 
@@ -346,7 +346,7 @@
 
   8. Bunlar son derece kullanl komutlardr. imdi Ders 2 zete gein.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2: ZET
 
 
@@ -373,7 +373,7 @@
      Bir satrdaki tm deiiklikleri geri almak iin U (byk U) yazn.
      Geri almalar geri almak iin <CTRL> R kullann.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3.1: KOY KOMUTU
 
 
@@ -396,7 +396,7 @@
 ---> c) Akl renilir,
 ---> a) Gller krmzdr,
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3.2: DETR KOMUTU
 
 
@@ -417,7 +417,7 @@
 
   NOT: Unutmayn, ezberleyerek deil deneyerek renin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3.3: DETR LEC
 
 
@@ -439,7 +439,7 @@
   ce'nin sadece szc deitirmediini, ayn zamanda sizi EKLE kipine
   aldna da dikkat edin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3.4: c'Y KULLANARAK DAHA FAZLA DETRME
 
 
@@ -462,7 +462,7 @@
 ---> Bu satrn sonu dzeltilmek iin c$ komutu kullanlarak yardma ihtiya
      duyuyor.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3: ZET
 
 
@@ -484,7 +484,7 @@
 
   imdi bir sonraki derse gein.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4.1: MLE KONUMU VE DOSYA DURUMU
 
 
@@ -508,7 +508,7 @@
 
   4. Yapabileceinizi dndnzde, adm 1'den 3'e kadar yapn.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4.2: ARAMA KOMUTU
 
 
@@ -530,7 +530,7 @@
 Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
      devre d brakmak iin 'wrapscan' seeneini sfrlayn.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4.3: UYAN AYRALAR ARAMASI
 
 
@@ -552,7 +552,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   NOT: Bu ierisinde ei olmayan ayralar bulunan bir programn hatalarn
        ayklamak iin son derece yararldr.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4.4: BUL/DETR KOMUTU
 
 
@@ -576,7 +576,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
       :%s/eski/yeni/gc yazn. Bu tm dosyadaki her oluumu deitirir ancak
       her birini deitirmeden nce bize sorar.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4: ZET
 
 
@@ -600,7 +600,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
      Dosyadaki tm karlamalar deitirmek iin :%s/eski/yeni/g yazn.
      Her seferinde onay sormas iin :%s/eski/yeni/gc kullann.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5.1: BIR DI KOMUT ALITIRMAK
 
 
@@ -621,7 +621,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   NOT: Tm : komutlarndan sonra <ENTER> dmesine baslmaldr. Bundan
        sonra bunu her zaman anmsatmayacaz.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5.2: DOSYA YAZMAYA DEVAM
 
 
@@ -645,7 +645,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
 	    Windows:                       :!del DENEME
 	    Unix (macOS, Linux, Haiku):    :!rm DENEME
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5.3: YAZMA N METN SEME
 
 
@@ -664,7 +664,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   5. Vim seilen satrlar DENEME dosyasna yazacaktr. :!ls veya :!dir ile
      bakarak dosyay grn. Henz silmeyin; bir sonraki derste kullanacaz.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5.4: DOSYALARI BRLETRME VE BLM EKLEME
 
 
@@ -685,7 +685,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
        koyabilirsiniz. rnein :r :!ls yazmak ls komutunun verecei kty
        dosyann iinde hemen imlecin altndaki satra koyar.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5: ZET
 
 
@@ -705,7 +705,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   5. :r !dir veya !ls bu iki komutun (dosyalar listeleme) ieriklerini
      okur ve dosyann iine yerletirir.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.1: A KOMUTU
 
 
@@ -726,7 +726,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
 
 ---> Bu satrn zerine bir satr amak iin imle bu satrdayken O  yazn.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.2: EKLE KOMUTU
 
 
@@ -747,7 +747,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
 ---> Bu sat alabilirsiniz. al met ekl
 ---> Bu satrda alabilirsiniz. alrken metin eklemeyi kullann.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.3: BR BAKA DETR KOMUTU
 
 
@@ -767,9 +767,10 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
 ---> 123 saysna xxx eklemek size yyy toplamn verir.
 ---> 123 saysna 456 eklemek size 579 toplamn verir.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.4: METN KOPYALA VE YAPITIR
 
+
   ** y ilecini kullanarak metin kopyalayn ve p kullanarak yaptrn. **
 
   1. mleci aada ---> ile imlenmi satra getirin, "a)"nn ardna koyun.
@@ -791,7 +792,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   NOT: y komutunu bir ile olarak da kullanabilirsiniz; yw komutu yalnzca
        bir szc kopyalar.
   
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.4: SET KOMUTU
 
 
@@ -816,7 +817,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   NOT: Eer yalnzca bir arama ilemi iin BYK/kk harf ayrmsz arama
        yapmak istiyorsanz /ignore\c komutunu kullann.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	DERS 6 ZET
 
 
@@ -841,7 +842,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
 
   7. Bir ayar kapatmak iin "no" ekleyin, rnein :set noic.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 7.1: YARDIM KAYNAKLARI
 
 
@@ -849,12 +850,13 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
 
   Vim geni bir evrimii yardm sistemine sahiptir. Balamak iin u n
   deneyebilirsiniz:
+
     - (eer varsa) <HELP> dmesine basn
     - (eer varsa) <F1> dmesine basn
     - :help yazn ve <ENTER> dmesine basn
 
-  Yardm penceresindeki metinleri okuyarak yardm sisteminin nasl altn
-  renin. 
+  Yardm penceresindeki metinleri okuyarak yardm sisteminin nasl
+  altn renin. 
   Bir pencereden dierine gemek iin <CTRL> W ikilisini kullann.
   Yardm penceresini kapatmak iin :q yazp <ENTER> dmesine basn.
 
@@ -866,7 +868,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
     :help insert-index
     :help user-manual
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 7.2: BR BALANGI BET OLUTURUN
 
 
@@ -891,7 +893,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   Tm tercih ettiiniz ayarlar bu "vimrc" dosyasna ekleyebilirsiniz.
   Daha fazla bilgi iin :help vimrc-intro yazn.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 7.3: TAMAMLAMA
 
 
@@ -902,7 +904,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
 
   2. Bulunduunuz dizindeki dosyalara :!ls veya :!dir ile bakn.
 
-  3. Bir komutun balangcn yazn, rnein :e.
+  3. Bir komutun ba ksmn yazn, rnein :e.
 
   4. <CTRL> D'ye bastnzda Vim size e ile balayan komutlar
      gsterecektir.
@@ -919,7 +921,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   NOT: Tamamlama birok komut iin alr. Yalnzca <CTRL> D ve <TAB>
        ikililerini deneyin. zellikle :help iin ok yararldr.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 7: ZET
 
 
@@ -938,7 +940,7 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   6. Bir : komutu girerken <CTRL> D'ye basarak olanakl tamamlama
      seeneklerini grebilirsiniz. <TAB>'a basarak tamamlamay sein.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   Bylece Vim Eitmeni tamamlanm oldu. Eitmendeki ama Vim dzenleyicisi
   hakknda ksa bir bilgi vermek ve onu kolayca kullanmanz salamakt.
@@ -976,4 +978,4 @@ Not: Arama dosyann sonuna ulatnda dosyann bandan srecektir. Bunu
   2019 Gncelleme:
   Emir SARI, bitigchi (at) me (dot) com
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/runtime/tutor/tutor.tr.utf-8
+++ b/runtime/tutor/tutor.tr.utf-8
@@ -1,6 +1,6 @@
-===============================================================================
-=    V I M   T u t o r ' a   h o ş   g e l d i n i z !   -     Sürüm 1.7      =
-===============================================================================
+================================================================================
+=     V I M   T u t o r ' a   h o ş   g e l d i n i z !    --    Sürüm 1.7     =
+================================================================================
 
   Vim, böyle bir eğitmen ile açıklanması gereken çok fazla komut barındıran,
   oldukça kuvvetli bir metin düzenleyicidir. Bu eğitmen Vim'i çok amaçlı bir
@@ -22,7 +22,7 @@
   Şimdi Caps Lock düğmenizin basılı olmadığına emin olun ve Ders 1.1'in
   ekranı tamamen doldurması için j düğmesine yeterli miktarda basın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.1: İMLECİ HAREKET ETTİRMEK
 
 
@@ -47,7 +47,7 @@
   NOT: Ok düğmeleri de aynı işe yarar. Ancak hjkl düğmelerini kullanarak çok
        daha hızlı hareket edebilirsiniz. Gerçekten.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.2: VİM'DEN ÇIKIŞ
 
 
@@ -65,7 +65,7 @@
 
   5. İmleci Ders 1.3'e taşıyın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.3: METİN DÜZENLEME - METİN SİLME
 
 
@@ -85,7 +85,7 @@
 
   NOT: Bu eğitmende ilerledikçe ezberlemeye çalışmayın, deneyerek öğrenin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.4: METİN DÜZENLEME - METİN GİRME
 
 
@@ -106,7 +106,7 @@
 
   5. Artık yapabildiğinizi düşünüyorsanız bir sonraki bölüme geçin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.5: METİN DÜZENLEME - METİN EKLEME
 
 
@@ -129,7 +129,7 @@
 
   5. Artık rahatça metin ekleyebildiğinizi düşünüyorsanız Ders 1.6'ya geçin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1.6: DOSYA DÜZENLEME
 
 
@@ -154,7 +154,7 @@
 
   6. Yukarıdaki adımları okuduktan ve anladıktan sonra YAPIN.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 1: ÖZET
 
 
@@ -185,7 +185,7 @@
 
   Şimdi Ders 2 ile bu eğitmeni sürdürün.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.1: SİLME KOMUTLARI
 
 
@@ -207,7 +207,7 @@
 
   5. Tümce düzelene kadar adım 3 ve 4'ü tekrar edin ve Ders 2.2'ye geçin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.2: DAHA FAZLA SİLME KOMUTLARI
 
 
@@ -229,7 +229,7 @@
 
   5. Neler olduğunu anlamak için Ders 2.3'e gidin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.3: İŞLEÇLER VE HAREKETLER
 
 
@@ -254,7 +254,7 @@
   NOT: Normal kipte hiçbir hareket olmadan yalnızca işleci girmek imleci
        yukarıda belirtildiği gibi hareket ettirir.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.4: BİR HAREKET İLE BİRLİKTE SAYIM KULLANMAK
 
 
@@ -274,7 +274,7 @@
 
   6. Ders 2.5'e geçin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.5: BİR SAYIM KULLANARAK DAHA FAZLA SİLME İŞLEMİ
 
 
@@ -295,7 +295,7 @@
 
 ---> Bu ABC ÇDE satırdaki FGĞ HIİ JKLM NOÖ PRSŞT sözcükler UÜ VY temizlenmiştir.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.6: SATIRLARDA İŞLEM YAPMA
 
 
@@ -321,7 +321,7 @@
 ---> 6) Şeker tatlıdır
 ---> 7) Ve sen de öylesin
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2.7: GERİ AL KOMUTU
 
 
@@ -346,7 +346,7 @@
 
   8. Bunlar son derece kullanışlı komutlardır. Şimdi Ders 2 Özete geçin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 2: ÖZET
 
 
@@ -373,7 +373,7 @@
      Bir satırdaki tüm değişiklikleri geri almak için U (büyük U) yazın.
      Geri almaları geri almak için <CTRL> R kullanın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3.1: KOY KOMUTU
 
 
@@ -396,7 +396,7 @@
 ---> c) Akıl öğrenilir,
 ---> a) Güller kırmızıdır,
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3.2: DEĞİŞTİR KOMUTU
 
 
@@ -417,7 +417,7 @@
 
   NOT: Unutmayın, ezberleyerek değil deneyerek öğrenin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3.3: DEĞİŞTİR İŞLECİ
 
 
@@ -439,7 +439,7 @@
   ce'nin sadece sözcüğü değiştirmediğini, aynı zamanda sizi EKLE kipine
   aldığına da dikkat edin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3.4: c'Yİ KULLANARAK DAHA FAZLA DEĞİŞTİRME
 
 
@@ -462,7 +462,7 @@
 ---> Bu satırın sonu düzeltilmek için c$ komutu kullanılarak yardıma ihtiyaç
      duyuyor.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 3: ÖZET
 
 
@@ -484,7 +484,7 @@
 
   Şimdi bir sonraki derse geçin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4.1: İMLEÇ KONUMU VE DOSYA DURUMU
 
 
@@ -508,7 +508,7 @@
 
   4. Yapabileceğinizi düşündüğünüzde, adım 1'den 3'e kadar yapın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4.2: ARAMA KOMUTU
 
 
@@ -530,7 +530,7 @@
 Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
      devre dışı bırakmak için 'wrapscan' seçeneğini sıfırlayın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4.3: UYAN AYRAÇLAR ARAMASI
 
 
@@ -552,7 +552,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   NOT: Bu içerisinde eşi olmayan ayraçlar bulunan bir programın hatalarını
        ayıklamak için son derece yararlıdır.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4.4: BUL/DEĞİŞTİR KOMUTU
 
 
@@ -576,7 +576,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
       :%s/eski/yeni/gc yazın. Bu tüm dosyadaki her oluşumu değiştirir ancak
       her birini değiştirmeden önce bize sorar.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 4: ÖZET
 
 
@@ -600,7 +600,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
      Dosyadaki tüm karşılaşmaları değiştirmek için :%s/eski/yeni/g yazın.
      Her seferinde onay sorması için :%s/eski/yeni/gc kullanın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5.1: BIR DIŞ KOMUT ÇALIŞTIRMAK
 
 
@@ -621,7 +621,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   NOT: Tüm : komutlarından sonra <ENTER> düğmesine basılmalıdır. Bundan
        sonra bunu her zaman anımsatmayacağız.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5.2: DOSYA YAZMAYA DEVAM
 
 
@@ -645,7 +645,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
 	    Windows:                       :!del DENEME
 	    Unix (macOS, Linux, Haiku):    :!rm DENEME
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5.3: YAZMA İÇİN METİN SEÇME
 
 
@@ -664,7 +664,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   5. Vim seçilen satırları DENEME dosyasına yazacaktır. :!ls veya :!dir ile
      bakarak dosyayı görün. Henüz silmeyin; bir sonraki derste kullanacağız.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5.4: DOSYALARI BİRLEŞTİRME VE BÖLÜM EKLEME
 
 
@@ -685,7 +685,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
        koyabilirsiniz. Örneğin :r :!ls yazmak ls komutunun vereceği çıktıyı
        dosyanın içinde hemen imlecin altındaki satıra koyar.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 5: ÖZET
 
 
@@ -705,7 +705,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   5. :r !dir veya !ls bu iki komutun (dosyaları listeleme) içeriklerini
      okur ve dosyanın içine yerleştirir.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.1: AÇ KOMUTU
 
 
@@ -726,7 +726,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
 
 ---> Bu satırın üzerine bir satır açmak için imleç bu satırdayken O  yazın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.2: EKLE KOMUTU
 
 
@@ -747,7 +747,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
 ---> Bu satı çalışabilirsiniz. Çalı met ekl
 ---> Bu satırda çalışabilirsiniz. Çalışırken metin eklemeyi kullanın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.3: BİR BAŞKA DEĞİŞTİR KOMUTU
 
 
@@ -767,9 +767,10 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
 ---> 123 sayısına xxx eklemek size yyy toplamını verir.
 ---> 123 sayısına 456 eklemek size 579 toplamını verir.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.4: METİN KOPYALA VE YAPIŞTIR
 
+
   ** y işlecini kullanarak metin kopyalayın ve p kullanarak yapıştırın. **
 
   1. İmleci aşağıda ---> ile imlenmiş satıra getirin, "a)"nın ardına koyun.
@@ -791,7 +792,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   NOT: y komutunu bir işleç olarak da kullanabilirsiniz; yw komutu yalnızca
        bir sözcüğü kopyalar.
   
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 6.4: SET KOMUTU
 
 
@@ -816,7 +817,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   NOT: Eğer yalnızca bir arama işlemi için BÜYÜK/küçük harf ayrımsız arama
        yapmak istiyorsanız /ignore\c komutunu kullanın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	DERS 6 ÖZET
 
 
@@ -841,7 +842,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
 
   7. Bir ayarı kapatmak için "no" ekleyin, örneğin :set noic.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 7.1: YARDIM KAYNAKLARI
 
 
@@ -849,12 +850,13 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
 
   Vim geniş bir çevrimiçi yardım sistemine sahiptir. Başlamak için şu üçünü
   deneyebilirsiniz:
+
     - (eğer varsa) <HELP> düğmesine basın
     - (eğer varsa) <F1> düğmesine basın
     - :help yazın ve <ENTER> düğmesine basın
 
-  Yardım penceresindeki metinleri okuyarak yardım sisteminin nasıl çalıştığını
-  öğrenin. 
+  Yardım penceresindeki metinleri okuyarak yardım sisteminin nasıl
+  çalıştığını öğrenin. 
   Bir pencereden diğerine geçmek için <CTRL> W ikilisini kullanın.
   Yardım penceresini kapatmak için :q yazıp <ENTER> düğmesine basın.
 
@@ -866,7 +868,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
     :help insert-index
     :help user-manual
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 7.2: BİR BAŞLANGIÇ BETİĞİ OLUŞTURUN
 
 
@@ -891,7 +893,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   Tüm tercih ettiğiniz ayarları bu "vimrc" dosyasına ekleyebilirsiniz.
   Daha fazla bilgi için :help vimrc-intro yazın.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 7.3: TAMAMLAMA
 
 
@@ -902,7 +904,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
 
   2. Bulunduğunuz dizindeki dosyalara :!ls veya :!dir ile bakın.
 
-  3. Bir komutun başlangıcını yazın, örneğin :e.
+  3. Bir komutun baş kısmını yazın, örneğin :e.
 
   4. <CTRL> D'ye bastığınızda Vim size e ile başlayan komutları
      gösterecektir.
@@ -919,7 +921,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   NOT: Tamamlama birçok komut için çalışır. Yalnızca <CTRL> D ve <TAB>
        ikililerini deneyin. Özellikle :help için çok yararlıdır.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	Ders 7: ÖZET
 
 
@@ -938,7 +940,7 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   6. Bir : komutu girerken <CTRL> D'ye basarak olanaklı tamamlama
      seçeneklerini görebilirsiniz. <TAB>'a basarak tamamlamayı seçin.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
   Böylece Vim Eğitmeni tamamlanmış oldu. Eğitmendeki amaç Vim düzenleyicisi
   hakkında kısa bir bilgi vermek ve onu kolayca kullanmanızı sağlamaktı.
@@ -976,4 +978,4 @@ Not: Arama dosyanın sonuna ulaştığında dosyanın başından sürecektir. Bunu
   2019 Güncelleme:
   Emir SARI, bitigchi (at) me (dot) com
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/runtime/tutor/tutor.vim
+++ b/runtime/tutor/tutor.vim
@@ -1,7 +1,7 @@
 " Vim tutor support file
 " Author: Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
 " Maintainer: Bram Moolenaar
-" Last Change:	2019 Mar 30
+" Last Change:	2019 Nov 11
 
 " This Vim script is used for detecting if a translation of the
 " tutor file exist, i.e., a tutor.xx file, where xx is the language.
@@ -108,7 +108,7 @@ endif
 
 " The Turkish tutor is available in two encodings, guess which one to use
 if s:ext =~? '\.tr'
-  if &enc == "iso-8859-9"
+  if &enc == "iso-8859-9" || &enc == "cp1254"
     let s:ext = ".tr.iso9"
   endif
 endif
--- a/runtime/vim.desktop
+++ b/runtime/vim.desktop
@@ -4,19 +4,22 @@
 # Translators: This is the Application Name used in the Vim desktop file
 Name[de]=Vim
 Name[eo]=Vim
+Name[ru]=Vim
 Name[tr]=Vim
 Name=Vim
 # Translators: This is the Generic Application Name used in the Vim desktop file
 GenericName[de]=Texteditor
 GenericName[eo]=Tekstoredaktilo
 GenericName[ja]=テキストエディタ
+GenericName[ru]=Текстовый редактор
 GenericName[tr]=Metin Düzenleyici
 GenericName=Text Editor
 # Translators: This is the comment used in the Vim desktop file
 Comment[de]=Textdateien bearbeiten
 Comment[eo]=Redakti tekstajn dosierojn
 Comment[ja]=テキストファイルを編集します
-Comment[tr]=Metin dosyaları düzenle
+Comment[ru]=Редактирование текстовых файлов
+Comment[tr]=Metin dosyaları düzenleyin
 Comment=Edit text files
 # The translations should come from the po file. Leave them here for now, they will
 # be overwritten by the po file when generating the desktop.file.
@@ -74,7 +77,6 @@ Comment[pl]=Edytuj pliki tekstowe
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
-Comment[ru]=Редактор текстовых файлов
 Comment[sk]=Úprava textových súborov
 Comment[sl]=Urejanje datotek z besedili
 Comment[sq]=Përpuno files teksti
@@ -97,11 +99,13 @@ Type=Application
 Keywords[de]=Text;Editor;
 Keywords[eo]=Teksto;redaktilo;
 Keywords[ja]=テキスト;エディタ;
+Keywords[ru]=текст;текстовый редактор
 Keywords[tr]=Metin;düzenleyici;
 Keywords=Text;editor;
 # Translators: This is the Icon file name. Do NOT translate
 Icon[de]=gvim
 Icon[eo]=gvim
+Icon[ru]=gvim
 Icon=gvim
 Categories=Utility;TextEditor;
 StartupNotify=false
--- a/src/po/eo.po
+++ b/src/po/eo.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-04 17:23+0200\n"
-"PO-Revision-Date: 2019-08-04 17:45+0200\n"
+"POT-Creation-Date: 2019-11-10 22:35+0100\n"
+"PO-Revision-Date: 2019-11-10 22:50+0100\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: Esperanto\n"
 "Language: eo\n"
@@ -27,6 +27,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "E163: There is only one file to edit"
+msgstr "E163: Estas nur unu redaktenda dosiero"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: Ne eblas iri antaŭ ol la unuan dosieron"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: Ne eblas iri preter la lastan dosieron"
+
+msgid "E249: window layout changed unexpectedly"
+msgstr "E249: aranĝo de fenestro ŝanĝiĝis neatendite"
+
 msgid "--Deleted--"
 msgstr "--Forviŝita--"
 
@@ -257,9 +269,6 @@ msgstr "Subo"
 msgid "Top"
 msgstr "Supro"
 
-msgid "E249: window layout changed unexpectedly"
-msgstr "E249: aranĝo de fenestro ŝanĝiĝis neatendite"
-
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
 
@@ -272,6 +281,140 @@ msgstr "[Ŝprucfenestro]"
 msgid "[Scratch]"
 msgstr "[Malneto]"
 
+msgid "WARNING: The file has been changed since reading it!!!"
+msgstr "AVERTO: La dosiero estas ŝanĝita de post kiam ĝi estis legita!!!"
+
+msgid "Do you really want to write to it"
+msgstr "Ĉu vi vere volas skribi al ĝi"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: Neniu kongrua aŭtokomando por la bufro acwrite"
+
+msgid "E203: Autocommands deleted or unloaded buffer to be written"
+msgstr "E203: Aŭtokomandoj forviŝis aŭ malŝargis la skribendan bufron"
+
+msgid "E204: Autocommand changed number of lines in unexpected way"
+msgstr "E204: Aŭtokomando ŝanĝis la nombron de linioj neatendite"
+
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans malpermesas skribojn de neŝanĝitaj bufroj"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "Partaj skriboj malpermesitaj ĉe bufroj NetBeans"
+
+msgid "is a directory"
+msgstr "estas dosierujo"
+
+msgid "is not a file or writable device"
+msgstr "ne estas dosiero aŭ skribebla aparatdosiero"
+
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "skribo al aparatdosiero malŝaltita per la opcio 'opendevice'"
+
+msgid "is read-only (add ! to override)"
+msgstr "estas nurlegebla (aldonu ! por transpasi)"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: Ne eblas skribi restaŭrkopion (aldonu ! por transpasi)"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr "E507: Eraro dum fermo de restaŭrkopio (aldonu ! transpasi)"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: Ne eblas legi restaŭrkopion (aldonu ! por transpasi)"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: Ne eblas krei restaŭrkopion (aldonu ! por transpasi)"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: Ne eblas krei restaŭrkopion (aldonu ! por transpasi)"
+
+msgid "E214: Can't find temp file for writing"
+msgstr "E214: Ne eblas trovi provizoran dosieron por skribi"
+
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: Ne eblas konverti (aldonu ! por skribi sen konverto)"
+
+msgid "E166: Can't open linked file for writing"
+msgstr "E166: Ne eblas malfermi ligitan dosieron por skribi"
+
+msgid "E212: Can't open file for writing"
+msgstr "E212: Ne eblas malfermi la dosieron por skribi"
+
+msgid "E949: File changed while writing"
+msgstr "E949: Dosiero ŝanĝiĝis dum skribo"
+
+msgid "E512: Close failed"
+msgstr "E512: Fermo malsukcesis"
+
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr ""
+"E513: skriberaro, konverto malsukcesis (igu 'fenc' malplena por transpasi)"
+
+#, c-format
+msgid ""
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"override)"
+msgstr ""
+"E513: skriberaro, konverto malsukcesis en linio %ld (igu 'fenc' malplena por "
+"transpasi)"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: skriberaro (ĉu plena dosiersistemo?)"
+
+msgid " CONVERSION ERROR"
+msgstr " ERARO DE KONVERTO"
+
+#, c-format
+msgid " in line %ld;"
+msgstr " en linio %ld;"
+
+msgid "[NOT converted]"
+msgstr "[NE konvertita]"
+
+msgid "[converted]"
+msgstr "[konvertita]"
+
+msgid "[Device]"
+msgstr "[Aparatdosiero]"
+
+msgid "[New]"
+msgstr "[Nova]"
+
+msgid "[New File]"
+msgstr "[Nova dosiero]"
+
+msgid " [a]"
+msgstr " [a]"
+
+msgid " appended"
+msgstr " postaldonita(j)"
+
+msgid " [w]"
+msgstr " [s]"
+
+msgid " written"
+msgstr " skribita(j)"
+
+msgid "E205: Patchmode: can't save original file"
+msgstr "E205: Patchmode: ne eblas konservi originalan dosieron"
+
+msgid "E206: patchmode: can't touch empty original file"
+msgstr "E206: patchmode: ne eblas tuŝi malplenan originalan dosieron"
+
+msgid "E207: Can't delete backup file"
+msgstr "E207: Ne eblas forviŝi restaŭrkopion"
+
+msgid ""
+"\n"
+"WARNING: Original file may be lost or damaged\n"
+msgstr ""
+"\n"
+"AVERTO: Originala dosiero estas eble perdita aŭ difekta\n"
+
+msgid "don't quit the editor until the file is successfully written!"
+msgstr "ne eliru el la redaktilo ĝis kiam la dosiero estas sukcese konservita!"
+
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: Averto: Ŝanĝo de nurlegebla dosiero"
 
@@ -328,6 +471,15 @@ msgstr "E918: bufro devas esti ŝargita: %s"
 msgid "E916: not a valid job"
 msgstr "E916: nevalida tasko"
 
+msgid "tagname"
+msgstr "nomo de etikedo"
+
+msgid " kind file\n"
+msgstr " tipo de dosiero\n"
+
+msgid "'history' option is zero"
+msgstr "opcio 'history' estas nul"
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: Dosiero estas ĉifrita per nekonata metodo"
 
@@ -553,70 +705,17 @@ msgstr "E105: Uzo de \":loadkeymap\" nur
 msgid "E791: Empty keymap entry"
 msgstr "E791: Malplena rikordo en klavmapo"
 
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: Neatenditaj signoj en \":let\""
-
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: Nedifinita variablo: %s"
-
 msgid "E111: Missing ']'"
 msgstr "E111: Mankas ']'"
 
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Uzo de [:] ne eblas kun Vortaro"
 
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: Nevalida datumtipo de variablo de %s="
-
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: Nevalida nomo de variablo: %s"
-
-msgid "E995: Cannot modify existing variable"
-msgstr "E995: Ne eblas ŝanĝi ekzistantan variablon"
-
 msgid "E806: using Float as a String"
 msgstr "E806: uzo de Glitpunktnombro kiel Ĉeno"
 
-msgid "E991: cannot use =<< here"
-msgstr "E991: ne eblas uzi =<< ĉi tie"
-
-msgid "E221: Marker cannot start with lower case letter"
-msgstr "E221: Markilo ne povas komenciĝi per minusklo"
-
-msgid "E172: Missing marker"
-msgstr "E172: Markilo mankas"
-
-#, c-format
-msgid "E990: Missing end marker '%s'"
-msgstr "E990: Mankas fina markilo '%s'"
-
-msgid "E985: .= is not supported with script version 2"
-msgstr "E985: .= ne estas subtenata kun versio 2 de vim scripto"
-
-msgid "E687: Less targets than List items"
-msgstr "E687: Malpli da celoj ol Listeroj"
-
-msgid "E688: More targets than List items"
-msgstr "E688: Pli da celoj ol Listeroj"
-
-msgid "Double ; in list of variables"
-msgstr "Duobla ; en listo de variabloj"
-
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: Ne eblas listigi variablojn de %s"
-
-msgid "E996: Cannot lock an environment variable"
-msgstr "E996: Ne eblas ŝlosi medivariablon"
-
-msgid "E996: Cannot lock an option"
-msgstr "E996: Ne eblas ŝlosi opcion"
-
-msgid "E996: Cannot lock a register"
-msgstr "E996: Ne eblas ŝlosi reĝistron"
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274: Neniu spaceto permesebla antaŭ ol komenca krampo"
 
 msgid "E689: Can only index a List, Dictionary or Blob"
 msgstr "E689: Nur eblas indeksi Liston, Vortaron aŭ BLOB-on"
@@ -645,17 +744,6 @@ msgstr "E996: Ne eblas ŝlosi liston aŭ vortaron"
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: \"in\" mankas malantaŭ \":for\""
 
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: Ne estas tia variablo: \"%s\""
-
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: Ne eblas ŝlosi aŭ malŝlosi variablon %s"
-
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: variablo ingita tro profunde por (mal)ŝlosi"
-
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Mankas ':' malantaŭ '?'"
 
@@ -759,33 +847,6 @@ msgstr "E976: uzo de BLOB-o kiel Ĉeno"
 msgid "E908: using an invalid value as a String"
 msgstr "E908: uzo de nevalida valoro kiel Ĉeno"
 
-#, c-format
-msgid "E963: setting %s to value with wrong type"
-msgstr "E963: valorizo de %s kun valoro de neĝusta tipo"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: Ne eblas forviŝi variablon %s"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Nomo de variablo Funcref devas eki per majusklo: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Nomo de variablo konfliktas kun ekzistanta funkcio: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: Valoro estas ŝlosita: %s"
-
-msgid "Unknown"
-msgstr "Nekonata"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: Ne eblas ŝanĝi valoron de %s"
-
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: variablo ingita tro profunde por fari kopion"
 
@@ -817,32 +878,13 @@ msgstr "E736: Nevalida operacio de Vorta
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Nevalida operacio de Funcref-oj"
 
-msgid "map() argument"
-msgstr "argumento de map()"
-
-msgid "filter() argument"
-msgstr "argumento de filter()"
-
-#, c-format
-msgid "E899: Argument of %s must be a List or Blob"
-msgstr "E899: Argumento de %s devas esti Listo aŭ BLOB-o"
-
-msgid "E928: String required"
-msgstr "E928: Ĉeno bezonata"
-
 msgid "E808: Number or Float required"
 msgstr "E808: Nombro aŭ Glitpunktnombro bezonata"
 
-msgid "add() argument"
-msgstr "argumento de add()"
-
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Nevalida nomo de bufro: %s"
 
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() uzeblas nur en Enmeta reĝimo"
-
 msgid "&Ok"
 msgstr "&Bone"
 
@@ -850,12 +892,6 @@ msgid "E980: lowlevel input not supporte
 msgstr "E980: enigo de baza nivelo ne subtenata"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld linio: "
-msgstr[1] "+-%s%3ld linioj: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Nekonata funkcio: %s"
 
@@ -875,9 +911,6 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "alvokis inputrestore() pli ofte ol inputsave()"
 
-msgid "insert() argument"
-msgstr "argumento de insert()"
-
 msgid "E786: Range not allowed"
 msgstr "E786: Amplekso nepermesebla"
 
@@ -890,9 +923,6 @@ msgstr "E726: Paŝo estas nul"
 msgid "E727: Start past end"
 msgstr "E727: Komenco preter fino"
 
-msgid "<empty>"
-msgstr "<malplena>"
-
 msgid "E240: No connection to the X server"
 msgstr "E240: Neniu konekto al X-servilo"
 
@@ -909,23 +939,10 @@ msgstr "E941: servilo jam lanĉita"
 msgid "E942: +clientserver feature not available"
 msgstr "E942: la eblo +clientserver ne disponeblas"
 
-msgid "remove() argument"
-msgstr "argumento de remove()"
-
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: Tro da simbolaj ligiloj (ĉu estas ciklo?)"
-
-msgid "reverse() argument"
-msgstr "argumento de reverse()"
-
 msgid "E258: Unable to send to client"
 msgstr "E258: Ne eblas sendi al kliento"
 
 #, c-format
-msgid "E927: Invalid action: '%s'"
-msgstr "E927: Nevalida ago: '%s'"
-
-#, c-format
 msgid "E962: Invalid action: '%s'"
 msgstr "E962: Nevalida ago: '%s'"
 
@@ -936,8 +953,84 @@ msgstr "(Nevalida)"
 msgid "E935: invalid submatch number: %d"
 msgstr "E935: nevalida indekso de \"submatch\": %d"
 
-msgid "E677: Error writing temp file"
-msgstr "E677: Eraro dum skribo de provizora dosiero"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: Neatenditaj signoj en \":let\""
+
+msgid "E991: cannot use =<< here"
+msgstr "E991: ne eblas uzi =<< ĉi tie"
+
+msgid "E221: Marker cannot start with lower case letter"
+msgstr "E221: Markilo ne povas komenciĝi per minusklo"
+
+msgid "E172: Missing marker"
+msgstr "E172: Markilo mankas"
+
+#, c-format
+msgid "E990: Missing end marker '%s'"
+msgstr "E990: Mankas fina markilo '%s'"
+
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= ne estas subtenata kun versio 2 de vim scripto"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: Malpli da celoj ol Listeroj"
+
+msgid "E688: More targets than List items"
+msgstr "E688: Pli da celoj ol Listeroj"
+
+msgid "Double ; in list of variables"
+msgstr "Duobla ; en listo de variabloj"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: Ne eblas listigi variablojn de %s"
+
+msgid "E996: Cannot lock an environment variable"
+msgstr "E996: Ne eblas ŝlosi medivariablon"
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: Ne eblas ŝlosi opcion"
+
+msgid "E996: Cannot lock a register"
+msgstr "E996: Ne eblas ŝlosi reĝistron"
+
+#, c-format
+msgid "E108: No such variable: \"%s\""
+msgstr "E108: Ne estas tia variablo: \"%s\""
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: Ne eblas ŝlosi aŭ malŝlosi variablon %s"
+
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: variablo ingita tro profunde por (mal)ŝlosi"
+
+#, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: valorizo de %s kun valoro de neĝusta tipo"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: Ne eblas forviŝi variablon %s"
+
+#, c-format
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Nomo de variablo Funcref devas eki per majusklo: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Nomo de variablo konfliktas kun ekzistanta funkcio: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: Valoro estas ŝlosita: %s"
+
+msgid "Unknown"
+msgstr "Nekonata"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: Ne eblas ŝanĝi valoron de %s"
 
 msgid "E921: Invalid callback argument"
 msgstr "E921: Nevalida argumento de reagfunctio"
@@ -1155,32 +1248,11 @@ msgstr "E162: Neniu skribo de post la lasta ŝanĝo por bufro \"%s\""
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "Averto: Eniris neatendite alian bufron (kontrolu aŭtokomandojn)"
 
-msgid "E163: There is only one file to edit"
-msgstr "E163: Estas nur unu redaktenda dosiero"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: Ne eblas iri antaŭ ol la unuan dosieron"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Ne eblas iri preter la lastan dosieron"
-
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: kompililo nesubtenata: %s"
 
 #, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "Serĉado de \"%s\" en \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "Serĉado de \"%s\""
-
-#, c-format
-msgid "not found in '%s': \"%s\""
-msgstr "ne trovita en '%s: \"%s\""
-
-#, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr "W20: Pitono versio 2.x bezonata sed nesubtenata, ignoro de dosiero: %s"
 
@@ -1188,68 +1260,6 @@ msgstr "W20: Pitono versio 2.x bezonata 
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
 msgstr "W21: pitono versio 3.x bezonata sed nesubtenata, ignoro de dosiero: %s"
 
-msgid "Source Vim script"
-msgstr "Ruli Vim-skripton"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Ne eblas ruli dosierujon: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "ne eblis ruli \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "linio %ld: ne eblis ruli \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "rulas \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "linio %ld: rulas \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "finis ruli %s"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "daŭrigas en %s"
-
-msgid "modeline"
-msgstr "reĝimlinio"
-
-msgid "--cmd argument"
-msgstr "--cmd argumento"
-
-msgid "-c argument"
-msgstr "-c argumento"
-
-msgid "environment variable"
-msgstr "medivariablo"
-
-msgid "error handler"
-msgstr "erartraktilo"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Averto: Neĝusta disigilo de linio, ^M eble mankas"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: \":scriptencoding\" uzita ekster rulita dosiero"
-
-msgid "E984: :scriptversion used outside of a sourced file"
-msgstr "E984: :scriptversion uzita ekster rulita dosiero"
-
-#, c-format
-msgid "E999: scriptversion not supported: %d"
-msgstr "E999: scriptversion ne subtenata: %d"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: \":finish\" uzita ekster rulita dosiero"
-
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "Aktuala %slingvo: \"%s\""
@@ -1264,6 +1274,10 @@ msgstr "Eniras reĝimon Ex. Tajpu \"visual\" por iri al reĝimo Normala."
 msgid "E501: At end-of-file"
 msgstr "E501: Ĉe fino-de-dosiero"
 
+#, c-format
+msgid "Executing: %s"
+msgstr "Plenumado de %s"
+
 msgid "E169: Command too recursive"
 msgstr "E169: Komando tro rekursia"
 
@@ -1284,7 +1298,7 @@ msgid "E492: Not an editor command"
 msgstr "E492: Ne estas redaktila komando"
 
 msgid "E981: Command not allowed in rvim"
-msgstr "E981: Nepermesata komando en rvim"
+msgstr "E981: Nepermesebla komando en rvim"
 
 msgid "E493: Backwards range given"
 msgstr "E493: Inversa amplekso donita"
@@ -1546,15 +1560,6 @@ msgstr "E788: Ne eblas redakti alian buf
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: Ne eblas ŝanĝi informon de bufro nun"
 
-msgid "tagname"
-msgstr "nomo de etikedo"
-
-msgid " kind file\n"
-msgstr " tipo de dosiero\n"
-
-msgid "'history' option is zero"
-msgstr "opcio 'history' estas nul"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktiva fenestro aŭ bufro forviŝita"
 
@@ -1564,18 +1569,12 @@ msgstr "E812: Aŭtokomandoj ŝanĝis bufron aŭ nomon de bufro"
 msgid "Illegal file name"
 msgstr "Nevalida dosiernomo"
 
-msgid "is a directory"
-msgstr "estas dosierujo"
-
 msgid "is not a file"
 msgstr "ne estas dosiero"
 
 msgid "is a device (disabled with 'opendevice' option)"
 msgstr "estas aparatdosiero (malŝaltita per la opcio 'opendevice')"
 
-msgid "[New File]"
-msgstr "[Nova dosiero]"
-
 msgid "[New DIRECTORY]"
 msgstr "[Nova DOSIERUJO]"
 
@@ -1615,12 +1614,6 @@ msgstr "[CR mankas]"
 msgid "[long lines split]"
 msgstr "[divido de longaj linioj]"
 
-msgid "[NOT converted]"
-msgstr "[NE konvertita]"
-
-msgid "[converted]"
-msgstr "[konvertita]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[ERARO DE KONVERTO en linio %ld]"
@@ -1641,122 +1634,6 @@ msgstr "Konverto kun 'charconvert' malsu
 msgid "can't read output of 'charconvert'"
 msgstr "ne eblas legi la eligon de 'charconvert'"
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: Neniu kongrua aŭtokomando por la bufro acwrite"
-
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Aŭtokomandoj forviŝis aŭ malŝargis la skribendan bufron"
-
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Aŭtokomando ŝanĝis la nombron de linioj neatendite"
-
-msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans malpermesas skribojn de neŝanĝitaj bufroj"
-
-msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "Partaj skriboj malpermesitaj ĉe bufroj NetBeans"
-
-msgid "is not a file or writable device"
-msgstr "ne estas dosiero aŭ skribebla aparatdosiero"
-
-msgid "writing to device disabled with 'opendevice' option"
-msgstr "skribo al aparatdosiero malŝaltita per la opcio 'opendevice'"
-
-msgid "is read-only (add ! to override)"
-msgstr "estas nurlegebla (aldonu ! por transpasi)"
-
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: Ne eblas skribi restaŭrkopion (aldonu ! por transpasi)"
-
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: Eraro dum fermo de restaŭrkopio (aldonu ! transpasi)"
-
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: Ne eblas legi restaŭrkopion (aldonu ! por transpasi)"
-
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: Ne eblas krei restaŭrkopion (aldonu ! por transpasi)"
-
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: Ne eblas krei restaŭrkopion (aldonu ! por transpasi)"
-
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: Ne eblas trovi provizoran dosieron por skribi"
-
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: Ne eblas konverti (aldonu ! por skribi sen konverto)"
-
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: Ne eblas malfermi ligitan dosieron por skribi"
-
-msgid "E212: Can't open file for writing"
-msgstr "E212: Ne eblas malfermi la dosieron por skribi"
-
-msgid "E949: File changed while writing"
-msgstr "E949: Dosiero ŝanĝiĝis dum skribo"
-
-msgid "E512: Close failed"
-msgstr "E512: Fermo malsukcesis"
-
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr ""
-"E513: skriberaro, konverto malsukcesis (igu 'fenc' malplena por transpasi)"
-
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: skriberaro, konverto malsukcesis en linio %ld (igu 'fenc' malplena "
-"por transpasi)"
-
-msgid "E514: write error (file system full?)"
-msgstr "E514: skriberaro (ĉu plena dosiersistemo?)"
-
-msgid " CONVERSION ERROR"
-msgstr " ERARO DE KONVERTO"
-
-#, c-format
-msgid " in line %ld;"
-msgstr " en linio %ld;"
-
-msgid "[Device]"
-msgstr "[Aparatdosiero]"
-
-msgid "[New]"
-msgstr "[Nova]"
-
-msgid " [a]"
-msgstr " [a]"
-
-msgid " appended"
-msgstr " postaldonita(j)"
-
-msgid " [w]"
-msgstr " [s]"
-
-msgid " written"
-msgstr " skribita(j)"
-
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patchmode: ne eblas konservi originalan dosieron"
-
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patchmode: ne eblas tuŝi malplenan originalan dosieron"
-
-msgid "E207: Can't delete backup file"
-msgstr "E207: Ne eblas forviŝi restaŭrkopion"
-
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"AVERTO: Originala dosiero estas eble perdita aŭ difekta\n"
-
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "ne eliru el la redaktilo ĝis kiam la dosiero estas sukcese konservita!"
-
 msgid "[dos]"
 msgstr "[dos]"
 
@@ -1793,12 +1670,6 @@ msgstr "[sen EOL]"
 msgid "[Incomplete last line]"
 msgstr "[Nekompleta lasta linio]"
 
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "AVERTO: La dosiero estas ŝanĝita de post kiam ĝi estis legita!!!"
-
-msgid "Do you really want to write to it"
-msgstr "Ĉu vi vere volas skribi al ĝi"
-
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Eraro dum skribo de \"%s\""
@@ -1870,6 +1741,24 @@ msgstr "E219: Mankas {."
 msgid "E220: Missing }."
 msgstr "E220: Mankas }."
 
+msgid "<empty>"
+msgstr "<malplena>"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: Tro da simbolaj ligiloj (ĉu estas ciklo?)"
+
+msgid "Select Directory dialog"
+msgstr "Dialogujo de dosiera elekto"
+
+msgid "Save File dialog"
+msgstr "Dialogujo de dosiera konservo"
+
+msgid "Open File dialog"
+msgstr "Dialogujo de dosiera malfermo"
+
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: Bedaŭrinde ne estas dosierfoliumilo en konzola reĝimo"
+
 msgid "E854: path too long for completion"
 msgstr "E854: tro longa vojo por kompletigo"
 
@@ -1919,6 +1808,12 @@ msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld linio faldita"
 msgstr[1] "+--%3ld linioj falditaj"
 
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld linio: "
+msgstr[1] "+-%s%3ld linioj: "
+
 msgid "E222: Add to read buffer"
 msgstr "E222: Aldoni al lega bufro"
 
@@ -2765,6 +2660,16 @@ msgid "E251: VIM instance registry prope
 msgstr ""
 "E251: Ecoj de registro de apero de VIM estas nevalide formata. Forviŝita!"
 
+#, c-format
+msgid "%ld lines to indent... "
+msgstr "%ld krommarĝenendaj linioj... "
+
+#, c-format
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld linio krommarĝenita "
+msgstr[1] "%ld linioj krommarĝenitaj "
+
 msgid " Keyword completion (^N^P)"
 msgstr " Kompletigo de ŝlosilvorto (^N^P)"
 
@@ -2833,6 +2738,9 @@ msgstr " (enmeto) Rulumo (^E/^Y)"
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (anstataŭigo) Rulumo (^E/^Y)"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() uzeblas nur en Enmeta reĝimo"
+
 #, c-format
 msgid "Scanning: %s"
 msgstr "Analizas: %s"
@@ -2871,6 +2779,10 @@ msgid "E938: Duplicate key in JSON: \"%s
 msgstr "E938: Ripetita ŝlosilo en JSON: \"%s\""
 
 #, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: Argumento de %s devas esti Listo aŭ BLOB-o"
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Mankas komo en Listo: %s"
 
@@ -2890,6 +2802,24 @@ msgstr "E702: Ordiga funkcio malsukcesis
 msgid "E882: Uniq compare function failed"
 msgstr "E882: kompara funkcio de uniq() malsukcesis"
 
+msgid "map() argument"
+msgstr "argumento de map()"
+
+msgid "filter() argument"
+msgstr "argumento de filter()"
+
+msgid "add() argument"
+msgstr "argumento de add()"
+
+msgid "insert() argument"
+msgstr "argumento de insert()"
+
+msgid "remove() argument"
+msgstr "argumento de remove()"
+
+msgid "reverse() argument"
+msgstr "argumento de reverse()"
+
 msgid "Unknown option argument"
 msgstr "Nekonata argumento de opcio"
 
@@ -3348,6 +3278,14 @@ msgstr "Neniu mapo trovita"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Nevalida reĝimo"
 
+#, c-format
+msgid "E357: 'langmap': Matching character missing for %s"
+msgstr "E357: 'langmap': Kongrua signo mankas por %s"
+
+#, c-format
+msgid "E358: 'langmap': Extra characters after semicolon: %s"
+msgstr "E358: 'langmap': Ekstraj signoj malantaŭ punktokomo: %s"
+
 msgid "No marks set"
 msgstr "Neniu marko"
 
@@ -3721,8 +3659,8 @@ msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: nevalida lnum: %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: ne eblas trovi linion %ld"
+msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get: ne eblas trovi linion %ld en bufro %d %s"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: nevalida referenco de bloko id 3"
@@ -3970,18 +3908,6 @@ msgstr ""
 "&Forlasi Ĉion\n"
 "&Rezigni"
 
-msgid "Select Directory dialog"
-msgstr "Dialogujo de dosiera elekto"
-
-msgid "Save File dialog"
-msgstr "Dialogujo de dosiera konservo"
-
-msgid "Open File dialog"
-msgstr "Dialogujo de dosiera malfermo"
-
-msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: Bedaŭrinde ne estas dosierfoliumilo en konzola reĝimo"
-
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Ne sufiĉaj argumentoj por printf()"
 
@@ -4016,6 +3942,15 @@ msgstr " (Interrompita)"
 msgid "Beep!"
 msgstr "Bip!"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: Eraro dum skribo de provizora dosiero"
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "antaŭ %ld sekundo"
+msgstr[1] "antaŭ %ld sekundoj"
+
 msgid "ERROR: "
 msgstr "ERARO: "
 
@@ -4084,13 +4019,6 @@ msgstr "E505: %s estas nurlegebla (aldon
 msgid "E349: No identifier under cursor"
 msgstr "E349: Neniu identigilo sub la kursoro"
 
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' estas malplena"
-
-# DP: ĉu Eval devas esti tradukita?
-msgid "E775: Eval feature not available"
-msgstr "E775: Eval eblo ne disponeblas"
-
 msgid "Warning: terminal cannot highlight"
 msgstr "Averto: terminalo ne povas emfazi"
 
@@ -4129,19 +4057,6 @@ msgid_plural "%ld lines %sed %d times"
 msgstr[0] "%ld linioj %sitaj %d foje"
 msgstr[1] "%ld linioj %sitaj %d foje"
 
-#, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld krommarĝenendaj linioj... "
-
-#, c-format
-msgid "%ld line indented "
-msgid_plural "%ld lines indented "
-msgstr[0] "%ld linio krommarĝenita "
-msgstr[1] "%ld linioj krommarĝenitaj "
-
-msgid "E748: No previously used register"
-msgstr "E748: Neniu reĝistro antaŭe uzata"
-
 msgid "cannot yank; delete anyway"
 msgstr "ne eblas kopii; tamen forviŝi"
 
@@ -4152,43 +4067,6 @@ msgstr[0] "%ld linio ŝanĝita"
 msgstr[1] "%ld linioj ŝanĝitaj"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "malokupas %ld liniojn"
-
-#, c-format
-msgid " into \"%c"
-msgstr " en \"%c"
-
-#, c-format
-msgid "block of %ld line yanked%s"
-msgid_plural "block of %ld lines yanked%s"
-msgstr[0] "bloko de %ld linio kopiita%s"
-msgstr[1] "bloko de %ld linioj kopiitaj%s"
-
-#, c-format
-msgid "%ld line yanked%s"
-msgid_plural "%ld lines yanked%s"
-msgstr[0] "%ld linio kopiita%s"
-msgstr[1] "%ld linioj kopiitaj%s"
-
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: Nenio en reĝistro %s"
-
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- Reĝistroj ---"
-
-msgid ""
-"E883: search pattern and expression register may not contain two or more "
-"lines"
-msgstr ""
-"E883: serĉa ŝablono kaj esprima reĝistro ne povas enhavi du aŭ pliajn liniojn"
-
-#, c-format
 msgid "%ld Cols; "
 msgstr "%ld Kolumnoj; "
 
@@ -4221,8 +4099,12 @@ msgstr ""
 msgid "(+%lld for BOM)"
 msgstr "(+%lld por BOM)"
 
-msgid "Thanks for flying Vim"
-msgstr "Dankon pro flugi per Vim"
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' estas malplena"
+
+# DP: ĉu Eval devas esti tradukita?
+msgid "E775: Eval feature not available"
+msgstr "E775: Eval eblo ne disponeblas"
 
 msgid "E518: Unknown option"
 msgstr "E518: Nekonata opcio"
@@ -4245,96 +4127,6 @@ msgstr "E521: Nombro bezonata malantaŭ ="
 msgid "E522: Not found in termcap"
 msgstr "E522: Netrovita en termcap"
 
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: Nevalida signo <%s>"
-
-#, c-format
-msgid "For option %s"
-msgstr "Por opcio %s"
-
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: Ne eblas agordi 'term' al malplena ĉeno"
-
-msgid "E530: Cannot change term in GUI"
-msgstr "E530: term ne ŝanĝeblas en grafika interfaco"
-
-msgid "E531: Use \":gui\" to start the GUI"
-msgstr "E531: Uzu \":gui\" por lanĉi la grafikan interfacon"
-
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: 'backupext' kaj 'patchmode' estas egalaj"
-
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834: Konfliktoj kun la valoro de 'listchars'"
-
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835: Konfliktoj kun la valoro de 'fillchars'"
-
-msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-msgstr "E617: Ne ŝanĝeblas en la grafika interfaco GTK+ 2"
-
-#, c-format
-msgid "E950: Cannot convert between %s and %s"
-msgstr "E950: Ne eblas konverti de %s al %s"
-
-msgid "E524: Missing colon"
-msgstr "E524: Mankas dupunkto"
-
-msgid "E525: Zero length string"
-msgstr "E525: Ĉeno de nula longo"
-
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: Mankas nombro malantaŭ <%s>"
-
-msgid "E527: Missing comma"
-msgstr "E527: Mankas komo"
-
-msgid "E528: Must specify a ' value"
-msgstr "E528: Devas specifi ' valoron"
-
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: enhavas nepreseblan aŭ plurĉellarĝan signon"
-
-msgid "E596: Invalid font(s)"
-msgstr "E596: Nevalida(j) tiparo(j)"
-
-msgid "E597: can't select fontset"
-msgstr "E597: ne eblas elekti tiparon"
-
-msgid "E598: Invalid fontset"
-msgstr "E598: Nevalida tiparo"
-
-msgid "E533: can't select wide font"
-msgstr "E533: ne eblas elekti larĝan tiparon"
-
-msgid "E534: Invalid wide font"
-msgstr "E534: Nevalida larĝa tiparo"
-
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: Nevalida signo malantaŭ <%c>"
-
-msgid "E536: comma required"
-msgstr "E536: komo bezonata"
-
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring' devas esti malplena aŭ enhavi %s"
-
-msgid "E538: No mouse support"
-msgstr "E538: Neniu muso subtenata"
-
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: '}' mankas"
-
-msgid "E541: too many items"
-msgstr "E541: tro da elementoj"
-
-msgid "E542: unbalanced groups"
-msgstr "E542: misekvilibraj grupoj"
-
 msgid "E946: Cannot make a terminal with running job modifiable"
 msgstr "E946: Ne eblas igi modifebla terminalon kun aktiva tasko"
 
@@ -4395,12 +4187,91 @@ msgid "E356: get_varp ERROR"
 msgstr "E356: ERARO get_varp"
 
 #, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': Kongrua signo mankas por %s"
-
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': Ekstraj signoj malantaŭ punktokomo: %s"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: Nevalida signo <%s>"
+
+#, c-format
+msgid "For option %s"
+msgstr "Por opcio %s"
+
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: '}' mankas"
+
+msgid "E541: too many items"
+msgstr "E541: tro da elementoj"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: misekvilibraj grupoj"
+
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: Ne eblas agordi 'term' al malplena ĉeno"
+
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: term ne ŝanĝeblas en grafika interfaco"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: Uzu \":gui\" por lanĉi la grafikan interfacon"
+
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: 'backupext' kaj 'patchmode' estas egalaj"
+
+msgid "E834: Conflicts with value of 'listchars'"
+msgstr "E834: Konfliktoj kun la valoro de 'listchars'"
+
+msgid "E835: Conflicts with value of 'fillchars'"
+msgstr "E835: Konfliktoj kun la valoro de 'fillchars'"
+
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: Ne ŝanĝeblas en la grafika interfaco GTK+ 2"
+
+#, c-format
+msgid "E950: Cannot convert between %s and %s"
+msgstr "E950: Ne eblas konverti de %s al %s"
+
+msgid "E524: Missing colon"
+msgstr "E524: Mankas dupunkto"
+
+msgid "E525: Zero length string"
+msgstr "E525: Ĉeno de nula longo"
+
+#, c-format
+msgid "E526: Missing number after <%s>"
+msgstr "E526: Mankas nombro malantaŭ <%s>"
+
+msgid "E527: Missing comma"
+msgstr "E527: Mankas komo"
+
+msgid "E528: Must specify a ' value"
+msgstr "E528: Devas specifi ' valoron"
+
+msgid "E595: 'showbreak' contains unprintable or wide character"
+msgstr "E595: 'showbreak' enhavas nepreseblan aŭ plurĉellarĝan signon"
+
+msgid "E596: Invalid font(s)"
+msgstr "E596: Nevalida(j) tiparo(j)"
+
+msgid "E597: can't select fontset"
+msgstr "E597: ne eblas elekti tiparon"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: Nevalida tiparo"
+
+msgid "E533: can't select wide font"
+msgstr "E533: ne eblas elekti larĝan tiparon"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: Nevalida larĝa tiparo"
+
+#, c-format
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: Nevalida signo malantaŭ <%c>"
+
+msgid "E536: comma required"
+msgstr "E536: komo bezonata"
+
+#, c-format
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr "E537: 'commentstring' devas esti malplena aŭ enhavi %s"
 
 msgid "cannot open "
 msgstr "ne eblas malfermi "
@@ -4628,6 +4499,9 @@ msgstr "Averto de Vim"
 msgid "shell returned %d"
 msgstr "la ŝelo liveris %d"
 
+msgid "E278: Cannot put a terminal buffer in a popup window"
+msgstr "E278: Ne eblas meti bufron de terminalo en ŝprucfenestro"
+
 #, c-format
 msgid "E997: Tabpage not found: %d"
 msgstr "E997: Langeto netrovita: %d"
@@ -4720,6 +4594,10 @@ msgid "E777: String or List expected"
 msgstr "E777: Ĉeno aŭ Listo atendita"
 
 #, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: Nevalida ago: '%s'"
+
+#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: nevalida ano en %s%%[]"
 
@@ -4763,38 +4641,27 @@ msgstr "E70: Malplena %s%%[]"
 msgid "E956: Cannot use pattern recursively"
 msgstr "E956: Ne eblas uzi ŝablonon rekursie"
 
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: Sintaksa eraro en %s{...}"
+
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA-regulesprimo) ne eblas ripeti %s"
+
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= povas nur esti sekvita de 0, 1, aŭ 2. La aŭtomata motoro de "
+"regulesprimo estos uzata "
+
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Ŝanĝas al malavanca motoro de regulesprimo por ŝablono: "
+
 msgid "E65: Illegal back reference"
 msgstr "E65: Nevalida retro-referenco"
 
-msgid "E339: Pattern too long"
-msgstr "E339: Ŝablono tro longa"
-
-msgid "E50: Too many \\z("
-msgstr "E50: Tro da \\z("
-
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: Tro da %s("
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: Neekvilibra \\z("
-
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: nevalida signo malantaŭ %s@"
-
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: Tro da kompleksaj %s{...}-oj"
-
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: Ingita %s*"
-
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: Ingita %s%c"
-
 msgid "E63: invalid use of \\_"
 msgstr "E63: nevalida uzo de \\_"
 
@@ -4814,26 +4681,37 @@ msgid "E71: Invalid character after %s%%
 msgstr "E71: Nevalida signo malantaŭ %s%%"
 
 #, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: Sintaksa eraro en %s{...}"
+msgid "E59: invalid character after %s@"
+msgstr "E59: nevalida signo malantaŭ %s@"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: Tro da kompleksaj %s{...}-oj"
+
+#, c-format
+msgid "E61: Nested %s*"
+msgstr "E61: Ingita %s*"
+
+#, c-format
+msgid "E62: Nested %s%c"
+msgstr "E62: Ingita %s%c"
+
+msgid "E50: Too many \\z("
+msgstr "E50: Tro da \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Tro da %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: Neekvilibra \\z("
+
+msgid "E339: Pattern too long"
+msgstr "E339: Ŝablono tro longa"
 
 msgid "External submatches:\n"
 msgstr "Eksteraj subkongruoj:\n"
 
-#, c-format
-msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (NFA-regulesprimo) ne eblas ripeti %s"
-
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: \\%#= povas nur esti sekvita de 0, 1, aŭ 2. La aŭtomata motoro de "
-"regulesprimo estos uzata "
-
-msgid "Switching to backtracking RE engine for pattern: "
-msgstr "Ŝanĝas al malavanca motoro de regulesprimo por ŝablono: "
-
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue"
 
@@ -4901,6 +4779,46 @@ msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmemorigi la tutan NFA "
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"
 
+msgid "E748: No previously used register"
+msgstr "E748: Neniu reĝistro antaŭe uzata"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "malokupas %ld liniojn"
+
+#, c-format
+msgid " into \"%c"
+msgstr " en \"%c"
+
+#, c-format
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "bloko de %ld linio kopiita%s"
+msgstr[1] "bloko de %ld linioj kopiitaj%s"
+
+#, c-format
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld linio kopiita%s"
+msgstr[1] "%ld linioj kopiitaj%s"
+
+#, c-format
+msgid "E353: Nothing in register %s"
+msgstr "E353: Nenio en reĝistro %s"
+
+msgid ""
+"\n"
+"Type Name Content"
+msgstr ""
+"\n"
+"Tipo Nomo Enhavo"
+
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: serĉa ŝablono kaj esprima reĝistro ne povas enhavi du aŭ pliajn liniojn"
+
 msgid " VREPLACE"
 msgstr " V-ANSTATAŬIGO"
 
@@ -4953,6 +4871,80 @@ msgid "recording"
 msgstr "registrado"
 
 #, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "Serĉado de \"%s\" en \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "Serĉado de \"%s\""
+
+#, c-format
+msgid "not found in '%s': \"%s\""
+msgstr "ne trovita en '%s: \"%s\""
+
+msgid "Source Vim script"
+msgstr "Ruli Vim-skripton"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Ne eblas ruli dosierujon: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "ne eblis ruli \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "linio %ld: ne eblis ruli \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "rulas \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "linio %ld: rulas \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "finis ruli %s"
+
+#, c-format
+msgid "continuing in %s"
+msgstr "daŭrigas en %s"
+
+msgid "modeline"
+msgstr "reĝimlinio"
+
+msgid "--cmd argument"
+msgstr "--cmd argumento"
+
+msgid "-c argument"
+msgstr "-c argumento"
+
+msgid "environment variable"
+msgstr "medivariablo"
+
+msgid "error handler"
+msgstr "erartraktilo"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: Averto: Neĝusta disigilo de linio, ^M eble mankas"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: \":scriptencoding\" uzita ekster rulita dosiero"
+
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion uzita ekster rulita dosiero"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion ne subtenata: %d"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: \":finish\" uzita ekster rulita dosiero"
+
+#, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Nevalida serĉenda ĉeno: %s"
 
@@ -5035,7 +5027,7 @@ msgstr "Emfazaj simbolaĵoj de %s:"
 
 #, c-format
 msgid "  group=%s"
-msgstr "  groupo=%s"
+msgstr "  grupo=%s"
 
 #, c-format
 msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
@@ -5097,21 +5089,6 @@ msgstr "E797: Aŭtokomando SpellFileMissing forviŝis bufron"
 msgid "Warning: region %s not supported"
 msgstr "Averto: regiono %s ne subtenata"
 
-msgid "Sorry, no suggestions"
-msgstr "Bedaŭrinde ne estas sugestoj"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Bedaŭrinde estas nur %ld sugestoj"
-
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Anstataŭigi \"%.*s\" per:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
 msgid "E752: No previous spell replacement"
 msgstr "E752: Neniu antaŭa literuma anstataŭigo"
 
@@ -5439,6 +5416,21 @@ msgstr "E763: Signoj de vorto malsamas t
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: ripetita signo en rikordo MAP"
 
+msgid "Sorry, no suggestions"
+msgstr "Bedaŭrinde ne estas sugestoj"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Bedaŭrinde estas nur %ld sugestoj"
+
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Anstataŭigi \"%.*s\" per:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
 msgid "No Syntax items defined for this buffer"
 msgstr "Neniu sintaksa elemento difinita por tiu bufro"
 
@@ -5680,9 +5672,6 @@ msgstr "Serĉado de dosiero de etikedoj %s"
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Vojo de etikeda dosiero trunkita por %s\n"
 
-msgid "Ignoring long line in tags file"
-msgstr "Ignoro de longa linio en etikeda dosiero"
-
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Eraro de formato en etikeda dosiero \"%s\""
@@ -5698,6 +5687,9 @@ msgstr "E432: Etikeda dosiero ne estas o
 msgid "E433: No tags file"
 msgstr "E433: Neniu etikeda dosiero"
 
+msgid "Ignoring long line in tags file"
+msgstr "Ignoro de longa linio en etikeda dosiero"
+
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Ne eblas trovi ŝablonon de etikedo"
 
@@ -5744,6 +5736,9 @@ msgstr "Ne povas malfermi $VIMRUNTIME/rg
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Nevalida atributo: %s"
 
+msgid "E279: Sorry, ++shell is not supported on this system"
+msgstr "E279: Bedaŭrinde ++shell ne estas subtenata en tiu sistemo"
+
 #, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "Ĉu ĉesigi taskon en \"%s\"?"
@@ -5791,6 +5786,9 @@ msgstr "E966: Nevalida numero de linio: 
 msgid "E965: missing property type name"
 msgstr "E965: nomo de tipo de eco mankas"
 
+msgid "E275: Cannot add text property to unloaded buffer"
+msgstr "E275: Ne eblas aldoni econ de teksto al malŝaltita bufro"
+
 msgid "E967: text property info corrupted"
 msgstr "E967: difekta informo de eco de teksto"
 
@@ -5936,12 +5934,6 @@ msgstr "Nenio por malfari"
 msgid "number changes  when               saved"
 msgstr "numero ŝanĝoj   tempo              konservita"
 
-#, c-format
-msgid "%ld second ago"
-msgid_plural "%ld seconds ago"
-msgstr[0] "antaŭ %ld sekundo"
-msgstr[1] "antaŭ %ld sekundoj"
-
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin estas nepermesebla post malfaro"
 
@@ -6072,6 +6064,10 @@ msgid "E117: Unknown function: %s"
 msgstr "E117: Nekonata funkcio: %s"
 
 #, c-format
+msgid "E276: Cannot use function as a method: %s"
+msgstr "E276: Ne eblas uzi funkcion kiel metodo: %s"
+
+#, c-format
 msgid "E933: Function was deleted: %s"
 msgstr "E933: funkcio estis forviŝita: %s"
 
@@ -6752,9 +6748,6 @@ msgstr "E685: Interna eraro: %s"
 msgid "Interrupted"
 msgstr "Interrompita"
 
-msgid "E14: Invalid address"
-msgstr "E14: Nevalida adreso"
-
 msgid "E474: Invalid argument"
 msgstr "E474: Nevalida argumento"
 
@@ -6935,6 +6928,21 @@ msgid "E45: 'readonly' option is set (ad
 msgstr "E45: La opcio 'readonly' estas ŝaltita '(aldonu ! por transpasi)"
 
 #, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: Nedifinita variablo: %s"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: Nevalida datumtipo de variablo de %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: Nevalida nomo de variablo: %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: Ne eblas ŝanĝi ekzistantan variablon"
+
+#, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: Ne eblas ŝanĝi nurlegeblan variablon \"%s\""
 
@@ -6942,6 +6950,9 @@ msgstr "E46: Ne eblas ŝanĝi nurlegeblan variablon \"%s\""
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: Ne eblas agordi variablon en la sabloludejo: \"%s\""
 
+msgid "E928: String required"
+msgstr "E928: Ĉeno bezonata"
+
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: Ne eblas uzi malplenan ŝlosilon de Vortaro"
 
--- a/src/po/gvim.desktop.in
+++ b/src/po/gvim.desktop.in
@@ -64,7 +64,6 @@ Comment[pl]=Edytuj pliki tekstowe
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
-Comment[ru]=Редактор текстовых файлов
 Comment[sk]=Úprava textových súborov
 Comment[sl]=Urejanje datotek z besedili
 Comment[sq]=Përpuno files teksti
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-05 11:27+0900\n"
-"PO-Revision-Date: 2019-05-05 13:00+0900\n"
+"POT-Creation-Date: 2019-11-04 21:51+0900\n"
+"PO-Revision-Date: 2019-11-11 23:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -24,6 +24,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "E163: There is only one file to edit"
+msgstr "E163: Խե1Ĥޤ"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: ǽΥեˤϹԤޤ"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: ǸΥեۤƸˤϹԤޤ"
+
+msgid "E249: window layout changed unexpectedly"
+msgstr "E249: ͽɥ֤Ѥޤ"
+
 msgid "--Deleted--"
 msgstr "----"
 
@@ -118,8 +130,9 @@ msgstr "E83: ХåեǤʤΤǡ¾ΤѤޤ..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: ХåեϿǤޤ"
 
-msgid "E937: Attempt to delete a buffer that is in use"
-msgstr "E937: ΥХåե褦Ȼߤޤ"
+#, c-format
+msgid "E937: Attempt to delete a buffer that is in use: %s"
+msgstr "E937: ΥХåե褦Ȼߤޤ: %s"
 
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 줿ХåեϤޤ"
@@ -246,22 +259,157 @@ msgstr ""
 msgid "Top"
 msgstr "Ƭ"
 
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# Хåեꥹ:\n"
-
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' ץꤵƤΤǽޤ"
 
 msgid "[Prompt]"
 msgstr "[ץץ]"
 
+msgid "[Popup]"
+msgstr "[ݥåץå]"
+
 msgid "[Scratch]"
 msgstr "[]"
 
+msgid "WARNING: The file has been changed since reading it!!!"
+msgstr "ٹ: ɹ˥եѹޤ!!!"
+
+msgid "Do you really want to write to it"
+msgstr "˾񤭤ޤ"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwriteХåեγautocommand¸ߤޤ"
+
+msgid "E203: Autocommands deleted or unloaded buffer to be written"
+msgstr "E203: ¸Хåեautocommandޤ"
+
+msgid "E204: Autocommand changed number of lines in unexpected way"
+msgstr "E204: autocommandͽˡǹԿѹޤ"
+
+# Added at 19-Jan-2004.
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans̤ѹΥХåե񤹤뤳ȤϵĤƤޤ"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeansХåեΰ񤭽ФȤϤǤޤ"
+
+msgid "is a directory"
+msgstr "ϥǥ쥯ȥǤ"
+
+msgid "is not a file or writable device"
+msgstr "ϥեǤ߲ǽǥХǤ⤢ޤ"
+
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "'opendevice' ץˤǥХؤν񤭹ߤϤǤޤ"
+
+msgid "is read-only (add ! to override)"
+msgstr "ɹѤǤ (ˤ ! ɲ)"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: Хååץե¸Ǥޤ (! ɲäǶ)"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr ""
+"E507: ХååץեĤݤ˥顼ȯޤ (! ɲäǶ"
+")"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: Хååѥեɹޤ (! ɲäǶ)"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: Хååץեޤ (! ɲäǶ)"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: Хååץեޤ (! ɲäǶ)"
+
+msgid "E214: Can't find temp file for writing"
+msgstr "E214: ¸Ѱե뤬Ĥޤ"
+
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: ѴǤޤ (! ɲäѴ¸)"
+
+msgid "E166: Can't open linked file for writing"
+msgstr "E166: 󥯤줿ե˽ޤ"
+
+msgid "E212: Can't open file for writing"
+msgstr "E212: Ѥ˥ե򳫤ޤ"
+
+msgid "E949: File changed while writing"
+msgstr "E949: ˥ե뤬ѹޤ"
+
+msgid "E512: Close failed"
+msgstr "E512: Ĥ뤳Ȥ˼"
+
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: ߥ顼Ѵ (񤹤ˤ 'fenc' ˤƤ)"
+
+#, c-format
+msgid ""
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"override)"
+msgstr ""
+"E513: ߥ顼ѴԡԿ %ld (񤹤ˤ 'fenc' ˤƤ"
+")"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: ߥ顼 (ե륷ƥब?)"
+
+msgid " CONVERSION ERROR"
+msgstr " Ѵ顼"
+
+#, c-format
+msgid " in line %ld;"
+msgstr "  %ld;"
+
+msgid "[NOT converted]"
+msgstr "[̤Ѵ]"
+
+msgid "[converted]"
+msgstr "[Ѵ]"
+
+msgid "[Device]"
+msgstr "[ǥХ]"
+
+msgid "[New]"
+msgstr "[]"
+
+msgid "[New File]"
+msgstr "[ե]"
+
+msgid " [a]"
+msgstr " [a]"
+
+msgid " appended"
+msgstr " ɲ"
+
+msgid " [w]"
+msgstr " [w]"
+
+msgid " written"
+msgstr " "
+
+msgid "E205: Patchmode: can't save original file"
+msgstr "E205: patchmode: ܥե¸Ǥޤ"
+
+msgid "E206: patchmode: can't touch empty original file"
+msgstr "E206: patchmode: θܥեtouchǤޤ"
+
+msgid "E207: Can't delete backup file"
+msgstr "E207: Хååץեäޤ"
+
+msgid ""
+"\n"
+"WARNING: Original file may be lost or damaged\n"
+msgstr ""
+"\n"
+"ٹ: ܥե뤬줿ѹޤ\n"
+
+msgid "don't quit the editor until the file is successfully written!"
+msgstr "ե¸ޤǥǥλʤǤ!"
+
+msgid "W10: Warning: Changing a readonly file"
+msgstr "W10: ٹ: ɹѥեѹޤ"
+
 msgid "E902: Cannot connect to port"
 msgstr "E902: ݡȤ³Ǥޤ"
 
@@ -284,6 +432,9 @@ msgstr "E904: call 3ܤΰϥꥹȷǤʤФʤޤ"
 msgid "E905: received unknown command: %s"
 msgstr "E905: ̤ΤΥޥɤޤ: %s"
 
+msgid "E906: not an open channel"
+msgstr "E906: ƤʤͥǤ"
+
 #, c-format
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s(): ³֤ǽ񤭹ߤޤ"
@@ -300,9 +451,6 @@ msgid "E912: cannot use ch_evalexpr()/ch
 msgstr ""
 "E912: raw  nl ⡼ɤΥͥ ch_evalexpr()/ch_sendexpr() ϻȤޤ"
 
-msgid "E906: not an open channel"
-msgstr "E906: ƤʤͥǤ"
-
 msgid "E920: _io file requires _name to be set"
 msgstr "E920: _io ե _name ꤬ɬפǤ"
 
@@ -313,6 +461,18 @@ msgstr "E915: in_io Хåե in_buf  in_name ꤬ɬפǤ"
 msgid "E918: buffer must be loaded: %s"
 msgstr "E918: ХåեɤƤʤФʤޤ: %s"
 
+msgid "E916: not a valid job"
+msgstr "E916: ͭʥ֤ǤϤޤ"
+
+msgid "tagname"
+msgstr "̾"
+
+msgid " kind file\n"
+msgstr " ե\n"
+
+msgid "'history' option is zero"
+msgstr "ץ 'history' Ǥ"
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: ե뤬̤ΤˡǰŹ沽Ƥޤ"
 
@@ -332,7 +492,7 @@ msgid "[crypted]"
 msgstr "[Ź沽]"
 
 msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "ǥХå⡼ɤޤ. ³ˤ \"cont\" ϤƤ."
+msgstr "ǥХå⡼ɤޤ³ˤ \"cont\" ϤƤ"
 
 #, c-format
 msgid "Oldval = \"%s\""
@@ -539,45 +699,17 @@ msgstr "E105: :source ǼեʳǤ :loadkeymap Ȥޤ"
 msgid "E791: Empty keymap entry"
 msgstr "E791: Υޥåץȥ"
 
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: ͽʸ :let ˤޤ"
-
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ̤ѿǤ: %s"
-
 msgid "E111: Missing ']'"
 msgstr "E111: ']' Ĥޤ"
 
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] 򼭽񷿤Ȥ߹碌ƤϻȤޤ"
 
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: ۤʤäѿǤ %s="
-
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: ѿ̾Ǥ: %s"
-
 msgid "E806: using Float as a String"
 msgstr "E806: ưʸȤưäƤޤ"
 
-msgid "E985: .= is not supported with script version 2"
-msgstr "E985: .= ϥץȥС 2 ǤбƤޤ"
-
-msgid "E687: Less targets than List items"
-msgstr "E687: åȤꥹȷǤ⾯ʤǤ"
-
-msgid "E688: More targets than List items"
-msgstr "E688: åȤꥹȷǤ¿Ǥ"
-
-msgid "Double ; in list of variables"
-msgstr "ꥹȷͤ2İʾ ; Фޤ"
-
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: %s ͤɽǤޤ"
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274: ݳ̤˥ڡϵޤ"
 
 msgid "E689: Can only index a List, Dictionary or Blob"
 msgstr "E689: ꥹȷ񷿡BlobʳϥǥåǤޤ"
@@ -591,26 +723,21 @@ msgstr "E709: [:] ˤϥꥹȷBlobͤɬפǤ"
 msgid "E972: Blob value does not have the right number of bytes"
 msgstr "E972: BlobͤΥХȿޤ"
 
+msgid "E996: Cannot lock a range"
+msgstr "E996: ϰϤϥåǤޤ"
+
 msgid "E710: List value has more items than target"
 msgstr "E710: ꥹȷѿ˥åȤ¿Ǥޤ"
 
 msgid "E711: List value has not enough items"
 msgstr "E711: ꥹȷѿ˽ʬʿǤޤ"
 
+msgid "E996: Cannot lock a list or dict"
+msgstr "E996: ꥹȤ뤤ϼϥåǤޤ"
+
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for θ \"in\" ޤ"
 
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: ѿϤޤ: \"%s\""
-
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: ѿ %s ϥåޤϥåǤޤ"
-
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: ()åˤѿҤ᤮ޤ"
-
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' θ ':' ޤ"
 
@@ -623,6 +750,9 @@ msgstr "E973: Blobƥ϶Ĥ16ʿʸǤʤФʤޤ"
 msgid "E110: Missing ')'"
 msgstr "E110: ')' Ĥޤ"
 
+msgid "E260: Missing name after ->"
+msgstr "E260: -> θ̾ޤ"
+
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: ؿȷϥǥåǤޤ"
 
@@ -712,45 +842,11 @@ msgstr "E976: BlobʸȤưäƤޤ"
 msgid "E908: using an invalid value as a String"
 msgstr "E908: ̵ͤʸȤưäƤޤ"
 
-#, c-format
-msgid "E963: setting %s to value with wrong type"
-msgstr "E963: %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: ؿȷѿ̾ʸǻϤޤʤФʤޤ: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: ѿ̾¸δؿ̾Ⱦͤޤ: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: ͤåƤޤ: %s"
-
-msgid "Unknown"
-msgstr ""
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s ͤѹǤޤ"
-
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: ԡˤѿҤ᤮ޤ"
 
 msgid ""
 "\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# Хѿ:\n"
-
-msgid ""
-"\n"
 "\tLast set from "
 msgstr ""
 "\n"
@@ -777,39 +873,13 @@ msgstr "E736: 񷿤ˤ̵Ǥ"
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: ؿȷˤ̵Ǥ"
 
-msgid "map() argument"
-msgstr "map() ΰ"
-
-msgid "filter() argument"
-msgstr "filter() ΰ"
-
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s ΰϥꥹȷǤʤФʤޤ"
-
-#, c-format
-msgid "E899: Argument of %s must be a List or Blob"
-msgstr "E899: %s ΰϥꥹȷޤBlobǤʤФʤޤ"
-
-msgid "E928: String required"
-msgstr "E928: ʸɬפǤ"
-
-msgid "E957: Invalid window number"
-msgstr "E957: ̵ʥɥֹǤ"
-
 msgid "E808: Number or Float required"
 msgstr "E808: ͤưɬפǤ"
 
-msgid "add() argument"
-msgstr "add() ΰ"
-
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵ʥХåե̾Ǥ: %s"
 
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() ⡼ɤǤѤǤޤ"
-
 msgid "&Ok"
 msgstr "&Ok"
 
@@ -817,11 +887,6 @@ msgid "E980: lowlevel input not supporte
 msgstr "E980: ٥ϤϥݡȤƤޤ"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld : "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: ̤ΤδؿǤ: %s"
 
@@ -841,31 +906,18 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore()  inputsave() ¿ƤФޤ"
 
-msgid "insert() argument"
-msgstr "insert() ΰ"
-
 msgid "E786: Range not allowed"
 msgstr "E786: ϰϻϵĤƤޤ"
 
-msgid "E916: not a valid job"
-msgstr "E916: ͭʥ֤ǤϤޤ"
-
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() ˤ̵ʷǤ"
 
-#, c-format
-msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ID  \":match\" Τͽ󤵤Ƥޤ: %d"
-
 msgid "E726: Stride is zero"
 msgstr "E726: ȥ饤() 0 Ǥ"
 
 msgid "E727: Start past end"
 msgstr "E727: ϰ֤λ֤ۤޤ"
 
-msgid "<empty>"
-msgstr "<>"
-
 msgid "E240: No connection to the X server"
 msgstr "E240: X Сؤ³ޤ"
 
@@ -882,39 +934,13 @@ msgstr "E941: СϤǤ˳ϤƤޤ"
 msgid "E942: +clientserver feature not available"
 msgstr "E942: +clientserver ǽ̵ˤʤäƤޤ"
 
-msgid "remove() argument"
-msgstr "remove() ΰ"
-
-# Added at 10-Mar-2004.
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: ܥå󥯤¿᤮ޤ (۴ĤƤǽޤ)"
-
-msgid "reverse() argument"
-msgstr "reverse() ΰ"
-
 msgid "E258: Unable to send to client"
 msgstr "E258: 饤Ȥ뤳ȤǤޤ"
 
 #, c-format
-msgid "E927: Invalid action: '%s'"
-msgstr "E927: ̵Ǥ: '%s'"
-
-#, c-format
 msgid "E962: Invalid action: '%s'"
 msgstr "E962: ̵Ǥ: '%s'"
 
-msgid "sort() argument"
-msgstr "sort() ΰ"
-
-msgid "uniq() argument"
-msgstr "uniq() ΰ"
-
-msgid "E702: Sort compare function failed"
-msgstr "E702: ȤӴؿԤޤ"
-
-msgid "E882: Uniq compare function failed"
-msgstr "E882: Uniq ӴؿԤޤ"
-
 msgid "(Invalid)"
 msgstr "(̵)"
 
@@ -922,8 +948,84 @@ msgstr "(̵)"
 msgid "E935: invalid submatch number: %d"
 msgstr "E935: ̵ʥ֥ޥåֹǤ: %d"
 
-msgid "E677: Error writing temp file"
-msgstr "E677: ե˥顼ȯޤ"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: ͽʸ :let ˤޤ"
+
+msgid "E991: cannot use =<< here"
+msgstr "E991: Ǥ =<< ϻȤޤ"
+
+msgid "E221: Marker cannot start with lower case letter"
+msgstr "E221: ޡϱѾʸǻϤޤäƤϤޤ"
+
+msgid "E172: Missing marker"
+msgstr "E172: ޡޤ"
+
+#, c-format
+msgid "E990: Missing end marker '%s'"
+msgstr "E990: üޡޤ '%s'"
+
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= ϥץȥС 2 ǤбƤޤ"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: åȤꥹȷǤ⾯ʤǤ"
+
+msgid "E688: More targets than List items"
+msgstr "E688: åȤꥹȷǤ¿Ǥ"
+
+msgid "Double ; in list of variables"
+msgstr "ꥹȷͤ2İʾ ; Фޤ"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s ͤɽǤޤ"
+
+msgid "E996: Cannot lock an environment variable"
+msgstr "E996: ĶѿϥåǤޤ"
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: ץϥåǤޤ"
+
+msgid "E996: Cannot lock a register"
+msgstr "E996: 쥸ϥåǤޤ"
+
+#, c-format
+msgid "E108: No such variable: \"%s\""
+msgstr "E108: ѿϤޤ: \"%s\""
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: ѿ %s ϥåޤϥåǤޤ"
+
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: ()åˤѿҤ᤮ޤ"
+
+#, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: %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: ؿȷѿ̾ʸǻϤޤʤФʤޤ: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: ѿ̾¸δؿ̾Ⱦͤޤ: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: ͤåƤޤ: %s"
+
+msgid "Unknown"
+msgstr ""
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ͤѹǤޤ"
 
 msgid "E921: Invalid callback argument"
 msgstr "E921: ̵ʥХåǤ"
@@ -970,73 +1072,6 @@ msgstr "E135: *ե륿* autocommandϸߤΥХåեѹƤϤޤ"
 msgid "[No write since last change]\n"
 msgstr "[Ǹѹ¸Ƥޤ]\n"
 
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s : "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: 顼¿᤮Τǡʹߤϥåפޤ"
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "viminfoե \"%s\"%s%s%s ɹ"
-
-msgid " info"
-msgstr " "
-
-msgid " marks"
-msgstr " ޡ"
-
-msgid " oldfiles"
-msgstr " ե뷲"
-
-msgid " FAILED"
-msgstr " "
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: viminfoե뤬ߤǤޤ: %s"
-
-#, c-format
-msgid "E929: Too many viminfo temp files, like %s!"
-msgstr "E929: viminfoե뤬¿᤮ޤ! : %s"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: viminfoե %s ¸Ǥޤ!"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "viminfoե \"%s\" "
-
-#, c-format
-msgid "E886: Can't rename viminfo file to %s!"
-msgstr "E886: viminfoե %s ̾ѹǤޤ!"
-
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "#  viminfo ե Vim %s ˤäޤ.\n"
-
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# ѹݤˤϽʬդƤ!\n"
-"\n"
-
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Υե뤬񤫤줿 'encoding' \n"
-
-msgid "Illegal starting char"
-msgstr "ƬʸǤ"
-
-msgid ""
-"\n"
-"# Bar lines, copied verbatim:\n"
-msgstr ""
-"\n"
-"# '|' ǻϤޤԤΡʸ̤Υԡ:\n"
-
 msgid "Save As"
 msgstr "̾¸"
 
@@ -1052,7 +1087,7 @@ 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)"
@@ -1144,15 +1179,6 @@ msgstr "ѥƤιԤǸĤޤ: %s"
 msgid "Pattern not found: %s"
 msgstr "ѥϸĤޤǤ: %s"
 
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Ǹִ줿ʸ:\n"
-"$"
-
 msgid "E478: Don't panic!"
 msgstr "E478: ƤʤǤ"
 
@@ -1196,9 +1222,6 @@ msgstr "E150: ǥ쥯ȥǤϤޤ: %s"
 msgid "No old files"
 msgstr "ŤեϤޤ"
 
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750:  \":profile start {fname}\" ¹ԤƤ"
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "ѹ \"%s\" ¸ޤ?"
@@ -1214,32 +1237,11 @@ msgstr "E162: Хåե \"%s\" ѹ¸Ƥޤ"
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "ٹ: ͽ¾Хåեذưޤ (autocommands Ĵ٤Ƥ)"
 
-msgid "E163: There is only one file to edit"
-msgstr "E163: Խե1Ĥޤ"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: ǽΥեˤϹԤޤ"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: ǸΥեۤƸˤϹԤޤ"
-
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: ΥѥˤбƤޤ: %s"
 
 #, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "\"%s\"  \"%s\" 鸡"
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "\"%s\" 򸡺"
-
-#, c-format
-msgid "not found in '%s': \"%s\""
-msgstr "'%s' ˤϤޤ: \"%s\""
-
-#, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr "W20: ׵ᤵ줿python 2.xбƤޤ󡢥ե̵뤷ޤ: %s"
 
@@ -1247,68 +1249,6 @@ msgstr "W20: ׵ᤵ줿python 2.xбƤޤ󡢥ե̵뤷ޤ: %s"
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
 msgstr "W21: ׵ᤵ줿python 3.xбƤޤ󡢥ե̵뤷ޤ: %s"
 
-msgid "Source Vim script"
-msgstr "VimץȤμ"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "ǥ쥯ȥϼޤ: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "\"%s\" ޤ"
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr " %ld: \"%s\" ޤ"
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "\"%s\" "
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr " %ld: %s "
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "%s μλ"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s μ¹Ԥ³Ǥ"
-
-msgid "modeline"
-msgstr "⡼ɹ"
-
-msgid "--cmd argument"
-msgstr "--cmd "
-
-msgid "-c argument"
-msgstr "-c "
-
-msgid "environment variable"
-msgstr "Ķѿ"
-
-msgid "error handler"
-msgstr "顼ϥɥ"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ٹ: ԶڤǤ. ^M ʤΤǤ礦"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding ץȰʳǻѤޤ"
-
-msgid "E984: :scriptversion used outside of a sourced file"
-msgstr "E984: :scriptversion ץȰʳǻѤޤ"
-
-#, c-format
-msgid "E999: scriptversion not supported: %d"
-msgstr "E999: scriptversion ϥݡȤƤޤ: %d"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish ץȰʳǻѤޤ"
-
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "ߤ %s: \"%s\""
@@ -1319,11 +1259,15 @@ msgstr "E197:  \"%s\" Ǥޤ"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr ""
-"Ex⡼ɤޤ. Ρޥ⡼ɤˤ\"visual\"ϤƤ."
+"Ex⡼ɤޤΡޥ⡼ɤˤ\"visual\"ϤƤ"
 
 msgid "E501: At end-of-file"
 msgstr "E501: եνλ"
 
+#, c-format
+msgid "Executing: %s"
+msgstr "¹: %s"
+
 msgid "E169: Command too recursive"
 msgstr "E169: ޥɤƵŪ᤮ޤ"
 
@@ -1356,10 +1300,10 @@ msgid "E494: Use w or w>>"
 msgstr "E494: w ⤷ w>> ѤƤ"
 
 msgid ""
-"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
-msgstr ""
-"顼: DFLALL  ADDR_NONE, ADDR_UNSIGNED  ADDR_QUICKFIX ȤȤ˻Ȥ"
-"ȤϤǤޤ"
+"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"顼: EX_DFLALL  ADDR_NONE, ADDR_UNSIGNED  ADDR_QUICKFIX ȤȤ˻"
+"ȤϤǤޤ"
 
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
@@ -1442,15 +1386,6 @@ msgstr "E930: execute() Ǥ :redir ϻȤޤ"
 msgid "Save Redirection"
 msgstr "쥯Ȥ¸ޤ"
 
-msgid "Save View"
-msgstr "ӥ塼¸ޤ"
-
-msgid "Save Session"
-msgstr "å¸ޤ"
-
-msgid "Save Setup"
-msgstr "¸ޤ"
-
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: ǥ쥯ȥǤޤ: %s"
@@ -1501,9 +1436,6 @@ msgstr ""
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: ʸȤɾޤ"
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: viminfoեɹѤȤƳޤ"
-
 msgid "Untitled"
 msgstr "̵"
 
@@ -1617,38 +1549,6 @@ msgstr "E788: ߤ¾ΥХåեԽ뤳Ȥϵޤ"
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: ߤϥХåեѹ뤳Ȥϵޤ"
 
-msgid "tagname"
-msgstr "̾"
-
-msgid " kind file\n"
-msgstr " ե\n"
-
-msgid "'history' option is zero"
-msgstr "ץ 'history' Ǥ"
-
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s ܤ (ΤŤΤ):\n"
-
-msgid "Command Line"
-msgstr "ޥɥ饤"
-
-msgid "Search String"
-msgstr "ʸ"
-
-msgid "Expression"
-msgstr ""
-
-msgid "Input Line"
-msgstr "Ϲ"
-
-msgid "Debug Line"
-msgstr "ǥХå"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: ƥ֤ʥɥХåեޤ"
 
@@ -1658,18 +1558,12 @@ msgstr "E812: autocommandХåեХåե̾ѹޤ"
 msgid "Illegal file name"
 msgstr "ʥե̾"
 
-msgid "is a directory"
-msgstr "ϥǥ쥯ȥǤ"
-
 msgid "is not a file"
 msgstr "ϥեǤϤޤ"
 
 msgid "is a device (disabled with 'opendevice' option)"
 msgstr "ϥǥХǤ ('opendevice' ץDzǤޤ)"
 
-msgid "[New File]"
-msgstr "[ե]"
-
 msgid "[New DIRECTORY]"
 msgstr "[ǥ쥯ȥ]"
 
@@ -1709,12 +1603,6 @@ msgstr "[CR̵]"
 msgid "[long lines split]"
 msgstr "[Ĺʬ]"
 
-msgid "[NOT converted]"
-msgstr "[̤Ѵ]"
-
-msgid "[converted]"
-msgstr "[Ѵ]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[%ld ܤѴ顼]"
@@ -1735,124 +1623,6 @@ msgstr "'charconvert' ˤѴԤޤ"
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' νϤɹޤǤ"
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: acwriteХåեγautocommand¸ߤޤ"
-
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: ¸Хåեautocommandޤ"
-
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: autocommandͽˡǹԿѹޤ"
-
-# Added at 19-Jan-2004.
-msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans̤ѹΥХåե񤹤뤳ȤϵĤƤޤ"
-
-msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "NetBeansХåեΰ񤭽ФȤϤǤޤ"
-
-msgid "is not a file or writable device"
-msgstr "ϥեǤ߲ǽǥХǤ⤢ޤ"
-
-msgid "writing to device disabled with 'opendevice' option"
-msgstr "'opendevice' ץˤǥХؤν񤭹ߤϤǤޤ"
-
-msgid "is read-only (add ! to override)"
-msgstr "ɹѤǤ (ˤ ! ɲ)"
-
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: Хååץե¸Ǥޤ (! ɲäǶ)"
-
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr ""
-"E507: ХååץեĤݤ˥顼ȯޤ (! ɲäǶ"
-")"
-
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: Хååѥեɹޤ (! ɲäǶ)"
-
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: Хååץեޤ (! ɲäǶ)"
-
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: Хååץեޤ (! ɲäǶ)"
-
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: ¸Ѱե뤬Ĥޤ"
-
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: ѴǤޤ (! ɲäѴ¸)"
-
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: 󥯤줿ե˽ޤ"
-
-msgid "E212: Can't open file for writing"
-msgstr "E212: Ѥ˥ե򳫤ޤ"
-
-msgid "E949: File changed while writing"
-msgstr "E949: ˥ե뤬ѹޤ"
-
-msgid "E512: Close failed"
-msgstr "E512: Ĥ뤳Ȥ˼"
-
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: ߥ顼Ѵ (񤹤ˤ 'fenc' ˤƤ)"
-
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: ߥ顼ѴԡԿ %ld (񤹤ˤ 'fenc' ˤƤ"
-")"
-
-msgid "E514: write error (file system full?)"
-msgstr "E514: ߥ顼 (ե륷ƥब?)"
-
-msgid " CONVERSION ERROR"
-msgstr " Ѵ顼"
-
-#, c-format
-msgid " in line %ld;"
-msgstr "  %ld;"
-
-msgid "[Device]"
-msgstr "[ǥХ]"
-
-msgid "[New]"
-msgstr "[]"
-
-msgid " [a]"
-msgstr " [a]"
-
-msgid " appended"
-msgstr " ɲ"
-
-msgid " [w]"
-msgstr " [w]"
-
-msgid " written"
-msgstr " "
-
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: patchmode: ܥե¸Ǥޤ"
-
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patchmode: θܥեtouchǤޤ"
-
-msgid "E207: Can't delete backup file"
-msgstr "E207: Хååץեäޤ"
-
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"ٹ: ܥե뤬줿ѹޤ\n"
-
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "ե¸ޤǥǥλʤǤ!"
-
 msgid "[dos]"
 msgstr "[dos]"
 
@@ -1887,12 +1657,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[ǽԤԴ]"
 
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "ٹ: ɹ˥եѹޤ!!!"
-
-msgid "Do you really want to write to it"
-msgstr "˾񤭤ޤ"
-
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" Υ顼Ǥ"
@@ -1958,10 +1722,29 @@ msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" ϥɤǤޤǤ"
 
 msgid "E219: Missing {."
-msgstr "E219: { ޤ."
+msgstr "E219: { ޤ"
 
 msgid "E220: Missing }."
-msgstr "E220: } ޤ."
+msgstr "E220: } ޤ"
+
+msgid "<empty>"
+msgstr "<>"
+
+# Added at 10-Mar-2004.
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ܥå󥯤¿᤮ޤ (۴ĤƤǽޤ)"
+
+msgid "Select Directory dialog"
+msgstr "ǥ쥯ȥ"
+
+msgid "Save File dialog"
+msgstr "ե¸"
+
+msgid "Open File dialog"
+msgstr "եɹ"
+
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: 󥽡⡼ɤǤϥե֥饦Ȥޤ󡢤ʤ"
 
 msgid "E854: path too long for completion"
 msgstr "E854: ѥĹ᤮䴰Ǥޤ"
@@ -1972,7 +1755,7 @@ msgid ""
 "followed by '%s'."
 msgstr ""
 "E343: ̵ʥѥǤ: '**[]' pathκǸ夫 '%s' ³ƤʤȤޤ"
-"."
+""
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
@@ -2011,37 +1794,17 @@ msgid "+--%3ld line folded "
 msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld Ԥ޾ޤޤ"
 
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld : "
+
 msgid "E222: Add to read buffer"
 msgstr "E222: ɹХåեɲ"
 
 msgid "E223: recursive mapping"
 msgstr "E223: ƵŪޥåԥ"
 
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s ȤХûϤϴ¸ߤޤ"
-
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s ȤХޥåԥ󥰤ϴ¸ߤޤ"
-
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s ȤûϤϴ¸ߤޤ"
-
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: %s Ȥޥåԥ󥰤ϴ¸ߤޤ"
-
-msgid "No abbreviation found"
-msgstr "ûϤϸĤޤǤ"
-
-msgid "No mapping found"
-msgstr "ޥåԥ󥰤ϸĤޤǤ"
-
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ʥ⡼"
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: GUIѤΥץεư˼Ԥޤ"
 
@@ -2094,7 +1857,7 @@ msgid "Cancel"
 msgstr "󥻥"
 
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "С: ǤޤǤ."
+msgstr "С: ǤޤǤ"
 
 msgid "Vim dialog"
 msgstr "Vim "
@@ -2243,7 +2006,7 @@ msgstr "E671: ȥ뤬 \"%s\" ΥɥϸĤޤ"
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: ϥݡȤޤ: \"-%s\"; OLEǤѤƤ."
+msgstr "E243: ϥݡȤޤ: \"-%s\"; OLEǤѤƤ"
 
 msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
 msgstr "E988: GUIϻԲǽǤgvim.exeưǤޤ"
@@ -2378,14 +2141,16 @@ msgid "E621: \"%s\" resource file has wr
 msgstr "E621: ꥽ե \"%s\" ϥС󤬰ۤʤޤ"
 
 msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: ߴ̵ޥХȥ󥳡ǥ󥰤ʸåȤǤ"
+msgstr "E673: ߴ̵ޥХȥ󥳡ǥ󥰤ʸåȤǤ"
 
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: ޥХȥ󥳡ǥ󥰤Ǥ printmbcharset ˤǤޤ"
+msgstr ""
+"E674: ޥХȥ󥳡ǥ󥰤Ǥ printmbcharset ˤǤޤ"
 
 msgid "E675: No default font specified for multi-byte printing."
 msgstr ""
-"E675: ޥХʸ뤿ΥǥեȥեȤꤵƤޤ"
+"E675: ޥХʸ뤿ΥǥեȥեȤꤵƤޤ"
+""
 
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScriptѤΥե򳫤ޤ"
@@ -2415,7 +2180,94 @@ msgid "E365: Failed to print PostScript 
 msgstr "E365: PostScriptեΰ˼Ԥޤ"
 
 msgid "Print job sent."
-msgstr "֤ޤ."
+msgstr "֤ޤ"
+
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim κƵƤӽФ򸡽Фޤ"
+
+#, c-format
+msgid "E411: highlight group not found: %s"
+msgstr "E411: ϥ饤ȥ롼פĤޤ: %s"
+
+#, c-format
+msgid "E412: Not enough arguments: \":highlight link %s\""
+msgstr "E412: ʬǤϤʤ: \":highlight link %s\""
+
+#, c-format
+msgid "E413: Too many arguments: \":highlight link %s\""
+msgstr "E413: ¿᤮ޤ: \":highlight link %s\""
+
+msgid "E414: group has settings, highlight link ignored"
+msgstr "E414: 롼פꤵƤΤǥϥ饤ȥ󥯤̵뤵ޤ"
+
+#, c-format
+msgid "E415: unexpected equal sign: %s"
+msgstr "E415: ͽǤ: %s"
+
+#, c-format
+msgid "E416: missing equal sign: %s"
+msgstr "E416: 椬ޤ: %s"
+
+#, c-format
+msgid "E417: missing argument: %s"
+msgstr "E417: ޤ: %s"
+
+#, c-format
+msgid "E418: Illegal value: %s"
+msgstr "E418: ͤǤ: %s"
+
+msgid "E419: FG color unknown"
+msgstr "E419: ̤ΤʿǤ"
+
+msgid "E420: BG color unknown"
+msgstr "E420: ̤ΤطʿǤ"
+
+#, c-format
+msgid "E421: Color name or number not recognized: %s"
+msgstr "E421: 顼ֹ̾ǧǤޤ: %s"
+
+#, c-format
+msgid "E422: terminal code too long: %s"
+msgstr "E422: üɤĹ᤮ޤ: %s"
+
+#, c-format
+msgid "E423: Illegal argument: %s"
+msgstr "E423: ʰǤ: %s"
+
+msgid "E424: Too many different highlighting attributes in use"
+msgstr "E424: ¿ΰۤʤϥ饤°Ȥ᤮Ƥޤ"
+
+msgid "E669: Unprintable character in group name"
+msgstr "E669: 롼̾˰Բǽʸޤ"
+
+msgid "W18: Invalid character in group name"
+msgstr "W18: 롼̾ʸޤ"
+
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: ϥ饤Ȥȹʸ롼פ¿᤮ޤ"
+
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: ̵ ID: %d (1 ʾǤʤФʤޤ)"
+
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID ϤǤǤ: %d"
+
+msgid "List or number required"
+msgstr "ꥹȤͤɬפǤ"
+
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: ̵ ID: %d (1 ʾǤʤФʤޤ)"
+
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ID Ϥޤ: %d"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID  \":match\" Τͽ󤵤Ƥޤ: %d"
 
 msgid "Add a new database"
 msgstr "ǡ١ɲ"
@@ -2581,7 +2433,7 @@ msgid " # pid    database name          
 msgstr " # pid    ǡ١̾                      prepend ѥ\n"
 
 msgid "Lua library cannot be loaded."
-msgstr "Lua饤֥ɤǤޤ."
+msgstr "Lua饤֥ɤǤޤ"
 
 msgid "cannot save undo information"
 msgstr "ɥ¸Ǥޤ"
@@ -2589,14 +2441,14 @@ msgstr "ɥ¸Ǥޤ"
 msgid ""
 "E815: Sorry, this command is disabled, the MzScheme libraries could not be "
 "loaded."
-msgstr "E815: Υޥɤ̵Ǥ. MzScheme 饤֥ɤǤޤ."
+msgstr "E815: Υޥɤ̵ǤMzScheme 饤֥ɤǤޤ"
 
 msgid ""
 "E895: Sorry, this command is disabled, the MzScheme's racket/base module "
 "could not be loaded."
 msgstr ""
-"E895: Υޥɤ̵Ǥʤ. MzScheme  racket/base ⥸塼"
-"뤬ɤǤޤǤ."
+"E895: Υޥɤ̵ǤʤMzScheme  racket/base ⥸塼"
+"뤬ɤǤޤǤ"
 
 msgid "invalid expression"
 msgstr "̵ʼǤ"
@@ -2657,14 +2509,14 @@ msgid ""
 "loaded."
 msgstr ""
 "E263: Υޥɤ̵Ǥʤ: Python饤֥ɤǤޤ"
-"Ǥ."
+"Ǥ"
 
 msgid ""
 "E887: Sorry, this command is disabled, the Python's site module could not be "
 "loaded."
 msgstr ""
-"E887: Υޥɤ̵Ǥʤ. Python  site ⥸塼"
-"ǤޤǤ."
+"E887: Υޥɤ̵ǤʤPython  site ⥸塼"
+"ǤޤǤ"
 
 # Added at 07-Feb-2004.
 msgid "E659: Cannot invoke Python recursively"
@@ -2680,7 +2532,7 @@ msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: Υޥɤ̵Ǥʤ: Ruby饤֥ɤǤޤ"
-"Ǥ."
+"Ǥ"
 
 msgid "E267: unexpected return"
 msgstr "E267: ͽ return Ǥ"
@@ -2766,7 +2618,7 @@ msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
 "E571: Υޥɤ̵Ǥʤ: Tcl饤֥ɤǤޤ"
-"."
+""
 
 #, c-format
 msgid "E572: exit code %d"
@@ -2786,7 +2638,16 @@ msgid "E573: Invalid server id used: %s"
 msgstr "E573: ̵ʥСIDȤޤ: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM ΤϿץѥƥǤ. õޤ!"
+msgstr "E251: VIM ΤϿץѥƥǤõޤ!"
+
+#, c-format
+msgid "%ld lines to indent... "
+msgstr "%ld ԤǥȤޤ... "
+
+#, c-format
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld Ԥ򥤥ǥȤޤ "
 
 msgid " Keyword completion (^N^P)"
 msgstr " 䴰 (^N^P)"
@@ -2855,12 +2716,15 @@ msgstr " () (^E/^Y)"
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (ִ)  (^E/^Y)"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() ⡼ɤǤѤǤޤ"
+
 #, c-format
 msgid "Scanning: %s"
 msgstr ": %s"
 
 msgid "Scanning tags."
-msgstr "򥹥."
+msgstr "򥹥档"
 
 msgid "match in file"
 msgstr "եΥޥå"
@@ -2893,6 +2757,10 @@ msgid "E938: Duplicate key in JSON: \"%s
 msgstr "E938: JSON˽ʣޤ: \"%s\""
 
 #, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: %s ΰϥꥹȷޤBlobǤʤФʤޤ"
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: ꥹȷ˥ޤޤ: %s"
 
@@ -2900,6 +2768,36 @@ msgstr "E696: ꥹȷ˥ޤޤ: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: ꥹȷκǸ ']' ޤ: %s"
 
+msgid "sort() argument"
+msgstr "sort() ΰ"
+
+msgid "uniq() argument"
+msgstr "uniq() ΰ"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: ȤӴؿԤޤ"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq ӴؿԤޤ"
+
+msgid "map() argument"
+msgstr "map() ΰ"
+
+msgid "filter() argument"
+msgstr "filter() ΰ"
+
+msgid "add() argument"
+msgstr "add() ΰ"
+
+msgid "insert() argument"
+msgstr "insert() ΰ"
+
+msgid "remove() argument"
+msgstr "remove() ΰ"
+
+msgid "reverse() argument"
+msgstr "reverse() ΰ"
+
 msgid "Unknown option argument"
 msgstr "̤ΤΥץǤ"
 
@@ -2929,7 +2827,7 @@ msgid "'-nb' cannot be used: not enabled
 msgstr "'-nb' ԲǽǤ: ѥ̵ˤƤޤ\n"
 
 msgid "This Vim was not compiled with the diff feature."
-msgstr "Vimˤdiffǽޤ(ѥ)."
+msgstr "Vimˤdiffǽޤ(ѥ)"
 
 msgid "Attempt to open script file again: \""
 msgstr "ץȥեƤӳȤޤ: \""
@@ -3307,7 +3205,7 @@ msgid ": Send failed.\n"
 msgstr ": ˼Ԥޤ.\n"
 
 msgid ": Send failed. Trying to execute locally\n"
-msgstr ": ˼Ԥޤ. Ǥμ¹ԤߤƤޤ\n"
+msgstr ": ˼ԤޤǤμ¹ԤߤƤޤ\n"
 
 #, c-format
 msgid "%d of %d edited"
@@ -3319,6 +3217,39 @@ msgstr "ǥץ쥤ޤ: ˼Ԥޤ.\n"
 msgid ": Send expression failed.\n"
 msgstr ": ˼Ԥޤ.\n"
 
+#, c-format
+msgid "E224: global abbreviation already exists for %s"
+msgstr "E224: %s ȤХûϤϴ¸ߤޤ"
+
+#, c-format
+msgid "E225: global mapping already exists for %s"
+msgstr "E225: %s ȤХޥåԥ󥰤ϴ¸ߤޤ"
+
+#, c-format
+msgid "E226: abbreviation already exists for %s"
+msgstr "E226: %s ȤûϤϴ¸ߤޤ"
+
+#, c-format
+msgid "E227: mapping already exists for %s"
+msgstr "E227: %s Ȥޥåԥ󥰤ϴ¸ߤޤ"
+
+msgid "No abbreviation found"
+msgstr "ûϤϸĤޤǤ"
+
+msgid "No mapping found"
+msgstr "ޥåԥ󥰤ϸĤޤǤ"
+
+msgid "E228: makemap: Illegal mode"
+msgstr "E228: makemap: ʥ⡼"
+
+#, c-format
+msgid "E357: 'langmap': Matching character missing for %s"
+msgstr "E357: 'langmap': %s бʸޤ"
+
+#, c-format
+msgid "E358: 'langmap': Extra characters after semicolon: %s"
+msgstr "E358: 'langmap': ߥθ;ʬʸޤ: %s"
+
 msgid "No marks set"
 msgstr "ޡꤵƤޤ"
 
@@ -3347,30 +3278,6 @@ msgstr ""
 "\n"
 "ѹ         ƥ"
 
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# եޡ:\n"
-
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# ץꥹ (Τ):\n"
-
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# եޡ (ΤŤ):\n"
-
-msgid "Missing '>'"
-msgstr "'>' Ĥޤ"
-
 msgid "E543: Not a valid codepage"
 msgstr "E543: ̵ʥɥڡǤ"
 
@@ -3454,7 +3361,7 @@ msgid ""
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"餯ѹƤʤVimåץե򹹿Ƥޤ."
+"餯ѹƤʤVimåץե򹹿Ƥޤ"
 
 msgid " cannot be used with this version of Vim.\n"
 msgstr " VimΤΥСǤϻѤǤޤ.\n"
@@ -3477,7 +3384,7 @@ msgid ""
 "or the file has been damaged."
 msgstr ""
 ",\n"
-"⤷ϥե뤬»Ƥޤ."
+"⤷ϥե뤬»Ƥޤ"
 
 #, c-format
 msgid ""
@@ -3515,7 +3422,7 @@ msgid ""
 "enter the new crypt key."
 msgstr ""
 "\n"
-"Ź業ϤƤ."
+"Ź業ϤƤ"
 
 msgid ""
 "\n"
@@ -3529,7 +3436,7 @@ msgid ""
 "to use the same key for text file and swap file"
 msgstr ""
 "\n"
-"åץեƱŹ業Ȥenter򲡤Ƥ."
+"åץեƱŹ業Ȥenter򲡤Ƥ"
 
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
@@ -3575,7 +3482,7 @@ msgid "See \":help E312\" for more infor
 msgstr "ܺ٤ \":help E312\" 򻲾ȤƤ"
 
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "ꥫХ꤬λޤ. ƤåƤ."
+msgstr "ꥫХ꤬λޤƤåƤ"
 
 msgid ""
 "\n"
@@ -3588,7 +3495,7 @@ msgid "and run diff with the original fi
 msgstr "ܥեȤ diff ¹ԤɤǤ礦)"
 
 msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "λ. ХåեƤϥեƱˤʤޤ."
+msgstr "λХåեƤϥեƱˤʤޤ"
 
 msgid ""
 "\n"
@@ -3617,6 +3524,9 @@ msgstr "   ǥ쥯ȥ "
 msgid "      -- none --\n"
 msgstr "      -- ʤ --\n"
 
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%Y/%m/%d (%a) %H:%M:%S"
+
 msgid "          owned by: "
 msgstr "            ͭ: "
 
@@ -3709,8 +3619,8 @@ msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: ̵lnumǤ: %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get:  %ld 򸫤Ĥޤ"
+msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get:  %ld Хåե %d %s ˸Ĥޤ"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ݥ󥿥֥åIDְäƤޤ 3"
@@ -3781,10 +3691,10 @@ msgid ""
 "    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
-"(1) ̤ΥץबƱեԽƤ뤫⤷ޤ.\n"
+"(1) ̤ΥץबƱեԽƤ뤫⤷ޤ\n"
 "    ξˤϡѹ򤷤Ƥޤ1ĤΥեФưۤʤ2Ĥ\n"
-"    󥹥󥹤ǤƤޤΤǡʤ褦˵ĤƤ.\n"
-"    λ뤫դʤ³Ƥ.\n"
+"    󥹥󥹤ǤƤޤΤǡʤ褦˵ĤƤ\n"
+"    λ뤫դʤ³Ƥ\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ΥեԽå󤬥å夷.\n"
@@ -3955,18 +3865,6 @@ msgstr ""
 "(&D)\n"
 "󥻥(&C)"
 
-msgid "Select Directory dialog"
-msgstr "ǥ쥯ȥ"
-
-msgid "Save File dialog"
-msgstr "ե¸"
-
-msgid "Open File dialog"
-msgstr "եɹ"
-
-msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: 󥽡⡼ɤǤϥե֥饦Ȥޤ󡢤ʤ"
-
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() ΰԽʬǤ"
 
@@ -3976,9 +3874,6 @@ msgstr "E807: printf() ΰˤưԤƤޤ"
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() ΰ¿᤮ޤ"
 
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ٹ: ɹѥեѹޤ"
-
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "ֹ<Enter>Ϥ뤫ޥǥåƤ (ǥ󥻥): "
@@ -4002,6 +3897,14 @@ msgstr " (ޤޤ)"
 msgid "Beep!"
 msgstr "ӡ!"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: ե˥顼ȯޤ"
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld ÷вᤷƤޤ"
+
 msgid "ERROR: "
 msgstr "顼: "
 
@@ -4021,12 +3924,8 @@ msgstr ""
 "[ƽ]  re/malloc()  %lu,  free()  %lu\n"
 "\n"
 
-msgid "E340: Line is becoming too long"
-msgstr "E340: ԤĹʤ᤮ޤ"
-
-#, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: 顼: lalloc(%ld,)"
+msgid "E341: Internal error: lalloc(0, )"
+msgstr "E341: 顼: lalloc(0, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4073,12 +3972,6 @@ msgstr "E505: %s ɹѤǤ (ˤ ! ɲ)"
 msgid "E349: No identifier under cursor"
 msgstr "E349: ΰ֤ˤϼ̻Ҥޤ"
 
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' ץ󤬶Ǥ"
-
-msgid "E775: Eval feature not available"
-msgstr "E775: ɾǽ̵ˤʤäƤޤ"
-
 msgid "Warning: terminal cannot highlight"
 msgstr "ٹ: ѤƤüϥϥ饤ȤǤޤ"
 
@@ -4115,18 +4008,6 @@ msgid "%ld lines %sed %d time"
 msgid_plural "%ld lines %sed %d times"
 msgstr[0] "%ld Ԥ %s  %d ޤ"
 
-#, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld ԤǥȤޤ... "
-
-#, c-format
-msgid "%ld line indented "
-msgid_plural "%ld lines indented "
-msgstr[0] "%ld Ԥ򥤥ǥȤޤ "
-
-msgid "E748: No previously used register"
-msgstr "E748: ޤ쥸ѤƤޤ"
-
 msgid "cannot yank; delete anyway"
 msgstr "󥯤Ǥޤ; Ȥˤõ"
 
@@ -4136,54 +4017,6 @@ msgid_plural "%ld lines changed"
 msgstr[0] "%ld Ԥѹޤ"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "%ld Ԥ"
-
-#, c-format
-msgid " into \"%c"
-msgstr " \"%c "
-
-#, c-format
-msgid "block of %ld line yanked%s"
-msgid_plural "block of %ld lines yanked%s"
-msgstr[0] "%ld ԤΥ֥å%s󥯤ޤ"
-
-#, c-format
-msgid "%ld line yanked%s"
-msgid_plural "%ld lines yanked%s"
-msgstr[0] "%ld Ԥ%s󥯤ޤ"
-
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: 쥸 %s ˤϲ⤢ޤ"
-
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- 쥸 ---"
-
-msgid "Illegal register name"
-msgstr "ʥ쥸̾"
-
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# 쥸:\n"
-
-#, c-format
-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: ѥȼ쥸ˤ2԰ʾޤޤ"
-
-#, c-format
 msgid "%ld Cols; "
 msgstr "%ld ; "
 
@@ -4214,8 +4047,11 @@ msgstr ""
 msgid "(+%lld for BOM)"
 msgstr "(+%lld for BOM)"
 
-msgid "Thanks for flying Vim"
-msgstr "Vim ȤäƤƤ꤬Ȥ"
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' ץ󤬶Ǥ"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: ɾǽ̵ˤʤäƤޤ"
 
 msgid "E518: Unknown option"
 msgstr "E518: ̤ΤΥץǤ"
@@ -4226,6 +4062,9 @@ msgstr "E519: ץϥݡȤƤޤ"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline ǤϵĤޤ"
 
+msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
+msgstr "E992: 'modelineexpr' դλ modeline ǤϵĤޤ"
+
 msgid "E846: Key code not set"
 msgstr "E846: ɤꤵƤޤ"
 
@@ -4235,6 +4074,66 @@ msgstr "E521: = θˤϿɬפǤ"
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap ˸Ĥޤ"
 
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: ¹Υ֤üѹǽˤǤޤ"
+
+msgid "E590: A preview window already exists"
+msgstr "E590: ץӥ塼ɥ¸ߤޤ"
+
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr ""
+"W17: ӥʸˤUTF-8ɬפʤΤǡ':set encoding=utf-8' Ƥ"
+
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 24bitϤδĶǤϥݡȤƤޤ"
+
+#, c-format
+msgid "E593: Need at least %d lines"
+msgstr "E593:  %d ιԿɬפǤ"
+
+#, c-format
+msgid "E594: Need at least %d columns"
+msgstr "E594:  %d ΥɬפǤ"
+
+#, c-format
+msgid "E355: Unknown option: %s"
+msgstr "E355: ̤ΤΥץǤ: %s"
+
+#, c-format
+msgid "E521: Number required: &%s = '%s'"
+msgstr "E521: ɬפǤ: &%s = '%s'"
+
+msgid ""
+"\n"
+"--- Terminal codes ---"
+msgstr ""
+"\n"
+"--- ü ---"
+
+msgid ""
+"\n"
+"--- Global option values ---"
+msgstr ""
+"\n"
+"--- Х륪ץ ---"
+
+msgid ""
+"\n"
+"--- Local option values ---"
+msgstr ""
+"\n"
+"--- 륪ץ ---"
+
+msgid ""
+"\n"
+"--- Options ---"
+msgstr ""
+"\n"
+"--- ץ ---"
+
+msgid "E356: get_varp ERROR"
+msgstr "E356: get_varp 顼"
+
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: ʸǤ <%s>"
@@ -4243,6 +4142,15 @@ msgstr "E539: ʸǤ <%s>"
 msgid "For option %s"
 msgstr "ץ: %s"
 
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: λƤޤ"
+
+msgid "E541: too many items"
+msgstr "E541: Ǥ¿᤮ޤ"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: 롼פ礤ޤ"
+
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' ˤ϶ʸǤޤ"
 
@@ -4313,86 +4221,6 @@ msgstr "E536: ޤɬפǤ"
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' ϶Ǥ뤫 %s ޤɬפޤ"
 
-msgid "E538: No mouse support"
-msgstr "E538: ޥϥݡȤޤ"
-
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: λƤޤ"
-
-msgid "E541: too many items"
-msgstr "E541: Ǥ¿᤮ޤ"
-
-msgid "E542: unbalanced groups"
-msgstr "E542: 롼פ礤ޤ"
-
-msgid "E946: Cannot make a terminal with running job modifiable"
-msgstr "E946: ¹Υ֤üѹǽˤǤޤ"
-
-msgid "E590: A preview window already exists"
-msgstr "E590: ץӥ塼ɥ¸ߤޤ"
-
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr ""
-"W17: ӥʸˤUTF-8ɬפʤΤǡ':set encoding=utf-8' Ƥ"
-
-msgid "E954: 24-bit colors are not supported on this environment"
-msgstr "E954: 24bitϤδĶǤϥݡȤƤޤ"
-
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593:  %d ιԿɬפǤ"
-
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594:  %d ΥɬפǤ"
-
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: ̤ΤΥץǤ: %s"
-
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: ɬפǤ: &%s = '%s'"
-
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- ü ---"
-
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- Х륪ץ ---"
-
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- 륪ץ ---"
-
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- ץ ---"
-
-msgid "E356: get_varp ERROR"
-msgstr "E356: get_varp 顼"
-
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': %s бʸޤ"
-
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': ߥθ;ʬʸޤ: %s"
-
 msgid "cannot open "
 msgstr "ޤ "
 
@@ -4435,7 +4263,7 @@ msgid " returned\n"
 msgstr " ޤ\n"
 
 msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE ᤮ޤ."
+msgstr "ANCHOR_BUF_SIZE ᤮ޤ"
 
 msgid "I/O ERROR"
 msgstr "ϥ顼"
@@ -4485,6 +4313,10 @@ msgstr ""
 "\n"
 "Vim: X Υ顼򸡽Фޤr\n"
 
+#, c-format
+msgid "restoring display %s"
+msgstr "ǥץ쥤 %s Ƥޤ"
+
 msgid "Testing the X display failed"
 msgstr "X display Υå˼Ԥޤ"
 
@@ -4511,7 +4343,7 @@ msgstr "ƥƥ %s  %s Ǥޤ"
 
 #, c-format
 msgid "Could not get security context %s for %s. Removing it!"
-msgstr "ƥƥ %s  %s Ǥޤ. ޤ!"
+msgstr "ƥƥ %s  %s Ǥޤ󡣺ޤ!"
 
 msgid ""
 "\n"
@@ -4604,7 +4436,7 @@ msgid ""
 msgstr ""
 "VIMRUN.EXE $PATH ˸Ĥޤ.\n"
 "ޥɤνλ˰ߤ򤷤ޤ.\n"
-"ܺ٤  :help win32-vimrun  򻲾ȤƤ."
+"ܺ٤  :help win32-vimrun  򻲾ȤƤ"
 
 msgid "Vim Warning"
 msgstr "Vimηٹ"
@@ -4613,6 +4445,23 @@ msgstr "Vimηٹ"
 msgid "shell returned %d"
 msgstr "뤬 %d ǽλޤ"
 
+msgid "E278: Cannot put a terminal buffer in a popup window"
+msgstr "E278: üХåեݥåץåץɥ֤ȤϤǤޤ"
+
+#, c-format
+msgid "E997: Tabpage not found: %d"
+msgstr "E997: ֥ڡĤޤ: %d"
+
+#, c-format
+msgid "E993: window %d is not a popup window"
+msgstr "E993: ɥ %d ϥݥåץåץɥǤϤޤ"
+
+msgid "E994: Not allowed in a popup window"
+msgstr "E994: ݥåץåץɥǤϵޤ"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750:  \":profile start {fname}\" ¹ԤƤ"
+
 msgid "E553: No more items"
 msgstr "E553: Ǥ⤦ޤ"
 
@@ -4691,6 +4540,10 @@ msgid "E777: String or List expected"
 msgstr "E777: ʸ󤫥ꥹȤɬפǤ"
 
 #, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: ̵Ǥ: '%s'"
+
+#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ̵ʹܤǤ: %s%%[]"
 
@@ -4733,38 +4586,27 @@ msgstr "E70: %s%%[] Ǥ"
 msgid "E956: Cannot use pattern recursively"
 msgstr "E956: ѥƵŪ˻ȤȤϤǤޤ"
 
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} ʸˡ顼ޤ"
+
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA ɽ) ֤ޤ %s"
+
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= ˤ 0, 1 ⤷ 2 Τߤ³ޤɽ󥸥ϼư"
+"򤵤ޤ"
+
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Υѥ˥Хåȥå RE 󥸥ŬѤޤ: "
+
 msgid "E65: Illegal back reference"
 msgstr "E65: ʸȤǤ"
 
-msgid "E339: Pattern too long"
-msgstr "E339: ѥĹ᤮ޤ"
-
-msgid "E50: Too many \\z("
-msgstr "E50: \\z( ¿᤮ޤ"
-
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s( ¿᤮ޤ"
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: \\z( äƤޤ"
-
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: %s@ θʸޤ"
-
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: ʣ %s{...} ¿᤮ޤ"
-
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61:%s* ҤˤʤäƤޤ"
-
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62:%s%c ҤˤʤäƤޤ"
-
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ ̵ʻˡǤ"
 
@@ -4784,26 +4626,37 @@ msgid "E71: Invalid character after %s%%
 msgstr "E71: %s%% θʸޤ"
 
 #, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: %s{...} ʸˡ顼ޤ"
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ θʸޤ"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: ʣ %s{...} ¿᤮ޤ"
+
+#, c-format
+msgid "E61: Nested %s*"
+msgstr "E61:%s* ҤˤʤäƤޤ"
+
+#, c-format
+msgid "E62: Nested %s%c"
+msgstr "E62:%s%c ҤˤʤäƤޤ"
+
+msgid "E50: Too many \\z("
+msgstr "E50: \\z( ¿᤮ޤ"
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: %s( ¿᤮ޤ"
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: \\z( äƤޤ"
+
+msgid "E339: Pattern too long"
+msgstr "E339: ѥĹ᤮ޤ"
 
 msgid "External submatches:\n"
 msgstr "ʬ:\n"
 
-#, c-format
-msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (NFA ɽ) ֤ޤ %s"
-
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: \\%#= ˤ 0, 1 ⤷ 2 Τߤ³ޤɽ󥸥ϼư"
-"򤵤ޤ"
-
-msgid "Switching to backtracking RE engine for pattern: "
-msgstr "Υѥ˥Хåȥå RE 󥸥ŬѤޤ: "
-
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Ԥ᤯ɽνüãޤ"
 
@@ -4869,6 +4722,43 @@ msgstr "E876: (NFA ɽ) NFAΤ¸ˤ϶ڡ­ޤ"
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) ߲Υ֥˽ʬʥƤޤ!"
 
+msgid "E748: No previously used register"
+msgstr "E748: ޤ쥸ѤƤޤ"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "%ld Ԥ"
+
+#, c-format
+msgid " into \"%c"
+msgstr " \"%c "
+
+#, c-format
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "%ld ԤΥ֥å%s󥯤ޤ"
+
+#, c-format
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld Ԥ%s󥯤ޤ"
+
+#, c-format
+msgid "E353: Nothing in register %s"
+msgstr "E353: 쥸 %s ˤϲ⤢ޤ"
+
+msgid ""
+"\n"
+"Type Name Content"
+msgstr ""
+"\n"
+" ̾ "
+
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr "E883: ѥȼ쥸ˤ2԰ʾޤޤ"
+
 msgid " VREPLACE"
 msgstr " ִ"
 
@@ -4921,6 +4811,80 @@ msgid "recording"
 msgstr "Ͽ"
 
 #, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "\"%s\"  \"%s\" 鸡"
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "\"%s\" 򸡺"
+
+#, c-format
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' ˤϤޤ: \"%s\""
+
+msgid "Source Vim script"
+msgstr "VimץȤμ"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "ǥ쥯ȥϼޤ: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "\"%s\" ޤ"
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr " %ld: \"%s\" ޤ"
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "\"%s\" "
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr " %ld: %s "
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "%s μλ"
+
+#, c-format
+msgid "continuing in %s"
+msgstr "%s μ¹Ԥ³Ǥ"
+
+msgid "modeline"
+msgstr "⡼ɹ"
+
+msgid "--cmd argument"
+msgstr "--cmd "
+
+msgid "-c argument"
+msgstr "-c "
+
+msgid "environment variable"
+msgstr "Ķѿ"
+
+msgid "error handler"
+msgstr "顼ϥɥ"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: ٹ: ԶڤǤ^M ʤΤǤ礦"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding ץȰʳǻѤޤ"
+
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion ץȰʳǻѤޤ"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion ϥݡȤƤޤ: %d"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish ץȰʳǻѤޤ"
+
+#, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: ̵ʸʸǤ: %s"
 
@@ -4976,18 +4940,14 @@ msgstr "E388: 򸫤Ĥޤ"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: ѥ򸫤Ĥޤ"
 
-msgid "Substitute "
-msgstr "Substitute "
-
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# Ǹ %sѥ:\n"
-"~"
+msgid "Save View"
+msgstr "ӥ塼¸ޤ"
+
+msgid "Save Session"
+msgstr "å¸ޤ"
+
+msgid "Save Setup"
+msgstr "¸ޤ"
 
 msgid "[Deleted]"
 msgstr "[]"
@@ -5070,21 +5030,6 @@ msgstr "E797: autocommand  SpellFileMissing Хåեޤ"
 msgid "Warning: region %s not supported"
 msgstr "ٹ9: %s ȤϰϤϥݡȤƤޤ"
 
-msgid "Sorry, no suggestions"
-msgstr "ǰǤϤޤ"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "ǰǤ %ld Ĥޤ"
-
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" 򼡤Ѵ:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
 msgid "E752: No previous spell replacement"
 msgstr "E752: ڥִޤ¹ԤƤޤ"
 
@@ -5187,7 +5132,7 @@ msgstr ""
 
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "COMPOUNDRULES ͤ˸꤬ޤ. ե %s  %d : %s"
+msgstr "COMPOUNDRULES ͤ˸꤬ޤե %s  %d : %s"
 
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
@@ -5414,6 +5359,21 @@ msgstr "E763: ñʸڥեȰۤʤޤ"
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP ȥ˽ʣʸ¸ߤޤ"
 
+msgid "Sorry, no suggestions"
+msgstr "ǰǤϤޤ"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "ǰǤ %ld Ĥޤ"
+
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" 򼡤Ѵ:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
 msgid "No Syntax items defined for this buffer"
 msgstr "ΥХåե줿ʸǤϤޤ"
 
@@ -5589,70 +5549,6 @@ msgid ""
 msgstr ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: syncolor.vim κƵƤӽФ򸡽Фޤ"
-
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: ϥ饤ȥ롼פĤޤ: %s"
-
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: ʬǤϤʤ: \":highlight link %s\""
-
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ¿᤮ޤ: \":highlight link %s\""
-
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: 롼פꤵƤΤǥϥ饤ȥ󥯤̵뤵ޤ"
-
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: ͽǤ: %s"
-
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: 椬ޤ: %s"
-
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: ޤ: %s"
-
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: ͤǤ: %s"
-
-msgid "E419: FG color unknown"
-msgstr "E419: ̤ΤʿǤ"
-
-msgid "E420: BG color unknown"
-msgstr "E420: ̤ΤطʿǤ"
-
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: 顼ֹ̾ǧǤޤ: %s"
-
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: üɤĹ᤮ޤ: %s"
-
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: ʰǤ: %s"
-
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ¿ΰۤʤϥ饤°Ȥ᤮Ƥޤ"
-
-msgid "E669: Unprintable character in group name"
-msgstr "E669: 롼̾˰Բǽʸޤ"
-
-msgid "W18: Invalid character in group name"
-msgstr "W18: 롼̾ʸޤ"
-
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: ϥ饤Ȥȹʸ롼פ¿᤮ޤ"
-
 msgid "E555: at bottom of tag stack"
 msgstr "E555: åǤ"
 
@@ -5746,7 +5642,7 @@ msgid "Duplicate field name: %s"
 msgstr "ʣե̾: %s"
 
 msgid "' not known. Available builtin terminals are:"
-msgstr "' ̤ΤǤ. ԤȤ߹üϼΤȤǤ:"
+msgstr "' ̤ΤǤԤȤ߹üϼΤȤǤ:"
 
 msgid "defaulting to '"
 msgstr "άͤ򼡤Τ褦ꤷޤ '"
@@ -5781,6 +5677,9 @@ msgstr "$VIMRUNTIME/rgb.txt򳫤ޤ"
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: ̵°Ǥ: %s"
 
+msgid "E279: Sorry, ++shell is not supported on this system"
+msgstr "E279: ʤ++shell ϤΥƥǤϥݡȤƤޤ"
+
 #, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" Υ֤λޤ?"
@@ -5828,6 +5727,9 @@ msgstr "E966: ̵ʹֹǤ: %ld"
 msgid "E965: missing property type name"
 msgstr "E965: ץѥƥ̾ޤ"
 
+msgid "E275: Cannot add text property to unloaded buffer"
+msgstr "E275: 줿ХåեˤϥƥȥץѥƥɲäǤޤ"
+
 msgid "E967: text property info corrupted"
 msgstr "E967: ƥȥץѥƥ󤬲Ƥޤ"
 
@@ -5973,11 +5875,6 @@ msgstr "ɥоݤޤ"
 msgid "number changes  when               saved"
 msgstr "   ѹ   ѹ           ¸"
 
-#, c-format
-msgid "%ld second ago"
-msgid_plural "%ld seconds ago"
-msgstr[0] "%ld ÷вᤷƤޤ"
-
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo ľ undojoin ϤǤޤ"
 
@@ -6068,6 +5965,9 @@ msgstr "E125: ʰǤ: %s"
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: ̾ʣƤޤ: %s"
 
+msgid "E989: Non-default argument follows default argument"
+msgstr "E989: ǥեȰǥեȰθˤޤ"
+
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: ؿΰ¿᤮ޤ: %s"
@@ -6103,6 +6003,10 @@ msgid "E117: Unknown function: %s"
 msgstr "E117: ̤ΤδؿǤ: %s"
 
 #, c-format
+msgid "E276: Cannot use function as a method: %s"
+msgstr "E276: ؿ᥽åɤȤƻѤǤޤ: %s"
+
+#, c-format
 msgid "E933: Function was deleted: %s"
 msgstr "E933: ؿϺޤ: %s"
 
@@ -6171,10 +6075,6 @@ msgid "E133: :return not inside a functi
 msgstr "E133: ؿ :return ޤ"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: å '(' ޤ: %s"
-
-#, c-format
 msgid "%s (%s, compiled %s)"
 msgstr "%s (%s, compiled %s)"
 
@@ -6465,6 +6365,173 @@ msgstr "ܺ٤ʾ           :help register<Enter>  "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "ܺ٤ϥ˥塼 إ->ݥ󥵡/Ͽ 򻲾ȤƲ"
 
+msgid ""
+"\n"
+"# Buffer list:\n"
+msgstr ""
+"\n"
+"# Хåեꥹ:\n"
+
+#, c-format
+msgid ""
+"\n"
+"# %s History (newest to oldest):\n"
+msgstr ""
+"\n"
+"# %s ܤ (ΤŤΤ):\n"
+
+msgid "Command Line"
+msgstr "ޥɥ饤"
+
+msgid "Search String"
+msgstr "ʸ"
+
+msgid "Expression"
+msgstr ""
+
+msgid "Input Line"
+msgstr "Ϲ"
+
+msgid "Debug Line"
+msgstr "ǥХå"
+
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' ǻϤޤԤΡʸ̤Υԡ:\n"
+
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s : "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr "E136: viminfo: 顼¿᤮Τǡʹߤϥåפޤ"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# Хѿ:\n"
+
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# Ǹִ줿ʸ:\n"
+"$"
+
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# Ǹ %sѥ:\n"
+"~"
+
+msgid "Substitute "
+msgstr "Substitute "
+
+msgid "Illegal register name"
+msgstr "ʥ쥸̾"
+
+msgid ""
+"\n"
+"# Registers:\n"
+msgstr ""
+"\n"
+"# 쥸:\n"
+
+#, c-format
+msgid "E574: Unknown register type %d"
+msgstr "E574: ̤ΤΥ쥸 %d Ǥ"
+
+msgid ""
+"\n"
+"# History of marks within files (newest to oldest):\n"
+msgstr ""
+"\n"
+"# եޡ (ΤŤ):\n"
+
+msgid ""
+"\n"
+"# File marks:\n"
+msgstr ""
+"\n"
+"# եޡ:\n"
+
+msgid ""
+"\n"
+"# Jumplist (newest first):\n"
+msgstr ""
+"\n"
+"# ץꥹ (Τ):\n"
+
+msgid "Missing '>'"
+msgstr "'>' Ĥޤ"
+
+msgid "Illegal starting char"
+msgstr "ƬʸǤ"
+
+#, c-format
+msgid "# This viminfo file was generated by Vim %s.\n"
+msgstr "#  viminfo ե Vim %s ˤäޤ.\n"
+
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# ѹݤˤϽʬդƤ!\n"
+"\n"
+
+msgid "# Value of 'encoding' when this file was written\n"
+msgstr "# Υե뤬񤫤줿 'encoding' \n"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "viminfoե \"%s\"%s%s%s ɹ"
+
+msgid " info"
+msgstr " "
+
+msgid " marks"
+msgstr " ޡ"
+
+msgid " oldfiles"
+msgstr " ե뷲"
+
+msgid " FAILED"
+msgstr " "
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: viminfoե뤬ߤǤޤ: %s"
+
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: viminfoե뤬¿᤮ޤ! : %s"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: viminfoե %s ¸Ǥޤ!"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "viminfoե \"%s\" "
+
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: viminfoե %s ̾ѹǤޤ!"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: viminfoեɹѤȤƳޤ"
+
 msgid "Already only one window"
 msgstr "˥ɥ1Ĥޤ"
 
@@ -6475,6 +6542,9 @@ msgstr "E92: Хåե %ld Ĥޤ"
 msgid "E441: There is no preview window"
 msgstr "E441: ץӥ塼ɥޤ"
 
+msgid "E242: Can't split a window while closing another"
+msgstr "E242: ̤ΥɥĤƤ֤ʬ䤹뤳ȤϤǤޤ"
+
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: ȱƱʬ䤹뤳ȤϤǤޤ"
 
@@ -6484,8 +6554,8 @@ msgstr "E443: ¾Υɥʬ䤵ƤˤϽǤޤ"
 msgid "E444: Cannot close last window"
 msgstr "E444: ǸΥɥĤ뤳ȤϤǤޤ"
 
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: autocmdɥĤޤ"
+msgid "E813: Cannot close autocmd or popup window"
+msgstr "E813: autocmdɥޤϥݥåץåץɥĤޤ"
 
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: autocmdɥĤʤᡢɥĤޤ"
@@ -6494,31 +6564,13 @@ msgid "E445: Other window contains chang
 msgstr "E445: ¾Υɥˤѹޤ"
 
 #, c-format
-msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E799: ̵ ID: %d (1 ʾǤʤФʤޤ)"
-
-#, c-format
-msgid "E801: ID already taken: %d"
-msgstr "E801: ID ϤǤǤ: %d"
-
-msgid "List or number required"
-msgstr "ꥹȤͤɬפǤ"
-
-#, c-format
-msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: ̵ ID: %d (1 ʾǤʤФʤޤ)"
-
-#, c-format
-msgid "E803: ID not found: %d"
-msgstr "E803: ID Ϥޤ: %d"
-
-#, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: 饤֥ %s ɤǤޤǤ"
 
 msgid "Sorry, this command is disabled: the Perl library could not be loaded."
 msgstr ""
-"Υޥɤ̵Ǥʤ: Perl饤֥ɤǤޤǤ."
+"Υޥɤ̵Ǥʤ: Perl饤֥ɤǤޤǤ"
+""
 
 msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
 msgstr ""
@@ -6620,9 +6672,6 @@ msgstr "E685: 顼Ǥ: %s"
 msgid "Interrupted"
 msgstr "ޤޤ"
 
-msgid "E14: Invalid address"
-msgstr "E14: ̵ʥɥ쥹Ǥ"
-
 msgid "E474: Invalid argument"
 msgstr "E474: ̵ʰǤ"
 
@@ -6802,6 +6851,21 @@ msgid "E45: 'readonly' option is set (ad
 msgstr "E45: 'readonly' ץꤵƤޤ (! ɲäǾ)"
 
 #, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: ̤ѿǤ: %s"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: ۤʤäѿǤ %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: ѿ̾Ǥ: %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: ¸ѿѹǤޤ"
+
+#, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: ɼѿ \"%s\" ˤͤǤޤ"
 
@@ -6809,6 +6873,9 @@ msgstr "E46: ɼѿ \"%s\" ˤͤǤޤ"
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: ɥܥåǤѿ \"%s\" ͤǤޤ"
 
+msgid "E928: String required"
+msgstr "E928: ʸɬפǤ"
+
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: 񷿤˶ΥȤȤϤǤޤ"
 
@@ -6911,6 +6978,10 @@ msgstr "E939: ΥȤɬפǤ"
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: ץȰʳ<SID>Ȥޤ"
 
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: å '(' ޤ: %s"
+
 msgid "E449: Invalid expression received"
 msgstr "E449: ̵ʼޤ"
 
@@ -6953,6 +7024,13 @@ msgstr "E952: AutocommandƵޤ"
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: ˥塼¾Υ⡼ɤˤޤ"
 
+msgid "E957: Invalid window number"
+msgstr "E957: ̵ʥɥֹǤ"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s ΰϥꥹȷǤʤФʤޤ"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "ޤǸΤDzޤ"
 
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-05 11:27+0900\n"
-"PO-Revision-Date: 2019-05-05 13:00+0900\n"
+"POT-Creation-Date: 2019-11-04 21:51+0900\n"
+"PO-Revision-Date: 2019-11-11 23:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -24,6 +24,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "E163: There is only one file to edit"
+msgstr "E163: 編集するファイルは1つしかありません"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: 最初のファイルより前には行けません"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: 最後のファイルを越えて後には行けません"
+
+msgid "E249: window layout changed unexpectedly"
+msgstr "E249: 予期せずウィンドウの配置が変わりました"
+
 msgid "--Deleted--"
 msgstr "--削除済--"
 
@@ -118,8 +130,9 @@ msgstr "E83: バッファを作成できないので、他のを使用します..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: バッファを登録できません"
 
-msgid "E937: Attempt to delete a buffer that is in use"
-msgstr "E937: 使用中のバッファを削除しようと試みました"
+#, c-format
+msgid "E937: Attempt to delete a buffer that is in use: %s"
+msgstr "E937: 使用中のバッファを削除しようと試みました: %s"
 
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 解放されたバッファはありません"
@@ -246,22 +259,157 @@ msgstr "末尾"
 msgid "Top"
 msgstr "先頭"
 
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# バッファリスト:\n"
-
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' オプションが設定されているので書込めません"
 
 msgid "[Prompt]"
 msgstr "[プロンプト]"
 
+msgid "[Popup]"
+msgstr "[ポップアップ]"
+
 msgid "[Scratch]"
 msgstr "[下書き]"
 
+msgid "WARNING: The file has been changed since reading it!!!"
+msgstr "警告: 読込んだ後にファイルに変更がありました!!!"
+
+msgid "Do you really want to write to it"
+msgstr "本当に上書きしますか"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwriteバッファの該当するautocommandは存在しません"
+
+msgid "E203: Autocommands deleted or unloaded buffer to be written"
+msgstr "E203: 保存するバッファをautocommandが削除か解放しました"
+
+msgid "E204: Autocommand changed number of lines in unexpected way"
+msgstr "E204: autocommandが予期せぬ方法で行数を変更しました"
+
+# Added at 19-Jan-2004.
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeansは未変更のバッファを上書することは許可していません"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeansバッファの一部を書き出すことはできません"
+
+msgid "is a directory"
+msgstr "はディレクトリです"
+
+msgid "is not a file or writable device"
+msgstr "はファイルでも書込み可能デバイスでもありません"
+
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "'opendevice' オプションによりデバイスへの書き込みはできません"
+
+msgid "is read-only (add ! to override)"
+msgstr "は読込専用です (強制書込には ! を追加)"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: バックアップファイルを保存できません (! を追加で強制書込)"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr ""
+"E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制書"
+"込)"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制書込)"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: バックアップファイルを作れません (! を追加で強制書込)"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: バックアップファイルを作れません (! を追加で強制書込)"
+
+msgid "E214: Can't find temp file for writing"
+msgstr "E214: 保存用一時ファイルが見つかりません"
+
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: 変換できません (! を追加で変換せずに保存)"
+
+msgid "E166: Can't open linked file for writing"
+msgstr "E166: リンクされたファイルに書込めません"
+
+msgid "E212: Can't open file for writing"
+msgstr "E212: 書込み用にファイルを開けません"
+
+msgid "E949: File changed while writing"
+msgstr "E949: 書込み中にファイルが変更されました"
+
+msgid "E512: Close failed"
+msgstr "E512: 閉じることに失敗"
+
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: 書込みエラー、変換失敗 (上書するには 'fenc' を空にしてください)"
+
+#, c-format
+msgid ""
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"override)"
+msgstr ""
+"E513: 書込みエラー、変換失敗、行数 %ld (上書するには 'fenc' を空にしてくださ"
+"い)"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: 書込みエラー (ファイルシステムが満杯?)"
+
+msgid " CONVERSION ERROR"
+msgstr " 変換エラー"
+
+#, c-format
+msgid " in line %ld;"
+msgstr " 行 %ld;"
+
+msgid "[NOT converted]"
+msgstr "[未変換]"
+
+msgid "[converted]"
+msgstr "[変換済]"
+
+msgid "[Device]"
+msgstr "[デバイス]"
+
+msgid "[New]"
+msgstr "[新]"
+
+msgid "[New File]"
+msgstr "[新ファイル]"
+
+msgid " [a]"
+msgstr " [a]"
+
+msgid " appended"
+msgstr " 追加"
+
+msgid " [w]"
+msgstr " [w]"
+
+msgid " written"
+msgstr " 書込み"
+
+msgid "E205: Patchmode: can't save original file"
+msgstr "E205: patchmode: 原本ファイルを保存できません"
+
+msgid "E206: patchmode: can't touch empty original file"
+msgstr "E206: patchmode: 空の原本ファイルをtouchできません"
+
+msgid "E207: Can't delete backup file"
+msgstr "E207: バックアップファイルを消せません"
+
+msgid ""
+"\n"
+"WARNING: Original file may be lost or damaged\n"
+msgstr ""
+"\n"
+"警告: 原本ファイルが失われたか変更されました\n"
+
+msgid "don't quit the editor until the file is successfully written!"
+msgstr "ファイルの保存に成功するまでエディタを終了しないでください!"
+
+msgid "W10: Warning: Changing a readonly file"
+msgstr "W10: 警告: 読込専用ファイルを変更します"
+
 msgid "E902: Cannot connect to port"
 msgstr "E902: ポートに接続できません"
 
@@ -284,6 +432,9 @@ msgstr "E904: call の3番目の引数はリスト型でなければなりません"
 msgid "E905: received unknown command: %s"
 msgstr "E905: 未知のコマンドを受信しました: %s"
 
+msgid "E906: not an open channel"
+msgstr "E906: 開いていないチャネルです"
+
 #, c-format
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s(): 非接続状態で書き込みました"
@@ -300,9 +451,6 @@ msgid "E912: cannot use ch_evalexpr()/ch
 msgstr ""
 "E912: raw や nl モードのチャネルに ch_evalexpr()/ch_sendexpr() は使えません"
 
-msgid "E906: not an open channel"
-msgstr "E906: 開いていないチャネルです"
-
 msgid "E920: _io file requires _name to be set"
 msgstr "E920: _io ファイルは _name の設定が必要です"
 
@@ -313,6 +461,18 @@ msgstr "E915: in_io バッファは in_buf か in_name の設定が必要です"
 msgid "E918: buffer must be loaded: %s"
 msgstr "E918: バッファがロードされてなければなりません: %s"
 
+msgid "E916: not a valid job"
+msgstr "E916: 有効なジョブではありません"
+
+msgid "tagname"
+msgstr "タグ名"
+
+msgid " kind file\n"
+msgstr " ファイル種類\n"
+
+msgid "'history' option is zero"
+msgstr "オプション 'history' がゼロです"
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: ファイルが未知の方法で暗号化されています"
 
@@ -332,7 +492,7 @@ msgid "[crypted]"
 msgstr "[暗号化]"
 
 msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
+msgstr "デバッグモードに入ります。続けるには \"cont\" と入力してください。"
 
 #, c-format
 msgid "Oldval = \"%s\""
@@ -539,45 +699,17 @@ msgstr "E105: :source で取込むファイル以外では :loadkeymap を使えません"
 msgid "E791: Empty keymap entry"
 msgstr "E791: 空のキーマップエントリ"
 
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: 予期せぬ文字が :let にありました"
-
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: 未定義の変数です: %s"
-
 msgid "E111: Missing ']'"
 msgstr "E111: ']' が見つかりません"
 
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] を辞書型と組み合わせては使えません"
 
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: 異なった型の変数です %s="
-
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: 不正な変数名です: %s"
-
 msgid "E806: using Float as a String"
 msgstr "E806: 浮動小数点数を文字列として扱っています"
 
-msgid "E985: .= is not supported with script version 2"
-msgstr "E985: .= はスクリプトバージョン 2 では対応していません"
-
-msgid "E687: Less targets than List items"
-msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"
-
-msgid "E688: More targets than List items"
-msgstr "E688: ターゲットがリスト型内の要素よりも多いです"
-
-msgid "Double ; in list of variables"
-msgstr "リスト型の値に2つ以上の ; が検出されました"
-
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: %s の値を一覧表示できません"
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274: 丸括弧の前にスペースは許されません"
 
 msgid "E689: Can only index a List, Dictionary or Blob"
 msgstr "E689: リスト型、辞書型、Blob型以外はインデックス指定できません"
@@ -591,26 +723,21 @@ msgstr "E709: [:] にはリスト型かBlob型の値が必要です"
 msgid "E972: Blob value does not have the right number of bytes"
 msgstr "E972: Blob型の値のバイト数が正しくありません"
 
+msgid "E996: Cannot lock a range"
+msgstr "E996: 範囲はロックできません"
+
 msgid "E710: List value has more items than target"
 msgstr "E710: リスト型変数にターゲットよりも多い要素があります"
 
 msgid "E711: List value has not enough items"
 msgstr "E711: リスト型変数に十分な数の要素がありません"
 
+msgid "E996: Cannot lock a list or dict"
+msgstr "E996: リストあるいは辞書はロックできません"
+
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for の後に \"in\" がありません"
 
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: その変数はありません: \"%s\""
-
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: 変数 %s はロックまたはアンロックできません"
-
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: (アン)ロックするには変数の入れ子が深過ぎます"
-
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' の後に ':' がありません"
 
@@ -623,6 +750,9 @@ msgstr "E973: Blobリテラルは偶数個の16進数文字でなければなりません"
 msgid "E110: Missing ')'"
 msgstr "E110: ')' が見つかりません"
 
+msgid "E260: Missing name after ->"
+msgstr "E260: -> の後に名前がありません"
+
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: 関数参照型はインデックスできません"
 
@@ -712,45 +842,11 @@ msgstr "E976: Blob型を文字列として扱っています"
 msgid "E908: using an invalid value as a String"
 msgstr "E908: 無効な値を文字列として扱っています"
 
-#, c-format
-msgid "E963: setting %s to value with wrong type"
-msgstr "E963: %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: 関数参照型変数名は大文字で始まらなければなりません: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: 変数名が既存の関数名と衝突します: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: 値がロックされています: %s"
-
-msgid "Unknown"
-msgstr "不明"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s の値を変更できません"
-
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
 
 msgid ""
 "\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# グローバル変数:\n"
-
-msgid ""
-"\n"
 "\tLast set from "
 msgstr ""
 "\n"
@@ -777,39 +873,13 @@ msgstr "E736: 辞書型には無効な操作です"
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: 関数参照型には無効な操作です"
 
-msgid "map() argument"
-msgstr "map() の引数"
-
-msgid "filter() argument"
-msgstr "filter() の引数"
-
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s の引数はリスト型でなければなりません"
-
-#, c-format
-msgid "E899: Argument of %s must be a List or Blob"
-msgstr "E899: %s の引数はリスト型またはBlob型でなければなりません"
-
-msgid "E928: String required"
-msgstr "E928: 文字列が必要です"
-
-msgid "E957: Invalid window number"
-msgstr "E957: 無効なウィンドウ番号です"
-
 msgid "E808: Number or Float required"
 msgstr "E808: 数値か浮動小数点数が必要です"
 
-msgid "add() argument"
-msgstr "add() の引数"
-
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 無効なバッファ名です: %s"
 
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() は挿入モードでしか利用できません"
-
 msgid "&Ok"
 msgstr "&Ok"
 
@@ -817,11 +887,6 @@ msgid "E980: lowlevel input not supporte
 msgstr "E980: 低レベル入力はサポートされていません"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld 行: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: 未知の関数です: %s"
 
@@ -841,31 +906,18 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() が inputsave() よりも多く呼ばれました"
 
-msgid "insert() argument"
-msgstr "insert() の引数"
-
 msgid "E786: Range not allowed"
 msgstr "E786: 範囲指定は許可されていません"
 
-msgid "E916: not a valid job"
-msgstr "E916: 有効なジョブではありません"
-
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() には無効な型です"
 
-#, c-format
-msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ID は \":match\" のために予約されています: %d"
-
 msgid "E726: Stride is zero"
 msgstr "E726: ストライド(前進量)が 0 です"
 
 msgid "E727: Start past end"
 msgstr "E727: 開始位置が終了位置を越えました"
 
-msgid "<empty>"
-msgstr "<空>"
-
 msgid "E240: No connection to the X server"
 msgstr "E240: X サーバーへの接続がありません"
 
@@ -882,39 +934,13 @@ msgstr "E941: サーバーはすでに開始しています"
 msgid "E942: +clientserver feature not available"
 msgstr "E942: +clientserver 機能が無効になっています"
 
-msgid "remove() argument"
-msgstr "remove() の引数"
-
-# Added at 10-Mar-2004.
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
-
-msgid "reverse() argument"
-msgstr "reverse() の引数"
-
 msgid "E258: Unable to send to client"
 msgstr "E258: クライアントへ送ることができません"
 
 #, c-format
-msgid "E927: Invalid action: '%s'"
-msgstr "E927: 無効な操作です: '%s'"
-
-#, c-format
 msgid "E962: Invalid action: '%s'"
 msgstr "E962: 無効な操作です: '%s'"
 
-msgid "sort() argument"
-msgstr "sort() の引数"
-
-msgid "uniq() argument"
-msgstr "uniq() の引数"
-
-msgid "E702: Sort compare function failed"
-msgstr "E702: ソートの比較関数が失敗しました"
-
-msgid "E882: Uniq compare function failed"
-msgstr "E882: Uniq の比較関数が失敗しました"
-
 msgid "(Invalid)"
 msgstr "(無効)"
 
@@ -922,8 +948,84 @@ msgstr "(無効)"
 msgid "E935: invalid submatch number: %d"
 msgstr "E935: 無効なサブマッチ番号です: %d"
 
-msgid "E677: Error writing temp file"
-msgstr "E677: 一時ファイル書込中にエラーが発生しました"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: 予期せぬ文字が :let にありました"
+
+msgid "E991: cannot use =<< here"
+msgstr "E991: ここでは =<< は使えません"
+
+msgid "E221: Marker cannot start with lower case letter"
+msgstr "E221: マーカーは英小文字で始まってはいけません"
+
+msgid "E172: Missing marker"
+msgstr "E172: マーカーがありません"
+
+#, c-format
+msgid "E990: Missing end marker '%s'"
+msgstr "E990: 終端マーカーがありません '%s'"
+
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= はスクリプトバージョン 2 では対応していません"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"
+
+msgid "E688: More targets than List items"
+msgstr "E688: ターゲットがリスト型内の要素よりも多いです"
+
+msgid "Double ; in list of variables"
+msgstr "リスト型の値に2つ以上の ; が検出されました"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s の値を一覧表示できません"
+
+msgid "E996: Cannot lock an environment variable"
+msgstr "E996: 環境変数はロックできません"
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: オプションはロックできません"
+
+msgid "E996: Cannot lock a register"
+msgstr "E996: レジスタはロックできません"
+
+#, c-format
+msgid "E108: No such variable: \"%s\""
+msgstr "E108: その変数はありません: \"%s\""
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: 変数 %s はロックまたはアンロックできません"
+
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (アン)ロックするには変数の入れ子が深過ぎます"
+
+#, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: %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: 関数参照型変数名は大文字で始まらなければなりません: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: 変数名が既存の関数名と衝突します: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: 値がロックされています: %s"
+
+msgid "Unknown"
+msgstr "不明"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s の値を変更できません"
 
 msgid "E921: Invalid callback argument"
 msgstr "E921: 無効なコールバック引数です"
@@ -970,73 +1072,6 @@ msgstr "E135: *フィルタ* autocommandは現在のバッファを変更してはいけません"
 msgid "[No write since last change]\n"
 msgstr "[最後の変更が保存されていません]\n"
 
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s 行目: "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: エラーが多過ぎるので、以降はスキップします"
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "viminfoファイル \"%s\"%s%s%s を読込み中"
-
-msgid " info"
-msgstr " 情報"
-
-msgid " marks"
-msgstr " マーク"
-
-msgid " oldfiles"
-msgstr " 旧ファイル群"
-
-msgid " FAILED"
-msgstr " 失敗"
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: viminfoファイルが書込みできません: %s"
-
-#, c-format
-msgid "E929: Too many viminfo temp files, like %s!"
-msgstr "E929: 一時viminfoファイルが多過ぎます! 例: %s"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: viminfoファイル %s を保存できません!"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "viminfoファイル \"%s\" を書込み中"
-
-#, c-format
-msgid "E886: Can't rename viminfo file to %s!"
-msgstr "E886: viminfoファイルを %s へ名前変更できません!"
-
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# この viminfo ファイルは Vim %s によって生成されました.\n"
-
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# 変更する際には十分注意してください!\n"
-"\n"
-
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# このファイルが書かれた時の 'encoding' の値\n"
-
-msgid "Illegal starting char"
-msgstr "不正な先頭文字です"
-
-msgid ""
-"\n"
-"# Bar lines, copied verbatim:\n"
-msgstr ""
-"\n"
-"# '|' で始まる行の、文字通りのコピー:\n"
-
 msgid "Save As"
 msgstr "別名で保存"
 
@@ -1052,7 +1087,7 @@ 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)"
@@ -1144,15 +1179,6 @@ msgstr "パターンが全ての行で見つかりました: %s"
 msgid "Pattern not found: %s"
 msgstr "パターンは見つかりませんでした: %s"
 
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# 最後に置換された文字列:\n"
-"$"
-
 msgid "E478: Don't panic!"
 msgstr "E478: 慌てないでください"
 
@@ -1196,9 +1222,6 @@ msgstr "E150: ディレクトリではありません: %s"
 msgid "No old files"
 msgstr "古いファイルはありません"
 
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: 初めに \":profile start {fname}\" を実行してください"
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "変更を \"%s\" に保存しますか?"
@@ -1214,32 +1237,11 @@ msgstr "E162: バッファ \"%s\" の変更は保存されていません"
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "警告: 予期せず他バッファへ移動しました (autocommands を調べてください)"
 
-msgid "E163: There is only one file to edit"
-msgstr "E163: 編集するファイルは1つしかありません"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: 最初のファイルより前には行けません"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: 最後のファイルを越えて後には行けません"
-
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: そのコンパイラには対応していません: %s"
 
 #, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "\"%s\" を \"%s\" から検索中"
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "\"%s\" を検索中"
-
-#, c-format
-msgid "not found in '%s': \"%s\""
-msgstr "'%s' の中にはありません: \"%s\""
-
-#, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr "W20: 要求されたpython 2.xは対応していません、ファイルを無視します: %s"
 
@@ -1247,68 +1249,6 @@ msgstr "W20: 要求されたpython 2.xは対応していません、ファイルを無視します: %s"
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
 msgstr "W21: 要求されたpython 3.xは対応していません、ファイルを無視します: %s"
 
-msgid "Source Vim script"
-msgstr "Vimスクリプトの取込み"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "ディレクトリは取込めません: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "\"%s\" を取込めません"
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "行 %ld: \"%s\" を取込めません"
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "\"%s\" を取込中"
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "行 %ld: %s を取込中"
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "%s の取込を完了"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s の実行を継続中です"
-
-msgid "modeline"
-msgstr "モード行"
-
-msgid "--cmd argument"
-msgstr "--cmd 引数"
-
-msgid "-c argument"
-msgstr "-c 引数"
-
-msgid "environment variable"
-msgstr "環境変数"
-
-msgid "error handler"
-msgstr "エラーハンドラ"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: 警告: 行区切が不正です. ^M がないのでしょう"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding が取込スクリプト以外で使用されました"
-
-msgid "E984: :scriptversion used outside of a sourced file"
-msgstr "E984: :scriptversion が取込スクリプト以外で使用されました"
-
-#, c-format
-msgid "E999: scriptversion not supported: %d"
-msgstr "E999: scriptversion はサポートされていません: %d"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish が取込スクリプト以外で使用されました"
-
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "現在の %s言語: \"%s\""
@@ -1319,11 +1259,15 @@ msgstr "E197: 言語を \"%s\" に設定できません"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr ""
-"Exモードに入ります. ノーマルモードに戻るには\"visual\"と入力してください."
+"Exモードに入ります。ノーマルモードに戻るには\"visual\"と入力してください。"
 
 msgid "E501: At end-of-file"
 msgstr "E501: ファイルの終了位置"
 
+#, c-format
+msgid "Executing: %s"
+msgstr "実行中: %s"
+
 msgid "E169: Command too recursive"
 msgstr "E169: コマンドが再帰的過ぎます"
 
@@ -1356,10 +1300,10 @@ msgid "E494: Use w or w>>"
 msgstr "E494: w もしくは w>> を使用してください"
 
 msgid ""
-"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
-msgstr ""
-"内部エラー: DFLALL を ADDR_NONE, ADDR_UNSIGNED や ADDR_QUICKFIX とともに使う"
-"ことはできません"
+"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"内部エラー: EX_DFLALL を ADDR_NONE, ADDR_UNSIGNED や ADDR_QUICKFIX とともに使"
+"うことはできません"
 
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
@@ -1442,15 +1386,6 @@ msgstr "E930: execute() の中では :redir は使えません"
 msgid "Save Redirection"
 msgstr "リダイレクトを保存します"
 
-msgid "Save View"
-msgstr "ビューを保存します"
-
-msgid "Save Session"
-msgstr "セッション情報を保存します"
-
-msgid "Save Setup"
-msgstr "設定を保存します"
-
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: ディレクトリを作成できません: %s"
@@ -1501,9 +1436,6 @@ msgstr ""
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: 空文字列として評価されました"
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: viminfoファイルを読込用として開けません"
-
 msgid "Untitled"
 msgstr "無題"
 
@@ -1617,38 +1549,6 @@ msgstr "E788: 現在は他のバッファを編集することは許されません"
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: 現在はバッファ情報を変更することは許されません"
 
-msgid "tagname"
-msgstr "タグ名"
-
-msgid " kind file\n"
-msgstr " ファイル種類\n"
-
-msgid "'history' option is zero"
-msgstr "オプション 'history' がゼロです"
-
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s 項目の履歴 (新しいものから古いものへ):\n"
-
-msgid "Command Line"
-msgstr "コマンドライン"
-
-msgid "Search String"
-msgstr "検索文字列"
-
-msgid "Expression"
-msgstr "式"
-
-msgid "Input Line"
-msgstr "入力行"
-
-msgid "Debug Line"
-msgstr "デバッグ行"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: アクティブなウィンドウかバッファが削除されました"
 
@@ -1658,18 +1558,12 @@ msgstr "E812: autocommandがバッファかバッファ名を変更しました"
 msgid "Illegal file name"
 msgstr "不正なファイル名"
 
-msgid "is a directory"
-msgstr "はディレクトリです"
-
 msgid "is not a file"
 msgstr "はファイルではありません"
 
 msgid "is a device (disabled with 'opendevice' option)"
 msgstr "はデバイスです ('opendevice' オプションで回避できます)"
 
-msgid "[New File]"
-msgstr "[新ファイル]"
-
 msgid "[New DIRECTORY]"
 msgstr "[新規ディレクトリ]"
 
@@ -1709,12 +1603,6 @@ msgstr "[CR無]"
 msgid "[long lines split]"
 msgstr "[長行分割]"
 
-msgid "[NOT converted]"
-msgstr "[未変換]"
-
-msgid "[converted]"
-msgstr "[変換済]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[%ld 行目で変換エラー]"
@@ -1735,124 +1623,6 @@ msgstr "'charconvert' による変換が失敗しました"
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' の出力を読込めませんでした"
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: acwriteバッファの該当するautocommandは存在しません"
-
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: 保存するバッファをautocommandが削除か解放しました"
-
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: autocommandが予期せぬ方法で行数を変更しました"
-
-# Added at 19-Jan-2004.
-msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeansは未変更のバッファを上書することは許可していません"
-
-msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "NetBeansバッファの一部を書き出すことはできません"
-
-msgid "is not a file or writable device"
-msgstr "はファイルでも書込み可能デバイスでもありません"
-
-msgid "writing to device disabled with 'opendevice' option"
-msgstr "'opendevice' オプションによりデバイスへの書き込みはできません"
-
-msgid "is read-only (add ! to override)"
-msgstr "は読込専用です (強制書込には ! を追加)"
-
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: バックアップファイルを保存できません (! を追加で強制書込)"
-
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr ""
-"E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制書"
-"込)"
-
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制書込)"
-
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: バックアップファイルを作れません (! を追加で強制書込)"
-
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: バックアップファイルを作れません (! を追加で強制書込)"
-
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: 保存用一時ファイルが見つかりません"
-
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: 変換できません (! を追加で変換せずに保存)"
-
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: リンクされたファイルに書込めません"
-
-msgid "E212: Can't open file for writing"
-msgstr "E212: 書込み用にファイルを開けません"
-
-msgid "E949: File changed while writing"
-msgstr "E949: 書込み中にファイルが変更されました"
-
-msgid "E512: Close failed"
-msgstr "E512: 閉じることに失敗"
-
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: 書込みエラー、変換失敗 (上書するには 'fenc' を空にしてください)"
-
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: 書込みエラー、変換失敗、行数 %ld (上書するには 'fenc' を空にしてくださ"
-"い)"
-
-msgid "E514: write error (file system full?)"
-msgstr "E514: 書込みエラー (ファイルシステムが満杯?)"
-
-msgid " CONVERSION ERROR"
-msgstr " 変換エラー"
-
-#, c-format
-msgid " in line %ld;"
-msgstr " 行 %ld;"
-
-msgid "[Device]"
-msgstr "[デバイス]"
-
-msgid "[New]"
-msgstr "[新]"
-
-msgid " [a]"
-msgstr " [a]"
-
-msgid " appended"
-msgstr " 追加"
-
-msgid " [w]"
-msgstr " [w]"
-
-msgid " written"
-msgstr " 書込み"
-
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: patchmode: 原本ファイルを保存できません"
-
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patchmode: 空の原本ファイルをtouchできません"
-
-msgid "E207: Can't delete backup file"
-msgstr "E207: バックアップファイルを消せません"
-
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"警告: 原本ファイルが失われたか変更されました\n"
-
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "ファイルの保存に成功するまでエディタを終了しないでください!"
-
 msgid "[dos]"
 msgstr "[dos]"
 
@@ -1887,12 +1657,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[最終行が不完全]"
 
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "警告: 読込んだ後にファイルに変更がありました!!!"
-
-msgid "Do you really want to write to it"
-msgstr "本当に上書きしますか"
-
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" を書込み中のエラーです"
@@ -1958,10 +1722,29 @@ msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" はリロードできませんでした"
 
 msgid "E219: Missing {."
-msgstr "E219: { がありません."
+msgstr "E219: { がありません。"
 
 msgid "E220: Missing }."
-msgstr "E220: } がありません."
+msgstr "E220: } がありません。"
+
+msgid "<empty>"
+msgstr "<空>"
+
+# Added at 10-Mar-2004.
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
+
+msgid "Select Directory dialog"
+msgstr "ディレクトリ選択ダイアログ"
+
+msgid "Save File dialog"
+msgstr "ファイル保存ダイアログ"
+
+msgid "Open File dialog"
+msgstr "ファイル読込ダイアログ"
+
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: コンソールモードではファイルブラウザを使えません、ごめんなさい"
 
 msgid "E854: path too long for completion"
 msgstr "E854: パスが長過ぎて補完できません"
@@ -1972,7 +1755,7 @@ msgid ""
 "followed by '%s'."
 msgstr ""
 "E343: 無効なパスです: '**[数値]' はpathの最後か '%s' が続いてないといけませ"
-"ん."
+"ん。"
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
@@ -2011,37 +1794,17 @@ msgid "+--%3ld line folded "
 msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld 行が折畳まれました"
 
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld 行: "
+
 msgid "E222: Add to read buffer"
 msgstr "E222: 読込バッファへ追加"
 
 msgid "E223: recursive mapping"
 msgstr "E223: 再帰的マッピング"
 
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s というグローバル短縮入力は既に存在します"
-
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s というグローバルマッピングは既に存在します"
-
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s という短縮入力は既に存在します"
-
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: %s というマッピングは既に存在します"
-
-msgid "No abbreviation found"
-msgstr "短縮入力は見つかりませんでした"
-
-msgid "No mapping found"
-msgstr "マッピングは見つかりませんでした"
-
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: 不正なモード"
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: GUI用のプロセスの起動に失敗しました"
 
@@ -2094,7 +1857,7 @@ msgid "Cancel"
 msgstr "キャンセル"
 
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "スクロールバー: 画像を取得できませんでした."
+msgstr "スクロールバー: 画像を取得できませんでした。"
 
 msgid "Vim dialog"
 msgstr "Vim ダイアログ"
@@ -2243,7 +2006,7 @@ msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
+msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください。"
 
 msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
 msgstr "E988: GUIは使用不可能です。gvim.exeを起動できません。"
@@ -2378,14 +2141,16 @@ msgid "E621: \"%s\" resource file has wr
 msgstr "E621: リソースファイル \"%s\" はバージョンが異なります"
 
 msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: 互換性の無いマルチバイトエンコーディングと文字セットです"
+msgstr "E673: 互換性の無いマルチバイトエンコーディングと文字セットです。"
 
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: マルチバイトエンコーディングでは printmbcharset を空にできません"
+msgstr ""
+"E674: マルチバイトエンコーディングでは printmbcharset を空にできません。"
 
 msgid "E675: No default font specified for multi-byte printing."
 msgstr ""
-"E675: マルチバイト文字を印刷するためのデフォルトフォントが指定されていません"
+"E675: マルチバイト文字を印刷するためのデフォルトフォントが指定されていませ"
+"ん。"
 
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript出力用のファイルを開けません"
@@ -2415,7 +2180,94 @@ msgid "E365: Failed to print PostScript 
 msgstr "E365: PostScriptファイルの印刷に失敗しました"
 
 msgid "Print job sent."
-msgstr "印刷ジョブを送信しました."
+msgstr "印刷ジョブを送信しました。"
+
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim の再帰呼び出しを検出しました"
+
+#, c-format
+msgid "E411: highlight group not found: %s"
+msgstr "E411: ハイライトグループが見つかりません: %s"
+
+#, c-format
+msgid "E412: Not enough arguments: \":highlight link %s\""
+msgstr "E412: 引数が充分ではない: \":highlight link %s\""
+
+#, c-format
+msgid "E413: Too many arguments: \":highlight link %s\""
+msgstr "E413: 引数が多過ぎます: \":highlight link %s\""
+
+msgid "E414: group has settings, highlight link ignored"
+msgstr "E414: グループが設定されているのでハイライトリンクは無視されます"
+
+#, c-format
+msgid "E415: unexpected equal sign: %s"
+msgstr "E415: 予期せぬ等号です: %s"
+
+#, c-format
+msgid "E416: missing equal sign: %s"
+msgstr "E416: 等号がありません: %s"
+
+#, c-format
+msgid "E417: missing argument: %s"
+msgstr "E417: 引数がありません: %s"
+
+#, c-format
+msgid "E418: Illegal value: %s"
+msgstr "E418: 不正な値です: %s"
+
+msgid "E419: FG color unknown"
+msgstr "E419: 未知の前景色です"
+
+msgid "E420: BG color unknown"
+msgstr "E420: 未知の背景色です"
+
+#, c-format
+msgid "E421: Color name or number not recognized: %s"
+msgstr "E421: カラー名や番号を認識できません: %s"
+
+#, c-format
+msgid "E422: terminal code too long: %s"
+msgstr "E422: 終端コードが長過ぎます: %s"
+
+#, c-format
+msgid "E423: Illegal argument: %s"
+msgstr "E423: 不正な引数です: %s"
+
+msgid "E424: Too many different highlighting attributes in use"
+msgstr "E424: 多くの異なるハイライト属性が使われ過ぎています"
+
+msgid "E669: Unprintable character in group name"
+msgstr "E669: グループ名に印刷不可能な文字があります"
+
+msgid "W18: Invalid character in group name"
+msgstr "W18: グループ名に不正な文字があります"
+
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: ハイライトと構文グループが多過ぎます"
+
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: 無効な ID: %d (1 以上でなければなりません)"
+
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID はすでに利用中です: %d"
+
+msgid "List or number required"
+msgstr "リストか数値が必要です"
+
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: 無効な ID: %d (1 以上でなければなりません)"
+
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ID はありません: %d"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID は \":match\" のために予約されています: %d"
 
 msgid "Add a new database"
 msgstr "新データベースを追加"
@@ -2581,7 +2433,7 @@ msgid " # pid    database name          
 msgstr " # pid    データベース名                      prepend パス\n"
 
 msgid "Lua library cannot be loaded."
-msgstr "Luaライブラリをロードできません."
+msgstr "Luaライブラリをロードできません。"
 
 msgid "cannot save undo information"
 msgstr "アンドゥ情報が保存できません"
@@ -2589,14 +2441,14 @@ msgstr "アンドゥ情報が保存できません"
 msgid ""
 "E815: Sorry, this command is disabled, the MzScheme libraries could not be "
 "loaded."
-msgstr "E815: このコマンドは無効です. MzScheme ライブラリをロードできません."
+msgstr "E815: このコマンドは無効です。MzScheme ライブラリをロードできません。"
 
 msgid ""
 "E895: Sorry, this command is disabled, the MzScheme's racket/base module "
 "could not be loaded."
 msgstr ""
-"E895: このコマンドは無効です、ごめんなさい. MzScheme の racket/base モジュー"
-"ルがロードできませんでした."
+"E895: このコマンドは無効です、ごめんなさい。MzScheme の racket/base モジュー"
+"ルがロードできませんでした。"
 
 msgid "invalid expression"
 msgstr "無効な式です"
@@ -2657,14 +2509,14 @@ msgid ""
 "loaded."
 msgstr ""
 "E263: このコマンドは無効です、ごめんなさい: Pythonライブラリをロードできませ"
-"んでした."
+"んでした。"
 
 msgid ""
 "E887: Sorry, this command is disabled, the Python's site module could not be "
 "loaded."
 msgstr ""
-"E887: このコマンドは無効です、ごめんなさい. Python の site モジュールをロード"
-"できませんでした."
+"E887: このコマンドは無効です、ごめんなさい。Python の site モジュールをロード"
+"できませんでした。"
 
 # Added at 07-Feb-2004.
 msgid "E659: Cannot invoke Python recursively"
@@ -2680,7 +2532,7 @@ msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: このコマンドは無効です、ごめんなさい: Rubyライブラリをロードできません"
-"でした."
+"でした。"
 
 msgid "E267: unexpected return"
 msgstr "E267: 予期せぬ return です"
@@ -2766,7 +2618,7 @@ msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
 "E571: このコマンドは無効です、ごめんなさい: Tclライブラリをロードできませんで"
-"した."
+"した。"
 
 #, c-format
 msgid "E572: exit code %d"
@@ -2786,7 +2638,16 @@ msgid "E573: Invalid server id used: %s"
 msgstr "E573: 無効なサーバーIDが使われました: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
+msgstr "E251: VIM 実体の登録プロパティが不正です。消去しました!"
+
+#, c-format
+msgid "%ld lines to indent... "
+msgstr "%ld 行がインデントされます... "
+
+#, c-format
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld 行をインデントしました "
 
 msgid " Keyword completion (^N^P)"
 msgstr " キーワード補完 (^N^P)"
@@ -2855,12 +2716,15 @@ msgstr " (挿入) スクロール(^E/^Y)"
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (置換) スクロール (^E/^Y)"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() は挿入モードでしか利用できません"
+
 #, c-format
 msgid "Scanning: %s"
 msgstr "スキャン中: %s"
 
 msgid "Scanning tags."
-msgstr "タグをスキャン中."
+msgstr "タグをスキャン中。"
 
 msgid "match in file"
 msgstr "ファイル内のマッチ"
@@ -2893,6 +2757,10 @@ msgid "E938: Duplicate key in JSON: \"%s
 msgstr "E938: JSONに重複キーがあります: \"%s\""
 
 #, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: %s の引数はリスト型またはBlob型でなければなりません"
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: リスト型にカンマがありません: %s"
 
@@ -2900,6 +2768,36 @@ msgstr "E696: リスト型にカンマがありません: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: リスト型の最後に ']' がありません: %s"
 
+msgid "sort() argument"
+msgstr "sort() の引数"
+
+msgid "uniq() argument"
+msgstr "uniq() の引数"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: ソートの比較関数が失敗しました"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq の比較関数が失敗しました"
+
+msgid "map() argument"
+msgstr "map() の引数"
+
+msgid "filter() argument"
+msgstr "filter() の引数"
+
+msgid "add() argument"
+msgstr "add() の引数"
+
+msgid "insert() argument"
+msgstr "insert() の引数"
+
+msgid "remove() argument"
+msgstr "remove() の引数"
+
+msgid "reverse() argument"
+msgstr "reverse() の引数"
+
 msgid "Unknown option argument"
 msgstr "未知のオプション引数です"
 
@@ -2929,7 +2827,7 @@ msgid "'-nb' cannot be used: not enabled
 msgstr "'-nb' 使用不可能です: コンパイル時に無効にされています\n"
 
 msgid "This Vim was not compiled with the diff feature."
-msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
+msgstr "このVimにはdiff機能がありません(コンパイル時設定)。"
 
 msgid "Attempt to open script file again: \""
 msgstr "スクリプトファイルを再び開こうとしました: \""
@@ -3307,7 +3205,7 @@ msgid ": Send failed.\n"
 msgstr ": 送信に失敗しました.\n"
 
 msgid ": Send failed. Trying to execute locally\n"
-msgstr ": 送信に失敗しました. ローカルでの実行を試みています\n"
+msgstr ": 送信に失敗しました。ローカルでの実行を試みています\n"
 
 #, c-format
 msgid "%d of %d edited"
@@ -3319,6 +3217,39 @@ msgstr "ディスプレイがありません: 式の送信に失敗しました.\n"
 msgid ": Send expression failed.\n"
 msgstr ": 式の送信に失敗しました.\n"
 
+#, c-format
+msgid "E224: global abbreviation already exists for %s"
+msgstr "E224: %s というグローバル短縮入力は既に存在します"
+
+#, c-format
+msgid "E225: global mapping already exists for %s"
+msgstr "E225: %s というグローバルマッピングは既に存在します"
+
+#, c-format
+msgid "E226: abbreviation already exists for %s"
+msgstr "E226: %s という短縮入力は既に存在します"
+
+#, c-format
+msgid "E227: mapping already exists for %s"
+msgstr "E227: %s というマッピングは既に存在します"
+
+msgid "No abbreviation found"
+msgstr "短縮入力は見つかりませんでした"
+
+msgid "No mapping found"
+msgstr "マッピングは見つかりませんでした"
+
+msgid "E228: makemap: Illegal mode"
+msgstr "E228: makemap: 不正なモード"
+
+#, c-format
+msgid "E357: 'langmap': Matching character missing for %s"
+msgstr "E357: 'langmap': %s に対応する文字がありません"
+
+#, c-format
+msgid "E358: 'langmap': Extra characters after semicolon: %s"
+msgstr "E358: 'langmap': セミコロンの後に余分な文字があります: %s"
+
 msgid "No marks set"
 msgstr "マークが設定されていません"
 
@@ -3347,30 +3278,6 @@ msgstr ""
 "\n"
 "変更     行   列 テキスト"
 
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# ファイルマーク:\n"
-
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# ジャンプリスト (新しいものが先):\n"
-
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# ファイル内マークの履歴 (新しいものから古いもの):\n"
-
-msgid "Missing '>'"
-msgstr "'>' が見つかりません"
-
 msgid "E543: Not a valid codepage"
 msgstr "E543: 無効なコードページです"
 
@@ -3454,7 +3361,7 @@ msgid ""
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"恐らく変更がされていないかVimがスワップファイルを更新していません."
+"恐らく変更がされていないかVimがスワップファイルを更新していません。"
 
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vimのこのバージョンでは使用できません.\n"
@@ -3477,7 +3384,7 @@ msgid ""
 "or the file has been damaged."
 msgstr ""
 ",\n"
-"もしくはファイルが損傷しています."
+"もしくはファイルが損傷しています。"
 
 #, c-format
 msgid ""
@@ -3515,7 +3422,7 @@ msgid ""
 "enter the new crypt key."
 msgstr ""
 "\n"
-"新しい暗号キーを入力してください."
+"新しい暗号キーを入力してください。"
 
 msgid ""
 "\n"
@@ -3529,7 +3436,7 @@ msgid ""
 "to use the same key for text file and swap file"
 msgstr ""
 "\n"
-"スワップファイルに同じ暗号キーを使うためにenterだけを押してください."
+"スワップファイルに同じ暗号キーを使うためにenterだけを押してください。"
 
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
@@ -3575,7 +3482,7 @@ msgid "See \":help E312\" for more infor
 msgstr "詳細は \":help E312\" を参照してください"
 
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "リカバリが終了しました. 全てが正しいかチェックしてください."
+msgstr "リカバリが終了しました。全てが正しいかチェックしてください。"
 
 msgid ""
 "\n"
@@ -3588,7 +3495,7 @@ msgid "and run diff with the original fi
 msgstr "原本ファイルとの diff を実行すると良いでしょう)"
 
 msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "復元完了. バッファの内容はファイルと同じになりました."
+msgstr "復元完了。バッファの内容はファイルと同じになりました。"
 
 msgid ""
 "\n"
@@ -3617,6 +3524,9 @@ msgstr "   ディレクトリ "
 msgid "      -- none --\n"
 msgstr "      -- なし --\n"
 
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%Y/%m/%d (%a) %H:%M:%S"
+
 msgid "          owned by: "
 msgstr "            所有者: "
 
@@ -3709,8 +3619,8 @@ msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: 無効なlnumです: %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: 行 %ld を見つけられません"
+msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get: 行 %ld をバッファ %d %s 内に見つけられません"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ポインタブロックのIDが間違っています 3"
@@ -3781,10 +3691,10 @@ msgid ""
 "    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
-"(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
+"(1) 別のプログラムが同じファイルを編集しているかもしれません。\n"
 "    この場合には、変更をしてしまうと1つのファイルに対して異なる2つの\n"
-"    インスタンスができてしまうので、そうしないように気をつけてください.\n"
-"    終了するか、注意しながら続けてください.\n"
+"    インスタンスができてしまうので、そうしないように気をつけてください。\n"
+"    終了するか、注意しながら続けてください。\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) このファイルの編集セッションがクラッシュした.\n"
@@ -3955,18 +3865,6 @@ msgstr ""
 "全て放棄(&D)\n"
 "キャンセル(&C)"
 
-msgid "Select Directory dialog"
-msgstr "ディレクトリ選択ダイアログ"
-
-msgid "Save File dialog"
-msgstr "ファイル保存ダイアログ"
-
-msgid "Open File dialog"
-msgstr "ファイル読込ダイアログ"
-
-msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: コンソールモードではファイルブラウザを使えません、ごめんなさい"
-
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() の引数が不十分です"
 
@@ -3976,9 +3874,6 @@ msgstr "E807: printf() の引数には浮動小数点数が期待されています"
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() の引数が多過ぎます"
 
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: 警告: 読込専用ファイルを変更します"
-
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "番号と<Enter>を入力するかマウスでクリックしてください (空でキャンセル): "
@@ -4002,6 +3897,14 @@ msgstr " (割込まれました)"
 msgid "Beep!"
 msgstr "ビーッ!"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: 一時ファイル書込中にエラーが発生しました"
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld 秒経過しています"
+
 msgid "ERROR: "
 msgstr "エラー: "
 
@@ -4021,12 +3924,8 @@ msgstr ""
 "[呼出] 総 re/malloc() 回数 %lu, 総 free() 回数 %lu\n"
 "\n"
 
-msgid "E340: Line is becoming too long"
-msgstr "E340: 行が長くなり過ぎました"
-
-#, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: 内部エラー: lalloc(%ld,)"
+msgid "E341: Internal error: lalloc(0, )"
+msgstr "E341: 内部エラー: lalloc(0, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4073,12 +3972,6 @@ msgstr "E505: %s は読込専用です (強制書込には ! を追加)"
 msgid "E349: No identifier under cursor"
 msgstr "E349: カーソルの位置には識別子がありません"
 
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' オプションが空です"
-
-msgid "E775: Eval feature not available"
-msgstr "E775: 式評価機能が無効になっています"
-
 msgid "Warning: terminal cannot highlight"
 msgstr "警告: 使用している端末はハイライトできません"
 
@@ -4115,18 +4008,6 @@ msgid "%ld lines %sed %d time"
 msgid_plural "%ld lines %sed %d times"
 msgstr[0] "%ld 行が %s で %d 回処理されました"
 
-#, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld 行がインデントされます... "
-
-#, c-format
-msgid "%ld line indented "
-msgid_plural "%ld lines indented "
-msgstr[0] "%ld 行をインデントしました "
-
-msgid "E748: No previously used register"
-msgstr "E748: まだレジスタを使用していません"
-
 msgid "cannot yank; delete anyway"
 msgstr "ヤンクできません; とにかく消去"
 
@@ -4136,54 +4017,6 @@ msgid_plural "%ld lines changed"
 msgstr[0] "%ld 行が変更されました"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "%ld 行を解放中"
-
-#, c-format
-msgid " into \"%c"
-msgstr " \"%c に"
-
-#, c-format
-msgid "block of %ld line yanked%s"
-msgid_plural "block of %ld lines yanked%s"
-msgstr[0] "%ld 行のブロックが%sヤンクされました"
-
-#, c-format
-msgid "%ld line yanked%s"
-msgid_plural "%ld lines yanked%s"
-msgstr[0] "%ld 行が%sヤンクされました"
-
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: レジスタ %s には何もありません"
-
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- レジスタ ---"
-
-msgid "Illegal register name"
-msgstr "不正なレジスタ名"
-
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# レジスタ:\n"
-
-#, c-format
-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: 検索パターンと式レジスタには2行以上を含められません"
-
-#, c-format
 msgid "%ld Cols; "
 msgstr "%ld 列; "
 
@@ -4214,8 +4047,11 @@ msgstr ""
 msgid "(+%lld for BOM)"
 msgstr "(+%lld for BOM)"
 
-msgid "Thanks for flying Vim"
-msgstr "Vim を使ってくれてありがとう"
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' オプションが空です"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: 式評価機能が無効になっています"
 
 msgid "E518: Unknown option"
 msgstr "E518: 未知のオプションです"
@@ -4226,6 +4062,9 @@ msgstr "E519: オプションはサポートされていません"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline では許可されません"
 
+msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
+msgstr "E992: 'modelineexpr' がオフの時 modeline では許可されません"
+
 msgid "E846: Key code not set"
 msgstr "E846: キーコードが設定されていません"
 
@@ -4235,6 +4074,66 @@ msgstr "E521: = の後には数字が必要です"
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap 内に見つかりません"
 
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: 実行中のジョブがある端末は変更可能にできません"
+
+msgid "E590: A preview window already exists"
+msgstr "E590: プレビューウィンドウが既に存在します"
+
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr ""
+"W17: アラビア文字にはUTF-8が必要なので、':set encoding=utf-8' してください"
+
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 24bit色はこの環境ではサポートされていません"
+
+#, c-format
+msgid "E593: Need at least %d lines"
+msgstr "E593: 最低 %d の行数が必要です"
+
+#, c-format
+msgid "E594: Need at least %d columns"
+msgstr "E594: 最低 %d のカラム幅が必要です"
+
+#, c-format
+msgid "E355: Unknown option: %s"
+msgstr "E355: 未知のオプションです: %s"
+
+#, c-format
+msgid "E521: Number required: &%s = '%s'"
+msgstr "E521: 数字が必要です: &%s = '%s'"
+
+msgid ""
+"\n"
+"--- Terminal codes ---"
+msgstr ""
+"\n"
+"--- 端末コード ---"
+
+msgid ""
+"\n"
+"--- Global option values ---"
+msgstr ""
+"\n"
+"--- グローバルオプション値 ---"
+
+msgid ""
+"\n"
+"--- Local option values ---"
+msgstr ""
+"\n"
+"--- ローカルオプション値 ---"
+
+msgid ""
+"\n"
+"--- Options ---"
+msgstr ""
+"\n"
+"--- オプション ---"
+
+msgid "E356: get_varp ERROR"
+msgstr "E356: get_varp エラー"
+
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: 不正な文字です <%s>"
@@ -4243,6 +4142,15 @@ msgstr "E539: 不正な文字です <%s>"
 msgid "For option %s"
 msgstr "オプション: %s"
 
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: 式が終了していません"
+
+msgid "E541: too many items"
+msgstr "E541: 要素が多過ぎます"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: グループが釣合いません"
+
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' には空文字列を設定できません"
 
@@ -4313,86 +4221,6 @@ msgstr "E536: カンマが必要です"
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' は空であるか %s を含む必要があります"
 
-msgid "E538: No mouse support"
-msgstr "E538: マウスはサポートされません"
-
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: 式が終了していません"
-
-msgid "E541: too many items"
-msgstr "E541: 要素が多過ぎます"
-
-msgid "E542: unbalanced groups"
-msgstr "E542: グループが釣合いません"
-
-msgid "E946: Cannot make a terminal with running job modifiable"
-msgstr "E946: 実行中のジョブがある端末は変更可能にできません"
-
-msgid "E590: A preview window already exists"
-msgstr "E590: プレビューウィンドウが既に存在します"
-
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr ""
-"W17: アラビア文字にはUTF-8が必要なので、':set encoding=utf-8' してください"
-
-msgid "E954: 24-bit colors are not supported on this environment"
-msgstr "E954: 24bit色はこの環境ではサポートされていません"
-
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: 最低 %d の行数が必要です"
-
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: 最低 %d のカラム幅が必要です"
-
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: 未知のオプションです: %s"
-
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: 数字が必要です: &%s = '%s'"
-
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- 端末コード ---"
-
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- グローバルオプション値 ---"
-
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- ローカルオプション値 ---"
-
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- オプション ---"
-
-msgid "E356: get_varp ERROR"
-msgstr "E356: get_varp エラー"
-
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': %s に対応する文字がありません"
-
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': セミコロンの後に余分な文字があります: %s"
-
 msgid "cannot open "
 msgstr "開けません "
 
@@ -4435,7 +4263,7 @@ msgid " returned\n"
 msgstr " 戻りました\n"
 
 msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE が小さ過ぎます."
+msgstr "ANCHOR_BUF_SIZE が小さ過ぎます。"
 
 msgid "I/O ERROR"
 msgstr "入出力エラー"
@@ -4485,6 +4313,10 @@ msgstr ""
 "\n"
 "Vim: X のエラーを検出しましたr\n"
 
+#, c-format
+msgid "restoring display %s"
+msgstr "ディスプレイ %s を復元しています"
+
 msgid "Testing the X display failed"
 msgstr "X display のチェックに失敗しました"
 
@@ -4511,7 +4343,7 @@ msgstr "セキュリティコンテキスト %s を %s に設定できません"
 
 #, c-format
 msgid "Could not get security context %s for %s. Removing it!"
-msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!"
+msgstr "セキュリティコンテキスト %s を %s から取得できません。削除します!"
 
 msgid ""
 "\n"
@@ -4604,7 +4436,7 @@ msgid ""
 msgstr ""
 "VIMRUN.EXEが $PATH の中に見つかりません.\n"
 "外部コマンドの終了後に一時停止をしません.\n"
-"詳細は  :help win32-vimrun  を参照してください."
+"詳細は  :help win32-vimrun  を参照してください。"
 
 msgid "Vim Warning"
 msgstr "Vimの警告"
@@ -4613,6 +4445,23 @@ msgstr "Vimの警告"
 msgid "shell returned %d"
 msgstr "シェルがコード %d で終了しました"
 
+msgid "E278: Cannot put a terminal buffer in a popup window"
+msgstr "E278: 端末バッファをポップアップウィンドウ内に置くことはできません"
+
+#, c-format
+msgid "E997: Tabpage not found: %d"
+msgstr "E997: タブページが見つかりません: %d"
+
+#, c-format
+msgid "E993: window %d is not a popup window"
+msgstr "E993: ウィンドウ %d はポップアップウィンドウではありません"
+
+msgid "E994: Not allowed in a popup window"
+msgstr "E994: ポップアップウィンドウでは許されません"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: 初めに \":profile start {fname}\" を実行してください"
+
 msgid "E553: No more items"
 msgstr "E553: 要素がもうありません"
 
@@ -4691,6 +4540,10 @@ msgid "E777: String or List expected"
 msgstr "E777: 文字列かリストが必要です"
 
 #, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: 無効な操作です: '%s'"
+
+#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: 無効な項目です: %s%%[]"
 
@@ -4733,38 +4586,27 @@ msgstr "E70: %s%%[] が空です"
 msgid "E956: Cannot use pattern recursively"
 msgstr "E956: パターンを再帰的に使うことはできません"
 
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} 内に文法エラーがあります"
+
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA 正規表現) 繰り返せません %s"
+
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表現エンジンは自動選"
+"択されます。"
+
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "次のパターンにバックトラッキング RE エンジンを適用します: "
+
 msgid "E65: Illegal back reference"
 msgstr "E65: 不正な後方参照です"
 
-msgid "E339: Pattern too long"
-msgstr "E339: パターンが長過ぎます"
-
-msgid "E50: Too many \\z("
-msgstr "E50: \\z( が多過ぎます"
-
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s( が多過ぎます"
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: \\z( が釣り合っていません"
-
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: %s@ の後に不正な文字がありました"
-
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: 複雑な %s{...} が多過ぎます"
-
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61:%s* が入れ子になっています"
-
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62:%s%c が入れ子になっています"
-
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ の無効な使用方法です"
 
@@ -4784,26 +4626,37 @@ msgid "E71: Invalid character after %s%%
 msgstr "E71: %s%% の後に不正な文字がありました"
 
 #, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: %s{...} 内に文法エラーがあります"
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ の後に不正な文字がありました"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: 複雑な %s{...} が多過ぎます"
+
+#, c-format
+msgid "E61: Nested %s*"
+msgstr "E61:%s* が入れ子になっています"
+
+#, c-format
+msgid "E62: Nested %s%c"
+msgstr "E62:%s%c が入れ子になっています"
+
+msgid "E50: Too many \\z("
+msgstr "E50: \\z( が多過ぎます"
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: %s( が多過ぎます"
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: \\z( が釣り合っていません"
+
+msgid "E339: Pattern too long"
+msgstr "E339: パターンが長過ぎます"
 
 msgid "External submatches:\n"
 msgstr "外部の部分該当:\n"
 
-#, c-format
-msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (NFA 正規表現) 繰り返せません %s"
-
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表現エンジンは自動選"
-"択されます。"
-
-msgid "Switching to backtracking RE engine for pattern: "
-msgstr "次のパターンにバックトラッキング RE エンジンを適用します: "
-
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました"
 
@@ -4869,6 +4722,43 @@ msgstr "E876: (NFA 正規表現) NFA全体を保存するには空きスペースが足りません"
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"
 
+msgid "E748: No previously used register"
+msgstr "E748: まだレジスタを使用していません"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "%ld 行を解放中"
+
+#, c-format
+msgid " into \"%c"
+msgstr " \"%c に"
+
+#, c-format
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "%ld 行のブロックが%sヤンクされました"
+
+#, c-format
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld 行が%sヤンクされました"
+
+#, c-format
+msgid "E353: Nothing in register %s"
+msgstr "E353: レジスタ %s には何もありません"
+
+msgid ""
+"\n"
+"Type Name Content"
+msgstr ""
+"\n"
+"型式 名前 内容"
+
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr "E883: 検索パターンと式レジスタには2行以上を含められません"
+
 msgid " VREPLACE"
 msgstr " 仮想置換"
 
@@ -4921,6 +4811,80 @@ msgid "recording"
 msgstr "記録中"
 
 #, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "\"%s\" を \"%s\" から検索中"
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "\"%s\" を検索中"
+
+#, c-format
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' の中にはありません: \"%s\""
+
+msgid "Source Vim script"
+msgstr "Vimスクリプトの取込み"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "ディレクトリは取込めません: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "\"%s\" を取込めません"
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "行 %ld: \"%s\" を取込めません"
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "\"%s\" を取込中"
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "行 %ld: %s を取込中"
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "%s の取込を完了"
+
+#, c-format
+msgid "continuing in %s"
+msgstr "%s の実行を継続中です"
+
+msgid "modeline"
+msgstr "モード行"
+
+msgid "--cmd argument"
+msgstr "--cmd 引数"
+
+msgid "-c argument"
+msgstr "-c 引数"
+
+msgid "environment variable"
+msgstr "環境変数"
+
+msgid "error handler"
+msgstr "エラーハンドラ"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: 警告: 行区切が不正です。^M がないのでしょう"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding が取込スクリプト以外で使用されました"
+
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion が取込スクリプト以外で使用されました"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion はサポートされていません: %d"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish が取込スクリプト以外で使用されました"
+
+#, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: 無効な検索文字列です: %s"
 
@@ -4976,18 +4940,14 @@ msgstr "E388: 定義を見つけられません"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: パターンを見つけられません"
 
-msgid "Substitute "
-msgstr "Substitute "
-
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# 最後の %s検索パターン:\n"
-"~"
+msgid "Save View"
+msgstr "ビューを保存します"
+
+msgid "Save Session"
+msgstr "セッション情報を保存します"
+
+msgid "Save Setup"
+msgstr "設定を保存します"
 
 msgid "[Deleted]"
 msgstr "[削除済]"
@@ -5070,21 +5030,6 @@ msgstr "E797: autocommand の SpellFileMissing がバッファを削除しました"
 msgid "Warning: region %s not supported"
 msgstr "警告9: %s という範囲はサポートされていません"
 
-msgid "Sorry, no suggestions"
-msgstr "残念ですが、修正候補はありません"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "残念ですが、修正候補は %ld 個しかありません"
-
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" を次へ変換:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
 msgid "E752: No previous spell replacement"
 msgstr "E752: スペル置換がまだ実行されていません"
 
@@ -5187,7 +5132,7 @@ msgstr ""
 
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "COMPOUNDRULES の値に誤りがあります. ファイル %s の %d 行目: %s"
+msgstr "COMPOUNDRULES の値に誤りがあります。ファイル %s の %d 行目: %s"
 
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
@@ -5414,6 +5359,21 @@ msgstr "E763: 単語の文字がスペルファイルと異なります"
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP エントリに重複文字が存在します"
 
+msgid "Sorry, no suggestions"
+msgstr "残念ですが、修正候補はありません"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "残念ですが、修正候補は %ld 個しかありません"
+
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" を次へ変換:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
 msgid "No Syntax items defined for this buffer"
 msgstr "このバッファに定義された構文要素はありません"
 
@@ -5589,70 +5549,6 @@ msgid ""
 msgstr ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: syncolor.vim の再帰呼び出しを検出しました"
-
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: ハイライトグループが見つかりません: %s"
-
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: 引数が充分ではない: \":highlight link %s\""
-
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: 引数が多過ぎます: \":highlight link %s\""
-
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: グループが設定されているのでハイライトリンクは無視されます"
-
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: 予期せぬ等号です: %s"
-
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: 等号がありません: %s"
-
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: 引数がありません: %s"
-
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: 不正な値です: %s"
-
-msgid "E419: FG color unknown"
-msgstr "E419: 未知の前景色です"
-
-msgid "E420: BG color unknown"
-msgstr "E420: 未知の背景色です"
-
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: カラー名や番号を認識できません: %s"
-
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: 終端コードが長過ぎます: %s"
-
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: 不正な引数です: %s"
-
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: 多くの異なるハイライト属性が使われ過ぎています"
-
-msgid "E669: Unprintable character in group name"
-msgstr "E669: グループ名に印刷不可能な文字があります"
-
-msgid "W18: Invalid character in group name"
-msgstr "W18: グループ名に不正な文字があります"
-
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: ハイライトと構文グループが多過ぎます"
-
 msgid "E555: at bottom of tag stack"
 msgstr "E555: タグスタックの末尾です"
 
@@ -5746,7 +5642,7 @@ msgid "Duplicate field name: %s"
 msgstr "重複したフィールド名: %s"
 
 msgid "' not known. Available builtin terminals are:"
-msgstr "' は未知です. 現行の組み込み端末は次のとおりです:"
+msgstr "' は未知です。現行の組み込み端末は次のとおりです:"
 
 msgid "defaulting to '"
 msgstr "省略値を次のように設定します '"
@@ -5781,6 +5677,9 @@ msgstr "$VIMRUNTIME/rgb.txtを開けません"
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: 無効な属性です: %s"
 
+msgid "E279: Sorry, ++shell is not supported on this system"
+msgstr "E279: ごめんなさい、++shell はこのシステムではサポートされていません"
+
 #, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" 内のジョブを終了しますか?"
@@ -5828,6 +5727,9 @@ msgstr "E966: 無効な行番号です: %ld"
 msgid "E965: missing property type name"
 msgstr "E965: プロパティタイプ名がありません"
 
+msgid "E275: Cannot add text property to unloaded buffer"
+msgstr "E275: 解放されたバッファにはテキストプロパティを追加できません"
+
 msgid "E967: text property info corrupted"
 msgstr "E967: テキストプロパティ情報が壊れています"
 
@@ -5973,11 +5875,6 @@ msgstr "アンドゥ対象がありません"
 msgid "number changes  when               saved"
 msgstr "通番   変更数   変更時期           保存済"
 
-#, c-format
-msgid "%ld second ago"
-msgid_plural "%ld seconds ago"
-msgstr[0] "%ld 秒経過しています"
-
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo の直後に undojoin はできません"
 
@@ -6068,6 +5965,9 @@ msgstr "E125: 不正な引数です: %s"
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: 引数名が重複しています: %s"
 
+msgid "E989: Non-default argument follows default argument"
+msgstr "E989: 非デフォルト引数がデフォルト引数の後にあります"
+
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: 関数の引数が多過ぎます: %s"
@@ -6103,6 +6003,10 @@ msgid "E117: Unknown function: %s"
 msgstr "E117: 未知の関数です: %s"
 
 #, c-format
+msgid "E276: Cannot use function as a method: %s"
+msgstr "E276: 関数をメソッドとして使用できません: %s"
+
+#, c-format
 msgid "E933: Function was deleted: %s"
 msgstr "E933: 関数は削除されました: %s"
 
@@ -6171,10 +6075,6 @@ msgid "E133: :return not inside a functi
 msgstr "E133: 関数外に :return がありました"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: カッコ '(' がありません: %s"
-
-#, c-format
 msgid "%s (%s, compiled %s)"
 msgstr "%s (%s, compiled %s)"
 
@@ -6465,6 +6365,173 @@ msgstr "詳細な情報は           :help register<Enter>  "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
 
+msgid ""
+"\n"
+"# Buffer list:\n"
+msgstr ""
+"\n"
+"# バッファリスト:\n"
+
+#, c-format
+msgid ""
+"\n"
+"# %s History (newest to oldest):\n"
+msgstr ""
+"\n"
+"# %s 項目の履歴 (新しいものから古いものへ):\n"
+
+msgid "Command Line"
+msgstr "コマンドライン"
+
+msgid "Search String"
+msgstr "検索文字列"
+
+msgid "Expression"
+msgstr "式"
+
+msgid "Input Line"
+msgstr "入力行"
+
+msgid "Debug Line"
+msgstr "デバッグ行"
+
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' で始まる行の、文字通りのコピー:\n"
+
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s 行目: "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr "E136: viminfo: エラーが多過ぎるので、以降はスキップします"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# グローバル変数:\n"
+
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# 最後に置換された文字列:\n"
+"$"
+
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# 最後の %s検索パターン:\n"
+"~"
+
+msgid "Substitute "
+msgstr "Substitute "
+
+msgid "Illegal register name"
+msgstr "不正なレジスタ名"
+
+msgid ""
+"\n"
+"# Registers:\n"
+msgstr ""
+"\n"
+"# レジスタ:\n"
+
+#, c-format
+msgid "E574: Unknown register type %d"
+msgstr "E574: 未知のレジスタ型 %d です"
+
+msgid ""
+"\n"
+"# History of marks within files (newest to oldest):\n"
+msgstr ""
+"\n"
+"# ファイル内マークの履歴 (新しいものから古いもの):\n"
+
+msgid ""
+"\n"
+"# File marks:\n"
+msgstr ""
+"\n"
+"# ファイルマーク:\n"
+
+msgid ""
+"\n"
+"# Jumplist (newest first):\n"
+msgstr ""
+"\n"
+"# ジャンプリスト (新しいものが先):\n"
+
+msgid "Missing '>'"
+msgstr "'>' が見つかりません"
+
+msgid "Illegal starting char"
+msgstr "不正な先頭文字です"
+
+#, c-format
+msgid "# This viminfo file was generated by Vim %s.\n"
+msgstr "# この viminfo ファイルは Vim %s によって生成されました.\n"
+
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# 変更する際には十分注意してください!\n"
+"\n"
+
+msgid "# Value of 'encoding' when this file was written\n"
+msgstr "# このファイルが書かれた時の 'encoding' の値\n"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "viminfoファイル \"%s\"%s%s%s を読込み中"
+
+msgid " info"
+msgstr " 情報"
+
+msgid " marks"
+msgstr " マーク"
+
+msgid " oldfiles"
+msgstr " 旧ファイル群"
+
+msgid " FAILED"
+msgstr " 失敗"
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: viminfoファイルが書込みできません: %s"
+
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: 一時viminfoファイルが多過ぎます! 例: %s"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: viminfoファイル %s を保存できません!"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "viminfoファイル \"%s\" を書込み中"
+
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: viminfoファイルを %s へ名前変更できません!"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: viminfoファイルを読込用として開けません"
+
 msgid "Already only one window"
 msgstr "既にウィンドウは1つしかありません"
 
@@ -6475,6 +6542,9 @@ msgstr "E92: バッファ %ld が見つかりません"
 msgid "E441: There is no preview window"
 msgstr "E441: プレビューウィンドウがありません"
 
+msgid "E242: Can't split a window while closing another"
+msgstr "E242: 別のウィンドウを閉じている間に分割することはできません"
+
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: 左上と右下を同時に分割することはできません"
 
@@ -6484,8 +6554,8 @@ msgstr "E443: 他のウィンドウが分割されている時には順回できません"
 msgid "E444: Cannot close last window"
 msgstr "E444: 最後のウィンドウを閉じることはできません"
 
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: autocmdウィンドウは閉じられません"
+msgid "E813: Cannot close autocmd or popup window"
+msgstr "E813: autocmdウィンドウまたはポップアップウィンドウは閉じられません"
 
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: autocmdウィンドウしか残らないため、ウィンドウは閉じられません"
@@ -6494,31 +6564,13 @@ msgid "E445: Other window contains chang
 msgstr "E445: 他のウィンドウには変更があります"
 
 #, c-format
-msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E799: 無効な ID: %d (1 以上でなければなりません)"
-
-#, c-format
-msgid "E801: ID already taken: %d"
-msgstr "E801: ID はすでに利用中です: %d"
-
-msgid "List or number required"
-msgstr "リストか数値が必要です"
-
-#, c-format
-msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802: 無効な ID: %d (1 以上でなければなりません)"
-
-#, c-format
-msgid "E803: ID not found: %d"
-msgstr "E803: ID はありません: %d"
-
-#, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: ライブラリ %s をロードできませんでした"
 
 msgid "Sorry, this command is disabled: the Perl library could not be loaded."
 msgstr ""
-"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでした."
+"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでし"
+"た。"
 
 msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
 msgstr ""
@@ -6620,9 +6672,6 @@ msgstr "E685: 内部エラーです: %s"
 msgid "Interrupted"
 msgstr "割込まれました"
 
-msgid "E14: Invalid address"
-msgstr "E14: 無効なアドレスです"
-
 msgid "E474: Invalid argument"
 msgstr "E474: 無効な引数です"
 
@@ -6802,6 +6851,21 @@ msgid "E45: 'readonly' option is set (ad
 msgstr "E45: 'readonly' オプションが設定されています (! を追加で上書き)"
 
 #, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: 未定義の変数です: %s"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: 異なった型の変数です %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: 不正な変数名です: %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: 既存の変数を変更できません"
+
+#, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
 
@@ -6809,6 +6873,9 @@ msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません"
 
+msgid "E928: String required"
+msgstr "E928: 文字列が必要です"
+
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: 辞書型に空のキーを使うことはできません"
 
@@ -6911,6 +6978,10 @@ msgstr "E939: 正のカウントが必要です"
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: スクリプト以外で<SID>が使われました"
 
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: カッコ '(' がありません: %s"
+
 msgid "E449: Invalid expression received"
 msgstr "E449: 無効な式を受け取りました"
 
@@ -6953,6 +7024,13 @@ msgstr "E952: Autocommandが再帰を引き起こしました"
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: メニューは他のモードにだけあります"
 
+msgid "E957: Invalid window number"
+msgstr "E957: 無効なウィンドウ番号です"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s の引数はリスト型でなければなりません"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "上まで検索したので下に戻ります"
 
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-05 11:27+0900\n"
-"PO-Revision-Date: 2019-05-05 13:00+0900\n"
+"POT-Creation-Date: 2019-11-04 21:51+0900\n"
+"PO-Revision-Date: 2019-11-11 23:00+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
 "Language: ja\n"
@@ -24,6 +24,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "E163: There is only one file to edit"
+msgstr "E163: ҏWt@C1‚܂"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: ŏ̃t@COɂ͍s܂"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: Ō̃t@CzČɂ͍s܂"
+
+msgid "E249: window layout changed unexpectedly"
+msgstr "E249: \\EBhE̔zuς܂"
+
 msgid "--Deleted--"
 msgstr "--폜--"
 
@@ -118,8 +130,9 @@ msgstr "E83: obt@쐬łȂ̂ŁÂgp܂..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: obt@o^ł܂"
 
-msgid "E937: Attempt to delete a buffer that is in use"
-msgstr "E937: gp̃obt@폜悤Ǝ݂܂"
+#, c-format
+msgid "E937: Attempt to delete a buffer that is in use: %s"
+msgstr "E937: gp̃obt@폜悤Ǝ݂܂: %s"
 
 msgid "E515: No buffers were unloaded"
 msgstr "E515: ꂽobt@͂܂"
@@ -246,22 +259,157 @@ msgstr ""
 msgid "Top"
 msgstr "擪"
 
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# obt@Xg:\n"
-
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' IvVݒ肳Ă̂ŏ߂܂"
 
 msgid "[Prompt]"
 msgstr "[vvg]"
 
+msgid "[Popup]"
+msgstr "[|bvAbv]"
+
 msgid "[Scratch]"
 msgstr "[]"
 
+msgid "WARNING: The file has been changed since reading it!!!"
+msgstr "x: Ǎ񂾌Ƀt@CɕύX܂!!!"
+
+msgid "Do you really want to write to it"
+msgstr "{ɏ㏑܂"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwriteobt@̊Yautocommand݂͑܂"
+
+msgid "E203: Autocommands deleted or unloaded buffer to be written"
+msgstr "E203: ۑobt@autocommand폜܂"
+
+msgid "E204: Autocommand changed number of lines in unexpected way"
+msgstr "E204: autocommand\\ʕ@ōsύX܂"
+
+# Added at 19-Jan-2004.
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans͖ύX̃obt@㏑邱Ƃ͋‚Ă܂"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeansobt@̈ꕔoƂ͂ł܂"
+
+msgid "is a directory"
+msgstr "̓fBNgł"
+
+msgid "is not a file or writable device"
+msgstr "̓t@Cł݉”\\foCXł܂"
+
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "'opendevice' IvVɂfoCXւ݂̏͂ł܂"
+
+msgid "is read-only (add ! to override)"
+msgstr "͓Ǎpł (ɂ ! lj)"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr "E506: obNAbvt@Cۑł܂ (! ljŋ)"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr ""
+"E507: obNAbvt@C‚ۂɃG[܂ (! ljŋ"
+")"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr "E508: obNAbvpt@CǍ߂܂ (! ljŋ)"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr "E509: obNAbvt@C܂ (! ljŋ)"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr "E510: obNAbvt@C܂ (! ljŋ)"
+
+msgid "E214: Can't find temp file for writing"
+msgstr "E214: ۑpꎞt@C‚܂"
+
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr "E213: ϊł܂ (! ljŕϊɕۑ)"
+
+msgid "E166: Can't open linked file for writing"
+msgstr "E166: Nꂽt@Cɏ߂܂"
+
+msgid "E212: Can't open file for writing"
+msgstr "E212: ݗpɃt@CJ܂"
+
+msgid "E949: File changed while writing"
+msgstr "E949: ݒɃt@CύX܂"
+
+msgid "E512: Close failed"
+msgstr "E512: ‚邱ƂɎs"
+
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: ݃G[Aϊs (㏑ɂ 'fenc' ɂĂ)"
+
+#, c-format
+msgid ""
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"override)"
+msgstr ""
+"E513: ݃G[AϊsAs %ld (㏑ɂ 'fenc' ɂĂ"
+")"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: ݃G[ (t@CVXet?)"
+
+msgid " CONVERSION ERROR"
+msgstr " ϊG["
+
+#, c-format
+msgid " in line %ld;"
+msgstr " s %ld;"
+
+msgid "[NOT converted]"
+msgstr "[ϊ]"
+
+msgid "[converted]"
+msgstr "[ϊ]"
+
+msgid "[Device]"
+msgstr "[foCX]"
+
+msgid "[New]"
+msgstr "[V]"
+
+msgid "[New File]"
+msgstr "[Vt@C]"
+
+msgid " [a]"
+msgstr " [a]"
+
+msgid " appended"
+msgstr " lj"
+
+msgid " [w]"
+msgstr " [w]"
+
+msgid " written"
+msgstr " "
+
+msgid "E205: Patchmode: can't save original file"
+msgstr "E205: patchmode: {t@Cۑł܂"
+
+msgid "E206: patchmode: can't touch empty original file"
+msgstr "E206: patchmode: ̌{t@Ctouchł܂"
+
+msgid "E207: Can't delete backup file"
+msgstr "E207: obNAbvt@C܂"
+
+msgid ""
+"\n"
+"WARNING: Original file may be lost or damaged\n"
+msgstr ""
+"\n"
+"x: {t@CꂽύX܂\n"
+
+msgid "don't quit the editor until the file is successfully written!"
+msgstr "t@C̕ۑɐ܂ŃGfB^IȂł!"
+
+msgid "W10: Warning: Changing a readonly file"
+msgstr "W10: x: Ǎpt@CύX܂"
+
 msgid "E902: Cannot connect to port"
 msgstr "E902: |[gɐڑł܂"
 
@@ -284,6 +432,9 @@ msgstr "E904: call 3Ԗڂ̈̓Xg^łȂ΂Ȃ܂"
 msgid "E905: received unknown command: %s"
 msgstr "E905: m̃R}hM܂: %s"
 
+msgid "E906: not an open channel"
+msgstr "E906: JĂȂ`lł"
+
 #, c-format
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s(): ڑԂŏ݂܂"
@@ -300,9 +451,6 @@ msgid "E912: cannot use ch_evalexpr()/ch
 msgstr ""
 "E912: raw  nl [h̃`l ch_evalexpr()/ch_sendexpr() ͎g܂"
 
-msgid "E906: not an open channel"
-msgstr "E906: JĂȂ`lł"
-
 msgid "E920: _io file requires _name to be set"
 msgstr "E920: _io t@C _name ̐ݒ肪Kvł"
 
@@ -313,6 +461,18 @@ msgstr "E915: in_io obt@ in_buf  in_name ̐ݒ肪Kvł"
 msgid "E918: buffer must be loaded: %s"
 msgstr "E918: obt@[hĂȂ΂Ȃ܂: %s"
 
+msgid "E916: not a valid job"
+msgstr "E916: LȃWuł͂܂"
+
+msgid "tagname"
+msgstr "^O"
+
+msgid " kind file\n"
+msgstr " t@C\n"
+
+msgid "'history' option is zero"
+msgstr "IvV 'history' [ł"
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: t@Cm̕@ňÍĂ܂"
 
@@ -332,7 +492,7 @@ msgid "[crypted]"
 msgstr "[Í]"
 
 msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "fobO[hɓ܂. ɂ \"cont\" Ɠ͂Ă."
+msgstr "fobO[hɓ܂Bɂ \"cont\" Ɠ͂ĂB"
 
 #, c-format
 msgid "Oldval = \"%s\""
@@ -539,45 +699,17 @@ msgstr "E105: :source Ŏ捞ރt@CȊOł :loadkeymap g܂"
 msgid "E791: Empty keymap entry"
 msgstr "E791: ̃L[}bvGg"
 
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: \\ʕ :let ɂ܂"
-
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: `̕ϐł: %s"
-
 msgid "E111: Missing ']'"
 msgstr "E111: ']' ‚܂"
 
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] ^Ƒgݍ킹Ă͎g܂"
 
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: قȂ^̕ϐł %s="
-
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: sȕϐł: %s"
-
 msgid "E806: using Float as a String"
 msgstr "E806: _𕶎ƂĈĂ܂"
 
-msgid "E985: .= is not supported with script version 2"
-msgstr "E985: .= ̓XNvgo[W 2 ł͑ΉĂ܂"
-
-msgid "E687: Less targets than List items"
-msgstr "E687: ^[QbgXg^̗vfȂł"
-
-msgid "E688: More targets than List items"
-msgstr "E688: ^[QbgXg^̗vfł"
-
-msgid "Double ; in list of variables"
-msgstr "Xg^̒l2ˆȏ ; o܂"
-
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: %s ̒lꗗ\\ł܂"
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274: ۊʂ̑OɃXy[X͋܂"
 
 msgid "E689: Can only index a List, Dictionary or Blob"
 msgstr "E689: Xg^A^ABlob^ȊO̓CfbNXwł܂"
@@ -591,26 +723,21 @@ msgstr "E709: [:] ɂ̓Xg^Blob^̒lKvł"
 msgid "E972: Blob value does not have the right number of bytes"
 msgstr "E972: Blob^̒l̃oCg܂"
 
+msgid "E996: Cannot lock a range"
+msgstr "E996: ͈͂̓bNł܂"
+
 msgid "E710: List value has more items than target"
 msgstr "E710: Xg^ϐɃ^[Qbgvf܂"
 
 msgid "E711: List value has not enough items"
 msgstr "E711: Xg^ϐɏ\\Ȑ̗vf܂"
 
+msgid "E996: Cannot lock a list or dict"
+msgstr "E996: Xg邢͎̓bNł܂"
+
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for ̌ \"in\" ܂"
 
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: ̕ϐ͂܂: \"%s\""
-
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: ϐ %s ̓bN܂̓AbNł܂"
-
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: (A)bNɂ͕ϐ̓q[߂܂"
-
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' ̌ ':' ܂"
 
@@ -623,6 +750,9 @@ msgstr "E973: Blobe͋‚16iłȂ΂Ȃ܂"
 msgid "E110: Missing ')'"
 msgstr "E110: ')' ‚܂"
 
+msgid "E260: Missing name after ->"
+msgstr "E260: -> ̌ɖO܂"
+
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: ֐Qƌ^̓CfbNXł܂"
 
@@ -712,45 +842,11 @@ msgstr "E976: Blob^𕶎ƂĈĂ܂"
 msgid "E908: using an invalid value as a String"
 msgstr "E908: Ȓl𕶎ƂĈĂ܂"
 
-#, c-format
-msgid "E963: setting %s to value with wrong type"
-msgstr "E963: %s Ԉ^̒lŐݒ肵Ă܂"
-
-#, 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: ֐Qƌ^ϐ͑啶Ŏn܂Ȃ΂Ȃ܂: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: ϐ̊֐ƏՓ˂܂: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: lbNĂ܂: %s"
-
-msgid "Unknown"
-msgstr "s"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s ̒lύXł܂"
-
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: Rs[ɂ͕ϐ̓q[߂܂"
 
 msgid ""
 "\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# O[oϐ:\n"
-
-msgid ""
-"\n"
 "\tLast set from "
 msgstr ""
 "\n"
@@ -777,39 +873,13 @@ msgstr "E736: ^ɂ͖ȑł"
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: ֐Qƌ^ɂ͖ȑł"
 
-msgid "map() argument"
-msgstr "map() ̈"
-
-msgid "filter() argument"
-msgstr "filter() ̈"
-
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s ̈̓Xg^łȂ΂Ȃ܂"
-
-#, c-format
-msgid "E899: Argument of %s must be a List or Blob"
-msgstr "E899: %s ̈̓Xg^܂Blob^łȂ΂Ȃ܂"
-
-msgid "E928: String required"
-msgstr "E928: 񂪕Kvł"
-
-msgid "E957: Invalid window number"
-msgstr "E957: ȃEBhEԍł"
-
 msgid "E808: Number or Float required"
 msgstr "E808: l_Kvł"
 
-msgid "add() argument"
-msgstr "add() ̈"
-
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ȃobt@ł: %s"
 
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() ͑}[hłpł܂"
-
 msgid "&Ok"
 msgstr "&Ok"
 
@@ -817,11 +887,6 @@ msgid "E980: lowlevel input not supporte
 msgstr "E980: ჌x͂̓T|[gĂ܂"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld s: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: m̊֐ł: %s"
 
@@ -841,31 +906,18 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore()  inputsave() Ă΂܂"
 
-msgid "insert() argument"
-msgstr "insert() ̈"
-
 msgid "E786: Range not allowed"
 msgstr "E786: ͈͎w͋‚Ă܂"
 
-msgid "E916: not a valid job"
-msgstr "E916: LȃWuł͂܂"
-
 msgid "E701: Invalid type for len()"
 msgstr "E701: len() ɂ͖Ȍ^ł"
 
-#, c-format
-msgid "E798: ID is reserved for \":match\": %d"
-msgstr "E798: ID  \":match\" ̂߂ɗ\\񂳂Ă܂: %d"
-
 msgid "E726: Stride is zero"
 msgstr "E726: XgCh(Oi) 0 ł"
 
 msgid "E727: Start past end"
 msgstr "E727: JnʒuIʒuz܂"
 
-msgid "<empty>"
-msgstr "<>"
-
 msgid "E240: No connection to the X server"
 msgstr "E240: X T[o[ւ̐ڑ܂"
 
@@ -882,39 +934,13 @@ msgstr "E941: T[o[͂łɊJnĂ܂"
 msgid "E942: +clientserver feature not available"
 msgstr "E942: +clientserver @\\ɂȂĂ܂"
 
-msgid "remove() argument"
-msgstr "remove() ̈"
-
-# Added at 10-Mar-2004.
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: V{bNN߂܂ (z‚Ă”\\܂)"
-
-msgid "reverse() argument"
-msgstr "reverse() ̈"
-
 msgid "E258: Unable to send to client"
 msgstr "E258: NCAg֑邱Ƃł܂"
 
 #, c-format
-msgid "E927: Invalid action: '%s'"
-msgstr "E927: ȑł: '%s'"
-
-#, c-format
 msgid "E962: Invalid action: '%s'"
 msgstr "E962: ȑł: '%s'"
 
-msgid "sort() argument"
-msgstr "sort() ̈"
-
-msgid "uniq() argument"
-msgstr "uniq() ̈"
-
-msgid "E702: Sort compare function failed"
-msgstr "E702: \\[g̔r֐s܂"
-
-msgid "E882: Uniq compare function failed"
-msgstr "E882: Uniq ̔r֐s܂"
-
 msgid "(Invalid)"
 msgstr "()"
 
@@ -922,8 +948,84 @@ msgstr "()"
 msgid "E935: invalid submatch number: %d"
 msgstr "E935: ȃTu}b`ԍł: %d"
 
-msgid "E677: Error writing temp file"
-msgstr "E677: ꎞt@CɃG[܂"
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: \\ʕ :let ɂ܂"
+
+msgid "E991: cannot use =<< here"
+msgstr "E991: ł =<< ͎g܂"
+
+msgid "E221: Marker cannot start with lower case letter"
+msgstr "E221: }[J[͉pŎn܂Ă͂܂"
+
+msgid "E172: Missing marker"
+msgstr "E172: }[J[܂"
+
+#, c-format
+msgid "E990: Missing end marker '%s'"
+msgstr "E990: I[}[J[܂ '%s'"
+
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= ̓XNvgo[W 2 ł͑ΉĂ܂"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: ^[QbgXg^̗vfȂł"
+
+msgid "E688: More targets than List items"
+msgstr "E688: ^[QbgXg^̗vfł"
+
+msgid "Double ; in list of variables"
+msgstr "Xg^̒l2ˆȏ ; o܂"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s ̒lꗗ\\ł܂"
+
+msgid "E996: Cannot lock an environment variable"
+msgstr "E996: ‹ϐ̓bNł܂"
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: IvV̓bNł܂"
+
+msgid "E996: Cannot lock a register"
+msgstr "E996: WX^̓bNł܂"
+
+#, c-format
+msgid "E108: No such variable: \"%s\""
+msgstr "E108: ̕ϐ͂܂: \"%s\""
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: ϐ %s ̓bN܂̓AbNł܂"
+
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (A)bNɂ͕ϐ̓q[߂܂"
+
+#, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: %s Ԉ^̒lŐݒ肵Ă܂"
+
+#, 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: ֐Qƌ^ϐ͑啶Ŏn܂Ȃ΂Ȃ܂: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: ϐ̊֐ƏՓ˂܂: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: lbNĂ܂: %s"
+
+msgid "Unknown"
+msgstr "s"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ̒lύXł܂"
 
 msgid "E921: Invalid callback argument"
 msgstr "E921: ȃR[obNł"
@@ -970,73 +1072,6 @@ msgstr "E135: *tB^* autocommand݂͌̃obt@ύXĂ͂܂"
 msgid "[No write since last change]\n"
 msgstr "[Ō̕ύXۑĂ܂]\n"
 
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s s: "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: G[߂̂ŁAȍ~̓XLbv܂"
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "viminfot@C \"%s\"%s%s%s Ǎݒ"
-
-msgid " info"
-msgstr " "
-
-msgid " marks"
-msgstr " }[N"
-
-msgid " oldfiles"
-msgstr " t@CQ"
-
-msgid " FAILED"
-msgstr " s"
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: viminfot@C݂ł܂: %s"
-
-#, c-format
-msgid "E929: Too many viminfo temp files, like %s!"
-msgstr "E929: ꎞviminfot@C߂܂! : %s"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: viminfot@C %s ۑł܂!"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "viminfot@C \"%s\" ݒ"
-
-#, c-format
-msgid "E886: Can't rename viminfo file to %s!"
-msgstr "E886: viminfot@C %s ֖OύXł܂!"
-
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "#  viminfo t@C Vim %s ɂĐ܂.\n"
-
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# ύXۂɂ͏\\ӂĂ!\n"
-"\n"
-
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# ̃t@Cꂽ 'encoding' ̒l\n"
-
-msgid "Illegal starting char"
-msgstr "sȐ擪ł"
-
-msgid ""
-"\n"
-"# Bar lines, copied verbatim:\n"
-msgstr ""
-"\n"
-"# '|' Ŏn܂śAʂ̃Rs[:\n"
-
 msgid "Save As"
 msgstr "ʖŕۑ"
 
@@ -1052,7 +1087,7 @@ msgstr "̃t@C \"%s\" ㏑܂?"
 
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "Xbvt@C \"%s\" ݂܂. ㏑܂?"
+msgstr "Xbvt@C \"%s\" ݂܂B㏑܂?"
 
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
@@ -1144,15 +1179,6 @@ msgstr "p^[SĂ̍sŌ‚܂: %s"
 msgid "Pattern not found: %s"
 msgstr "p^[͌‚܂ł: %s"
 
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Ōɒuꂽ:\n"
-"$"
-
 msgid "E478: Don't panic!"
 msgstr "E478: QĂȂł"
 
@@ -1196,9 +1222,6 @@ msgstr "E150: fBNgł͂܂: %s"
 msgid "No old files"
 msgstr "Ât@C͂܂"
 
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: ߂ \":profile start {fname}\" sĂ"
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "ύX \"%s\" ɕۑ܂?"
@@ -1214,32 +1237,11 @@ msgstr "E162: obt@ \"%s\" ̕ύX͕ۑĂ܂"
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "x: \\obt@ֈړ܂ (autocommands 𒲂ׂĂ)"
 
-msgid "E163: There is only one file to edit"
-msgstr "E163: ҏWt@C1‚܂"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: ŏ̃t@COɂ͍s܂"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Ō̃t@CzČɂ͍s܂"
-
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: ̃RpCɂ͑ΉĂ܂: %s"
 
 #, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "\"%s\"  \"%s\" 猟"
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "\"%s\" "
-
-#, c-format
-msgid "not found in '%s': \"%s\""
-msgstr "'%s' ̒ɂ͂܂: \"%s\""
-
-#, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr "W20: vꂽpython 2.x͑ΉĂ܂At@C𖳎܂: %s"
 
@@ -1247,68 +1249,6 @@ msgstr "W20: vꂽpython 2.x͑ΉĂ܂At@C𖳎܂: %s"
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
 msgstr "W21: vꂽpython 3.x͑ΉĂ܂At@C𖳎܂: %s"
 
-msgid "Source Vim script"
-msgstr "VimXNvg̎捞"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "fBNg͎捞߂܂: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "\"%s\" 捞߂܂"
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "s %ld: \"%s\" 捞߂܂"
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "\"%s\" 捞"
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "s %ld: %s 捞"
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "%s ̎捞"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s ̎spł"
-
-msgid "modeline"
-msgstr "[hs"
-
-msgid "--cmd argument"
-msgstr "--cmd "
-
-msgid "-c argument"
-msgstr "-c "
-
-msgid "environment variable"
-msgstr "‹ϐ"
-
-msgid "error handler"
-msgstr "G[nh"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: x: s؂sł. ^M Ȃ̂ł傤"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding 捞XNvgȊOŎgp܂"
-
-msgid "E984: :scriptversion used outside of a sourced file"
-msgstr "E984: :scriptversion 捞XNvgȊOŎgp܂"
-
-#, c-format
-msgid "E999: scriptversion not supported: %d"
-msgstr "E999: scriptversion ̓T|[gĂ܂: %d"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish 捞XNvgȊOŎgp܂"
-
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "݂ %s: \"%s\""
@@ -1319,11 +1259,15 @@ msgstr "E197:  \"%s\" ɐݒł܂"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr ""
-"Ex[hɓ܂. m[}[hɖ߂ɂ\"visual\"Ɠ͂Ă."
+"Ex[hɓ܂Bm[}[hɖ߂ɂ\"visual\"Ɠ͂ĂB"
 
 msgid "E501: At end-of-file"
 msgstr "E501: t@C̏Iʒu"
 
+#, c-format
+msgid "Executing: %s"
+msgstr "s: %s"
+
 msgid "E169: Command too recursive"
 msgstr "E169: R}hċAI߂܂"
 
@@ -1356,10 +1300,10 @@ msgid "E494: Use w or w>>"
 msgstr "E494: w  w>> gpĂ"
 
 msgid ""
-"INTERNAL: Cannot use DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
-msgstr ""
-"G[: DFLALL  ADDR_NONE, ADDR_UNSIGNED  ADDR_QUICKFIX ƂƂɎg"
-"Ƃ͂ł܂"
+"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"G[: EX_DFLALL  ADDR_NONE, ADDR_UNSIGNED  ADDR_QUICKFIX ƂƂɎg"
+"Ƃ͂ł܂"
 
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr ""
@@ -1442,15 +1386,6 @@ msgstr "E930: execute() ̒ł :redir ͎g܂"
 msgid "Save Redirection"
 msgstr "_CNgۑ܂"
 
-msgid "Save View"
-msgstr "r[ۑ܂"
-
-msgid "Save Session"
-msgstr "ZbVۑ܂"
-
-msgid "Save Setup"
-msgstr "ݒۑ܂"
-
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: fBNg쐬ł܂: %s"
@@ -1501,9 +1436,6 @@ msgstr ""
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: 󕶎Ƃĕ]܂"
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: viminfot@CǍpƂĊJ܂"
-
 msgid "Untitled"
 msgstr ""
 
@@ -1617,38 +1549,6 @@ msgstr "E788: ݂͑̃obt@ҏW邱Ƃ͋܂"
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: ݂̓obt@ύX邱Ƃ͋܂"
 
-msgid "tagname"
-msgstr "^O"
-
-msgid " kind file\n"
-msgstr " t@C\n"
-
-msgid "'history' option is zero"
-msgstr "IvV 'history' [ł"
-
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s ڂ̗ (V̂Â̂):\n"
-
-msgid "Command Line"
-msgstr "R}hC"
-
-msgid "Search String"
-msgstr ""
-
-msgid "Expression"
-msgstr ""
-
-msgid "Input Line"
-msgstr "͍s"
-
-msgid "Debug Line"
-msgstr "fobOs"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: ANeBuȃEBhEobt@폜܂"
 
@@ -1658,18 +1558,12 @@ msgstr "E812: autocommandobt@obt@ύX܂"
 msgid "Illegal file name"
 msgstr "sȃt@C"
 
-msgid "is a directory"
-msgstr "̓fBNgł"
-
 msgid "is not a file"
 msgstr "̓t@Cł͂܂"
 
 msgid "is a device (disabled with 'opendevice' option)"
 msgstr "̓foCXł ('opendevice' IvVʼnł܂)"
 
-msgid "[New File]"
-msgstr "[Vt@C]"
-
 msgid "[New DIRECTORY]"
 msgstr "[VKfBNg]"
 
@@ -1709,12 +1603,6 @@ msgstr "[CR]"
 msgid "[long lines split]"
 msgstr "[s]"
 
-msgid "[NOT converted]"
-msgstr "[ϊ]"
-
-msgid "[converted]"
-msgstr "[ϊ]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[%ld sڂŕϊG[]"
@@ -1735,124 +1623,6 @@ msgstr "'charconvert' ɂϊs܂"
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' ̏o͂Ǎ߂܂ł"
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: acwriteobt@̊Yautocommand݂͑܂"
-
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: ۑobt@autocommand폜܂"
-
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: autocommand\\ʕ@ōsύX܂"
-
-# Added at 19-Jan-2004.
-msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans͖ύX̃obt@㏑邱Ƃ͋‚Ă܂"
-
-msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "NetBeansobt@̈ꕔoƂ͂ł܂"
-
-msgid "is not a file or writable device"
-msgstr "̓t@Cł݉”\\foCXł܂"
-
-msgid "writing to device disabled with 'opendevice' option"
-msgstr "'opendevice' IvVɂfoCXւ݂̏͂ł܂"
-
-msgid "is read-only (add ! to override)"
-msgstr "͓Ǎpł (ɂ ! lj)"
-
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: obNAbvt@Cۑł܂ (! ljŋ)"
-
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr ""
-"E507: obNAbvt@C‚ۂɃG[܂ (! ljŋ"
-")"
-
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: obNAbvpt@CǍ߂܂ (! ljŋ)"
-
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: obNAbvt@C܂ (! ljŋ)"
-
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: obNAbvt@C܂ (! ljŋ)"
-
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: ۑpꎞt@C‚܂"
-
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: ϊł܂ (! ljŕϊɕۑ)"
-
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: Nꂽt@Cɏ߂܂"
-
-msgid "E212: Can't open file for writing"
-msgstr "E212: ݗpɃt@CJ܂"
-
-msgid "E949: File changed while writing"
-msgstr "E949: ݒɃt@CύX܂"
-
-msgid "E512: Close failed"
-msgstr "E512: ‚邱ƂɎs"
-
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: ݃G[Aϊs (㏑ɂ 'fenc' ɂĂ)"
-
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: ݃G[AϊsAs %ld (㏑ɂ 'fenc' ɂĂ"
-")"
-
-msgid "E514: write error (file system full?)"
-msgstr "E514: ݃G[ (t@CVXet?)"
-
-msgid " CONVERSION ERROR"
-msgstr " ϊG["
-
-#, c-format
-msgid " in line %ld;"
-msgstr " s %ld;"
-
-msgid "[Device]"
-msgstr "[foCX]"
-
-msgid "[New]"
-msgstr "[V]"
-
-msgid " [a]"
-msgstr " [a]"
-
-msgid " appended"
-msgstr " lj"
-
-msgid " [w]"
-msgstr " [w]"
-
-msgid " written"
-msgstr " "
-
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: patchmode: {t@Cۑł܂"
-
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patchmode: ̌{t@Ctouchł܂"
-
-msgid "E207: Can't delete backup file"
-msgstr "E207: obNAbvt@C܂"
-
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"x: {t@CꂽύX܂\n"
-
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "t@C̕ۑɐ܂ŃGfB^IȂł!"
-
 msgid "[dos]"
 msgstr "[dos]"
 
@@ -1887,12 +1657,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[ŏIssS]"
 
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "x: Ǎ񂾌Ƀt@CɕύX܂!!!"
-
-msgid "Do you really want to write to it"
-msgstr "{ɏ㏑܂"
-
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" ݒ̃G[ł"
@@ -1958,10 +1722,29 @@ msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" ̓[hł܂ł"
 
 msgid "E219: Missing {."
-msgstr "E219: { ܂."
+msgstr "E219: { ܂B"
 
 msgid "E220: Missing }."
-msgstr "E220: } ܂."
+msgstr "E220: } ܂B"
+
+msgid "<empty>"
+msgstr "<>"
+
+# Added at 10-Mar-2004.
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: V{bNN߂܂ (z‚Ă”\\܂)"
+
+msgid "Select Directory dialog"
+msgstr "fBNgI_CAO"
+
+msgid "Save File dialog"
+msgstr "t@Cۑ_CAO"
+
+msgid "Open File dialog"
+msgstr "t@CǍ_CAO"
+
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: R\\[[hł̓t@CuEUg܂A߂Ȃ"
 
 msgid "E854: path too long for completion"
 msgstr "E854: pX߂ĕ⊮ł܂"
@@ -1972,7 +1755,7 @@ msgid ""
 "followed by '%s'."
 msgstr ""
 "E343: ȃpXł: '**[l]' path̍Ōォ '%s' ĂȂƂ܂"
-"."
+"B"
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
@@ -2011,37 +1794,17 @@ msgid "+--%3ld line folded "
 msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld s܏܂܂"
 
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld s: "
+
 msgid "E222: Add to read buffer"
 msgstr "E222: Ǎobt@֒lj"
 
 msgid "E223: recursive mapping"
 msgstr "E223: ċAI}bsO"
 
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s ƂO[oZk͂͊ɑ݂܂"
-
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s ƂO[o}bsO͊ɑ݂܂"
-
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s ƂZk͂͊ɑ݂܂"
-
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: %s Ƃ}bsO͊ɑ݂܂"
-
-msgid "No abbreviation found"
-msgstr "Zk͂͌‚܂ł"
-
-msgid "No mapping found"
-msgstr "}bsO͌‚܂ł"
-
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: sȃ[h"
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: GUIp̃vZX̋NɎs܂"
 
@@ -2094,7 +1857,7 @@ msgid "Cancel"
 msgstr "LZ"
 
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "XN[o[: 摜擾ł܂ł."
+msgstr "XN[o[: 摜擾ł܂łB"
 
 msgid "Vim dialog"
 msgstr "Vim _CAO"
@@ -2243,7 +2006,7 @@ msgstr "E671: ^Cg \"%s\" ̃EBhE͌‚܂"
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: ̓T|[g܂: \"-%s\"; OLEłgpĂ."
+msgstr "E243: ̓T|[g܂: \"-%s\"; OLEłgpĂB"
 
 msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
 msgstr "E988: GUI͎gps”\\łBgvim.exeNł܂B"
@@ -2378,14 +2141,16 @@ msgid "E621: \"%s\" resource file has wr
 msgstr "E621: \\[Xt@C \"%s\" ̓o[WقȂ܂"
 
 msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: ̖݊}`oCgGR[fBOƕZbgł"
+msgstr "E673: ̖݊}`oCgGR[fBOƕZbgłB"
 
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: }`oCgGR[fBOł printmbcharset ɂł܂"
+msgstr ""
+"E674: }`oCgGR[fBOł printmbcharset ɂł܂B"
 
 msgid "E675: No default font specified for multi-byte printing."
 msgstr ""
-"E675: }`oCg邽߂̃ftHgtHgw肳Ă܂"
+"E675: }`oCg邽߂̃ftHgtHgw肳Ă܂"
+"B"
 
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScripto͗p̃t@CJ܂"
@@ -2415,7 +2180,94 @@ msgid "E365: Failed to print PostScript 
 msgstr "E365: PostScriptt@C̈Ɏs܂"
 
 msgid "Print job sent."
-msgstr "Wu𑗐M܂."
+msgstr "Wu𑗐M܂B"
+
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim ̍ċAĂяoo܂"
+
+#, c-format
+msgid "E411: highlight group not found: %s"
+msgstr "E411: nCCgO[v‚܂: %s"
+
+#, c-format
+msgid "E412: Not enough arguments: \":highlight link %s\""
+msgstr "E412: [ł͂Ȃ: \":highlight link %s\""
+
+#, c-format
+msgid "E413: Too many arguments: \":highlight link %s\""
+msgstr "E413: ߂܂: \":highlight link %s\""
+
+msgid "E414: group has settings, highlight link ignored"
+msgstr "E414: O[vݒ肳Ă̂ŃnCCgN͖܂"
+
+#, c-format
+msgid "E415: unexpected equal sign: %s"
+msgstr "E415: \\ʓł: %s"
+
+#, c-format
+msgid "E416: missing equal sign: %s"
+msgstr "E416: ܂: %s"
+
+#, c-format
+msgid "E417: missing argument: %s"
+msgstr "E417: ܂: %s"
+
+#, c-format
+msgid "E418: Illegal value: %s"
+msgstr "E418: sȒlł: %s"
+
+msgid "E419: FG color unknown"
+msgstr "E419: m̑OiFł"
+
+msgid "E420: BG color unknown"
+msgstr "E420: m̔wiFł"
+
+#, c-format
+msgid "E421: Color name or number not recognized: %s"
+msgstr "E421: J[ԍFł܂: %s"
+
+#, c-format
+msgid "E422: terminal code too long: %s"
+msgstr "E422: I[R[h߂܂: %s"
+
+#, c-format
+msgid "E423: Illegal argument: %s"
+msgstr "E423: sȈł: %s"
+
+msgid "E424: Too many different highlighting attributes in use"
+msgstr "E424: ̈قȂnCCgg߂Ă܂"
+
+msgid "E669: Unprintable character in group name"
+msgstr "E669: O[vɈs”\\ȕ܂"
+
+msgid "W18: Invalid character in group name"
+msgstr "W18: O[vɕsȕ܂"
+
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: nCCgƍ\\O[v߂܂"
+
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799:  ID: %d (1 ȏłȂ΂Ȃ܂)"
+
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID ͂łɗpł: %d"
+
+msgid "List or number required"
+msgstr "XglKvł"
+
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802:  ID: %d (1 ȏłȂ΂Ȃ܂)"
+
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ID ͂܂: %d"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID  \":match\" ̂߂ɗ\\񂳂Ă܂: %d"
 
 msgid "Add a new database"
 msgstr "Vf[^x[Xlj"
@@ -2581,7 +2433,7 @@ msgid " # pid    database name          
 msgstr " # pid    f[^x[X                      prepend pX\n"
 
 msgid "Lua library cannot be loaded."
-msgstr "LuaCu[hł܂."
+msgstr "LuaCu[hł܂B"
 
 msgid "cannot save undo information"
 msgstr "AhD񂪕ۑł܂"
@@ -2589,14 +2441,14 @@ msgstr "AhD񂪕ۑł܂"
 msgid ""
 "E815: Sorry, this command is disabled, the MzScheme libraries could not be "
 "loaded."
-msgstr "E815: ̃R}h͖ł. MzScheme Cu[hł܂."
+msgstr "E815: ̃R}h͖łBMzScheme Cu[hł܂B"
 
 msgid ""
 "E895: Sorry, this command is disabled, the MzScheme's racket/base module "
 "could not be loaded."
 msgstr ""
-"E895: ̃R}h͖łA߂Ȃ. MzScheme  racket/base W["
-"[hł܂ł."
+"E895: ̃R}h͖łA߂ȂBMzScheme  racket/base W["
+"[hł܂łB"
 
 msgid "invalid expression"
 msgstr "Ȏł"
@@ -2657,14 +2509,14 @@ msgid ""
 "loaded."
 msgstr ""
 "E263: ̃R}h͖łA߂Ȃ: PythonCu[hł܂"
-"ł."
+"łB"
 
 msgid ""
 "E887: Sorry, this command is disabled, the Python's site module could not be "
 "loaded."
 msgstr ""
-"E887: ̃R}h͖łA߂Ȃ. Python  site W[[h"
-"ł܂ł."
+"E887: ̃R}h͖łA߂ȂBPython  site W[[h"
+"ł܂łB"
 
 # Added at 07-Feb-2004.
 msgid "E659: Cannot invoke Python recursively"
@@ -2680,7 +2532,7 @@ msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: ̃R}h͖łA߂Ȃ: RubyCu[hł܂"
-"ł."
+"łB"
 
 msgid "E267: unexpected return"
 msgstr "E267: \\ return ł"
@@ -2766,7 +2618,7 @@ msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
 "E571: ̃R}h͖łA߂Ȃ: TclCu[hł܂"
-"."
+"B"
 
 #, c-format
 msgid "E572: exit code %d"
@@ -2786,7 +2638,16 @@ msgid "E573: Invalid server id used: %s"
 msgstr "E573: ȃT[o[IDg܂: %s"
 
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-msgstr "E251: VIM ̂̓o^vpeBsł. ܂!"
+msgstr "E251: VIM ̂̓o^vpeBsłB܂!"
+
+#, c-format
+msgid "%ld lines to indent... "
+msgstr "%ld sCfg܂... "
+
+#, c-format
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld sCfg܂ "
 
 msgid " Keyword completion (^N^P)"
 msgstr " L[[h⊮ (^N^P)"
@@ -2855,12 +2716,15 @@ msgstr " (}) XN[(^E/^Y)"
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (u) XN[ (^E/^Y)"
 
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() ͑}[hłpł܂"
+
 #, c-format
 msgid "Scanning: %s"
 msgstr "XL: %s"
 
 msgid "Scanning tags."
-msgstr "^OXL."
+msgstr "^OXLB"
 
 msgid "match in file"
 msgstr "t@C̃}b`"
@@ -2893,6 +2757,10 @@ msgid "E938: Duplicate key in JSON: \"%s
 msgstr "E938: JSONɏdL[܂: \"%s\""
 
 #, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: %s ̈̓Xg^܂Blob^łȂ΂Ȃ܂"
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Xg^ɃJ}܂: %s"
 
@@ -2900,6 +2768,36 @@ msgstr "E696: Xg^ɃJ}܂: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Xg^̍Ō ']' ܂: %s"
 
+msgid "sort() argument"
+msgstr "sort() ̈"
+
+msgid "uniq() argument"
+msgstr "uniq() ̈"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: \\[g̔r֐s܂"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq ̔r֐s܂"
+
+msgid "map() argument"
+msgstr "map() ̈"
+
+msgid "filter() argument"
+msgstr "filter() ̈"
+
+msgid "add() argument"
+msgstr "add() ̈"
+
+msgid "insert() argument"
+msgstr "insert() ̈"
+
+msgid "remove() argument"
+msgstr "remove() ̈"
+
+msgid "reverse() argument"
+msgstr "reverse() ̈"
+
 msgid "Unknown option argument"
 msgstr "m̃IvVł"
 
@@ -2929,7 +2827,7 @@ msgid "'-nb' cannot be used: not enabled
 msgstr "'-nb' gps”\\ł: RpCɖɂĂ܂\n"
 
 msgid "This Vim was not compiled with the diff feature."
-msgstr "Vimɂdiff@\\܂(RpCݒ)."
+msgstr "Vimɂdiff@\\܂(RpCݒ)B"
 
 msgid "Attempt to open script file again: \""
 msgstr "XNvgt@CĂъJƂ܂: \""
@@ -3307,7 +3205,7 @@ msgid ": Send failed.\n"
 msgstr ": MɎs܂.\n"
 
 msgid ": Send failed. Trying to execute locally\n"
-msgstr ": MɎs܂. [Jł̎s݂Ă܂\n"
+msgstr ": MɎs܂B[Jł̎s݂Ă܂\n"
 
 #, c-format
 msgid "%d of %d edited"
@@ -3319,6 +3217,39 @@ msgstr "fBXvC܂: ̑MɎs܂.\n"
 msgid ": Send expression failed.\n"
 msgstr ": ̑MɎs܂.\n"
 
+#, c-format
+msgid "E224: global abbreviation already exists for %s"
+msgstr "E224: %s ƂO[oZk͂͊ɑ݂܂"
+
+#, c-format
+msgid "E225: global mapping already exists for %s"
+msgstr "E225: %s ƂO[o}bsO͊ɑ݂܂"
+
+#, c-format
+msgid "E226: abbreviation already exists for %s"
+msgstr "E226: %s ƂZk͂͊ɑ݂܂"
+
+#, c-format
+msgid "E227: mapping already exists for %s"
+msgstr "E227: %s Ƃ}bsO͊ɑ݂܂"
+
+msgid "No abbreviation found"
+msgstr "Zk͂͌‚܂ł"
+
+msgid "No mapping found"
+msgstr "}bsO͌‚܂ł"
+
+msgid "E228: makemap: Illegal mode"
+msgstr "E228: makemap: sȃ[h"
+
+#, c-format
+msgid "E357: 'langmap': Matching character missing for %s"
+msgstr "E357: 'langmap': %s ɑΉ镶܂"
+
+#, c-format
+msgid "E358: 'langmap': Extra characters after semicolon: %s"
+msgstr "E358: 'langmap': Z~Řɗ]ȕ܂: %s"
+
 msgid "No marks set"
 msgstr "}[Nݒ肳Ă܂"
 
@@ -3347,30 +3278,6 @@ msgstr ""
 "\n"
 "ύX     s    eLXg"
 
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# t@C}[N:\n"
-
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# WvXg (V̂):\n"
-
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# t@C}[N̗ (V̂Â):\n"
-
-msgid "Missing '>'"
-msgstr "'>' ‚܂"
-
 msgid "E543: Not a valid codepage"
 msgstr "E543: ȃR[hy[Wł"
 
@@ -3454,7 +3361,7 @@ msgid ""
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"炭ύXĂȂVimXbvt@CXVĂ܂."
+"炭ύXĂȂVimXbvt@CXVĂ܂B"
 
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vim̂̃o[Wł͎gpł܂.\n"
@@ -3477,7 +3384,7 @@ msgid ""
 "or the file has been damaged."
 msgstr ""
 ",\n"
-"̓t@CĂ܂."
+"̓t@CĂ܂B"
 
 #, c-format
 msgid ""
@@ -3515,7 +3422,7 @@ msgid ""
 "enter the new crypt key."
 msgstr ""
 "\n"
-"VÍL[͂Ă."
+"VÍL[͂ĂB"
 
 msgid ""
 "\n"
@@ -3529,7 +3436,7 @@ msgid ""
 "to use the same key for text file and swap file"
 msgstr ""
 "\n"
-"Xbvt@CɓÍL[g߂enterĂ."
+"Xbvt@CɓÍL[g߂enterĂB"
 
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
@@ -3575,7 +3482,7 @@ msgid "See \":help E312\" for more infor
 msgstr "ڍׂ \":help E312\" QƂĂ"
 
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "JoI܂. SĂ`FbNĂ."
+msgstr "JoI܂BSĂ`FbNĂB"
 
 msgid ""
 "\n"
@@ -3588,7 +3495,7 @@ msgid "and run diff with the original fi
 msgstr "{t@CƂ diff sƗǂł傤)"
 
 msgid "Recovery completed. Buffer contents equals file contents."
-msgstr ". obt@̓e̓t@CƓɂȂ܂."
+msgstr "Bobt@̓e̓t@CƓɂȂ܂B"
 
 msgid ""
 "\n"
@@ -3617,6 +3524,9 @@ msgstr "   fBNg "
 msgid "      -- none --\n"
 msgstr "      -- Ȃ --\n"
 
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%Y/%m/%d (%a) %H:%M:%S"
+
 msgid "          owned by: "
 msgstr "            L: "
 
@@ -3709,8 +3619,8 @@ msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: lnumł: %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: s %ld ‚܂"
+msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get: s %ld obt@ %d %s Ɍ‚܂"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: |C^ubNIDԈĂ܂ 3"
@@ -3781,10 +3691,10 @@ msgid ""
 "    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
-"(1) ʂ̃vOt@CҏWĂ邩܂.\n"
+"(1) ʂ̃vOt@CҏWĂ邩܂B\n"
 "    ̏ꍇɂ́AύXĂ܂1‚̃t@Cɑ΂ĈقȂ2‚\n"
-"    CX^XłĂ܂̂ŁAȂ悤ɋC‚Ă.\n"
-"    I邩AӂȂ瑱Ă.\n"
+"    CX^XłĂ܂̂ŁAȂ悤ɋC‚ĂB\n"
+"    I邩AӂȂ瑱ĂB\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ̃t@C̕ҏWZbVNbV.\n"
@@ -3955,18 +3865,6 @@ msgstr ""
 "Sĕ(&D)\n"
 "LZ(&C)"
 
-msgid "Select Directory dialog"
-msgstr "fBNgI_CAO"
-
-msgid "Save File dialog"
-msgstr "t@Cۑ_CAO"
-
-msgid "Open File dialog"
-msgstr "t@CǍ_CAO"
-
-msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: R\\[[hł̓t@CuEUg܂A߂Ȃ"
-
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() ̈s\\ł"
 
@@ -3976,9 +3874,6 @@ msgstr "E807: printf() ̈ɂ͕_҂Ă܂"
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() ̈߂܂"
 
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: x: Ǎpt@CύX܂"
-
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "ԍ<Enter>͂邩}EXŃNbNĂ (ŃLZ): "
@@ -4002,6 +3897,14 @@ msgstr " (܂܂)"
 msgid "Beep!"
 msgstr "r[b!"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: ꎞt@CɃG[܂"
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld bo߂Ă܂"
+
 msgid "ERROR: "
 msgstr "G[: "
 
@@ -4021,12 +3924,8 @@ msgstr ""
 "[ďo]  re/malloc()  %lu,  free()  %lu\n"
 "\n"
 
-msgid "E340: Line is becoming too long"
-msgstr "E340: sȂ߂܂"
-
-#, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: G[: lalloc(%ld,)"
+msgid "E341: Internal error: lalloc(0, )"
+msgstr "E341: G[: lalloc(0, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4073,12 +3972,6 @@ msgstr "E505: %s ͓Ǎpł (ɂ ! lj)"
 msgid "E349: No identifier under cursor"
 msgstr "E349: J[\\̈ʒuɂ͎ʎq܂"
 
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' IvVł"
-
-msgid "E775: Eval feature not available"
-msgstr "E775: ]@\\ɂȂĂ܂"
-
 msgid "Warning: terminal cannot highlight"
 msgstr "x: gpĂ[̓nCCgł܂"
 
@@ -4115,18 +4008,6 @@ msgid "%ld lines %sed %d time"
 msgid_plural "%ld lines %sed %d times"
 msgstr[0] "%ld s %s  %d 񏈗܂"
 
-#, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld sCfg܂... "
-
-#, c-format
-msgid "%ld line indented "
-msgid_plural "%ld lines indented "
-msgstr[0] "%ld sCfg܂ "
-
-msgid "E748: No previously used register"
-msgstr "E748: ܂WX^gpĂ܂"
-
 msgid "cannot yank; delete anyway"
 msgstr "Nł܂; Ƃɂ"
 
@@ -4136,54 +4017,6 @@ msgid_plural "%ld lines changed"
 msgstr[0] "%ld sύX܂"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "%ld s"
-
-#, c-format
-msgid " into \"%c"
-msgstr " \"%c "
-
-#, c-format
-msgid "block of %ld line yanked%s"
-msgid_plural "block of %ld lines yanked%s"
-msgstr[0] "%ld s̃ubN%sN܂"
-
-#, c-format
-msgid "%ld line yanked%s"
-msgid_plural "%ld lines yanked%s"
-msgstr[0] "%ld s%sN܂"
-
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: WX^ %s ɂ͉܂"
-
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- WX^ ---"
-
-msgid "Illegal register name"
-msgstr "sȃWX^"
-
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# WX^:\n"
-
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: m̃WX^^ %d ł"
-
-msgid ""
-"E883: search pattern and expression register may not contain two or more "
-"lines"
-msgstr "E883: p^[ƎWX^ɂ2sȏ܂߂܂"
-
-#, c-format
 msgid "%ld Cols; "
 msgstr "%ld ; "
 
@@ -4214,8 +4047,11 @@ msgstr ""
 msgid "(+%lld for BOM)"
 msgstr "(+%lld for BOM)"
 
-msgid "Thanks for flying Vim"
-msgstr "Vim gĂĂ肪Ƃ"
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' IvVł"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: ]@\\ɂȂĂ܂"
 
 msgid "E518: Unknown option"
 msgstr "E518: m̃IvVł"
@@ -4226,6 +4062,9 @@ msgstr "E519: IvV̓T|[gĂ܂"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline ł͋‚܂"
 
+msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
+msgstr "E992: 'modelineexpr' It̎ modeline ł͋‚܂"
+
 msgid "E846: Key code not set"
 msgstr "E846: L[R[hݒ肳Ă܂"
 
@@ -4235,6 +4074,66 @@ msgstr "E521: = ̌ɂ͐Kvł"
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap Ɍ‚܂"
 
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: s̃Wu[͕ύX”\\ɂł܂"
+
+msgid "E590: A preview window already exists"
+msgstr "E590: vr[EBhEɑ݂܂"
+
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr ""
+"W17: ArAɂUTF-8KvȂ̂ŁA':set encoding=utf-8' Ă"
+
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 24bitF͂̊‹ł̓T|[gĂ܂"
+
+#, c-format
+msgid "E593: Need at least %d lines"
+msgstr "E593: Œ %d ̍sKvł"
+
+#, c-format
+msgid "E594: Need at least %d columns"
+msgstr "E594: Œ %d ̃JKvł"
+
+#, c-format
+msgid "E355: Unknown option: %s"
+msgstr "E355: m̃IvVł: %s"
+
+#, c-format
+msgid "E521: Number required: &%s = '%s'"
+msgstr "E521: Kvł: &%s = '%s'"
+
+msgid ""
+"\n"
+"--- Terminal codes ---"
+msgstr ""
+"\n"
+"--- [R[h ---"
+
+msgid ""
+"\n"
+"--- Global option values ---"
+msgstr ""
+"\n"
+"--- O[oIvVl ---"
+
+msgid ""
+"\n"
+"--- Local option values ---"
+msgstr ""
+"\n"
+"--- [JIvVl ---"
+
+msgid ""
+"\n"
+"--- Options ---"
+msgstr ""
+"\n"
+"--- IvV ---"
+
+msgid "E356: get_varp ERROR"
+msgstr "E356: get_varp G["
+
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: sȕł <%s>"
@@ -4243,6 +4142,15 @@ msgstr "E539: sȕł <%s>"
 msgid "For option %s"
 msgstr "IvV: %s"
 
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: IĂ܂"
+
+msgid "E541: too many items"
+msgstr "E541: vf߂܂"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: O[vލ܂"
+
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' ɂ͋󕶎ݒł܂"
 
@@ -4313,86 +4221,6 @@ msgstr "E536: J}Kvł"
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' ͋ł邩 %s ܂ޕKv܂"
 
-msgid "E538: No mouse support"
-msgstr "E538: }EX̓T|[g܂"
-
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: IĂ܂"
-
-msgid "E541: too many items"
-msgstr "E541: vf߂܂"
-
-msgid "E542: unbalanced groups"
-msgstr "E542: O[vލ܂"
-
-msgid "E946: Cannot make a terminal with running job modifiable"
-msgstr "E946: s̃Wu[͕ύX”\\ɂł܂"
-
-msgid "E590: A preview window already exists"
-msgstr "E590: vr[EBhEɑ݂܂"
-
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr ""
-"W17: ArAɂUTF-8KvȂ̂ŁA':set encoding=utf-8' Ă"
-
-msgid "E954: 24-bit colors are not supported on this environment"
-msgstr "E954: 24bitF͂̊‹ł̓T|[gĂ܂"
-
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: Œ %d ̍sKvł"
-
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: Œ %d ̃JKvł"
-
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: m̃IvVł: %s"
-
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: Kvł: &%s = '%s'"
-
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- [R[h ---"
-
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- O[oIvVl ---"
-
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- [JIvVl ---"
-
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- IvV ---"
-
-msgid "E356: get_varp ERROR"
-msgstr "E356: get_varp G["
-
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': %s ɑΉ镶܂"
-
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': Z~Řɗ]ȕ܂: %s"
-
 msgid "cannot open "
 msgstr "J܂ "
 
@@ -4435,7 +4263,7 @@ msgid " returned\n"
 msgstr " ߂܂\n"
 
 msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE ߂܂."
+msgstr "ANCHOR_BUF_SIZE ߂܂B"
 
 msgid "I/O ERROR"
 msgstr "o̓G["
@@ -4485,6 +4313,10 @@ msgstr ""
 "\n"
 "Vim: X ̃G[o܂r\n"
 
+#, c-format
+msgid "restoring display %s"
+msgstr "fBXvC %s 𕜌Ă܂"
+
 msgid "Testing the X display failed"
 msgstr "X display ̃`FbNɎs܂"
 
@@ -4511,7 +4343,7 @@ msgstr "ZLeBReLXg %s  %s ɐݒł܂"
 
 #, c-format
 msgid "Could not get security context %s for %s. Removing it!"
-msgstr "ZLeBReLXg %s  %s 擾ł܂. 폜܂!"
+msgstr "ZLeBReLXg %s  %s 擾ł܂B폜܂!"
 
 msgid ""
 "\n"
@@ -4604,7 +4436,7 @@ msgid ""
 msgstr ""
 "VIMRUN.EXE $PATH ̒Ɍ‚܂.\n"
 "OR}h̏IɈꎞ~܂.\n"
-"ڍׂ  :help win32-vimrun  QƂĂ."
+"ڍׂ  :help win32-vimrun  QƂĂB"
 
 msgid "Vim Warning"
 msgstr "Vim̌x"
@@ -4613,6 +4445,23 @@ msgstr "Vim̌x"
 msgid "shell returned %d"
 msgstr "VFR[h %d ŏI܂"
 
+msgid "E278: Cannot put a terminal buffer in a popup window"
+msgstr "E278: [obt@|bvAbvEBhEɒuƂ͂ł܂"
+
+#, c-format
+msgid "E997: Tabpage not found: %d"
+msgstr "E997: ^uy[W‚܂: %d"
+
+#, c-format
+msgid "E993: window %d is not a popup window"
+msgstr "E993: EBhE %d ̓|bvAbvEBhEł͂܂"
+
+msgid "E994: Not allowed in a popup window"
+msgstr "E994: |bvAbvEBhEł͋܂"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: ߂ \":profile start {fname}\" sĂ"
+
 msgid "E553: No more items"
 msgstr "E553: vf܂"
 
@@ -4691,6 +4540,10 @@ msgid "E777: String or List expected"
 msgstr "E777: 񂩃XgKvł"
 
 #, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: ȑł: '%s'"
+
+#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ȍڂł: %s%%[]"
 
@@ -4733,38 +4586,27 @@ msgstr "E70: %s%%[] ł"
 msgid "E956: Cannot use pattern recursively"
 msgstr "E956: p^[ċAIɎgƂ͂ł܂"
 
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: %s{...} ɕ@G[܂"
+
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA K\\) JԂ܂ %s"
+
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= ɂ 0, 1  2 ݂̂܂BK\\GW͎I"
+"܂B"
+
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "̃p^[ɃobNgbLO RE GWKp܂: "
+
 msgid "E65: Illegal back reference"
 msgstr "E65: sȌQƂł"
 
-msgid "E339: Pattern too long"
-msgstr "E339: p^[߂܂"
-
-msgid "E50: Too many \\z("
-msgstr "E50: \\z( ߂܂"
-
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s( ߂܂"
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: \\z( ނ荇Ă܂"
-
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: %s@ ̌ɕsȕ܂"
-
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: G %s{...} ߂܂"
-
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61:%s* qɂȂĂ܂"
-
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62:%s%c qɂȂĂ܂"
-
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ ̖Ȏgp@ł"
 
@@ -4784,26 +4626,37 @@ msgid "E71: Invalid character after %s%%
 msgstr "E71: %s%% ̌ɕsȕ܂"
 
 #, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: %s{...} ɕ@G[܂"
+msgid "E59: invalid character after %s@"
+msgstr "E59: %s@ ̌ɕsȕ܂"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: G %s{...} ߂܂"
+
+#, c-format
+msgid "E61: Nested %s*"
+msgstr "E61:%s* qɂȂĂ܂"
+
+#, c-format
+msgid "E62: Nested %s%c"
+msgstr "E62:%s%c qɂȂĂ܂"
+
+msgid "E50: Too many \\z("
+msgstr "E50: \\z( ߂܂"
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: %s( ߂܂"
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: \\z( ނ荇Ă܂"
+
+msgid "E339: Pattern too long"
+msgstr "E339: p^[߂܂"
 
 msgid "External submatches:\n"
 msgstr "O̕Y:\n"
 
-#, c-format
-msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (NFA K\\) JԂ܂ %s"
-
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: \\%#= ɂ 0, 1  2 ݂̂܂BK\\GW͎I"
-"܂B"
-
-msgid "Switching to backtracking RE engine for pattern: "
-msgstr "̃p^[ɃobNgbLO RE GWKp܂: "
-
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) ҂葁K\\̏I[ɓB܂"
 
@@ -4869,6 +4722,43 @@ msgstr "E876: (NFA K\\) NFAŜۑɂ͋󂫃Xy[X܂"
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) ݉f̃u`ɏ\\ȃ蓖Ă܂!"
 
+msgid "E748: No previously used register"
+msgstr "E748: ܂WX^gpĂ܂"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "%ld s"
+
+#, c-format
+msgid " into \"%c"
+msgstr " \"%c "
+
+#, c-format
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "%ld s̃ubN%sN܂"
+
+#, c-format
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld s%sN܂"
+
+#, c-format
+msgid "E353: Nothing in register %s"
+msgstr "E353: WX^ %s ɂ͉܂"
+
+msgid ""
+"\n"
+"Type Name Content"
+msgstr ""
+"\n"
+"^ O e"
+
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr "E883: p^[ƎWX^ɂ2sȏ܂߂܂"
+
 msgid " VREPLACE"
 msgstr " zu"
 
@@ -4921,6 +4811,80 @@ msgid "recording"
 msgstr "L^"
 
 #, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "\"%s\"  \"%s\" 猟"
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "\"%s\" "
+
+#, c-format
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' ̒ɂ͂܂: \"%s\""
+
+msgid "Source Vim script"
+msgstr "VimXNvg̎捞"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "fBNg͎捞߂܂: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "\"%s\" 捞߂܂"
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "s %ld: \"%s\" 捞߂܂"
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "\"%s\" 捞"
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "s %ld: %s 捞"
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "%s ̎捞"
+
+#, c-format
+msgid "continuing in %s"
+msgstr "%s ̎spł"
+
+msgid "modeline"
+msgstr "[hs"
+
+msgid "--cmd argument"
+msgstr "--cmd "
+
+msgid "-c argument"
+msgstr "-c "
+
+msgid "environment variable"
+msgstr "‹ϐ"
+
+msgid "error handler"
+msgstr "G[nh"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: x: s؂słB^M Ȃ̂ł傤"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding 捞XNvgȊOŎgp܂"
+
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion 捞XNvgȊOŎgp܂"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion ̓T|[gĂ܂: %d"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish 捞XNvgȊOŎgp܂"
+
+#, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Ȍł: %s"
 
@@ -4976,18 +4940,14 @@ msgstr "E388: `‚܂"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: p^[‚܂"
 
-msgid "Substitute "
-msgstr "Substitute "
-
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# Ō %sp^[:\n"
-"~"
+msgid "Save View"
+msgstr "r[ۑ܂"
+
+msgid "Save Session"
+msgstr "ZbVۑ܂"
+
+msgid "Save Setup"
+msgstr "ݒۑ܂"
 
 msgid "[Deleted]"
 msgstr "[폜]"
@@ -5070,21 +5030,6 @@ msgstr "E797: autocommand  SpellFileMissing obt@폜܂"
 msgid "Warning: region %s not supported"
 msgstr "x9: %s Ƃ͈͂̓T|[gĂ܂"
 
-msgid "Sorry, no suggestions"
-msgstr "cOłAC͂܂"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "cOłAC %ld ‚܂"
-
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" ֕ϊ:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
 msgid "E752: No previous spell replacement"
 msgstr "E752: Xyu܂sĂ܂"
 
@@ -5187,7 +5132,7 @@ msgstr ""
 
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "COMPOUNDRULES ̒lɌ肪܂. t@C %s  %d s: %s"
+msgstr "COMPOUNDRULES ̒lɌ肪܂Bt@C %s  %d s: %s"
 
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
@@ -5414,6 +5359,21 @@ msgstr "E763: P̕Xyt@CƈقȂ܂"
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP Ggɏd݂܂"
 
+msgid "Sorry, no suggestions"
+msgstr "cOłAC͂܂"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "cOłAC %ld ‚܂"
+
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" ֕ϊ:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
 msgid "No Syntax items defined for this buffer"
 msgstr "̃obt@ɒ`ꂽ\\vf͂܂"
 
@@ -5589,70 +5549,6 @@ msgid ""
 msgstr ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: syncolor.vim ̍ċAĂяoo܂"
-
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: nCCgO[v‚܂: %s"
-
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: [ł͂Ȃ: \":highlight link %s\""
-
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ߂܂: \":highlight link %s\""
-
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: O[vݒ肳Ă̂ŃnCCgN͖܂"
-
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: \\ʓł: %s"
-
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: ܂: %s"
-
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: ܂: %s"
-
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: sȒlł: %s"
-
-msgid "E419: FG color unknown"
-msgstr "E419: m̑OiFł"
-
-msgid "E420: BG color unknown"
-msgstr "E420: m̔wiFł"
-
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: J[ԍFł܂: %s"
-
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: I[R[h߂܂: %s"
-
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: sȈł: %s"
-
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ̈قȂnCCgg߂Ă܂"
-
-msgid "E669: Unprintable character in group name"
-msgstr "E669: O[vɈs”\\ȕ܂"
-
-msgid "W18: Invalid character in group name"
-msgstr "W18: O[vɕsȕ܂"
-
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: nCCgƍ\\O[v߂܂"
-
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ^OX^bN̖ł"
 
@@ -5746,7 +5642,7 @@ msgid "Duplicate field name: %s"
 msgstr "dtB[h: %s"
 
 msgid "' not known. Available builtin terminals are:"
-msgstr "' ͖mł. s̑gݍݒ[͎̂Ƃł:"
+msgstr "' ͖młBs̑gݍݒ[͎̂Ƃł:"
 
 msgid "defaulting to '"
 msgstr "ȗl̂悤ɐݒ肵܂ '"
@@ -5781,6 +5677,9 @@ msgstr "$VIMRUNTIME/rgb.txtJ܂"
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: ȑł: %s"
 
+msgid "E279: Sorry, ++shell is not supported on this system"
+msgstr "E279: ߂ȂA++shell ͂̃VXeł̓T|[gĂ܂"
+
 #, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" ̃WuI܂?"
@@ -5828,6 +5727,9 @@ msgstr "E966: ȍsԍł: %ld"
 msgid "E965: missing property type name"
 msgstr "E965: vpeB^Cv܂"
 
+msgid "E275: Cannot add text property to unloaded buffer"
+msgstr "E275: ꂽobt@ɂ̓eLXgvpeBljł܂"
+
 msgid "E967: text property info corrupted"
 msgstr "E967: eLXgvpeB񂪉Ă܂"
 
@@ -5973,11 +5875,6 @@ msgstr "AhDΏۂ܂"
 msgid "number changes  when               saved"
 msgstr "ʔ   ύX   ύX           ۑ"
 
-#, c-format
-msgid "%ld second ago"
-msgid_plural "%ld seconds ago"
-msgstr[0] "%ld bo߂Ă܂"
-
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo ̒ undojoin ͂ł܂"
 
@@ -6068,6 +5965,9 @@ msgstr "E125: sȈł: %s"
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: dĂ܂: %s"
 
+msgid "E989: Non-default argument follows default argument"
+msgstr "E989: ftHgftHǧɂ܂"
+
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: ֐̈߂܂: %s"
@@ -6103,6 +6003,10 @@ msgid "E117: Unknown function: %s"
 msgstr "E117: m̊֐ł: %s"
 
 #, c-format
+msgid "E276: Cannot use function as a method: %s"
+msgstr "E276: ֐\\bhƂĎgpł܂: %s"
+
+#, c-format
 msgid "E933: Function was deleted: %s"
 msgstr "E933: ֐͍폜܂: %s"
 
@@ -6171,10 +6075,6 @@ msgid "E133: :return not inside a functi
 msgstr "E133: ֐O :return ܂"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: JbR '(' ܂: %s"
-
-#, c-format
 msgid "%s (%s, compiled %s)"
 msgstr "%s (%s, compiled %s)"
 
@@ -6465,6 +6365,173 @@ msgstr "ڍׂȏ           :help register<Enter>  "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "ڍׂ̓j[ wv->X|T[/o^ QƂĉ"
 
+msgid ""
+"\n"
+"# Buffer list:\n"
+msgstr ""
+"\n"
+"# obt@Xg:\n"
+
+#, c-format
+msgid ""
+"\n"
+"# %s History (newest to oldest):\n"
+msgstr ""
+"\n"
+"# %s ڂ̗ (V̂Â̂):\n"
+
+msgid "Command Line"
+msgstr "R}hC"
+
+msgid "Search String"
+msgstr ""
+
+msgid "Expression"
+msgstr ""
+
+msgid "Input Line"
+msgstr "͍s"
+
+msgid "Debug Line"
+msgstr "fobOs"
+
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' Ŏn܂śAʂ̃Rs[:\n"
+
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s s: "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr "E136: viminfo: G[߂̂ŁAȍ~̓XLbv܂"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# O[oϐ:\n"
+
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# Ōɒuꂽ:\n"
+"$"
+
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# Ō %sp^[:\n"
+"~"
+
+msgid "Substitute "
+msgstr "Substitute "
+
+msgid "Illegal register name"
+msgstr "sȃWX^"
+
+msgid ""
+"\n"
+"# Registers:\n"
+msgstr ""
+"\n"
+"# WX^:\n"
+
+#, c-format
+msgid "E574: Unknown register type %d"
+msgstr "E574: m̃WX^^ %d ł"
+
+msgid ""
+"\n"
+"# History of marks within files (newest to oldest):\n"
+msgstr ""
+"\n"
+"# t@C}[N̗ (V̂Â):\n"
+
+msgid ""
+"\n"
+"# File marks:\n"
+msgstr ""
+"\n"
+"# t@C}[N:\n"
+
+msgid ""
+"\n"
+"# Jumplist (newest first):\n"
+msgstr ""
+"\n"
+"# WvXg (V̂):\n"
+
+msgid "Missing '>'"
+msgstr "'>' ‚܂"
+
+msgid "Illegal starting char"
+msgstr "sȐ擪ł"
+
+#, c-format
+msgid "# This viminfo file was generated by Vim %s.\n"
+msgstr "#  viminfo t@C Vim %s ɂĐ܂.\n"
+
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# ύXۂɂ͏\\ӂĂ!\n"
+"\n"
+
+msgid "# Value of 'encoding' when this file was written\n"
+msgstr "# ̃t@Cꂽ 'encoding' ̒l\n"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "viminfot@C \"%s\"%s%s%s Ǎݒ"
+
+msgid " info"
+msgstr " "
+
+msgid " marks"
+msgstr " }[N"
+
+msgid " oldfiles"
+msgstr " t@CQ"
+
+msgid " FAILED"
+msgstr " s"
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: viminfot@C݂ł܂: %s"
+
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: ꎞviminfot@C߂܂! : %s"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: viminfot@C %s ۑł܂!"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "viminfot@C \"%s\" ݒ"
+
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: viminfot@C %s ֖OύXł܂!"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: viminfot@CǍpƂĊJ܂"
+
 msgid "Already only one window"
 msgstr "ɃEBhE1‚܂"
 
@@ -6475,6 +6542,9 @@ msgstr "E92: obt@ %ld ‚܂"
 msgid "E441: There is no preview window"
 msgstr "E441: vr[EBhE܂"
 
+msgid "E242: Can't split a window while closing another"
+msgstr "E242: ʂ̃EBhE‚ĂԂɕ邱Ƃ͂ł܂"
+
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: ƉE𓯎ɕ邱Ƃ͂ł܂"
 
@@ -6484,8 +6554,8 @@ msgstr "E443: ̃EBhEĂ鎞ɂ͏ł܂"
 msgid "E444: Cannot close last window"
 msgstr "E444: Ō̃EBhE‚邱Ƃ͂ł܂"
 
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: autocmdEBhE͕‚܂"
+msgid "E813: Cannot close autocmd or popup window"
+msgstr "E813: autocmdEBhE܂̓|bvAbvEBhE͕‚܂"
 
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: autocmdEBhEcȂ߁AEBhE͕‚܂"
@@ -6494,31 +6564,13 @@ msgid "E445: Other window contains chang
 msgstr "E445: ̃EBhEɂ͕ύX܂"
 
 #, c-format
-msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E799:  ID: %d (1 ȏłȂ΂Ȃ܂)"
-
-#, c-format
-msgid "E801: ID already taken: %d"
-msgstr "E801: ID ͂łɗpł: %d"
-
-msgid "List or number required"
-msgstr "XglKvł"
-
-#, c-format
-msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
-msgstr "E802:  ID: %d (1 ȏłȂ΂Ȃ܂)"
-
-#, c-format
-msgid "E803: ID not found: %d"
-msgstr "E803: ID ͂܂: %d"
-
-#, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: Cu %s [hł܂ł"
 
 msgid "Sorry, this command is disabled: the Perl library could not be loaded."
 msgstr ""
-"̃R}h͖łA߂Ȃ: PerlCu[hł܂ł."
+"̃R}h͖łA߂Ȃ: PerlCu[hł܂ł"
+"B"
 
 msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
 msgstr ""
@@ -6620,9 +6672,6 @@ msgstr "E685: G[ł: %s"
 msgid "Interrupted"
 msgstr "܂܂"
 
-msgid "E14: Invalid address"
-msgstr "E14: ȃAhXł"
-
 msgid "E474: Invalid argument"
 msgstr "E474: Ȉł"
 
@@ -6802,6 +6851,21 @@ msgid "E45: 'readonly' option is set (ad
 msgstr "E45: 'readonly' IvVݒ肳Ă܂ (! ljŏ㏑)"
 
 #, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: `̕ϐł: %s"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: قȂ^̕ϐł %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: sȕϐł: %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: ̕ϐύXł܂"
+
+#, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: ǎpϐ \"%s\" ɂ͒lݒł܂"
 
@@ -6809,6 +6873,9 @@ msgstr "E46: ǎpϐ \"%s\" ɂ͒lݒł܂"
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: Th{bNXł͕ϐ \"%s\" ɒlݒł܂"
 
+msgid "E928: String required"
+msgstr "E928: 񂪕Kvł"
+
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: ^ɋ̃L[gƂ͂ł܂"
 
@@ -6911,6 +6978,10 @@ msgstr "E939: ̃JEgKvł"
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: XNvgȊO<SID>g܂"
 
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: JbR '(' ܂: %s"
+
 msgid "E449: Invalid expression received"
 msgstr "E449: Ȏ󂯎܂"
 
@@ -6953,6 +7024,13 @@ msgstr "E952: AutocommandċAN܂"
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: j[͑̃[hɂ܂"
 
+msgid "E957: Invalid window number"
+msgstr "E957: ȃEBhEԍł"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s ̈̓Xg^łȂ΂Ȃ܂"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "܂Ō̂ʼnɖ߂܂"
 
--- a/src/po/ru.cp1251.po
+++ b/src/po/ru.cp1251.po
@@ -3,14 +3,14 @@
 #       Vim ":help uganda"
 #
 # vassily "vr" ragosin <vrr@users.sourceforge.net>, 2004
-# Sergey Alyoshin <alyoshin.s@gmail.com>, 2013-2014, 2016, 2018
+# Sergey Alyoshin <alyoshin.s@gmail.com>, 2013-2014, 2016, 2018-2019
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vim_ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-28 21:50+0300\n"
-"PO-Revision-Date: 2018-04-28 21:51+0300\n"
+"POT-Creation-Date: 2019-11-10 21:53+0300\n"
+"PO-Revision-Date: 2019-11-10 21:53+0300\n"
 "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
 "Language-Team: \n"
 "Language: Russian\n"
@@ -20,6 +20,79 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+msgid "E163: There is only one file to edit"
+msgstr "E163:      "
+
+msgid "E164: Cannot go before first file"
+msgstr "E164:   "
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165:   "
+
+msgid "E249: window layout changed unexpectedly"
+msgstr "E249:    "
+
+msgid "--Deleted--"
+msgstr "----"
+
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "- : %s <=%d>"
+
+#, c-format
+msgid "E367: No such group: \"%s\""
+msgstr "E367:  \"%s\"  "
+
+msgid "E936: Cannot delete the current group"
+msgstr "E936:    "
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19:     "
+
+#, c-format
+msgid "E215: Illegal character after *: %s"
+msgstr "E215:    *: %s"
+
+#, c-format
+msgid "E216: No such event: %s"
+msgstr "E216:  : %s"
+
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216:    : %s"
+
+msgid ""
+"\n"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"---  ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>:    "
+
+msgid "E217: Can't execute autocommands for ALL events"
+msgstr "E217:      "
+
+msgid "No matching autocommands"
+msgstr "  "
+
+msgid "E218: autocommand nesting too deep"
+msgstr "E218:    "
+
+#, c-format
+msgid "%s Autocommands for \"%s\""
+msgstr "%s   \"%s\""
+
+#, c-format
+msgid "Executing %s"
+msgstr " %s"
+
+#, c-format
+msgid "autocommand %s"
+msgstr " %s"
+
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: bf_key_init()    "
 
@@ -54,8 +127,9 @@ msgstr "E83:     ,   ..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931:   "
 
-msgid "E937: Attempt to delete a buffer that is in use"
-msgstr "E937:    "
+#, c-format
+msgid "E937: Attempt to delete a buffer that is in use: %s"
+msgstr "E937:    : %s"
 
 msgid "E515: No buffers were unloaded"
 msgstr "E515:        "
@@ -66,26 +140,26 @@ msgstr "E516:      "
 msgid "E517: No buffers were wiped out"
 msgstr "E517:      "
 
-msgid "1 buffer unloaded"
-msgstr "    "
-
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "    : %d"
-
-msgid "1 buffer deleted"
-msgstr "  "
-
-#, c-format
-msgid "%d buffers deleted"
-msgstr "  : %d"
-
-msgid "1 buffer wiped out"
-msgstr "  "
-
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "  : %d"
+#, c-format
+msgid "%d buffer unloaded"
+msgid_plural "%d buffers unloaded"
+msgstr[0] " %d "
+msgstr[1] " %d "
+msgstr[2] " %d "
+
+#, c-format
+msgid "%d buffer deleted"
+msgid_plural "%d buffers deleted"
+msgstr[0] " %d "
+msgstr[1] " %d "
+msgstr[2] " %d "
+
+#, c-format
+msgid "%d buffer wiped out"
+msgid_plural "%d buffers wiped out"
+msgstr[0] " %d "
+msgstr[1] " %d "
+msgstr[2] " %d "
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90:      "
@@ -103,9 +177,9 @@ msgid "E88: Cannot go before first buffe
 msgstr "E88:   "
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr ""
-"E89:    %ld   ( !,   )"
+msgid "E89: No write since last change for buffer %d (add ! to override)"
+msgstr ""
+"E89:      %d ( !,   )"
 
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948:    ( !,  )"
@@ -123,8 +197,8 @@ msgid "W14: Warning: List of file names 
 msgstr "W14: :    "
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92:  %ld  "
+msgid "E92: Buffer %d not found"
+msgstr "E92:    %d"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -160,12 +234,11 @@ msgid "[readonly]"
 msgstr "[  ]"
 
 #, c-format
-msgid "1 line --%d%%--"
-msgstr "  --%d%%--"
-
-#, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld . --%d%%--"
+msgid "%ld line --%d%%--"
+msgid_plural "%ld lines --%d%%--"
+msgstr[0] "%ld  --%d%%--"
+msgstr[1] "%ld  --%d%%--"
+msgstr[2] "%ld  --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
@@ -192,34 +265,164 @@ msgstr ""
 msgid "Top"
 msgstr ""
 
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"#  :\n"
-
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr ""
 "E382:  ,   'buftype'    "
 
+msgid "[Prompt]"
+msgstr "[]"
+
+msgid "[Popup]"
+msgstr "[]"
+
 msgid "[Scratch]"
 msgstr "[]"
 
+msgid "WARNING: The file has been changed since reading it!!!"
+msgstr ":     !!!"
+
+msgid "Do you really want to write to it"
+msgstr "     "
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676:      acwrite"
+
+msgid "E203: Autocommands deleted or unloaded buffer to be written"
+msgstr ""
+"E203: ,   ,    "
+
+msgid "E204: Autocommand changed number of lines in unexpected way"
+msgstr "E204:      "
+
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans      "
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "   NetBeans  "
+
+msgid "is a directory"
+msgstr " "
+
+msgid "is not a file or writable device"
+msgstr "    ,   "
+
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "      'opendevice'"
+
+msgid "is read-only (add ! to override)"
+msgstr "    ( !,   )"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr ""
+"E506:      ( !,   )"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr ""
+"E507:     ( !,   )"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr ""
+"E508:     ( !,   )"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr ""
+"E509:     ( !,   )"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr ""
+"E510:     ( !,   )"
+
+msgid "E214: Can't find temp file for writing"
+msgstr "E214:      "
+
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr ""
+"E213:   ( !    )"
+
+msgid "E166: Can't open linked file for writing"
+msgstr "E166:       "
+
+msgid "E212: Can't open file for writing"
+msgstr "E212:     "
+
+msgid "E949: File changed while writing"
+msgstr "E949:     "
+
+msgid "E512: Close failed"
+msgstr "E512:    "
+
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr ""
+"E513:  ,    ( 'fenc',  "
+")"
+
+#, c-format
 msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"---  ---"
-
-#, c-format
-msgid "Signs for %s:"
-msgstr "  %s:"
-
-#, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    =%ld  id=%d  =%s"
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"override)"
+msgstr ""
+"E513:  ,      %ld ( "
+"'fenc',  )"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514:   (  ?)"
+
+msgid " CONVERSION ERROR"
+msgstr "  "
+
+#, c-format
+msgid " in line %ld;"
+msgstr "   %ld;"
+
+msgid "[NOT converted]"
+msgstr "[ ]"
+
+msgid "[converted]"
+msgstr "[]"
+
+msgid "[Device]"
+msgstr "[]"
+
+msgid "[New]"
+msgstr "[]"
+
+msgid "[New File]"
+msgstr "[ ]"
+
+msgid " [a]"
+msgstr " []"
+
+msgid " appended"
+msgstr " "
+
+msgid " [w]"
+msgstr " []"
+
+msgid " written"
+msgstr " "
+
+msgid "E205: Patchmode: can't save original file"
+msgstr "E205:  :    "
+
+msgid "E206: patchmode: can't touch empty original file"
+msgstr ""
+"E206:  :      "
+
+msgid "E207: Can't delete backup file"
+msgstr "E207:    "
+
+msgid ""
+"\n"
+"WARNING: Original file may be lost or damaged\n"
+msgstr ""
+"\n"
+":       \n"
+
+msgid "don't quit the editor until the file is successfully written!"
+msgstr "   ,      !"
+
+msgid "W10: Warning: Changing a readonly file"
+msgstr "W10: :       "
 
 msgid "E902: Cannot connect to port"
 msgstr "E902:    "
@@ -243,6 +446,9 @@ msgstr "E904:       "
 msgid "E905: received unknown command: %s"
 msgstr "E905:    %s"
 
+msgid "E906: not an open channel"
+msgstr "E906:   "
+
 #, c-format
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s():   "
@@ -260,9 +466,6 @@ msgstr ""
 "E912:   ch_evalexpr()  ch_sendexpr()   nl "
 " raw"
 
-msgid "E906: not an open channel"
-msgstr "E906:   "
-
 msgid "E920: _io file requires _name to be set"
 msgstr "E920:  _io   _name"
 
@@ -273,6 +476,18 @@ msgstr "E915:  in_io   in_buf  in_name"
 msgid "E918: buffer must be loaded: %s"
 msgstr "E918:    : %s"
 
+msgid "E916: not a valid job"
+msgstr "E916:  "
+
+msgid "tagname"
+msgstr " "
+
+msgid " kind file\n"
+msgstr "  \n"
+
+msgid "'history' option is zero"
+msgstr "  'history'  "
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821:    "
 
@@ -291,6 +506,51 @@ msgstr "   !"
 msgid "[crypted]"
 msgstr "[]"
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "  .    \"cont\""
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr ".. = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "..  = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr " %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr ": %s"
+
+msgid "frame is zero"
+msgstr " "
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr " : %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "   \"%s%s\" . %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161:    : %s"
+
+msgid "No breakpoints defined"
+msgstr "   "
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s . %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  . %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720:    : %s"
@@ -315,8 +575,12 @@ msgid "E737: Key already exists: %s"
 msgstr "E737:   : %s"
 
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
-msgstr "E96:         %ld "
+msgid "E96: Cannot diff more than %d buffers"
+msgstr "E96:       %d "
+
+#, c-format
+msgid "Not enough memory to use internal diff for buffer \"%s\""
+msgstr "    diff   \"%s\""
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810:      "
@@ -324,6 +588,9 @@ msgstr "E810:      "
 msgid "E97: Cannot create diffs"
 msgstr "E97:    "
 
+msgid "E960: Problem creating the internal diff"
+msgstr "E960:      "
+
 msgid "Patch file"
 msgstr "-"
 
@@ -333,6 +600,9 @@ msgstr "E816:    patch"
 msgid "E98: Cannot read diff output"
 msgstr "E98:    diff"
 
+msgid "E959: Invalid diff format."
+msgstr "E959:   diff"
+
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99:       "
 
@@ -359,6 +629,81 @@ msgstr "E787:   "
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104:   Escape    "
 
+msgid "Custom"
+msgstr ""
+
+msgid "Latin supplement"
+msgstr " "
+
+msgid "Greek and Coptic"
+msgstr "  "
+
+msgid "Cyrillic"
+msgstr ""
+
+msgid "Hebrew"
+msgstr ""
+
+msgid "Arabic"
+msgstr ""
+
+msgid "Latin extended"
+msgstr " "
+
+msgid "Greek extended"
+msgstr " "
+
+msgid "Punctuation"
+msgstr ""
+
+msgid "Super- and subscripts"
+msgstr "-  "
+
+msgid "Currency"
+msgstr ""
+
+msgid "Other"
+msgstr ""
+
+msgid "Roman numbers"
+msgstr " "
+
+msgid "Arrows"
+msgstr ""
+
+msgid "Mathematical operators"
+msgstr " "
+
+msgid "Technical"
+msgstr ""
+
+msgid "Box drawing"
+msgstr ""
+
+msgid "Block elements"
+msgstr " "
+
+msgid "Geometric shapes"
+msgstr " "
+
+msgid "Symbols"
+msgstr ""
+
+msgid "Dingbats"
+msgstr ""
+
+msgid "CJK symbols and punctuation"
+msgstr ",      "
+
+msgid "Hiragana"
+msgstr ""
+
+msgid "Katakana"
+msgstr ""
+
+msgid "Bopomofo"
+msgstr " ()"
+
 msgid "E544: Keymap file not found"
 msgstr "E544:      "
 
@@ -368,151 +713,32 @@ msgstr "E105:  :loadkeymap    "
 msgid "E791: Empty keymap entry"
 msgstr "E791:    "
 
-msgid " Keyword completion (^N^P)"
-msgstr "    (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr "  ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr "    (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr "    (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr "   (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr "    (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr "   (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr "    (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr "   (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr "    (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr "   (^U^N^P)"
-
-msgid " Omni completion (^O^N^P)"
-msgstr " Omni- (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr "    (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr "     (^N^P)"
-
-msgid "Hit end of paragraph"
-msgstr " "
-
-msgid "E839: Completion function changed window"
-msgstr "E839:    "
-
-msgid "E840: Completion function deleted text"
-msgstr "E840:    "
-
-msgid "'dictionary' option is empty"
-msgstr "    'dictionary'"
-
-msgid "'thesaurus' option is empty"
-msgstr "    'thesaurus'"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr " : %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " ()  (^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " ()  (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr ": %s"
-
-msgid "Scanning tags."
-msgstr "   ."
-
-msgid "match in file"
-msgstr "  "
-
-msgid " Adding"
-msgstr " "
-
-msgid "-- Searching..."
-msgstr "-- ..."
-
-msgid "Back at original"
-msgstr " "
-
-msgid "Word from other line"
-msgstr "   "
-
-msgid "The only match"
-msgstr " "
-
-#, c-format
-msgid "match %d of %d"
-msgstr " %d  %d"
-
-#, c-format
-msgid "match %d"
-msgstr " %d"
-
-msgid "E18: Unexpected characters in :let"
-msgstr "E18:    :let"
-
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121:  : %s"
-
 msgid "E111: Missing ']'"
 msgstr "E111:  ']'"
 
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719:   [:]  "
 
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734:     %s="
-
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461:   : %s"
-
 msgid "E806: using Float as a String"
 msgstr "E806:       "
 
-msgid "E687: Less targets than List items"
-msgstr "E687:     "
-
-msgid "E688: More targets than List items"
-msgstr "E688:     "
-
-msgid "Double ; in list of variables"
-msgstr " ;   "
-
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738:     %s"
-
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689:      "
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274:      "
+
+msgid "E689: Can only index a List, Dictionary or Blob"
+msgstr "E689:    ,   "
 
 msgid "E708: [:] must come last"
 msgstr "E708: [:]   "
 
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:]   "
+msgid "E709: [:] requires a List or Blob value"
+msgstr "E709: [:]     "
+
+msgid "E972: Blob value does not have the right number of bytes"
+msgstr "E972:       "
+
+msgid "E996: Cannot lock a range"
+msgstr "E996:   "
 
 msgid "E710: List value has more items than target"
 msgstr "E710:  -    "
@@ -520,29 +746,28 @@ msgstr "E710:  -    "
 msgid "E711: List value has not enough items"
 msgstr "E711: -    "
 
+msgid "E996: Cannot lock a list or dict"
+msgstr "E996:     "
+
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690:  \"in\"  :for"
 
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108:   : \"%s\""
-
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940:  ()  %s"
-
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743:      ()"
-
 msgid "E109: Missing ':' after '?'"
 msgstr "E109:  ':'  '?'"
 
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804:   '%'     "
 
+msgid "E973: Blob literal should have an even number of hex characters"
+msgstr ""
+"E973: -      "
+
 msgid "E110: Missing ')'"
 msgstr "E110:  ')'"
 
+msgid "E260: Missing name after ->"
+msgstr "E260:    ->"
+
 msgid "E695: Cannot index a Funcref"
 msgstr "E695:     "
 
@@ -589,6 +814,9 @@ msgstr "E910:    "
 msgid "E913: Using a Channel as a Number"
 msgstr "E913:    "
 
+msgid "E974: Using a Blob as a Number"
+msgstr "E974:    "
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891:         "
 
@@ -610,6 +838,9 @@ msgstr "E911:       "
 msgid "E914: Using a Channel as a Float"
 msgstr "E914:       "
 
+msgid "E975: Using a Blob as a Float"
+msgstr "E975:       "
+
 msgid "E729: using Funcref as a String"
 msgstr "E729:      "
 
@@ -619,9 +850,174 @@ msgstr "E730:    "
 msgid "E731: using Dictionary as a String"
 msgstr "E731:    "
 
+msgid "E976: using Blob as a String"
+msgstr "E976:    "
+
 msgid "E908: using an invalid value as a String"
 msgstr "E908:     "
 
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698:      "
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t    "
+
+msgid " line "
+msgstr "  "
+
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977:      "
+
+msgid "E691: Can only compare List with List"
+msgstr "E691:      "
+
+msgid "E692: Invalid operation for List"
+msgstr "E692:    "
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735:      "
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736:    "
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694:      "
+
+msgid "E808: Number or Float required"
+msgstr "E808:       "
+
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158:   : %s"
+
+msgid "&Ok"
+msgstr "&Ok"
+
+msgid "E980: lowlevel input not supported"
+msgstr "E980:    "
+
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700:  : %s"
+
+msgid "E922: expected a dict"
+msgstr "E922:  "
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923:   ()     "
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"&OK\n"
+"&C "
+
+msgid "called inputrestore() more often than inputsave()"
+msgstr " inputrestore()  ,   inputsave()"
+
+msgid "E786: Range not allowed"
+msgstr "E786:   "
+
+msgid "E701: Invalid type for len()"
+msgstr "E701:    len()"
+
+msgid "E726: Stride is zero"
+msgstr "E726:  "
+
+msgid "E727: Start past end"
+msgstr "E727:   "
+
+msgid "E240: No connection to the X server"
+msgstr "E240:    X-"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241:      %s"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277:   "
+
+msgid "E941: already started a server"
+msgstr "E941:   "
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942:  +clientserver "
+
+msgid "E258: Unable to send to client"
+msgstr "E258:    "
+
+#, c-format
+msgid "E962: Invalid action: '%s'"
+msgstr "E962:  : '%s'"
+
+msgid "(Invalid)"
+msgstr "()"
+
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935:   : %d"
+
+msgid "E18: Unexpected characters in :let"
+msgstr "E18:    :let"
+
+msgid "E991: cannot use =<< here"
+msgstr "E991:    =<<"
+
+msgid "E221: Marker cannot start with lower case letter"
+msgstr "E221:      "
+
+msgid "E172: Missing marker"
+msgstr "E172:  "
+
+#, c-format
+msgid "E990: Missing end marker '%s'"
+msgstr "E990:    '%s'"
+
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .=      2"
+
+msgid "E687: Less targets than List items"
+msgstr "E687:     "
+
+msgid "E688: More targets than List items"
+msgstr "E688:     "
+
+msgid "Double ; in list of variables"
+msgstr " ;   "
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738:     %s"
+
+msgid "E996: Cannot lock an environment variable"
+msgstr "E996:    "
+
+msgid "E996: Cannot lock an option"
+msgstr "E996:   "
+
+msgid "E996: Cannot lock a register"
+msgstr "E996:   "
+
+#, c-format
+msgid "E108: No such variable: \"%s\""
+msgstr "E108:   : \"%s\""
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940:  ()  %s"
+
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743:      ()"
+
+#, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963:  %s    "
+
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795:    %s"
@@ -647,170 +1043,6 @@ msgstr ""
 msgid "E742: Cannot change value of %s"
 msgstr "E742:    %s"
 
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698:      "
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"#  :\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t      "
-
-msgid "E691: Can only compare List with List"
-msgstr "E691:      "
-
-msgid "E692: Invalid operation for List"
-msgstr "E692:    "
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735:      "
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736:    "
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694:      "
-
-msgid "map() argument"
-msgstr " map()"
-
-msgid "filter() argument"
-msgstr " filter()"
-
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686:  %s   "
-
-msgid "E928: String required"
-msgstr "E928:  "
-
-msgid "E808: Number or Float required"
-msgstr "E808:       "
-
-msgid "add() argument"
-msgstr " add()"
-
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete()      "
-
-msgid "&Ok"
-msgstr "&Ok"
-
-#, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld : "
-msgstr[1] "+-%s%3ld : "
-msgstr[2] "+-%s%3ld : "
-
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700:  : %s"
-
-msgid "E922: expected a dict"
-msgstr "E922:  "
-
-msgid "E923: Second argument of function() must be a list or a dict"
-msgstr "E923:   ()     "
-
-msgid ""
-"&OK\n"
-"&Cancel"
-msgstr ""
-"&OK\n"
-"&C "
-
-msgid "called inputrestore() more often than inputsave()"
-msgstr " inputrestore()  ,   inputsave()"
-
-msgid "insert() argument"
-msgstr " insert()"
-
-msgid "E786: Range not allowed"
-msgstr "E786:   "
-
-msgid "E916: not a valid job"
-msgstr "E916:  "
-
-msgid "E701: Invalid type for len()"
-msgstr "E701:    len()"
-
-#, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
-msgstr "E798: ID   \":match\": %ld"
-
-msgid "E726: Stride is zero"
-msgstr "E726:  "
-
-msgid "E727: Start past end"
-msgstr "E727:   "
-
-msgid "<empty>"
-msgstr "<>"
-
-msgid "E240: No connection to the X server"
-msgstr "E240:    X-"
-
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241:      %s"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277:   "
-
-msgid "E941: already started a server"
-msgstr "E941:   "
-
-msgid "E942: +clientserver feature not available"
-msgstr "E942:  +clientserver "
-
-msgid "remove() argument"
-msgstr " remove()"
-
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655:     (?)"
-
-msgid "reverse() argument"
-msgstr " reverse()"
-
-msgid "E258: Unable to send to client"
-msgstr "E258:    "
-
-#, c-format
-msgid "E927: Invalid action: '%s'"
-msgstr "E927:  : '%s'"
-
-msgid "sort() argument"
-msgstr " sort()"
-
-msgid "uniq() argument"
-msgstr " uniq()"
-
-msgid "E702: Sort compare function failed"
-msgstr "E702:      "
-
-msgid "E882: Uniq compare function failed"
-msgstr ""
-"E882:       "
-
-msgid "(Invalid)"
-msgstr "()"
-
-#, c-format
-msgid "E935: invalid submatch number: %d"
-msgstr "E935:   : %d"
-
-msgid "E677: Error writing temp file"
-msgstr "E677:     "
-
 msgid "E921: Invalid callback argument"
 msgstr "E921:    "
 
@@ -836,17 +1068,17 @@ msgstr "> %d,  %04x,  %o"
 
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d,  %08x,  %o"
-
-msgid "E134: Move lines into themselves"
-msgstr "E134:     "
-
-msgid "1 line moved"
-msgstr "  "
-
-#, c-format
-msgid "%ld lines moved"
-msgstr " : %ld"
+msgstr "> %d,  %08x,  %o"
+
+msgid "E134: Cannot move a range of lines into itself"
+msgstr "E134:      "
+
+#, c-format
+msgid "%ld line moved"
+msgid_plural "%ld lines moved"
+msgstr[0] " %ld "
+msgstr[1] " %ld "
+msgstr[2] " %ld "
 
 #, c-format
 msgid "%ld lines filtered"
@@ -858,74 +1090,6 @@ msgstr "E135:  *Filter*     "
 msgid "[No write since last change]\n"
 msgstr "[  ]\n"
 
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s  : "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr ""
-"E136: viminfo:   ,     "
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "  viminfo \"%s\"%s%s%s"
-
-msgid " info"
-msgstr " "
-
-msgid " marks"
-msgstr " "
-
-msgid " oldfiles"
-msgstr "  "
-
-msgid " FAILED"
-msgstr " "
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137:     viminfo : %s"
-
-#, c-format
-msgid "E929: Too many viminfo temp files, like %s!"
-msgstr "E929:     viminfo,   %s"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138:    viminfo %s!"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "  viminfo \"%s\""
-
-#, c-format
-msgid "E886: Can't rename viminfo file to %s!"
-msgstr "E886:    viminfo  %s!"
-
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "#   viminfo   Vim %s.\n"
-
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"#   (!) .\n"
-"\n"
-
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "#   'encoding'    \n"
-
-msgid "Illegal starting char"
-msgstr "  "
-
-msgid ""
-"\n"
-"# Bar lines, copied verbatim:\n"
-msgstr ""
-"\n"
-"#   '|',  :\n"
-
 msgid "Save As"
 msgstr " "
 
@@ -987,8 +1151,10 @@ msgstr "E143:      %s"
 msgid "E144: non-numeric argument to :z"
 msgstr "E144:   :z   "
 
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145:       rvim."
+msgid "E145: Shell commands and some functionality not allowed in rvim"
+msgstr ""
+"E145:        "
+"  rvim"
 
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146:      "
@@ -1000,26 +1166,33 @@ msgstr "  %s? (y/n/a/q/l/^E/^Y)"
 msgid "(Interrupted) "
 msgstr "()"
 
-msgid "1 match"
-msgstr " "
-
-msgid "1 substitution"
-msgstr " "
-
-#, c-format
-msgid "%ld matches"
-msgstr "%ld "
-
-#, c-format
-msgid "%ld substitutions"
-msgstr "%ld "
-
-msgid " on 1 line"
-msgstr "  1 ."
-
-#, c-format
-msgid " on %ld lines"
-msgstr "  %ld ."
+#, c-format
+msgid "%ld match on %ld line"
+msgid_plural "%ld matches on %ld line"
+msgstr[0] "%ld   %ld "
+msgstr[1] "%ld   %ld "
+msgstr[2] "%ld   %ld "
+
+#, c-format
+msgid "%ld substitution on %ld line"
+msgid_plural "%ld substitutions on %ld line"
+msgstr[0] "%ld   %ld "
+msgstr[1] "%ld   %ld "
+msgstr[2] "%ld   %ld "
+
+#, c-format
+msgid "%ld match on %ld lines"
+msgid_plural "%ld matches on %ld lines"
+msgstr[0] "%ld   %ld "
+msgstr[1] "%ld   %ld "
+msgstr[2] "%ld   %ld "
+
+#, c-format
+msgid "%ld substitution on %ld lines"
+msgid_plural "%ld substitutions on %ld lines"
+msgstr[0] "%ld   %ld "
+msgstr[1] "%ld   %ld "
+msgstr[2] "%ld   %ld "
 
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147:   :global   "
@@ -1035,15 +1208,6 @@ msgstr "     : %s"
 msgid "Pattern not found: %s"
 msgstr "  : %s"
 
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"#    :\n"
-"$"
-
 msgid "E478: Don't panic!"
 msgstr "E478: ,  !"
 
@@ -1083,102 +1247,9 @@ msgstr "E154:   \"%s\"   %s/%s"
 msgid "E150: Not a directory: %s"
 msgstr "E150: %s   "
 
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160:    %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156:   "
-
-msgid "E612: Too many signs defined"
-msgstr "E612:    "
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239:   : %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155:  : %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159:   "
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158:   : %s"
-
-msgid "E934: Cannot jump to a buffer that does not have a name"
-msgstr "E934:      "
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157:  ID : %ld"
-
-#, c-format
-msgid "E885: Not possible to change sign %s"
-msgstr "E885:    %s"
-
-msgid " (NOT FOUND)"
-msgstr " ( )"
-
-msgid " (not supported)"
-msgstr " ( )"
-
-msgid "[Deleted]"
-msgstr "[]"
-
 msgid "No old files"
 msgstr "  "
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "  .    \"cont\""
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr ".. = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "..  = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr " %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr ": %s"
-
-msgid "frame is zero"
-msgstr " "
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr " : %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "   \"%s%s\" . %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161:    : %s"
-
-msgid "No breakpoints defined"
-msgstr "   "
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s . %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  . %s"
-
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750:   \":profile start {-}\""
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "   \"%s\"?"
@@ -1195,32 +1266,11 @@ msgid "Warning: Entered other buffer une
 msgstr ""
 ":      ( )"
 
-msgid "E163: There is only one file to edit"
-msgstr "E163:      "
-
-msgid "E164: Cannot go before first file"
-msgstr "E164:   "
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165:   "
-
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666:   : %s"
 
 #, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr " \"%s\"  \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr " \"%s\""
-
-#, c-format
-msgid "not found in '%s': \"%s\""
-msgstr "   '%s': \"%s\""
-
-#, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr ""
 "W20:   python   2.x,  : %s"
@@ -1230,62 +1280,6 @@ msgid "W21: Required python version 3.x 
 msgstr ""
 "W21:   python   3.x,  : %s"
 
-msgid "Source Vim script"
-msgstr "  Vim"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "  : \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "  \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr " %ld:   \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "  \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr " %ld:  \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "  %s "
-
-#, c-format
-msgid "continuing in %s"
-msgstr "  %s"
-
-msgid "modeline"
-msgstr " "
-
-msgid "--cmd argument"
-msgstr "--cmd "
-
-msgid "-c argument"
-msgstr "-c "
-
-msgid "environment variable"
-msgstr " "
-
-msgid "error handler"
-msgstr " "
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr ""
-"W15: :   .   ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167:  :scriptencoding    "
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168:  :finish    "
-
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr " %s: \"%s\""
@@ -1300,6 +1294,10 @@ msgstr "   Ex.       \"visual\""
 msgid "E501: At end-of-file"
 msgstr "E501:   "
 
+#, c-format
+msgid "Executing: %s"
+msgstr ": %s"
+
 msgid "E169: Command too recursive"
 msgstr "E169:   "
 
@@ -1319,6 +1317,9 @@ msgstr "E464:    "
 msgid "E492: Not an editor command"
 msgstr "E492:    "
 
+msgid "E981: Command not allowed in rvim"
+msgstr "E981:     rvim"
+
 msgid "E493: Backwards range given"
 msgstr "E493:   "
 
@@ -1328,89 +1329,31 @@ msgstr "  ,   "
 msgid "E494: Use w or w>>"
 msgstr "E494:  w  w>>"
 
+msgid ""
+"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+":   EX_DFLALL  ADDR_NONE, ADDR_UNSIGNED  "
+"ADDR_QUICKFIX"
+
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr "E943:     ,  'make cmdidxs'"
 
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ,      "
 
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "1   . ?"
-
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "   (%d). ?"
-
-msgid "E173: 1 more file to edit"
-msgstr "E173: 1   ."
-
-#, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173:    (%ld)."
-
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174:   .  !  ."
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"             .     .     .   "
-
-msgid "No user-defined commands found"
-msgstr ",  ,  ."
-
-msgid "E175: No attribute specified"
-msgstr "E175:   "
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176:   "
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: -   "
-
-msgid "E178: Invalid default value for count"
-msgstr "E178:   -  "
-
-msgid "E179: argument required for -complete"
-msgstr "E179:  -complete   "
-
-msgid "E179: argument required for -addr"
-msgstr "E179:  -addr   "
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181:  : %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182:   "
-
-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:        "
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184:    : %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180:    : %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180:   : %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr ""
-"E468:        "
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467:      "
+#, c-format
+msgid "%d more file to edit.  Quit anyway?"
+msgid_plural "%d more files to edit.  Quit anyway?"
+msgstr[0] "  %d . ?"
+msgstr[1] "  %d . ?"
+msgstr[2] "  %d . ?"
+
+#, c-format
+msgid "E173: %d more file to edit"
+msgid_plural "E173: %d more files to edit"
+msgstr[0] "E173:   %d "
+msgstr[1] "E173:   %d "
+msgstr[2] "E173:   %d "
 
 msgid "unknown"
 msgstr ""
@@ -1428,6 +1371,9 @@ msgstr "E784:    "
 msgid "Already only one tab page"
 msgstr "    "
 
+msgid "Edit File in new tab page"
+msgstr "    "
+
 msgid "Edit File in new window"
 msgstr "    "
 
@@ -1471,15 +1417,6 @@ msgstr "E930:   :redir  execute()"
 msgid "Save Redirection"
 msgstr " "
 
-msgid "Save View"
-msgstr " "
-
-msgid "Save Session"
-msgstr " "
-
-msgid "Save Setup"
-msgstr " "
-
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739:   : %s"
@@ -1519,6 +1456,9 @@ msgstr "E498:    :source   \"<sfile>\""
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842:      \"<slnum>\""
 
+msgid "E961: no line number to use for \"<sflnum>\""
+msgstr "E961:      \"<sflnum>\""
+
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499:     '%'  '#',   c \":p:h\""
@@ -1526,9 +1466,6 @@ msgstr "E499:     '%'  '#',   c \":p:h\""
 msgid "E500: Evaluates to an empty string"
 msgstr "E500:     "
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195:    viminfo  "
-
 msgid "Untitled"
 msgstr " "
 
@@ -1643,41 +1580,6 @@ msgstr "E788:      "
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811:       "
 
-msgid "tagname"
-msgstr " "
-
-msgid " kind file\n"
-msgstr "  \n"
-
-msgid "'history' option is zero"
-msgstr "  'history'  "
-
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s,  (    ):\n"
-
-msgid "Command Line"
-msgstr " "
-
-msgid "Search String"
-msgstr " "
-
-msgid "Expression"
-msgstr ""
-
-msgid "Input Line"
-msgstr " "
-
-msgid "Debug Line"
-msgstr " "
-
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar   "
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199:     "
 
@@ -1687,18 +1589,12 @@ msgstr "E812:      "
 msgid "Illegal file name"
 msgstr "  "
 
-msgid "is a directory"
-msgstr " "
-
 msgid "is not a file"
 msgstr "  "
 
 msgid "is a device (disabled with 'opendevice' option)"
 msgstr "  (   'opendevice')"
 
-msgid "[New File]"
-msgstr "[ ]"
-
 msgid "[New DIRECTORY]"
 msgstr "[ ]"
 
@@ -1723,9 +1619,6 @@ msgstr "     stdin..."
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202:      !"
 
-msgid "[fifo/socket]"
-msgstr "[fifo/]"
-
 msgid "[fifo]"
 msgstr "[fifo]"
 
@@ -1741,12 +1634,6 @@ msgstr "[  CR]"
 msgid "[long lines split]"
 msgstr "[  ]"
 
-msgid "[NOT converted]"
-msgstr "[ ]"
-
-msgid "[converted]"
-msgstr "[]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[    %ld]"
@@ -1767,131 +1654,6 @@ msgstr "   'charconvert'  "
 msgid "can't read output of 'charconvert'"
 msgstr "   'charconvert'"
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676:      acwrite"
-
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr ""
-"E203: ,   ,    "
-
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204:      "
-
-msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans      "
-
-msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "   NetBeans  "
-
-msgid "is not a file or writable device"
-msgstr "    ,   "
-
-msgid "writing to device disabled with 'opendevice' option"
-msgstr "      'opendevice'"
-
-msgid "is read-only (add ! to override)"
-msgstr "    ( !,   )"
-
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr ""
-"E506:      ( !,   )"
-
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr ""
-"E507:     ( !,   )"
-
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr ""
-"E508:     ( !,   )"
-
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr ""
-"E509:     ( !,   )"
-
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr ""
-"E510:     ( !,   )"
-
-msgid "E214: Can't find temp file for writing"
-msgstr "E214:      "
-
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr ""
-"E213:   ( !    )"
-
-msgid "E166: Can't open linked file for writing"
-msgstr "E166:       "
-
-msgid "E212: Can't open file for writing"
-msgstr "E212:     "
-
-msgid "E949: File changed while writing"
-msgstr "E949:     "
-
-msgid "E512: Close failed"
-msgstr "E512:    "
-
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr ""
-"E513:  ,    ( 'fenc',  "
-")"
-
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513:  ,      %ld ( "
-"'fenc',  )"
-
-msgid "E514: write error (file system full?)"
-msgstr "E514:   (  ?)"
-
-msgid " CONVERSION ERROR"
-msgstr "  "
-
-#, c-format
-msgid " in line %ld;"
-msgstr "   %ld;"
-
-msgid "[Device]"
-msgstr "[]"
-
-msgid "[New]"
-msgstr "[]"
-
-msgid " [a]"
-msgstr " []"
-
-msgid " appended"
-msgstr " "
-
-msgid " [w]"
-msgstr " []"
-
-msgid " written"
-msgstr " "
-
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205:  :    "
-
-msgid "E206: patchmode: can't touch empty original file"
-msgstr ""
-"E206:  :      "
-
-msgid "E207: Can't delete backup file"
-msgstr "E207:    "
-
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-":       \n"
-
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "   ,      !"
-
 msgid "[dos]"
 msgstr "[dos]"
 
@@ -1910,19 +1672,19 @@ msgstr "[unix]"
 msgid "[unix format]"
 msgstr "[ unix]"
 
-msgid "1 line, "
-msgstr "1 , "
-
-#, c-format
-msgid "%ld lines, "
-msgstr ": %ld, "
-
-msgid "1 character"
-msgstr "1 "
-
-#, c-format
-msgid "%lld characters"
-msgstr ": %lld"
+#, c-format
+msgid "%ld line, "
+msgid_plural "%ld lines, "
+msgstr[0] "%ld , "
+msgstr[1] "%ld , "
+msgstr[2] "%ld , "
+
+#, c-format
+msgid "%lld character"
+msgid_plural "%lld characters"
+msgstr[0] "%lld "
+msgstr[1] "%lld "
+msgstr[2] "%lld "
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1930,12 +1692,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[  ]"
 
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr ":     !!!"
-
-msgid "Do you really want to write to it"
-msgstr "     "
-
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208:    \"%s\""
@@ -2006,73 +1762,65 @@ msgstr "E462:     \"%s\""
 msgid "E321: Could not reload \"%s\""
 msgstr "E321:    \"%s\""
 
-msgid "--Deleted--"
-msgstr "----"
-
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "- : %s <=%d>"
-
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367:  \"%s\"  "
-
-msgid "E936: Cannot delete the current group"
-msgstr "E936:    "
-
-msgid "W19: Deleting augroup that is still in use"
-msgstr "W19:     "
-
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215:    *: %s"
-
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216:  : %s"
-
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216:    : %s"
-
-msgid ""
-"\n"
-"--- Autocommands ---"
-msgstr ""
-"\n"
-"---  ---"
-
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>:    "
-
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217:      "
-
-msgid "No matching autocommands"
-msgstr "  "
-
-msgid "E218: autocommand nesting too deep"
-msgstr "E218:    "
-
-#, c-format
-msgid "%s Autocommands for \"%s\""
-msgstr "%s   \"%s\""
-
-#, c-format
-msgid "Executing %s"
-msgstr " %s"
-
-#, c-format
-msgid "autocommand %s"
-msgstr " %s"
-
 msgid "E219: Missing {."
 msgstr "E219:  {."
 
 msgid "E220: Missing }."
 msgstr "E220:  }."
 
+msgid "<empty>"
+msgstr "<>"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655:     (?)"
+
+msgid "Select Directory dialog"
+msgstr " "
+
+msgid "Save File dialog"
+msgstr " "
+
+msgid "Open File dialog"
+msgstr " "
+
+msgid "E338: Sorry, no file browser in console mode"
+msgstr ""
+"E338: ,         "
+
+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 "
+"followed by '%s'."
+msgstr ""
+"E343:   : '**[]'      , "
+"     '%s'"
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344:  \"%s\"       "
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345:  \"%s\"     "
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346:        \"%s\""
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347:       \"%s\""
+
+msgid "E446: No file name under cursor"
+msgstr "E446:      "
+
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447:  \"%s\"     "
+
 msgid "E490: No fold found"
 msgstr "E490:   "
 
@@ -2091,37 +1839,19 @@ msgstr[0] "+--%3ld    "
 msgstr[1] "+--%3ld    "
 msgstr[2] "+--%3ld    "
 
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld : "
+msgstr[1] "+-%s%3ld : "
+msgstr[2] "+-%s%3ld : "
+
 msgid "E222: Add to read buffer"
 msgstr "E222:    "
 
 msgid "E223: recursive mapping"
 msgstr "E223:  "
 
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224:      %s"
-
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225:      %s"
-
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226:     %s"
-
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227:     %s"
-
-msgid "No abbreviation found"
-msgstr "  "
-
-msgid "No mapping found"
-msgstr "  "
-
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap:  "
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851:      . "
 
@@ -2308,11 +2038,11 @@ msgstr "&"
 msgid "Open tab..."
 msgstr " ..."
 
-msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "  ( '\\\\'   '\\')"
-
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "   ( '\\\\'   '\\')"
+msgid "Find string"
+msgstr " "
+
+msgid "Find & Replace"
+msgstr "  "
 
 msgid "Not Used"
 msgstr " "
@@ -2328,6 +2058,11 @@ msgstr "E671:    \"%s\"  "
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243:   : \"-%s\";   OLE."
 
+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr ""
+"E988:      .   "
+"gvim.exe."
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672:      MDI"
 
@@ -2357,20 +2092,20 @@ msgid "Font0: %s"
 msgstr "Font0: %s"
 
 #, c-format
-msgid "Font1: %s"
-msgstr "Font1: %s"
-
-#, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "  font%ld       font0"
-
-#, c-format
-msgid "Font0 width: %ld"
-msgstr "  font0: %ld"
-
-#, c-format
-msgid "Font1 width: %ld"
-msgstr "  font1: %ld"
+msgid "Font%d: %s"
+msgstr "Font%d: %s"
+
+#, c-format
+msgid "Font%d width is not twice that of font0"
+msgstr "  font%d       font0"
+
+#, c-format
+msgid "Font0 width: %d"
+msgstr "  font0: %d"
+
+#, c-format
+msgid "Font%d width: %d"
+msgstr "  font%d: %d"
 
 msgid "Invalid font specification"
 msgstr "  "
@@ -2496,7 +2231,94 @@ msgid "E365: Failed to print PostScript 
 msgstr "E365:      PostScript"
 
 msgid "Print job sent."
-msgstr "   ."
+msgstr "   ."
+
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679:     syncolor.vim"
+
+#, c-format
+msgid "E411: highlight group not found: %s"
+msgstr "E411:    %s  "
+
+#, c-format
+msgid "E412: Not enough arguments: \":highlight link %s\""
+msgstr "E412:   : \":highlight link %s\""
+
+#, c-format
+msgid "E413: Too many arguments: \":highlight link %s\""
+msgstr "E413:   : \":highlight link %s\""
+
+msgid "E414: group has settings, highlight link ignored"
+msgstr "E414:    ,  highlight link"
+
+#, c-format
+msgid "E415: unexpected equal sign: %s"
+msgstr "E415:   : %s"
+
+#, c-format
+msgid "E416: missing equal sign: %s"
+msgstr "E416:   : %s"
+
+#, c-format
+msgid "E417: missing argument: %s"
+msgstr "E417:  : %s"
+
+#, c-format
+msgid "E418: Illegal value: %s"
+msgstr "E418:  : %s"
+
+msgid "E419: FG color unknown"
+msgstr "E419:   "
+
+msgid "E420: BG color unknown"
+msgstr "E420:   "
+
+#, c-format
+msgid "E421: Color name or number not recognized: %s"
+msgstr "E421:      : %s"
+
+#, c-format
+msgid "E422: terminal code too long: %s"
+msgstr "E422:    : %s"
+
+#, c-format
+msgid "E423: Illegal argument: %s"
+msgstr "E423:  : %s"
+
+msgid "E424: Too many different highlighting attributes in use"
+msgstr "E424:       "
+
+msgid "E669: Unprintable character in group name"
+msgstr "E669:     "
+
+msgid "W18: Invalid character in group name"
+msgstr "W18:     "
+
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849:      "
+
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799:  ID: %d (     1)"
+
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID  : %d"
+
+msgid "List or number required"
+msgstr "   "
+
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802:  ID: %d (     1)"
+
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ID  : %d"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID   \":match\": %d"
 
 msgid "Add a new database"
 msgstr "   "
@@ -2545,8 +2367,8 @@ msgid "Added cscope database %s"
 msgstr "   cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262:      cscope %ld"
+msgid "E262: error reading cscope connection %d"
+msgstr "E262:    cscope %d"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561:    cscope"
@@ -2873,10 +2695,128 @@ msgstr ""
 "!"
 
 #, c-format
+msgid "%ld lines to indent... "
+msgstr "   (%ld)..."
+
+#, c-format
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "   %ld  "
+msgstr[1] "   %ld  "
+msgstr[2] "   %ld  "
+
+msgid " Keyword completion (^N^P)"
+msgstr "    (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr "  ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr "    (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr "    (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr "   (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr "    (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr "   (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr "    (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr "   (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr "    (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr "   (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " Omni- (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr "    (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr "     (^N^P)"
+
+msgid "Hit end of paragraph"
+msgstr " "
+
+msgid "E839: Completion function changed window"
+msgstr "E839:    "
+
+msgid "E840: Completion function deleted text"
+msgstr "E840:    "
+
+msgid "'dictionary' option is empty"
+msgstr "    'dictionary'"
+
+msgid "'thesaurus' option is empty"
+msgstr "    'thesaurus'"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr " : %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " ()  (^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " ()  (^E/^Y)"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete()      "
+
+#, c-format
+msgid "Scanning: %s"
+msgstr ": %s"
+
+msgid "Scanning tags."
+msgstr "   ."
+
+msgid "match in file"
+msgstr "  "
+
+msgid " Adding"
+msgstr " "
+
+msgid "-- Searching..."
+msgstr "-- ..."
+
+msgid "Back at original"
+msgstr " "
+
+msgid "Word from other line"
+msgstr "   "
+
+msgid "The only match"
+msgstr " "
+
+#, c-format
+msgid "match %d of %d"
+msgstr " %d  %d"
+
+#, c-format
+msgid "match %d"
+msgstr " %d"
+
+#, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938:    JSON: \"%s\""
 
 #, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899:  %s     "
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696:    : %s"
 
@@ -2884,6 +2824,37 @@ msgstr "E696:    : %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697:    ']': %s"
 
+msgid "sort() argument"
+msgstr " sort()"
+
+msgid "uniq() argument"
+msgstr " uniq()"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702:      "
+
+msgid "E882: Uniq compare function failed"
+msgstr ""
+"E882:       "
+
+msgid "map() argument"
+msgstr " map()"
+
+msgid "filter() argument"
+msgstr " filter()"
+
+msgid "add() argument"
+msgstr " add()"
+
+msgid "insert() argument"
+msgstr " insert()"
+
+msgid "remove() argument"
+msgstr " remove()"
+
+msgid "reverse() argument"
+msgstr " reverse()"
+
 msgid "Unknown option argument"
 msgstr "  "
 
@@ -3095,9 +3066,6 @@ msgstr "-A\t\t\t   "
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t   \"\""
 
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\t   \"\""
-
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <>\t   <>"
 
@@ -3332,6 +3300,39 @@ msgstr " :    .\n"
 msgid ": Send expression failed.\n"
 msgstr ":    .\n"
 
+#, c-format
+msgid "E224: global abbreviation already exists for %s"
+msgstr "E224:      %s"
+
+#, c-format
+msgid "E225: global mapping already exists for %s"
+msgstr "E225:      %s"
+
+#, c-format
+msgid "E226: abbreviation already exists for %s"
+msgstr "E226:     %s"
+
+#, c-format
+msgid "E227: mapping already exists for %s"
+msgstr "E227:     %s"
+
+msgid "No abbreviation found"
+msgstr "  "
+
+msgid "No mapping found"
+msgstr "  "
+
+msgid "E228: makemap: Illegal mode"
+msgstr "E228: makemap:  "
+
+#, c-format
+msgid "E357: 'langmap': Matching character missing for %s"
+msgstr "E357: 'langmap':     %s"
+
+#, c-format
+msgid "E358: 'langmap': Extra characters after semicolon: %s"
+msgstr "E358: 'langmap':      : %s"
+
 msgid "No marks set"
 msgstr "  "
 
@@ -3360,30 +3361,6 @@ msgstr ""
 "\n"
 ".     "
 
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"#  :\n"
-
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"#   (  ):\n"
-
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"#    (    ):\n"
-
-msgid "Missing '>'"
-msgstr " '>'"
-
 msgid "E543: Not a valid codepage"
 msgstr "E543:   "
 
@@ -3638,6 +3615,10 @@ msgstr "       "
 msgid "      -- none --\n"
 msgstr "      --  --\n"
 
+#, no-c-format
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%d %b %Y %a %H:%M:%S"
+
 msgid "          owned by: "
 msgstr "          : "
 
@@ -3693,8 +3674,8 @@ msgstr ""
 "\n"
 "           : "
 
-msgid " (still running)"
-msgstr " ( )"
+msgid " (STILL RUNNING)"
+msgstr " ()"
 
 msgid ""
 "\n"
@@ -3730,8 +3711,8 @@ msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get:   lnum: %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get:    %ld"
+msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get:    %ld   %d %s"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317:     3"
@@ -3790,6 +3771,9 @@ msgstr ""
 msgid "While opening file \""
 msgstr "  : \""
 
+msgid "      CANNOT BE FOUND"
+msgstr "       "
+
 msgid "      NEWER than swap file!\n"
 msgstr "                     ,  -!\n"
 
@@ -3828,6 +3812,9 @@ msgstr ""
 "\"\n"
 "          .\n"
 
+msgid "Found a swap file that is not useful, deleting it"
+msgstr "  -, "
+
 msgid "Swap file \""
 msgstr "- \""
 
@@ -3874,9 +3861,6 @@ msgstr "E326:    -"
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327:        "
 
-msgid "E328: Menu only exists in another mode"
-msgstr "E328:      "
-
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329:   %s"
@@ -3976,19 +3960,6 @@ msgstr ""
 "&D  \n"
 "&C "
 
-msgid "Select Directory dialog"
-msgstr " "
-
-msgid "Save File dialog"
-msgstr " "
-
-msgid "Open File dialog"
-msgstr " "
-
-msgid "E338: Sorry, no file browser in console mode"
-msgstr ""
-"E338: ,         "
-
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766:    printf()"
 
@@ -3998,28 +3969,25 @@ msgstr "E807:        printf()"
 msgid "E767: Too many arguments to printf()"
 msgstr "E767:     printf()"
 
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: :       "
-
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr "   <Enter>    (  ): "
 
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "   <Enter> (  ): "
 
-msgid "1 more line"
-msgstr "  "
-
-msgid "1 line less"
-msgstr "  "
-
-#, c-format
-msgid "%ld more lines"
-msgstr " : %ld"
-
-#, c-format
-msgid "%ld fewer lines"
-msgstr " : %ld"
+#, c-format
+msgid "%ld more line"
+msgid_plural "%ld more lines"
+msgstr[0] " %ld "
+msgstr[1] " %ld "
+msgstr[2] " %ld "
+
+#, c-format
+msgid "%ld line less"
+msgid_plural "%ld fewer lines"
+msgstr[0] " %ld "
+msgstr[1] " %ld "
+msgstr[2] " %ld "
 
 msgid " (Interrupted)"
 msgstr " ()"
@@ -4027,6 +3995,16 @@ msgstr " ()"
 msgid "Beep!"
 msgstr "-!"
 
+msgid "E677: Error writing temp file"
+msgstr "E677:     "
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld  "
+msgstr[1] "%ld  "
+msgstr[2] "%ld  "
+
 msgid "ERROR: "
 msgstr ": "
 
@@ -4046,12 +4024,8 @@ msgstr ""
 "[] re/malloc()  %lu, free()  %lu\n"
 "\n"
 
-msgid "E340: Line is becoming too long"
-msgstr "E340:    "
-
-#, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341:  : lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(0, )"
+msgstr "E341:  : lalloc(0, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4076,41 +4050,14 @@ msgstr "E548:   "
 msgid "E549: Illegal percentage"
 msgstr "E549:   "
 
-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 "
-"followed by '%s'."
-msgstr ""
-"E343:   : '**[]'      , "
-"     '%s'"
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344:  \"%s\"       "
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345:  \"%s\"     "
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346:        \"%s\""
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347:       \"%s\""
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668:         NetBeans: \"%s\""
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658:    NetBeans   %ld"
+msgid "E658: NetBeans connection lost for buffer %d"
+msgstr "E658:    NetBeans   %d"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans      "
@@ -4125,12 +4072,6 @@ msgstr "E505: %s     ( !,   )"
 msgid "E349: No identifier under cursor"
 msgstr "E349:     "
 
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774:   'operatorfunc'   "
-
-msgid "E775: Eval feature not available"
-msgstr "E775: eval "
-
 msgid "Warning: terminal cannot highlight"
 msgstr ":     "
 
@@ -4154,101 +4095,32 @@ msgid "Type  :qa!  and press <Enter> to 
 msgstr ""
 "  :qa!    <Enter>        Vim"
 
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "   1  (%s 1 )"
-
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "   1  (%s %d )"
-
-#, c-format
-msgid "%ld lines %sed 1 time"
-msgstr " , %ld  (%s 1 )"
-
-#, c-format
-msgid "%ld lines %sed %d times"
-msgstr " , %ld  (%s %d )"
-
-#, c-format
-msgid "%ld lines to indent... "
-msgstr "   (%ld)..."
-
-msgid "1 line indented "
-msgstr "     "
-
-#, c-format
-msgid "%ld lines indented "
-msgstr "    (%ld) "
-
-msgid "E748: No previously used register"
-msgstr "E748:    "
+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "  :qa    <Enter>    Vim"
+
+#, c-format
+msgid "%ld line %sed %d time"
+msgid_plural "%ld line %sed %d times"
+msgstr[0] " , %ld  %s %d "
+msgstr[1] " , %ld  %s %d "
+msgstr[2] " , %ld  %s %d "
+
+#, c-format
+msgid "%ld lines %sed %d time"
+msgid_plural "%ld lines %sed %d times"
+msgstr[0] " , %ld  %s %d "
+msgstr[1] " , %ld  %s %d "
+msgstr[2] " , %ld  %s %d "
 
 msgid "cannot yank; delete anyway"
 msgstr "  ,  "
 
-msgid "1 line changed"
-msgstr " 1 "
-
-#, c-format
-msgid "%ld lines changed"
-msgstr " : %ld"
-
-#, c-format
-msgid "freeing %ld lines"
-msgstr " : %ld"
-
-#, c-format
-msgid " into \"%c"
-msgstr "  \"%c"
-
-#, c-format
-msgid "block of 1 line yanked%s"
-msgstr "    %s"
-
-#, c-format
-msgid "1 line yanked%s"
-msgstr "  %s"
-
-#, c-format
-msgid "block of %ld lines yanked%s"
-msgstr "   %ld %s"
-
-#, c-format
-msgid "%ld lines yanked%s"
-msgstr " %ld %s"
-
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353:   %s  "
-
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"---  ---"
-
-msgid "Illegal register name"
-msgstr "  "
-
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# :\n"
-
-#, c-format
-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:            "
-""
+#, c-format
+msgid "%ld line changed"
+msgid_plural "%ld lines changed"
+msgstr[0] " %ld "
+msgstr[1] " %ld "
+msgstr[2] " %ld "
 
 #, c-format
 msgid "%ld Cols; "
@@ -4282,8 +4154,11 @@ msgstr ""
 msgid "(+%lld for BOM)"
 msgstr "(+%lld   BOM)"
 
-msgid "Thanks for flying Vim"
-msgstr "   Vim"
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774:   'operatorfunc'   "
+
+msgid "E775: Eval feature not available"
+msgstr "E775: eval "
 
 msgid "E518: Unknown option"
 msgstr "E518:  "
@@ -4294,6 +4169,9 @@ msgstr "E519:   "
 msgid "E520: Not allowed in a modeline"
 msgstr "E520:     "
 
+msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
+msgstr "E992:        'modelineexpr'"
+
 msgid "E846: Key code not set"
 msgstr "E846:    "
 
@@ -4303,98 +4181,6 @@ msgstr "E521:  =   "
 msgid "E522: Not found in termcap"
 msgstr "E522:    termcap"
 
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539:   <%s>"
-
-#, c-format
-msgid "For option %s"
-msgstr "  %s"
-
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529:   'term'     "
-
-msgid "E530: Cannot change term in GUI"
-msgstr "E530:      "
-
-msgid "E531: Use \":gui\" to start the GUI"
-msgstr "E531:      \":gui\""
-
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589:   'backupext'  'patchmode' "
-
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834:    'listchars'"
-
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835:    'fillchars'"
-
-msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-msgstr "E617:        GTK+ 2"
-
-#, c-format
-msgid "E950: Cannot convert between %s and %s"
-msgstr "E950:   %s  %s"
-
-msgid "E524: Missing colon"
-msgstr "E524:  "
-
-msgid "E525: Zero length string"
-msgstr "E525:    "
-
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526:    <%s>"
-
-msgid "E527: Missing comma"
-msgstr "E527:  "
-
-msgid "E528: Must specify a ' value"
-msgstr "E528:     '"
-
-msgid "E595: contains unprintable or wide character"
-msgstr "E595:       "
-
-msgid "E596: Invalid font(s)"
-msgstr "E596:  "
-
-msgid "E597: can't select fontset"
-msgstr "E597:    "
-
-msgid "E598: Invalid fontset"
-msgstr "E598:   "
-
-msgid "E533: can't select wide font"
-msgstr "E533:       "
-
-msgid "E534: Invalid wide font"
-msgstr "E534:      "
-
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535:    <%c>"
-
-msgid "E536: comma required"
-msgstr "E536:  "
-
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr ""
-"E537:   'commentstring'      "
-" %s"
-
-msgid "E538: No mouse support"
-msgstr "E538:   "
-
-msgid "E540: Unclosed expression sequence"
-msgstr "E540:   "
-
-msgid "E541: too many items"
-msgstr "E541:   "
-
-msgid "E542: unbalanced groups"
-msgstr "E542:  "
-
 msgid "E946: Cannot make a terminal with running job modifiable"
 msgstr "E946:       "
 
@@ -4456,12 +4242,93 @@ msgid "E356: get_varp ERROR"
 msgstr "E356:  get_varp"
 
 #, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap':     %s"
-
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap':      : %s"
+msgid "E539: Illegal character <%s>"
+msgstr "E539:   <%s>"
+
+#, c-format
+msgid "For option %s"
+msgstr "  %s"
+
+msgid "E540: Unclosed expression sequence"
+msgstr "E540:   "
+
+msgid "E541: too many items"
+msgstr "E541:   "
+
+msgid "E542: unbalanced groups"
+msgstr "E542:  "
+
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529:   'term'     "
+
+msgid "E530: Cannot change term in GUI"
+msgstr "E530:      "
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531:      \":gui\""
+
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589:   'backupext'  'patchmode' "
+
+msgid "E834: Conflicts with value of 'listchars'"
+msgstr "E834:    'listchars'"
+
+msgid "E835: Conflicts with value of 'fillchars'"
+msgstr "E835:    'fillchars'"
+
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617:        GTK+ 2"
+
+#, c-format
+msgid "E950: Cannot convert between %s and %s"
+msgstr "E950:   %s  %s"
+
+msgid "E524: Missing colon"
+msgstr "E524:  "
+
+msgid "E525: Zero length string"
+msgstr "E525:    "
+
+#, c-format
+msgid "E526: Missing number after <%s>"
+msgstr "E526:    <%s>"
+
+msgid "E527: Missing comma"
+msgstr "E527:  "
+
+msgid "E528: Must specify a ' value"
+msgstr "E528:     '"
+
+msgid "E595: 'showbreak' contains unprintable or wide character"
+msgstr "E595: 'showbreak'     "
+
+msgid "E596: Invalid font(s)"
+msgstr "E596:  "
+
+msgid "E597: can't select fontset"
+msgstr "E597:    "
+
+msgid "E598: Invalid fontset"
+msgstr "E598:   "
+
+msgid "E533: can't select wide font"
+msgstr "E533:       "
+
+msgid "E534: Invalid wide font"
+msgstr "E534:      "
+
+#, c-format
+msgid "E535: Illegal character after <%c>"
+msgstr "E535:    <%c>"
+
+msgid "E536: comma required"
+msgstr "E536:  "
+
+#, c-format
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr ""
+"E537:   'commentstring'      "
+" %s"
 
 msgid "cannot open "
 msgstr "  "
@@ -4555,6 +4422,10 @@ msgstr ""
 "\n"
 "Vim:  X\n"
 
+#, c-format
+msgid "restoring display %s"
+msgstr "  %s"
+
 msgid "Testing the X display failed"
 msgstr "  X  "
 
@@ -4651,15 +4522,6 @@ msgstr "XSMP   SmcOpenConnection: %s"
 msgid "At line"
 msgstr " "
 
-msgid "Could not load vim32.dll!"
-msgstr "  vim32.dll!"
-
-msgid "VIM Error"
-msgstr " VIM"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "     DLL!"
-
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim:   %s\n"
@@ -4692,6 +4554,26 @@ msgstr " Vim"
 msgid "shell returned %d"
 msgstr "     %d"
 
+msgid "E278: Cannot put a terminal buffer in a popup window"
+msgstr "E278:       "
+
+#, c-format
+msgid "E997: Tabpage not found: %d"
+msgstr "E997:   : %d"
+
+#, c-format
+msgid "E993: window %d is not a popup window"
+msgstr "E993:  %d    "
+
+msgid "E994: Not allowed in a popup window"
+msgstr "E994:     "
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750:   \":profile start {-}\""
+
+msgid "E553: No more items"
+msgstr "E553:   "
+
 msgid "E926: Current location list was changed"
 msgstr "E926:    "
 
@@ -4724,9 +4606,6 @@ msgstr "E378:    'errorformat'  "
 msgid "E379: Missing or empty directory name"
 msgstr "E379:        "
 
-msgid "E553: No more items"
-msgstr "E553:   "
-
 msgid "E924: Current window was closed"
 msgstr "E924:    "
 
@@ -4770,6 +4649,10 @@ msgid "E777: String or List expected"
 msgstr "E777:    "
 
 #, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927:  : '%s'"
+
+#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369:    %s%%[]"
 
@@ -4809,38 +4692,30 @@ msgstr "E69:  ]  %s%%["
 msgid "E70: Empty %s%%[]"
 msgstr "E70:  %s%%[]"
 
+msgid "E956: Cannot use pattern recursively"
+msgstr "E956:    "
+
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554:    %s{...}"
+
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (.  )   %s"
+
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864:  \\%#=    0, 1  2.   "
+" "
+
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "   .   : "
+
 msgid "E65: Illegal back reference"
 msgstr "E65:   "
 
-msgid "E339: Pattern too long"
-msgstr "E339:   "
-
-msgid "E50: Too many \\z("
-msgstr "E50:   \\z("
-
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51:   %s("
-
-msgid "E52: Unmatched \\z("
-msgstr "E52:    \\z("
-
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59:    %s@"
-
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60:     %s{...}"
-
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61:  %s*"
-
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62:  %s%c"
-
 msgid "E63: invalid use of \\_"
 msgstr "E63:   \\_"
 
@@ -4860,26 +4735,37 @@ msgid "E71: Invalid character after %s%%
 msgstr "E71:    %s%%"
 
 #, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554:    %s{...}"
+msgid "E59: invalid character after %s@"
+msgstr "E59:    %s@"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60:     %s{...}"
+
+#, c-format
+msgid "E61: Nested %s*"
+msgstr "E61:  %s*"
+
+#, c-format
+msgid "E62: Nested %s%c"
+msgstr "E62:  %s%c"
+
+msgid "E50: Too many \\z("
+msgstr "E50:   \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51:   %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52:    \\z("
+
+msgid "E339: Pattern too long"
+msgstr "E339:   "
 
 msgid "External submatches:\n"
 msgstr " :\n"
 
-#, c-format
-msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (.  )   %s"
-
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864:  \\%#=    0, 1  2.   "
-" "
-
-msgid "Switching to backtracking RE engine for pattern: "
-msgstr "   .   : "
-
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: ()    "
 
@@ -4888,8 +4774,8 @@ msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (.  )  %c"
 
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
-msgstr "E877: (.  )   : %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
+msgstr "E877: (.  )   : %d"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4924,6 +4810,10 @@ msgstr "E879: (.  )   \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (.  )   "
 
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr ""
+"      ,   stderr..."
+
 msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (.  )    !"
 
@@ -4940,17 +4830,48 @@ msgstr "E876: (.  )      "
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: ()      !"
 
+msgid "E748: No previously used register"
+msgstr "E748:    "
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr " : %ld"
+
+#, c-format
+msgid " into \"%c"
+msgstr "  \"%c"
+
+#, c-format
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "   %ld %s"
+msgstr[1] "   %ld %s"
+msgstr[2] "   %ld %s"
+
+#, c-format
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] " %ld %s"
+msgstr[1] " %ld %s"
+msgstr[2] " %ld %s"
+
+#, c-format
+msgid "E353: Nothing in register %s"
+msgstr "E353:   %s  "
+
 msgid ""
-"Could not open temporary log file for writing, displaying on stderr... "
-msgstr ""
-"      ,   stderr..."
-
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "()   %s!"
-
-msgid "Could not open temporary log file for writing "
-msgstr "      "
+"\n"
+"Type Name Content"
+msgstr ""
+"\n"
+"  "
+
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883:            "
+""
 
 msgid " VREPLACE"
 msgstr "  "
@@ -5004,6 +4925,81 @@ msgid "recording"
 msgstr ""
 
 #, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr " \"%s\"  \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr " \"%s\""
+
+#, c-format
+msgid "not found in '%s': \"%s\""
+msgstr "   '%s': \"%s\""
+
+msgid "Source Vim script"
+msgstr "  Vim"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "  : \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "  \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr " %ld:   \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "  \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr " %ld:  \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "  %s "
+
+#, c-format
+msgid "continuing in %s"
+msgstr "  %s"
+
+msgid "modeline"
+msgstr " "
+
+msgid "--cmd argument"
+msgstr "--cmd "
+
+msgid "-c argument"
+msgstr "-c "
+
+msgid "environment variable"
+msgstr " "
+
+msgid "error handler"
+msgstr " "
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr ""
+"W15: :   .   ^M"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167:  :scriptencoding    "
+
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptencoding    "
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion  : %d"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168:  :finish    "
+
+#, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383:   : %s"
 
@@ -5059,18 +5055,74 @@ msgstr "E388:   "
 msgid "E389: Couldn't find pattern"
 msgstr "E389:   "
 
-msgid "Substitute "
-msgstr " "
-
-#, c-format
+msgid "Save View"
+msgstr " "
+
+msgid "Save Session"
+msgstr " "
+
+msgid "Save Setup"
+msgstr " "
+
+msgid "[Deleted]"
+msgstr "[]"
+
 msgid ""
 "\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"#  %s :\n"
-"~"
+"--- Signs ---"
+msgstr ""
+"\n"
+"---  ---"
+
+#, c-format
+msgid "Signs for %s:"
+msgstr "  %s:"
+
+#, c-format
+msgid "  group=%s"
+msgstr "  =%s"
+
+#, c-format
+msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
+msgstr "    =%ld  id=%d%s  =%s  =%d"
+
+msgid "E612: Too many signs defined"
+msgstr "E612:    "
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239:   : %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155:  : %s"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885:    %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159:   "
+
+#, c-format
+msgid "E157: Invalid sign ID: %d"
+msgstr "E157:  ID : %d"
+
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934:      "
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160:    %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156:   "
+
+msgid " (NOT FOUND)"
+msgstr " ( )"
+
+msgid " (not supported)"
+msgstr " ( )"
 
 msgid "E756: Spell checking is not enabled"
 msgstr "E756:   "
@@ -5094,21 +5146,6 @@ msgstr "E797:      SpellFileMissing"
 msgid "Warning: region %s not supported"
 msgstr ":  %s  "
 
-msgid "Sorry, no suggestions"
-msgstr ",  "
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr ",  %ld "
-
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr " \"%.*s\" :"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
 msgid "E752: No previous spell replacement"
 msgstr "E752:    "
 
@@ -5185,10 +5222,6 @@ msgid "Conversion in %s not supported: f
 msgstr "  %s  :  %s  %s"
 
 #, c-format
-msgid "Conversion in %s not supported"
-msgstr "  %s  "
-
-#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "  FLAG  %s,  %d: %s"
 
@@ -5406,8 +5439,8 @@ msgid "E751: Output file name must not h
 msgstr "E751:        "
 
 #, c-format
-msgid "E754: Only up to %ld regions supported"
-msgstr "E754:    %ld "
+msgid "E754: Only up to %d regions supported"
+msgstr "E754:    %d "
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5424,8 +5457,8 @@ msgid "Done!"
 msgstr "!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile'   %ld "
+msgid "E765: 'spellfile' does not have %d entries"
+msgstr "E765: 'spellfile'   %d "
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5441,9 +5474,27 @@ msgstr "E763:      "
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783:     MAP"
 
+msgid "Sorry, no suggestions"
+msgstr ",  "
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr ",  %ld "
+
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr " \"%.*s\" :"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
 msgid "No Syntax items defined for this buffer"
 msgstr "      "
 
+msgid "'redrawtime' exceeded, syntax highlighting disabled"
+msgstr " 'redrawtime',   "
+
 msgid "syntax conceal on"
 msgstr "  "
 
@@ -5472,6 +5523,9 @@ msgstr "    "
 msgid "syntax iskeyword "
 msgstr "  "
 
+msgid "syntax iskeyword not set"
+msgstr "    "
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391:   %s  "
@@ -5611,76 +5665,18 @@ msgid ""
 msgstr ""
 "         .  .                         "
 
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679:     syncolor.vim"
-
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411:    %s  "
-
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412:   : \":highlight link %s\""
-
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413:   : \":highlight link %s\""
-
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414:    ,  highlight link"
-
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415:   : %s"
-
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416:   : %s"
-
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417:  : %s"
-
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418:  : %s"
-
-msgid "E419: FG color unknown"
-msgstr "E419:   "
-
-msgid "E420: BG color unknown"
-msgstr "E420:   "
-
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421:      : %s"
-
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422:    : %s"
-
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423:  : %s"
-
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424:       "
-
-msgid "E669: Unprintable character in group name"
-msgstr "E669:     "
-
-msgid "W18: Invalid character in group name"
-msgstr "W18:     "
-
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849:      "
-
 msgid "E555: at bottom of tag stack"
 msgstr "E555:   "
 
 msgid "E556: at top of tag stack"
 msgstr "E556:   "
 
+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986:      tagfunc"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987:     tagfunc"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425:        "
 
@@ -5688,12 +5684,6 @@ msgstr "E425:        "
 msgid "E426: tag not found: %s"
 msgstr "E426:   : %s"
 
-msgid "  # pri kind tag"
-msgstr "  #    "
-
-msgid "file\n"
-msgstr "\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427:     "
 
@@ -5718,6 +5708,12 @@ msgstr "       !"
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429:  \"%s\"  "
 
+msgid "  # pri kind tag"
+msgstr "  #    "
+
+msgid "file\n"
+msgstr "\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5733,9 +5729,6 @@ msgstr "    %s"
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430:     %s \n"
 
-msgid "Ignoring long line in tags file"
-msgstr "     tags"
-
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431:      \"%s\""
@@ -5751,6 +5744,9 @@ msgstr "E432:    : %s"
 msgid "E433: No tags file"
 msgstr "E433:    "
 
+msgid "Ignoring long line in tags file"
+msgstr "     tags"
+
 msgid "E434: Can't find tag pattern"
 msgstr "E434:    "
 
@@ -5794,8 +5790,15 @@ msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "  $VIMRUNTIME/rgb.txt"
 
 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181:  : %s"
+
+msgid "E279: Sorry, ++shell is not supported on this system"
+msgstr "E279: ++shell     "
+
+#, c-format
 msgid "Kill job in \"%s\"?"
-msgstr "   \"%s\"?"
+msgstr "   \"%s\"?"
 
 msgid "Terminal"
 msgstr ""
@@ -5812,6 +5815,9 @@ msgstr ""
 msgid "finished"
 msgstr ""
 
+msgid "E958: Job already finished"
+msgstr "E958:   "
+
 #, c-format
 msgid "E953: File exists: %s"
 msgstr "E953:  : %s"
@@ -5819,6 +5825,41 @@ msgstr "E953:  : %s"
 msgid "E955: Not a terminal buffer"
 msgstr "E955:    "
 
+msgid "E982: ConPTY is not available"
+msgstr "E982: ConPTY "
+
+#, c-format
+msgid "E971: Property type %s does not exist"
+msgstr "E971:   %s  "
+
+#, c-format
+msgid "E964: Invalid column number: %ld"
+msgstr "E964:   : %ld"
+
+#, c-format
+msgid "E966: Invalid line number: %ld"
+msgstr "E966:   : %ld"
+
+msgid "E965: missing property type name"
+msgstr "E965:     "
+
+msgid "E275: Cannot add text property to unloaded buffer"
+msgstr "E275:       "
+
+msgid "E967: text property info corrupted"
+msgstr "E967:     "
+
+msgid "E968: Need at least one of 'id' or 'type'"
+msgstr "E968:  'id'  'type'"
+
+#, c-format
+msgid "E969: Property type %s already defined"
+msgstr "E969:   %s  "
+
+#, c-format
+msgid "E970: Unknown highlight group name: '%s'"
+msgstr "E970:    : %s"
+
 msgid "new shell started\n"
 msgstr "  \n"
 
@@ -5951,10 +5992,6 @@ msgstr " "
 msgid "number changes  when               saved"
 msgstr "   .                "
 
-#, c-format
-msgid "%ld seconds ago"
-msgstr "%ld "
-
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790:      "
 
@@ -5964,6 +6001,67 @@ msgstr "E439:   "
 msgid "E440: undo line missing"
 msgstr "E440:   "
 
+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"                   .    .     "
+
+msgid "No user-defined commands found"
+msgstr ",  ,  ."
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180:    : %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180:   : %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr ""
+"E468:        "
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467:      "
+
+msgid "E175: No attribute specified"
+msgstr "E175:   "
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176:   "
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: -   "
+
+msgid "E178: Invalid default value for count"
+msgstr "E178:   -  "
+
+msgid "E179: argument required for -complete"
+msgstr "E179:  -complete   "
+
+msgid "E179: argument required for -addr"
+msgstr "E179:  -addr   "
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174:   ,  !  : %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182:   "
+
+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:        "
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184:    : %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122:  %s  .  !,   ."
@@ -5986,6 +6084,9 @@ msgstr "E125:  : %s"
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853:   : %s"
 
+msgid "E989: Non-default argument follows default argument"
+msgstr "E989:         "
+
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740:      %s"
@@ -6021,6 +6122,10 @@ msgid "E117: Unknown function: %s"
 msgstr "E117:  : %s"
 
 #, c-format
+msgid "E276: Cannot use function as a method: %s"
+msgstr "E276:     : %s"
+
+#, c-format
 msgid "E933: Function was deleted: %s"
 msgstr "E933:  : %s"
 
@@ -6089,22 +6194,36 @@ msgid "E133: :return not inside a functi
 msgstr "E133:  :return  "
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107:  : %s"
+msgid "%s (%s, compiled %s)"
+msgstr "%s (%s,  %s)"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"/   MS-Windows 64 "
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"/   MS-Windows 32 "
 
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
-"     MS-Windows 64 "
+"   MS-Windows 64 "
 
 msgid ""
 "\n"
 "MS-Windows 32-bit GUI version"
 msgstr ""
 "\n"
-"     MS-Windows 32 "
+"   MS-Windows 32 "
 
 msgid " with OLE support"
 msgstr "   OLE"
@@ -6114,14 +6233,14 @@ msgid ""
 "MS-Windows 64-bit console version"
 msgstr ""
 "\n"
-"   MS-Windows 64 "
+"   MS-Windows 64 "
 
 msgid ""
 "\n"
 "MS-Windows 32-bit console version"
 msgstr ""
 "\n"
-"   MS-Windows 32 "
+"   MS-Windows 32 "
 
 msgid ""
 "\n"
@@ -6365,12 +6484,187 @@ msgstr " :help register<Enter>          "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr " ->/          "
 
+msgid ""
+"\n"
+"# Buffer list:\n"
+msgstr ""
+"\n"
+"#  :\n"
+
+#, c-format
+msgid ""
+"\n"
+"# %s History (newest to oldest):\n"
+msgstr ""
+"\n"
+"# %s,  (    ):\n"
+
+msgid "Command Line"
+msgstr " "
+
+msgid "Search String"
+msgstr " "
+
+msgid "Expression"
+msgstr ""
+
+msgid "Input Line"
+msgstr " "
+
+msgid "Debug Line"
+msgstr " "
+
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"#   '|',  :\n"
+
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s  : "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr ""
+"E136: viminfo:   ,     "
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"#  :\n"
+
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"#    :\n"
+"$"
+
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"#  %s :\n"
+"~"
+
+msgid "Substitute "
+msgstr " "
+
+msgid "Illegal register name"
+msgstr "  "
+
+msgid ""
+"\n"
+"# Registers:\n"
+msgstr ""
+"\n"
+"# :\n"
+
+#, c-format
+msgid "E574: Unknown register type %d"
+msgstr "E574:    %d"
+
+msgid ""
+"\n"
+"# History of marks within files (newest to oldest):\n"
+msgstr ""
+"\n"
+"#    (    ):\n"
+
+msgid ""
+"\n"
+"# File marks:\n"
+msgstr ""
+"\n"
+"#  :\n"
+
+msgid ""
+"\n"
+"# Jumplist (newest first):\n"
+msgstr ""
+"\n"
+"#   (  ):\n"
+
+msgid "Missing '>'"
+msgstr " '>'"
+
+msgid "Illegal starting char"
+msgstr "  "
+
+#, c-format
+msgid "# This viminfo file was generated by Vim %s.\n"
+msgstr "#   viminfo   Vim %s.\n"
+
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"#   (!) .\n"
+"\n"
+
+msgid "# Value of 'encoding' when this file was written\n"
+msgstr "#   'encoding'    \n"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "  viminfo \"%s\"%s%s%s"
+
+msgid " info"
+msgstr " "
+
+msgid " marks"
+msgstr " "
+
+msgid " oldfiles"
+msgstr "  "
+
+msgid " FAILED"
+msgstr " "
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137:     viminfo : %s"
+
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929:     viminfo,   %s"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138:    viminfo %s!"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "  viminfo \"%s\""
+
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886:    viminfo  %s!"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195:    viminfo  "
+
 msgid "Already only one window"
 msgstr "    "
 
+#, c-format
+msgid "E92: Buffer %ld not found"
+msgstr "E92:  %ld  "
+
 msgid "E441: There is no preview window"
 msgstr "E441:   "
 
+msgid "E242: Can't split a window while closing another"
+msgstr "E242:      "
+
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442:          "
 
@@ -6380,8 +6674,8 @@ msgstr "E443:   ,    "
 msgid "E444: Cannot close last window"
 msgstr "E444:    "
 
-msgid "E813: Cannot close autocmd window"
-msgstr "E813:    "
+msgid "E813: Cannot close autocmd or popup window"
+msgstr "E813:       "
 
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814:   ,    "
@@ -6389,32 +6683,6 @@ msgstr "E814:   ,    "
 msgid "E445: Other window contains changes"
 msgstr "E445:      "
 
-msgid "E446: No file name under cursor"
-msgstr "E446:      "
-
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447:  \"%s\"     "
-
-#, c-format
-msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E799:  ID: %ld (     1)"
-
-#, c-format
-msgid "E801: ID already taken: %ld"
-msgstr "E801: ID  : %ld"
-
-msgid "List or number required"
-msgstr "   "
-
-#, c-format
-msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E802:  ID: %ld (     1)"
-
-#, c-format
-msgid "E803: ID not found: %ld"
-msgstr "E803: ID  : %ld"
-
 #, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370:    %s"
@@ -6439,6 +6707,9 @@ msgstr "   Vim"
 msgid "Edit with &Vim"
 msgstr "&   Vim"
 
+msgid "Edit with existing Vim"
+msgstr "   Vim"
+
 msgid "Edit with existing Vim - "
 msgstr "   Vim  "
 
@@ -6520,9 +6791,6 @@ msgstr "E685:  : %s"
 msgid "Interrupted"
 msgstr ""
 
-msgid "E14: Invalid address"
-msgstr "E14:  "
-
 msgid "E474: Invalid argument"
 msgstr "E474:  "
 
@@ -6531,6 +6799,10 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475:  : %s"
 
 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983:  : %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475:   : %s"
 
@@ -6592,8 +6864,8 @@ msgstr ""
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26:    \n"
 
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27:    \n"
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27:    \n"
 
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800:    \n"
@@ -6700,6 +6972,21 @@ msgid "E45: 'readonly' option is set (ad
 msgstr "E45:   'readonly' ( !,   )"
 
 #, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121:  : %s"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734:     %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461:   : %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995:    "
+
+#, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46:       \"%s\""
 
@@ -6707,6 +6994,9 @@ msgstr "E46:       \"%s\""
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794:     : \"%s\""
 
+msgid "E928: String required"
+msgstr "E928:  "
+
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713:      "
 
@@ -6718,6 +7008,13 @@ msgid "E684: list index out of range: %l
 msgstr "E684:     : %ld"
 
 #, c-format
+msgid "E979: Blob index out of range: %ld"
+msgstr "E979:     : %ld"
+
+msgid "E978: Invalid operation for Blob"
+msgstr "E978:    "
+
+#, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118:      %s"
 
@@ -6728,10 +7025,17 @@ msgstr "E716:    : %s"
 msgid "E714: List required"
 msgstr "E714:  "
 
+msgid "E897: List or Blob required"
+msgstr "E897:    "
+
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712:  %s     "
 
+#, c-format
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896:  %s   ,   "
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47:     "
 
@@ -6797,6 +7101,10 @@ msgstr "E939:   "
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81:  <SID>   "
 
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107:  : %s"
+
 msgid "E449: Invalid expression received"
 msgstr "E449:   "
 
@@ -6836,6 +7144,16 @@ msgstr "E919:     '%s': \"%s\""
 msgid "E952: Autocommand caused recursive behavior"
 msgstr "E952:    "
 
+msgid "E328: Menu only exists in another mode"
+msgstr "E328:      "
+
+msgid "E957: Invalid window number"
+msgstr "E957:   "
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686:  %s   "
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "     "
 
@@ -6938,7 +7256,7 @@ msgstr ""
 " %d"
 
 msgid "list constructor does not accept keyword arguments"
-msgstr "       "
+msgstr "       "
 
 msgid "list index out of range"
 msgstr "    "
@@ -7108,4 +7426,64 @@ msgstr ""
 "   : sys.path   \n"
 "  vim.VIM_SPECIAL_PATH  sys.path"
 
-
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+" Vim (*.vim)\t*.vim\n"
+"  (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "  (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"  (*.*)\t*.*\n"
+"  C (*.c, *.h)\t*.c;*.h\n"
+"  C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"  VB (*.bas, *.frm)\t*.bas;*.frm\n"
+" Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+" Vim (*.vim)\t*.vim\n"
+"  (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "  (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"  (*)\t*\n"
+"  C (*.c, *.h)\t*.c;*.h\n"
+"  C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+" Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid "GVim"
+msgstr "GVim"
+
+msgid "Text Editor"
+msgstr " "
+
+msgid "Edit text files"
+msgstr "  "
+
+msgid "Text;editor;"
+msgstr "; "
+
+msgid "gvim"
+msgstr "gvim"
+
+msgid "Vim"
+msgstr "Vim"
--- a/src/po/ru.po
+++ b/src/po/ru.po
@@ -3,23 +3,96 @@
 # Об условиях использования читайте в редакторе Vim ":help uganda"
 #
 # vassily "vr" ragosin <vrr@users.sourceforge.net>, 2004
-# Sergey Alyoshin <alyoshin.s@gmail.com>, 2013-2014, 2016, 2018
+# Sergey Alyoshin <alyoshin.s@gmail.com>, 2013-2014, 2016, 2018-2019
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vim_ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-28 21:50+0300\n"
-"PO-Revision-Date: 2018-04-28 21:51+0300\n"
+"POT-Creation-Date: 2019-11-10 21:53+0300\n"
+"PO-Revision-Date: 2019-11-10 21:53+0300\n"
 "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
 "Language-Team: \n"
 "Language: Russian\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+msgid "E163: There is only one file to edit"
+msgstr "E163: Для редактирования доступен только один файл"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: Это первый файл"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: Это последний файл"
+
+msgid "E249: window layout changed unexpectedly"
+msgstr "E249: Неожиданно изменилось расположение окна"
+
+msgid "--Deleted--"
+msgstr "--Удалено--"
+
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "авто-удаление автокоманды: %s <буффер=%d>"
+
+#, c-format
+msgid "E367: No such group: \"%s\""
+msgstr "E367: Группа \"%s\" не существует"
+
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Невозможно удалить текущую группу"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: Удаление ещё используемой группы автокоманд"
+
+#, c-format
+msgid "E215: Illegal character after *: %s"
+msgstr "E215: Недопустимые символы после *: %s"
+
+#, c-format
+msgid "E216: No such event: %s"
+msgstr "E216: Несуществующее событие: %s"
+
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: Несуществующая группа или событие: %s"
+
+msgid ""
+"\n"
+"--- Autocommands ---"
+msgstr ""
+"\n"
+"--- Автокоманды ---"
+
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <buffer=%d>: неправильный номер буфера "
+
+msgid "E217: Can't execute autocommands for ALL events"
+msgstr "E217: Невозможно выполнить автокоманды для ВСЕХ событий"
+
+msgid "No matching autocommands"
+msgstr "Нет подходящих автокоманд"
+
+msgid "E218: autocommand nesting too deep"
+msgstr "E218: слишком глубоко вложенные автокоманды"
+
+#, c-format
+msgid "%s Autocommands for \"%s\""
+msgstr "%s Автокоманды для \"%s\""
+
+#, c-format
+msgid "Executing %s"
+msgstr "Выполнение %s"
+
+#, c-format
+msgid "autocommand %s"
+msgstr "автокоманда %s"
+
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: bf_key_init() вызван с пустым паролем"
 
@@ -54,8 +127,9 @@ msgstr "E83: Невозможно выделить память для буфера, используем другой буфер..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Невозможно зарегистрировать буфер"
 
-msgid "E937: Attempt to delete a buffer that is in use"
-msgstr "E937: Попытка удалить используемый буфер"
+#, c-format
+msgid "E937: Attempt to delete a buffer that is in use: %s"
+msgstr "E937: Попытка удалить используемый буфер: %s"
 
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Ни один буфер не был выгружен из памяти"
@@ -66,26 +140,26 @@ msgstr "E516: Ни один буфер не был удалён"
 msgid "E517: No buffers were wiped out"
 msgstr "E517: Ни один буфер не был очищен"
 
-msgid "1 buffer unloaded"
-msgstr "Один буфер выгружен из памяти"
-
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "Всего выгружено буферов из памяти: %d"
-
-msgid "1 buffer deleted"
-msgstr "Один буфер удалён"
-
-#, c-format
-msgid "%d buffers deleted"
-msgstr "Всего удалено буферов: %d"
-
-msgid "1 buffer wiped out"
-msgstr "Один буфер очищен"
-
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "Всего очищено буферов: %d"
+#, c-format
+msgid "%d buffer unloaded"
+msgid_plural "%d buffers unloaded"
+msgstr[0] "Выгружен %d буфер"
+msgstr[1] "Выгружено %d буфера"
+msgstr[2] "Выгружено %d буферов"
+
+#, c-format
+msgid "%d buffer deleted"
+msgid_plural "%d buffers deleted"
+msgstr[0] "Удалён %d буфер"
+msgstr[1] "Удалено %d буфера"
+msgstr[2] "Удалено %d буферов"
+
+#, c-format
+msgid "%d buffer wiped out"
+msgid_plural "%d buffers wiped out"
+msgstr[0] "Очищен %d буфер"
+msgstr[1] "Очищено %d буфера"
+msgstr[2] "Очищено %d буферов"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Невозможно выгрузить из памяти последний буфер"
@@ -103,9 +177,9 @@ msgid "E88: Cannot go before first buffe
 msgstr "E88: Это первый буфер"
 
 #, c-format
-msgid "E89: No write since last change for buffer %ld (add ! to override)"
-msgstr ""
-"E89: Изменения в буфере %ld не сохранены (добавьте !, чтобы обойти проверку)"
+msgid "E89: No write since last change for buffer %d (add ! to override)"
+msgstr ""
+"E89: Не сохранены изменения в буфере %d (добавьте !, чтобы обойти проверку)"
 
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: Задание ещё выполняется (добавьте !, чтобы завершить)"
@@ -123,8 +197,8 @@ msgid "W14: Warning: List of file names 
 msgstr "W14: Предупреждение: переполнение списка имён файлов"
 
 #, c-format
-msgid "E92: Buffer %ld not found"
-msgstr "E92: Буфер %ld не найден"
+msgid "E92: Buffer %d not found"
+msgstr "E92: Не найден буфер %d"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -160,12 +234,11 @@ msgid "[readonly]"
 msgstr "[только для чтения]"
 
 #, c-format
-msgid "1 line --%d%%--"
-msgstr "Одна строка --%d%%--"
-
-#, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld стр. --%d%%--"
+msgid "%ld line --%d%%--"
+msgid_plural "%ld lines --%d%%--"
+msgstr[0] "%ld строка --%d%%--"
+msgstr[1] "%ld строки --%d%%--"
+msgstr[2] "%ld строк --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
@@ -192,34 +265,164 @@ msgstr "Внизу"
 msgid "Top"
 msgstr "Наверху"
 
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# Список буферов:\n"
-
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr ""
 "E382: Запись невозможна, значение опции 'buftype' не является пустой строкой"
 
+msgid "[Prompt]"
+msgstr "[Уведомление]"
+
+msgid "[Popup]"
+msgstr "[Всплывающий]"
+
 msgid "[Scratch]"
 msgstr "[Временный]"
 
+msgid "WARNING: The file has been changed since reading it!!!"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Файл изменён с момента чтения!!!"
+
+msgid "Do you really want to write to it"
+msgstr "Серьёзно хотите записать в этот файл"
+
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: Нет подходящих автокоманд для буфера acwrite"
+
+msgid "E203: Autocommands deleted or unloaded buffer to be written"
+msgstr ""
+"E203: Буфер, который требовалось записать, удалён или выгружен автокомандой"
+
+msgid "E204: Autocommand changed number of lines in unexpected way"
+msgstr "E204: Количество строк изменено автокомандой неожиданным образом"
+
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans не позволяет выполнять запись неизменённых буферов"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "Частичная запись буферов NetBeans не допускается"
+
+msgid "is a directory"
+msgstr "является каталогом"
+
+msgid "is not a file or writable device"
+msgstr "не является файлом или устройством, доступным для записи"
+
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "запись в устройство отключена при опции 'opendevice'"
+
+msgid "is read-only (add ! to override)"
+msgstr "открыт только для чтения (добавьте !, чтобы обойти проверку)"
+
+msgid "E506: Can't write to backup file (add ! to override)"
+msgstr ""
+"E506: Запись в резервный файл невозможна (добавьте !, чтобы обойти проверку)"
+
+msgid "E507: Close error for backup file (add ! to override)"
+msgstr ""
+"E507: Ошибка закрытия резервного файла (добавьте !, чтобы обойти проверку)"
+
+msgid "E508: Can't read file for backup (add ! to override)"
+msgstr ""
+"E508: Невозможно прочитать резервный файл (добавьте !, чтобы обойти проверку)"
+
+msgid "E509: Cannot create backup file (add ! to override)"
+msgstr ""
+"E509: Невозможно создать резервный файл (добавьте !, чтобы обойти проверку)"
+
+msgid "E510: Can't make backup file (add ! to override)"
+msgstr ""
+"E510: Невозможно создать резервный файл (добавьте !, чтобы обойти проверку)"
+
+msgid "E214: Can't find temp file for writing"
+msgstr "E214: Временный файл для записи не найден"
+
+msgid "E213: Cannot convert (add ! to write without conversion)"
+msgstr ""
+"E213: Перекодировка невозможна (добавьте ! для записи без перекодировки)"
+
+msgid "E166: Can't open linked file for writing"
+msgstr "E166: Невозможно открыть файл по ссылке для записи"
+
+msgid "E212: Can't open file for writing"
+msgstr "E212: Невозможно открыть файл для записи"
+
+msgid "E949: File changed while writing"
+msgstr "E949: Файл был изменён после записи"
+
+msgid "E512: Close failed"
+msgstr "E512: Операция закрытия не удалась"
+
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr ""
+"E513: Ошибка записи, преобразование не удалось (очистите 'fenc', чтобы "
+"обойти)"
+
+#, c-format
 msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- Значки ---"
-
-#, c-format
-msgid "Signs for %s:"
-msgstr "Значки для %s:"
-
-#, c-format
-msgid "    line=%ld  id=%d  name=%s"
-msgstr "    строка=%ld  id=%d  имя=%s"
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
+"override)"
+msgstr ""
+"E513: Ошибка записи, преобразование не удалось на строке %ld (очистите "
+"'fenc', чтобы обойти)"
+
+msgid "E514: write error (file system full?)"
+msgstr "E514: Ошибка записи (нет свободного места?)"
+
+msgid " CONVERSION ERROR"
+msgstr " ОШИБКА ПРЕОБРАЗОВАНИЯ"
+
+#, c-format
+msgid " in line %ld;"
+msgstr " на строке %ld;"
+
+msgid "[NOT converted]"
+msgstr "[БЕЗ преобразований]"
+
+msgid "[converted]"
+msgstr "[перекодировано]"
+
+msgid "[Device]"
+msgstr "[Устройство]"
+
+msgid "[New]"
+msgstr "[Новый]"
+
+msgid "[New File]"
+msgstr "[Новый файл]"
+
+msgid " [a]"
+msgstr " [д]"
+
+msgid " appended"
+msgstr " добавлено"
+
+msgid " [w]"
+msgstr " [з]"
+
+msgid " written"
+msgstr " записано"
+
+msgid "E205: Patchmode: can't save original file"
+msgstr "E205: Режим заплатки: невозможно сохранение исходного файла"
+
+msgid "E206: patchmode: can't touch empty original file"
+msgstr ""
+"E206: Режим заплатки: невозможно сменить параметры пустого исходного файла"
+
+msgid "E207: Can't delete backup file"
+msgstr "E207: Невозможно удалить резервный файл"
+
+msgid ""
+"\n"
+"WARNING: Original file may be lost or damaged\n"
+msgstr ""
+"\n"
+"ПРЕДУПРЕЖДЕНИЕ: Исходный файл может быть утрачен или повреждён\n"
+
+msgid "don't quit the editor until the file is successfully written!"
+msgstr "не выходите из редактора, пока файл не будет успешно записан!"
+
+msgid "W10: Warning: Changing a readonly file"
+msgstr "W10: Предупреждение: Изменение файла с правами только для чтения"
 
 msgid "E902: Cannot connect to port"
 msgstr "E902: Невозможно соединиться с портом"
@@ -243,6 +446,9 @@ msgstr "E904: Третий параметр для вызова должен быть списком"
 msgid "E905: received unknown command: %s"
 msgstr "E905: Получена неизвестная команда %s"
 
+msgid "E906: not an open channel"
+msgstr "E906: Не открытый канал"
+
 #, c-format
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s(): запись без соединения"
@@ -260,9 +466,6 @@ msgstr ""
 "E912: Невозможно использовать ch_evalexpr() или ch_sendexpr() с каналом nl "
 "или raw"
 
-msgid "E906: not an open channel"
-msgstr "E906: Не открытый канал"
-
 msgid "E920: _io file requires _name to be set"
 msgstr "E920: Файл _io требует установленного _name"
 
@@ -273,6 +476,18 @@ msgstr "E915: буфер in_io требует установленного in_buf или in_name"
 msgid "E918: buffer must be loaded: %s"
 msgstr "E918: Буфер должен быть загружен: %s"
 
+msgid "E916: not a valid job"
+msgstr "E916: Недопустимое задание"
+
+msgid "tagname"
+msgstr "имя метки"
+
+msgid " kind file\n"
+msgstr " тип файла\n"
+
+msgid "'history' option is zero"
+msgstr "значение опции 'history' равно нулю"
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: Файл зашифрован неизвестным методом"
 
@@ -291,6 +506,51 @@ msgstr "Введённые пароли не совпадают!"
 msgid "[crypted]"
 msgstr "[зашифровано]"
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "Включён режим отладки. Для продолжения наберите \"cont\""
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "Преж.зн. = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "Нов.зн.  = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "строка %ld: %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "команда: %s"
+
+msgid "frame is zero"
+msgstr "нулевой фрейм"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "максимальный фрейм: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Точка остановки в \"%s%s\" стр. %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Точка остановки не найдена: %s"
+
+msgid "No breakpoints defined"
+msgstr "Точки остановки не определены"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s стр. %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  выр. %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Пропущено двоеточие в словаре: %s"
@@ -315,8 +575,12 @@ msgid "E737: Key already exists: %s"
 msgstr "E737: Ключ уже существует: %s"
 
 #, c-format
-msgid "E96: Cannot diff more than %ld buffers"
-msgstr "E96: Следить за отличиями можно не более чем в %ld буферах"
+msgid "E96: Cannot diff more than %d buffers"
+msgstr "E96: Невозможно отобразить отличия для более чем %d буферов"
+
+#, c-format
+msgid "Not enough memory to use internal diff for buffer \"%s\""
+msgstr "Недостаточно памяти для встроенного diff для буфера \"%s\""
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Невозможно прочитать или записать временные файлы"
@@ -324,6 +588,9 @@ msgstr "E810: Невозможно прочитать или записать временные файлы"
 msgid "E97: Cannot create diffs"
 msgstr "E97: Невозможно создать файлы отличий"
 
+msgid "E960: Problem creating the internal diff"
+msgstr "E960: Проблема при создании внутреннем создании отличий"
+
 msgid "Patch file"
 msgstr "Файл-заплатка"
 
@@ -333,6 +600,9 @@ msgstr "E816: Невозможно прочитать вывод patch"
 msgid "E98: Cannot read diff output"
 msgstr "E98: Невозможно прочитать вывод diff"
 
+msgid "E959: Invalid diff format."
+msgstr "E959: Неверный формат diff"
+
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Активный буфер не находится в режиме отличий"
 
@@ -359,6 +629,81 @@ msgstr "E787: Буфер неожиданно изменился"
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: Экранирующий символ Escape нельзя использовать в диграфе"
 
+msgid "Custom"
+msgstr "Специальные"
+
+msgid "Latin supplement"
+msgstr "Латынь дополненная"
+
+msgid "Greek and Coptic"
+msgstr "Греческий и Коптский"
+
+msgid "Cyrillic"
+msgstr "Кириллица"
+
+msgid "Hebrew"
+msgstr "Иврит"
+
+msgid "Arabic"
+msgstr "Арабский"
+
+msgid "Latin extended"
+msgstr "Латынь расширенная"
+
+msgid "Greek extended"
+msgstr "Греческий расширенный"
+
+msgid "Punctuation"
+msgstr "Пунктуация"
+
+msgid "Super- and subscripts"
+msgstr "Над- и подстрочные"
+
+msgid "Currency"
+msgstr "Валюта"
+
+msgid "Other"
+msgstr "Прочее"
+
+msgid "Roman numbers"
+msgstr "Римские цифры"
+
+msgid "Arrows"
+msgstr "Стрелки"
+
+msgid "Mathematical operators"
+msgstr "Математические операторы"
+
+msgid "Technical"
+msgstr "Техника"
+
+msgid "Box drawing"
+msgstr "Псевдографика"
+
+msgid "Block elements"
+msgstr "Блочные элементы"
+
+msgid "Geometric shapes"
+msgstr "Геометрические фигуры"
+
+msgid "Symbols"
+msgstr "Символы"
+
+msgid "Dingbats"
+msgstr "Орнамент"
+
+msgid "CJK symbols and punctuation"
+msgstr "Китайские, Японские и Корейские символы и пунктуация"
+
+msgid "Hiragana"
+msgstr "Хирагана"
+
+msgid "Katakana"
+msgstr "Катакана"
+
+msgid "Bopomofo"
+msgstr "Чжуинь (бопомофо)"
+
 msgid "E544: Keymap file not found"
 msgstr "E544: Файл с раскладкой клавиатуры не найден"
 
@@ -368,151 +713,32 @@ msgstr "E105: Команда :loadkeymap применена вне файла сценария"
 msgid "E791: Empty keymap entry"
 msgstr "E791: пустая запись раскладки клавиатуры"
 
-msgid " Keyword completion (^N^P)"
-msgstr " Автодополнение ключевого слова (^N^P)"
-
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " Режим ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-msgid " Whole line completion (^L^N^P)"
-msgstr " Автодополнение целой строки (^L^N^P)"
-
-msgid " File name completion (^F^N^P)"
-msgstr " Автодополнение имени файла (^F^N^P)"
-
-msgid " Tag completion (^]^N^P)"
-msgstr " Автодополнение метки (^]^N^P)"
-
-msgid " Path pattern completion (^N^P)"
-msgstr " Автодополнение шаблона пути (^N^P)"
-
-msgid " Definition completion (^D^N^P)"
-msgstr " Автодополнение определения (^D^N^P)"
-
-msgid " Dictionary completion (^K^N^P)"
-msgstr " Автодополнение по словарю (^K^N^P)"
-
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " Автодополнение синонимов (^T^N^P)"
-
-msgid " Command-line completion (^V^N^P)"
-msgstr " Автодополнение командной строки (^V^N^P)"
-
-msgid " User defined completion (^U^N^P)"
-msgstr " Пользовательское автодополнение (^U^N^P)"
-
-msgid " Omni completion (^O^N^P)"
-msgstr " Omni-дополнение (^O^N^P)"
-
-msgid " Spelling suggestion (s^N^P)"
-msgstr " Предложение исправления правописания (s^N^P)"
-
-msgid " Keyword Local completion (^N^P)"
-msgstr " Местное автодополнение ключевого слова (^N^P)"
-
-msgid "Hit end of paragraph"
-msgstr "Конец абзаца"
-
-msgid "E839: Completion function changed window"
-msgstr "E839: Функция автодополнения изменила окно"
-
-msgid "E840: Completion function deleted text"
-msgstr "E840: Функция автодополнения удалила текст"
-
-msgid "'dictionary' option is empty"
-msgstr "Не задано значение опции 'dictionary'"
-
-msgid "'thesaurus' option is empty"
-msgstr "Не задано значение опции 'thesaurus'"
-
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "Просмотр словаря: %s"
-
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (вставка) Прокрутка (^E/^Y)"
-
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (замена) Прокрутка (^E/^Y)"
-
-#, c-format
-msgid "Scanning: %s"
-msgstr "Просмотр: %s"
-
-msgid "Scanning tags."
-msgstr "Выполняется поиск среди меток."
-
-msgid "match in file"
-msgstr "соответствие в файле"
-
-msgid " Adding"
-msgstr " Добавление"
-
-msgid "-- Searching..."
-msgstr "-- Поиск..."
-
-msgid "Back at original"
-msgstr "Исходное слово"
-
-msgid "Word from other line"
-msgstr "Слово из другой строки"
-
-msgid "The only match"
-msgstr "Единственное соответствие"
-
-#, c-format
-msgid "match %d of %d"
-msgstr "соответствие %d из %d"
-
-#, c-format
-msgid "match %d"
-msgstr "соответствие %d"
-
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: Неожиданные символы в :let"
-
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: Неопределённая переменная: %s"
-
 msgid "E111: Missing ']'"
 msgstr "E111: Пропущена ']'"
 
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Невозможно использовать [:] со словарём"
 
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: Неправильный тип переменной для %s="
-
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: Недопустимое имя переменной: %s"
-
 msgid "E806: using Float as a String"
 msgstr "E806: Использование числа с плавающей точкой как строки"
 
-msgid "E687: Less targets than List items"
-msgstr "E687: Целей меньше чем элементов списка"
-
-msgid "E688: More targets than List items"
-msgstr "E688: Целей больше чем элементов списка"
-
-msgid "Double ; in list of variables"
-msgstr "Двойная ; в списке переменных"
-
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: Невозможно отобразить переменные для %s"
-
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: Индексирование возможно только списка или словаря"
+msgid "E274: No white space allowed before parenthesis"
+msgstr "E274: Пробельные символы не допустимы между скобками"
+
+msgid "E689: Can only index a List, Dictionary or Blob"
+msgstr "E689: Индексирование возможно только списка, словаря или блоба"
 
 msgid "E708: [:] must come last"
 msgstr "E708: [:] должно быть последним"
 
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] требует значением список"
+msgid "E709: [:] requires a List or Blob value"
+msgstr "E709: [:] требует значением список или блоб"
+
+msgid "E972: Blob value does not have the right number of bytes"
+msgstr "E972: Значение блоба не имеет верное количество байт"
+
+msgid "E996: Cannot lock a range"
+msgstr "E996: Невозможно заблокировать диапазон"
 
 msgid "E710: List value has more items than target"
 msgstr "E710: Элементов списка-значения больше чем в цели"
@@ -520,29 +746,28 @@ msgstr "E710: Элементов списка-значения больше чем в цели"
 msgid "E711: List value has not enough items"
 msgstr "E711: Список-значение не содержит достаточно элементов"
 
+msgid "E996: Cannot lock a list or dict"
+msgstr "E996: Невозможно заблокировать список или словарь"
+
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: Пропущено \"in\" после :for"
 
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: Нет такой переменной: \"%s\""
-
-#, c-format
-msgid "E940: Cannot lock or unlock variable %s"
-msgstr "E940: Невозможно (раз)блокировать переменную %s"
-
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: Слишком глубоко вложенные переменные для (раз)блокировки"
-
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Пропущено ':' после '?'"
 
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Невозможно использовать '%' с числом с плавающей точкой"
 
+msgid "E973: Blob literal should have an even number of hex characters"
+msgstr ""
+"E973: блоб-литерал должен иметь чётное количество шестнадцатеричных символов"
+
 msgid "E110: Missing ')'"
 msgstr "E110: Пропущена ')'"
 
+msgid "E260: Missing name after ->"
+msgstr "E260: Пропущено имя после ->"
+
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Невозможно индексировать ссылку на функцию"
 
@@ -589,6 +814,9 @@ msgstr "E910: Использование задания как числа"
 msgid "E913: Using a Channel as a Number"
 msgstr "E913: Использование канала как числа"
 
+msgid "E974: Using a Blob as a Number"
+msgstr "E974: Использование блоба как числа"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: Использование ссылки на функцию как числа с плавающей точкой"
 
@@ -610,6 +838,9 @@ msgstr "E911: Использование задания как числа с плавающей точкой"
 msgid "E914: Using a Channel as a Float"
 msgstr "E914: Использование канала как числа с плавающей точкой"
 
+msgid "E975: Using a Blob as a Float"
+msgstr "E975: Использование блоба как числа с плавающей точкой"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: Использование ссылки на функцию как строки"
 
@@ -619,9 +850,174 @@ msgstr "E730: Использование списка как строки"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Использование словаря как строки"
 
+msgid "E976: using Blob as a String"
+msgstr "E976: Использование блоба как строки"
+
 msgid "E908: using an invalid value as a String"
 msgstr "E908: Использование неправильного значения как строки"
 
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: Слишком глубоко вложенные переменные для копирования"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tПоследний раз установлено на "
+
+msgid " line "
+msgstr " строке "
+
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977: Блоб можно сравнивать только с блобом"
+
+msgid "E691: Can only compare List with List"
+msgstr "E691: Список можно сравнивать только со списком"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: Недопустимая операция для списков"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Словарь можно сравнивать только со словарём"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: Недопустимая операция для словаря"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: Недопустимая операция для ссылки на функцию"
+
+msgid "E808: Number or Float required"
+msgstr "E808: Требуется целое число или с плавающей точкой"
+
+#, c-format
+msgid "E158: Invalid buffer name: %s"
+msgstr "E158: Неправильное имя буфера: %s"
+
+msgid "&Ok"
+msgstr "&Ok"
+
+msgid "E980: lowlevel input not supported"
+msgstr "E980: Не поддерживается низкоуровневый ввод"
+
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: Неизвестная функция: %s"
+
+msgid "E922: expected a dict"
+msgstr "E922: Ожидался словарь"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: Второй параметр функции() должен быть списком или словарём"
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"&OK\n"
+"&C Отмена"
+
+msgid "called inputrestore() more often than inputsave()"
+msgstr "Функция inputrestore() вызывается чаще, чем функция inputsave()"
+
+msgid "E786: Range not allowed"
+msgstr "E786: Диапазон не допускается"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: Неправильные тип для len()"
+
+msgid "E726: Stride is zero"
+msgstr "E726: Нулевой шаг"
+
+msgid "E727: Start past end"
+msgstr "E727: Начало после конца"
+
+msgid "E240: No connection to the X server"
+msgstr "E240: Нет связи с X-сервером"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: Не могу отправить сообщение для %s"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: Сервер не отвечает"
+
+msgid "E941: already started a server"
+msgstr "E941: Сервер уже запущен"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: Особенность +clientserver недоступна"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: Не могу ответить клиенту"
+
+#, c-format
+msgid "E962: Invalid action: '%s'"
+msgstr "E962: Неправильное действие: '%s'"
+
+msgid "(Invalid)"
+msgstr "(Неправильно)"
+
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: Недопустимый номер подсоответствия: %d"
+
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: Неожиданные символы в :let"
+
+msgid "E991: cannot use =<< here"
+msgstr "E991: Здесь невозможно использовать =<<"
+
+msgid "E221: Marker cannot start with lower case letter"
+msgstr "E221: Маркер должен начинаться с заглавной буквы"
+
+msgid "E172: Missing marker"
+msgstr "E172: Маркер отсутствует"
+
+#, c-format
+msgid "E990: Missing end marker '%s'"
+msgstr "E990: Пропущен конечный маркер '%s'"
+
+msgid "E985: .= is not supported with script version 2"
+msgstr "E985: .= не поддерживается в сценарии версии 2"
+
+msgid "E687: Less targets than List items"
+msgstr "E687: Целей меньше чем элементов списка"
+
+msgid "E688: More targets than List items"
+msgstr "E688: Целей больше чем элементов списка"
+
+msgid "Double ; in list of variables"
+msgstr "Двойная ; в списке переменных"
+
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: Невозможно отобразить переменные для %s"
+
+msgid "E996: Cannot lock an environment variable"
+msgstr "E996: Невозможно заблокировать переменную окружения"
+
+msgid "E996: Cannot lock an option"
+msgstr "E996: Невозможно заблокировать опцию"
+
+msgid "E996: Cannot lock a register"
+msgstr "E996: Невозможно заблокировать регистр"
+
+#, c-format
+msgid "E108: No such variable: \"%s\""
+msgstr "E108: Нет такой переменной: \"%s\""
+
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: Невозможно (раз)блокировать переменную %s"
+
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: Слишком глубоко вложенные переменные для (раз)блокировки"
+
+#, c-format
+msgid "E963: setting %s to value with wrong type"
+msgstr "E963: Установка %s в значение неверного типа"
+
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: Невозможно удалить переменную %s"
@@ -647,170 +1043,6 @@ msgstr "Неизвестно"
 msgid "E742: Cannot change value of %s"
 msgstr "E742: Невозможно изменить значение %s"
 
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: Слишком глубоко вложенные переменные для копирования"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# глобальные переменные:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tВ последний раз опция изменена в "
-
-msgid "E691: Can only compare List with List"
-msgstr "E691: Список можно сравнивать только со списком"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: Недопустимая операция для списков"
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: Словарь можно сравнивать только со словарём"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: Недопустимая операция для словаря"
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: Недопустимая операция для ссылки на функцию"
-
-msgid "map() argument"
-msgstr "параметра map()"
-
-msgid "filter() argument"
-msgstr "параметра filter()"
-
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Параметр %s должен быть списком"
-
-msgid "E928: String required"
-msgstr "E928: Требуется строка"
-
-msgid "E808: Number or Float required"
-msgstr "E808: Требуется целое число или с плавающей точкой"
-
-msgid "add() argument"
-msgstr "параметра add()"
-
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() может использоваться только в режиме Вставки"
-
-msgid "&Ok"
-msgstr "&Ok"
-
-#, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld строка: "
-msgstr[1] "+-%s%3ld строки: "
-msgstr[2] "+-%s%3ld строк: "
-
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: Неизвестная функция: %s"
-
-msgid "E922: expected a dict"
-msgstr "E922: Ожидался словарь"
-
-msgid "E923: Second argument of function() must be a list or a dict"
-msgstr "E923: Второй параметр функции() должен быть списком или словарём"
-
-msgid ""
-"&OK\n"
-"&Cancel"
-msgstr ""
-"&OK\n"
-"&C Отмена"
-
-msgid "called inputrestore() more often than inputsave()"
-msgstr "Функция inputrestore() вызывается чаще, чем функция inputsave()"
-
-msgid "insert() argument"
-msgstr "параметра insert()"
-
-msgid "E786: Range not allowed"
-msgstr "E786: Диапазон не допускается"
-
-msgid "E916: not a valid job"
-msgstr "E916: Недопустимое задание"
-
-msgid "E701: Invalid type for len()"
-msgstr "E701: Неправильные тип для len()"
-
-#, c-format
-msgid "E798: ID is reserved for \":match\": %ld"
-msgstr "E798: ID зарезервирован для \":match\": %ld"
-
-msgid "E726: Stride is zero"
-msgstr "E726: Нулевой шаг"
-
-msgid "E727: Start past end"
-msgstr "E727: Начало после конца"
-
-msgid "<empty>"
-msgstr "<пусто>"
-
-msgid "E240: No connection to the X server"
-msgstr "E240: Нет связи с X-сервером"
-
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: Не могу отправить сообщение для %s"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277: Сервер не отвечает"
-
-msgid "E941: already started a server"
-msgstr "E941: Сервер уже запущен"
-
-msgid "E942: +clientserver feature not available"
-msgstr "E942: Особенность +clientserver недоступна"
-
-msgid "remove() argument"
-msgstr "параметра remove()"
-
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: Слишком много символических ссылок (цикл?)"
-
-msgid "reverse() argument"
-msgstr "параметра reverse()"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: Не могу ответить клиенту"
-
-#, c-format
-msgid "E927: Invalid action: '%s'"
-msgstr "E927: Неправильное действие: '%s'"
-
-msgid "sort() argument"
-msgstr "параметра sort()"
-
-msgid "uniq() argument"
-msgstr "параметра uniq()"
-
-msgid "E702: Sort compare function failed"
-msgstr "E702: Неудачное завершение функции сравнения при сортировке"
-
-msgid "E882: Uniq compare function failed"
-msgstr ""
-"E882: Неудачное завершение функции сравнения при проверке единственности"
-
-msgid "(Invalid)"
-msgstr "(Неправильно)"
-
-#, c-format
-msgid "E935: invalid submatch number: %d"
-msgstr "E935: Недопустимый номер подсоответствия: %d"
-
-msgid "E677: Error writing temp file"
-msgstr "E677: Ошибка записи во временный файл"
-
 msgid "E921: Invalid callback argument"
 msgstr "E921: Недопустимый параметр обратного вызова"
 
@@ -836,17 +1068,17 @@ msgstr "> %d, Шес %04x, Вос %o"
 
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, Шес %08x, Вос %o"
-
-msgid "E134: Move lines into themselves"
-msgstr "E134: Строки перемещаются сами на себя"
-
-msgid "1 line moved"
-msgstr "Перемещена одна строка"
-
-#, c-format
-msgid "%ld lines moved"
-msgstr "Перемещено строк: %ld"
+msgstr "> %d, Шест %08x, Восм %o"
+
+msgid "E134: Cannot move a range of lines into itself"
+msgstr "E134: Невозможно переместить диапазон строк на себя"
+
+#, c-format
+msgid "%ld line moved"
+msgid_plural "%ld lines moved"
+msgstr[0] "Перемещена %ld строка"
+msgstr[1] "Перемещено %ld строки"
+msgstr[2] "Перемещено %ld строк"
 
 #, c-format
 msgid "%ld lines filtered"
@@ -858,74 +1090,6 @@ msgstr "E135: Автокоманды *Filter* не должны изменять активный буфер"
 msgid "[No write since last change]\n"
 msgstr "[Изменения не сохранены]\n"
 
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s в строке: "
-
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr ""
-"E136: viminfo: Слишком много ошибок, остальная часть файла будет пропущена"
-
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Чтение файла viminfo \"%s\"%s%s%s"
-
-msgid " info"
-msgstr " инфо"
-
-msgid " marks"
-msgstr " отметок"
-
-msgid " oldfiles"
-msgstr " старых файлов"
-
-msgid " FAILED"
-msgstr " НЕУДАЧНО"
-
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Права на запись файла viminfo отсутствуют: %s"
-
-#, c-format
-msgid "E929: Too many viminfo temp files, like %s!"
-msgstr "E929: Слишком много временных файлов viminfo, таких как %s"
-
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Невозможно записать файл viminfo %s!"
-
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Запись файла viminfo \"%s\""
-
-#, c-format
-msgid "E886: Can't rename viminfo file to %s!"
-msgstr "E886: Невозможно переименовать файл viminfo в %s!"
-
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# Этот файл viminfo автоматически создан Vim %s.\n"
-
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# Его можно (осторожно!) редактировать.\n"
-"\n"
-
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Значение опции 'encoding' в момент записи файла\n"
-
-msgid "Illegal starting char"
-msgstr "Недопустимый начальный символ"
-
-msgid ""
-"\n"
-"# Bar lines, copied verbatim:\n"
-msgstr ""
-"\n"
-"# Строк с '|', точно скопировано:\n"
-
 msgid "Save As"
 msgstr "Сохранить как"
 
@@ -987,8 +1151,10 @@ msgstr "E143: Автокоманды неожиданно убили новый буфер %s"
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: Параметр команды :z должен быть числом"
 
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: Использование команд оболочки не допускается в rvim."
+msgid "E145: Shell commands and some functionality not allowed in rvim"
+msgstr ""
+"E145: Использование команд оболочки и некоторая функциональность не "
+"допускаются в rvim"
 
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Регулярные выражения не могут разделяться буквами"
@@ -1000,26 +1166,33 @@ msgstr "заменить на %s? (y/n/a/q/l/^E/^Y)"
 msgid "(Interrupted) "
 msgstr "(Прервано)"
 
-msgid "1 match"
-msgstr "Одно соответствие"
-
-msgid "1 substitution"
-msgstr "Одна замена"
-
-#, c-format
-msgid "%ld matches"
-msgstr "%ld соответствий"
-
-#, c-format
-msgid "%ld substitutions"
-msgstr "%ld замен"
-
-msgid " on 1 line"
-msgstr " в 1 стр."
-
-#, c-format
-msgid " on %ld lines"
-msgstr " в %ld стр."
+#, c-format
+msgid "%ld match on %ld line"
+msgid_plural "%ld matches on %ld line"
+msgstr[0] "%ld совпадение на %ld строке"
+msgstr[1] "%ld совпадения на %ld строке"
+msgstr[2] "%ld совпадений на %ld строке"
+
+#, c-format
+msgid "%ld substitution on %ld line"
+msgid_plural "%ld substitutions on %ld line"
+msgstr[0] "%ld замена на %ld строке"
+msgstr[1] "%ld замены на %ld строке"
+msgstr[2] "%ld замен на %ld строке"
+
+#, c-format
+msgid "%ld match on %ld lines"
+msgid_plural "%ld matches on %ld lines"
+msgstr[0] "%ld совпадение на %ld строках"
+msgstr[1] "%ld совпадения на %ld строках"
+msgstr[2] "%ld совпадений на %ld строках"
+
+#, c-format
+msgid "%ld substitution on %ld lines"
+msgid_plural "%ld substitutions on %ld lines"
+msgstr[0] "%ld замена на %ld строках"
+msgstr[1] "%ld замены на %ld строках"
+msgstr[2] "%ld замен на %ld строках"
 
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: Невозможно выполнить :global рекурсивно с диапазоном"
@@ -1035,15 +1208,6 @@ msgstr "Соответствие шаблону найдено на каждой строке: %s"
 msgid "Pattern not found: %s"
 msgstr "Шаблон не найден: %s"
 
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Последняя строка для замены:\n"
-"$"
-
 msgid "E478: Don't panic!"
 msgstr "E478: Спокойствие, только спокойствие!"
 
@@ -1083,102 +1247,9 @@ msgstr "E154: Повторяющаяся метка \"%s\" в файле %s/%s"
 msgid "E150: Not a directory: %s"
 msgstr "E150: %s не является каталогом"
 
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: Неизвестная команда значка %s"
-
-msgid "E156: Missing sign name"
-msgstr "E156: Пропущено имя значка"
-
-msgid "E612: Too many signs defined"
-msgstr "E612: Определено слишком много значков"
-
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: Неправильный текст значка: %s"
-
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: Неизвестный значок: %s"
-
-msgid "E159: Missing sign number"
-msgstr "E159: Пропущен номер значка"
-
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: Неправильное имя буфера: %s"
-
-msgid "E934: Cannot jump to a buffer that does not have a name"
-msgstr "E934: Невозможно перейти к буферу без имени"
-
-#, c-format
-msgid "E157: Invalid sign ID: %ld"
-msgstr "E157: Неправильный ID значка: %ld"
-
-#, c-format
-msgid "E885: Not possible to change sign %s"
-msgstr "E885: Невозможно изменить значок %s"
-
-msgid " (NOT FOUND)"
-msgstr " (НЕ НАЙДЕНО)"
-
-msgid " (not supported)"
-msgstr " (не поддерживается)"
-
-msgid "[Deleted]"
-msgstr "[Удалено]"
-
 msgid "No old files"
 msgstr "Нет старых файлов"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "Включён режим отладки. Для продолжения наберите \"cont\""
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "Преж.зн. = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "Нов.зн.  = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "строка %ld: %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "команда: %s"
-
-msgid "frame is zero"
-msgstr "нулевой фрейм"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "максимальный фрейм: %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Точка остановки в \"%s%s\" стр. %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Точка остановки не найдена: %s"
-
-msgid "No breakpoints defined"
-msgstr "Точки остановки не определены"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s стр. %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  выр. %s"
-
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: Первое использование \":profile start {имя-файла}\""
-
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "Сохранить изменения в \"%s\"?"
@@ -1195,32 +1266,11 @@ msgid "Warning: Entered other buffer une
 msgstr ""
 "Предупреждение: Неожиданный переход в другой буфер (проверьте автокоманды)"
 
-msgid "E163: There is only one file to edit"
-msgstr "E163: Для редактирования доступен только один файл"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: Это первый файл"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Это последний файл"
-
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: Компилятор не поддерживается: %s"
 
 #, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "Поиск \"%s\" в \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "Поиск \"%s\""
-
-#, c-format
-msgid "not found in '%s': \"%s\""
-msgstr "не найдено в '%s': \"%s\""
-
-#, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr ""
 "W20: Не поддерживается python требуемой версии 2.x, файл проигнорирован: %s"
@@ -1230,62 +1280,6 @@ msgid "W21: Required python version 3.x 
 msgstr ""
 "W21: Не поддерживается python требуемой версии 3.x, файл проигнорирован: %s"
 
-msgid "Source Vim script"
-msgstr "Выполнить сценарий Vim"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Нельзя считать каталог: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "невозможно считать \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "строка %ld: невозможно считать \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "считывание сценария \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "строка %ld: считывание \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "считывание сценария %s завершено"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "продолжение в %s"
-
-msgid "modeline"
-msgstr "режимная строка"
-
-msgid "--cmd argument"
-msgstr "--cmd параметр"
-
-msgid "-c argument"
-msgstr "-c параметр"
-
-msgid "environment variable"
-msgstr "переменная окружения"
-
-msgid "error handler"
-msgstr "обработчик ошибки"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr ""
-"W15: Предупреждение: неправильный разделитель строки. Возможно пропущено ^M"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: Команда :scriptencoding используется вне файла сценария"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: Команда :finish используется вне файла сценария"
-
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "Активный %sязык: \"%s\""
@@ -1300,6 +1294,10 @@ msgstr "Переход в режим Ex. Для перехода в Обычный режим наберите \"visual\""
 msgid "E501: At end-of-file"
 msgstr "E501: В конце файла"
 
+#, c-format
+msgid "Executing: %s"
+msgstr "Выполнение: %s"
+
 msgid "E169: Command too recursive"
 msgstr "E169: Слишком рекурсивная команда"
 
@@ -1319,6 +1317,9 @@ msgstr "E464: Неоднозначное использование команды пользователя"
 msgid "E492: Not an editor command"
 msgstr "E492: Это не команда редактора"
 
+msgid "E981: Command not allowed in rvim"
+msgstr "E981: Команда не допустима в rvim"
+
 msgid "E493: Backwards range given"
 msgstr "E493: Задан обратный диапазон"
 
@@ -1328,89 +1329,31 @@ msgstr "Задан обратный диапазон, меняем границы местами"
 msgid "E494: Use w or w>>"
 msgstr "E494: Используйте w или w>>"
 
+msgid ""
+"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
+msgstr ""
+"ВНУТРЕННЕЕ: Невозможно использовать EX_DFLALL с ADDR_NONE, ADDR_UNSIGNED или "
+"ADDR_QUICKFIX"
+
 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
 msgstr "E943: Таблица команд должна быть обновлена, выполните 'make cmdidxs'"
 
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Извините, эта команда недоступна в данной версии"
 
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "1 файл ожидает редактирования. Выйти?"
-
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "Есть неотредактированные файлы (%d). Выйти?"
-
-msgid "E173: 1 more file to edit"
-msgstr "E173: 1 файл ожидает редактирования."
-
-#, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: Есть неотредактированные файлы (%ld)."
-
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: Команда уже существует. Добавьте ! для замены."
-
-msgid ""
-"\n"
-"    Name        Args       Address   Complete  Definition"
-msgstr ""
-"\n"
-"    Имя         Парам.     Диап.     Дополн.   Определение"
-
-msgid "No user-defined commands found"
-msgstr "Команды, определённые пользователем, не обнаружены."
-
-msgid "E175: No attribute specified"
-msgstr "E175: Параметр не задан"
-
-msgid "E176: Invalid number of arguments"
-msgstr "E176: Неправильное количество параметров"
-
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: Число-приставку нельзя указывать дважды"
-
-msgid "E178: Invalid default value for count"
-msgstr "E178: Неправильное значение числа-приставки по умолчанию"
-
-msgid "E179: argument required for -complete"
-msgstr "E179: Для -complete требуется указать параметр"
-
-msgid "E179: argument required for -addr"
-msgstr "E179: Для -addr требуется указать параметр"
-
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: Неправильный атрибут: %s"
-
-msgid "E182: Invalid command name"
-msgstr "E182: Неправильное имя команды"
-
-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: Зарезервированное имя не может использоваться для команд пользователя"
-
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: Нет такой команды пользователя: %s"
-
-#, c-format
-msgid "E180: Invalid address type value: %s"
-msgstr "E180: Неправильное значение типа адреса: %s"
-
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: Неправильное значение дополнения: %s"
-
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr ""
-"E468: Параметр автодополнения можно использовать только с особым дополнением"
-
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Особое дополнение требует указания параметра функции"
+#, c-format
+msgid "%d more file to edit.  Quit anyway?"
+msgid_plural "%d more files to edit.  Quit anyway?"
+msgstr[0] "Не отредактирован %d файл. Выйти?"
+msgstr[1] "Не отредактированы %d файла. Выйти?"
+msgstr[2] "Не отредактировано %d файлов. Выйти?"
+
+#, c-format
+msgid "E173: %d more file to edit"
+msgid_plural "E173: %d more files to edit"
+msgstr[0] "E173: Не отредактирован %d файл"
+msgstr[1] "E173: Не отредактированы %d файла"
+msgstr[2] "E173: Не отредактировано %d файлов"
 
 msgid "unknown"
 msgstr "неизвестно"
@@ -1428,6 +1371,9 @@ msgstr "E784: Нельзя закрыть последнюю вкладку"
 msgid "Already only one tab page"
 msgstr "На экране всего одна вкладка"
 
+msgid "Edit File in new tab page"
+msgstr "Редактировать файл в новой вкладке"
+
 msgid "Edit File in new window"
 msgstr "Редактировать файл в новом окне"
 
@@ -1471,15 +1417,6 @@ msgstr "E930: Невозможно использовать :redir внутри execute()"
 msgid "Save Redirection"
 msgstr "Перенаправление записи"
 
-msgid "Save View"
-msgstr "Сохранение вида"
-
-msgid "Save Session"
-msgstr "Сохранение сеанса"
-
-msgid "Save Setup"
-msgstr "Сохранение настроек"
-
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Невозможно создать каталог: %s"
@@ -1519,6 +1456,9 @@ msgstr "E498: Нет имени файла :source для замены \"<sfile>\""
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: Нет номера строки для использования \"<slnum>\""
 
+msgid "E961: no line number to use for \"<sflnum>\""
+msgstr "E961: Нет номера строки для использования \"<sflnum>\""
+
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: Пустое имя файла для '%' или '#', возможно только c \":p:h\""
@@ -1526,9 +1466,6 @@ msgstr "E499: Пустое имя файла для '%' или '#', возможно только c \":p:h\""
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: Результатом выражения является пустая строка"
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Невозможно открыть файл viminfo для чтения"
-
 msgid "Untitled"
 msgstr "Без имени"
 
@@ -1643,41 +1580,6 @@ msgstr "E788: Сейчас не допускается редактирование другого буфера"
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: Сейчас не допускается изменение информации о буфере"
 
-msgid "tagname"
-msgstr "имя метки"
-
-msgid " kind file\n"
-msgstr " тип файла\n"
-
-msgid "'history' option is zero"
-msgstr "значение опции 'history' равно нулю"
-
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s, история (начиная от свежего к старому):\n"
-
-msgid "Command Line"
-msgstr "Командная строка"
-
-msgid "Search String"
-msgstr "Строка поиска"
-
-msgid "Expression"
-msgstr "Выражение"
-
-msgid "Input Line"
-msgstr "Строка ввода"
-
-msgid "Debug Line"
-msgstr "Строка отладки"
-
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar больше длины команды"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Удалено активное окно или буфер"
 
@@ -1687,18 +1589,12 @@ msgstr "E812: Автокоманды изменили буфер или имя буфера"
 msgid "Illegal file name"
 msgstr "Недопустимое имя файла"
 
-msgid "is a directory"
-msgstr "является каталогом"
-
 msgid "is not a file"
 msgstr "не является файлом"
 
 msgid "is a device (disabled with 'opendevice' option)"
 msgstr "является устройством (отключено при опции 'opendevice')"
 
-msgid "[New File]"
-msgstr "[Новый файл]"
-
 msgid "[New DIRECTORY]"
 msgstr "[Новый КАТАЛОГ]"
 
@@ -1723,9 +1619,6 @@ msgstr "Чтение из стандартного потока ввода stdin..."
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: В результате преобразования файл стал нечитаемым!"
 
-msgid "[fifo/socket]"
-msgstr "[fifo/гнездо]"
-
 msgid "[fifo]"
 msgstr "[fifo]"
 
@@ -1741,12 +1634,6 @@ msgstr "[пропущены символы CR]"
 msgid "[long lines split]"
 msgstr "[длинные строки разбиты]"
 
-msgid "[NOT converted]"
-msgstr "[БЕЗ преобразований]"
-
-msgid "[converted]"
-msgstr "[перекодировано]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[ОШИБКА ПРЕОБРАЗОВАНИЯ в строке %ld]"
@@ -1767,131 +1654,6 @@ msgstr "Преобразование с помощью 'charconvert' не выполнено"
 msgid "can't read output of 'charconvert'"
 msgstr "невозможно прочитать вывод 'charconvert'"
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: Нет подходящих автокоманд для буфера acwrite"
-
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr ""
-"E203: Буфер, который требовалось записать, удалён или выгружен автокомандой"
-
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Количество строк изменено автокомандой неожиданным образом"
-
-msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans не позволяет выполнять запись неизменённых буферов"
-
-msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "Частичная запись буферов NetBeans не допускается"
-
-msgid "is not a file or writable device"
-msgstr "не является файлом или устройством, доступным для записи"
-
-msgid "writing to device disabled with 'opendevice' option"
-msgstr "запись в устройство отключена при опции 'opendevice'"
-
-msgid "is read-only (add ! to override)"
-msgstr "открыт только для чтения (добавьте !, чтобы обойти проверку)"
-
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr ""
-"E506: Запись в резервный файл невозможна (добавьте !, чтобы обойти проверку)"
-
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr ""
-"E507: Ошибка закрытия резервного файла (добавьте !, чтобы обойти проверку)"
-
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr ""
-"E508: Невозможно прочитать резервный файл (добавьте !, чтобы обойти проверку)"
-
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr ""
-"E509: Невозможно создать резервный файл (добавьте !, чтобы обойти проверку)"
-
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr ""
-"E510: Невозможно создать резервный файл (добавьте !, чтобы обойти проверку)"
-
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: Временный файл для записи не найден"
-
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr ""
-"E213: Перекодировка невозможна (добавьте ! для записи без перекодировки)"
-
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: Невозможно открыть файл по ссылке для записи"
-
-msgid "E212: Can't open file for writing"
-msgstr "E212: Невозможно открыть файл для записи"
-
-msgid "E949: File changed while writing"
-msgstr "E949: Файл был изменён после записи"
-
-msgid "E512: Close failed"
-msgstr "E512: Операция закрытия не удалась"
-
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr ""
-"E513: Ошибка записи, преобразование не удалось (очистите 'fenc', чтобы "
-"обойти)"
-
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: Ошибка записи, преобразование не удалось на строке %ld (очистите "
-"'fenc', чтобы обойти)"
-
-msgid "E514: write error (file system full?)"
-msgstr "E514: Ошибка записи (нет свободного места?)"
-
-msgid " CONVERSION ERROR"
-msgstr " ОШИБКА ПРЕОБРАЗОВАНИЯ"
-
-#, c-format
-msgid " in line %ld;"
-msgstr " на строке %ld;"
-
-msgid "[Device]"
-msgstr "[Устройство]"
-
-msgid "[New]"
-msgstr "[Новый]"
-
-msgid " [a]"
-msgstr " [д]"
-
-msgid " appended"
-msgstr " добавлено"
-
-msgid " [w]"
-msgstr " [з]"
-
-msgid " written"
-msgstr " записано"
-
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Режим заплатки: невозможно сохранение исходного файла"
-
-msgid "E206: patchmode: can't touch empty original file"
-msgstr ""
-"E206: Режим заплатки: невозможно сменить параметры пустого исходного файла"
-
-msgid "E207: Can't delete backup file"
-msgstr "E207: Невозможно удалить резервный файл"
-
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"ПРЕДУПРЕЖДЕНИЕ: Исходный файл может быть утрачен или повреждён\n"
-
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "не выходите из редактора, пока файл не будет успешно записан!"
-
 msgid "[dos]"
 msgstr "[dos]"
 
@@ -1910,19 +1672,19 @@ msgstr "[unix]"
 msgid "[unix format]"
 msgstr "[формат unix]"
 
-msgid "1 line, "
-msgstr "1 строка, "
-
-#, c-format
-msgid "%ld lines, "
-msgstr "строк: %ld, "
-
-msgid "1 character"
-msgstr "1 символ"
-
-#, c-format
-msgid "%lld characters"
-msgstr "символов: %lld"
+#, c-format
+msgid "%ld line, "
+msgid_plural "%ld lines, "
+msgstr[0] "%ld строка, "
+msgstr[1] "%ld строки, "
+msgstr[2] "%ld строк, "
+
+#, c-format
+msgid "%lld character"
+msgid_plural "%lld characters"
+msgstr[0] "%lld символ"
+msgstr[1] "%lld символа"
+msgstr[2] "%lld символов"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -1930,12 +1692,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[Незавершённая последняя строка]"
 
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Файл изменён с момента чтения!!!"
-
-msgid "Do you really want to write to it"
-msgstr "Серьёзно хотите записать в этот файл"
-
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Ошибка записи в \"%s\""
@@ -2006,73 +1762,65 @@ msgstr "E462: Невозможно подготовиться к перезагрузке \"%s\""
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Невозможно выполнить перезагрузку \"%s\""
 
-msgid "--Deleted--"
-msgstr "--Удалено--"
-
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "авто-удаление автокоманды: %s <буффер=%d>"
-
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: Группа \"%s\" не существует"
-
-msgid "E936: Cannot delete the current group"
-msgstr "E936: Невозможно удалить текущую группу"
-
-msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: Удаление ещё используемой группы автокоманд"
-
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: Недопустимые символы после *: %s"
-
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: Несуществующее событие: %s"
-
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: Несуществующая группа или событие: %s"
-
-msgid ""
-"\n"
-"--- Autocommands ---"
-msgstr ""
-"\n"
-"--- Автокоманды ---"
-
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>: неправильный номер буфера "
-
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: Невозможно выполнить автокоманды для ВСЕХ событий"
-
-msgid "No matching autocommands"
-msgstr "Нет подходящих автокоманд"
-
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: слишком глубоко вложенные автокоманды"
-
-#, c-format
-msgid "%s Autocommands for \"%s\""
-msgstr "%s Автокоманды для \"%s\""
-
-#, c-format
-msgid "Executing %s"
-msgstr "Выполнение %s"
-
-#, c-format
-msgid "autocommand %s"
-msgstr "автокоманда %s"
-
 msgid "E219: Missing {."
 msgstr "E219: Пропущена {."
 
 msgid "E220: Missing }."
 msgstr "E220: Пропущена }."
 
+msgid "<empty>"
+msgstr "<пусто>"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: Слишком много символических ссылок (цикл?)"
+
+msgid "Select Directory dialog"
+msgstr "Выбор каталога"
+
+msgid "Save File dialog"
+msgstr "Сохранение файла"
+
+msgid "Open File dialog"
+msgstr "Открытие файла"
+
+msgid "E338: Sorry, no file browser in console mode"
+msgstr ""
+"E338: Извините, но в консольном режиме нет проводника по файловой системе"
+
+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 "
+"followed by '%s'."
+msgstr ""
+"E343: Неправильно задан путь: '**[число]' должно быть либо в конце пути, "
+"либо за ним должно следовать '%s'"
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: Каталог \"%s\" не найден в пути для смены каталога"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: Файл \"%s\" в известных каталогах не найден"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: В пути смены каталога больше нет каталогов \"%s\""
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: В известных каталогах больше нет файлов \"%s\""
+
+msgid "E446: No file name under cursor"
+msgstr "E446: Нет имени файла в позиции курсора"
+
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: Файл \"%s\" не найден по известным путям"
+
 msgid "E490: No fold found"
 msgstr "E490: Складок не обнаружено"
 
@@ -2091,37 +1839,19 @@ msgstr[0] "+--%3ld строка в складке "
 msgstr[1] "+--%3ld строки в складке "
 msgstr[2] "+--%3ld строк в складке "
 
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld строка: "
+msgstr[1] "+-%s%3ld строки: "
+msgstr[2] "+-%s%3ld строк: "
+
 msgid "E222: Add to read buffer"
 msgstr "E222: Добавление в буфер чтения"
 
 msgid "E223: recursive mapping"
 msgstr "E223: Рекурсивная привязка"
 
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: Уже есть глобальное сокращение для %s"
-
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: Уже есть глобальная привязка для %s"
-
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: Уже есть сокращение для %s"
-
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: Уже есть привязка для %s"
-
-msgid "No abbreviation found"
-msgstr "Сокращения не найдены"
-
-msgid "No mapping found"
-msgstr "Привязки не найдены"
-
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: недопустимый режим"
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: Невозможно создать новый процесс для граф. интерфейса"
 
@@ -2308,11 +2038,11 @@ msgstr "О&тмена"
 msgid "Open tab..."
 msgstr "Открыть вкладку..."
 
-msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "Поиск строки (используйте '\\\\' для поиска '\\')"
-
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "Поиск и замена (используйте '\\\\' для поиска '\\')"
+msgid "Find string"
+msgstr "Найти строку"
+
+msgid "Find & Replace"
+msgstr "Найти и заменить"
 
 msgid "Not Used"
 msgstr "Не используется"
@@ -2328,6 +2058,11 @@ msgstr "E671: Окно с заголовком \"%s\" не обнаружено"
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: Параметр не поддерживается: \"-%s\"; используйте версию OLE."
 
+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr ""
+"E988: Графический интерфейс не может быть использован. Невозможно выполнить "
+"gvim.exe."
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Невозможно открыть окно внутри приложения MDI"
 
@@ -2357,20 +2092,20 @@ msgid "Font0: %s"
 msgstr "Font0: %s"
 
 #, c-format
-msgid "Font1: %s"
-msgstr "Font1: %s"
-
-#, c-format
-msgid "Font%ld width is not twice that of font0"
-msgstr "Ширина шрифта font%ld должна быть вдвое больше ширины шрифта font0"
-
-#, c-format
-msgid "Font0 width: %ld"
-msgstr "Ширина шрифта font0: %ld"
-
-#, c-format
-msgid "Font1 width: %ld"
-msgstr "Ширина шрифта font1: %ld"
+msgid "Font%d: %s"
+msgstr "Font%d: %s"
+
+#, c-format
+msgid "Font%d width is not twice that of font0"
+msgstr "Ширина шрифта font%d должна быть вдвое больше чем у font0"
+
+#, c-format
+msgid "Font0 width: %d"
+msgstr "Ширина шрифта font0: %d"
+
+#, c-format
+msgid "Font%d width: %d"
+msgstr "Ширина шрифта font%d: %d"
 
 msgid "Invalid font specification"
 msgstr "Неправильное определение шрифта"
@@ -2496,7 +2231,94 @@ msgid "E365: Failed to print PostScript 
 msgstr "E365: Не удалось выполнить печать файла PostScript"
 
 msgid "Print job sent."
-msgstr "Задание на печать отправлено."
+msgstr "Задание отправлено на печать."
+
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: Рекурсивная петля при загрузке syncolor.vim"
+
+#, c-format
+msgid "E411: highlight group not found: %s"
+msgstr "E411: Группа подсветки синтаксиса %s не найдена"
+
+#, c-format
+msgid "E412: Not enough arguments: \":highlight link %s\""
+msgstr "E412: Не хватает параметров: \":highlight link %s\""
+
+#, c-format
+msgid "E413: Too many arguments: \":highlight link %s\""
+msgstr "E413: Слишком много параметров: \":highlight link %s\""
+
+msgid "E414: group has settings, highlight link ignored"
+msgstr "E414: У группы есть настройки, пропускается highlight link"
+
+#, c-format
+msgid "E415: unexpected equal sign: %s"
+msgstr "E415: Неожиданный знак равенства: %s"
+
+#, c-format
+msgid "E416: missing equal sign: %s"
+msgstr "E416: Пропущен знак равенства: %s"
+
+#, c-format
+msgid "E417: missing argument: %s"
+msgstr "E417: Пропущен параметр: %s"
+
+#, c-format
+msgid "E418: Illegal value: %s"
+msgstr "E418: Недопустимое значение: %s"
+
+msgid "E419: FG color unknown"
+msgstr "E419: Неизвестный цвет текста"
+
+msgid "E420: BG color unknown"
+msgstr "E420: Неизвестный цвет фона"
+
+#, c-format
+msgid "E421: Color name or number not recognized: %s"
+msgstr "E421: Имя или номер цвета не известно: %s"
+
+#, c-format
+msgid "E422: terminal code too long: %s"
+msgstr "E422: Слишком длинный код терминала: %s"
+
+#, c-format
+msgid "E423: Illegal argument: %s"
+msgstr "E423: Недопустимый параметр: %s"
+
+msgid "E424: Too many different highlighting attributes in use"
+msgstr "E424: Используется слишком много разных атрибутов подсветки синтаксиса"
+
+msgid "E669: Unprintable character in group name"
+msgstr "E669: Непечатный символ в имени группы"
+
+msgid "W18: Invalid character in group name"
+msgstr "W18: Недопустимый символ в имени группы"
+
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: Слишком много групп подсветки и синтаксиса"
+
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: Неверный ID: %d (должен быть больше или равен 1)"
+
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID уже занят: %d"
+
+msgid "List or number required"
+msgstr "Требуется список или число"
+
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: Неверный ID: %d (должен быть больше или равен 1)"
+
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ID не найден: %d"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID зарезервирован для \":match\": %d"
 
 msgid "Add a new database"
 msgstr "Добавить новую базу данных"
@@ -2545,8 +2367,8 @@ msgid "Added cscope database %s"
 msgstr "Добавлена база данных cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %ld"
-msgstr "E262: Ошибка получения информации от соединения cscope %ld"
+msgid "E262: error reading cscope connection %d"
+msgstr "E262: Ошибка чтения соединения cscope %d"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: Неизвестный тип поиска cscope"
@@ -2873,10 +2695,128 @@ msgstr ""
 "Удалено!"
 
 #, c-format
+msgid "%ld lines to indent... "
+msgstr "Изменяются отступы строках (%ld)..."
+
+#, c-format
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "Изменён отступ в %ld строке "
+msgstr[1] "Изменён отступ в %ld строках "
+msgstr[2] "Изменён отступ в %ld строках "
+
+msgid " Keyword completion (^N^P)"
+msgstr " Автодополнение ключевого слова (^N^P)"
+
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " Режим ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " Автодополнение целой строки (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " Автодополнение имени файла (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Автодополнение метки (^]^N^P)"
+
+msgid " Path pattern completion (^N^P)"
+msgstr " Автодополнение шаблона пути (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " Автодополнение определения (^D^N^P)"
+
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Автодополнение по словарю (^K^N^P)"
+
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Автодополнение синонимов (^T^N^P)"
+
+msgid " Command-line completion (^V^N^P)"
+msgstr " Автодополнение командной строки (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " Пользовательское автодополнение (^U^N^P)"
+
+msgid " Omni completion (^O^N^P)"
+msgstr " Omni-дополнение (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " Предложение исправления правописания (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " Местное автодополнение ключевого слова (^N^P)"
+
+msgid "Hit end of paragraph"
+msgstr "Конец абзаца"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: Функция автодополнения изменила окно"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: Функция автодополнения удалила текст"
+
+msgid "'dictionary' option is empty"
+msgstr "Не задано значение опции 'dictionary'"
+
+msgid "'thesaurus' option is empty"
+msgstr "Не задано значение опции 'thesaurus'"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "Просмотр словаря: %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (вставка) Прокрутка (^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (замена) Прокрутка (^E/^Y)"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() может использоваться только в режиме Вставки"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "Просмотр: %s"
+
+msgid "Scanning tags."
+msgstr "Выполняется поиск среди меток."
+
+msgid "match in file"
+msgstr "соответствие в файле"
+
+msgid " Adding"
+msgstr " Добавление"
+
+msgid "-- Searching..."
+msgstr "-- Поиск..."
+
+msgid "Back at original"
+msgstr "Исходное слово"
+
+msgid "Word from other line"
+msgstr "Слово из другой строки"
+
+msgid "The only match"
+msgstr "Единственное соответствие"
+
+#, c-format
+msgid "match %d of %d"
+msgstr "соответствие %d из %d"
+
+#, c-format
+msgid "match %d"
+msgstr "соответствие %d"
+
+#, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: Повтор ключа в JSON: \"%s\""
 
 #, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: Параметр %s должен быть списком или блобом"
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Пропущена запятая в списке: %s"
 
@@ -2884,6 +2824,37 @@ msgstr "E696: Пропущена запятая в списке: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Пропущено окончание списка ']': %s"
 
+msgid "sort() argument"
+msgstr "параметра sort()"
+
+msgid "uniq() argument"
+msgstr "параметра uniq()"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: Неудачное завершение функции сравнения при сортировке"
+
+msgid "E882: Uniq compare function failed"
+msgstr ""
+"E882: Неудачное завершение функции сравнения при проверке единственности"
+
+msgid "map() argument"
+msgstr "параметра map()"
+
+msgid "filter() argument"
+msgstr "параметра filter()"
+
+msgid "add() argument"
+msgstr "параметра add()"
+
+msgid "insert() argument"
+msgstr "параметра insert()"
+
+msgid "remove() argument"
+msgstr "параметра remove()"
+
+msgid "reverse() argument"
+msgstr "параметра reverse()"
+
 msgid "Unknown option argument"
 msgstr "Неизвестный необязательный параметр"
 
@@ -3095,9 +3066,6 @@ msgstr "-A\t\t\tЗапуск в Арабском режиме"
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tЗапуск в режиме \"Иврит\""
 
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\tЗапуск в режиме \"Фарси\""
-
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <терминал>\tНазначить указанный тип <терминала>"
 
@@ -3332,6 +3300,39 @@ msgstr "Нет дисплея: отправка выражения не удалась.\n"
 msgid ": Send expression failed.\n"
 msgstr ": Отправка выражения не удалась.\n"
 
+#, c-format
+msgid "E224: global abbreviation already exists for %s"
+msgstr "E224: Уже есть глобальное сокращение для %s"
+
+#, c-format
+msgid "E225: global mapping already exists for %s"
+msgstr "E225: Уже есть глобальная привязка для %s"
+
+#, c-format
+msgid "E226: abbreviation already exists for %s"
+msgstr "E226: Уже есть сокращение для %s"
+
+#, c-format
+msgid "E227: mapping already exists for %s"
+msgstr "E227: Уже есть привязка для %s"
+
+msgid "No abbreviation found"
+msgstr "Сокращения не найдены"
+
+msgid "No mapping found"
+msgstr "Привязки не найдены"
+
+msgid "E228: makemap: Illegal mode"
+msgstr "E228: makemap: недопустимый режим"
+
+#, c-format
+msgid "E357: 'langmap': Matching character missing for %s"
+msgstr "E357: 'langmap': Нет соответствующего символа для %s"
+
+#, c-format
+msgid "E358: 'langmap': Extra characters after semicolon: %s"
+msgstr "E358: 'langmap': Лишние символы после точки с запятой: %s"
+
 msgid "No marks set"
 msgstr "Нет установленных отметок"
 
@@ -3360,30 +3361,6 @@ msgstr ""
 "\n"
 "измен.  стр  кол текст"
 
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# Глобальные отметки:\n"
-
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# Список прыжков (сначала более свежие):\n"
-
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# История местных отметок (от более свежих к старым):\n"
-
-msgid "Missing '>'"
-msgstr "Пропущена '>'"
-
 msgid "E543: Not a valid codepage"
 msgstr "E543: Недопустимое имя кодировки"
 
@@ -3638,6 +3615,10 @@ msgstr "   В каталоге   "
 msgid "      -- none --\n"
 msgstr "      -- нет --\n"
 
+#, no-c-format
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%d %b %Y %a %H:%M:%S"
+
 msgid "          owned by: "
 msgstr "          владелец: "
 
@@ -3693,8 +3674,8 @@ msgstr ""
 "\n"
 "           процесс: "
 
-msgid " (still running)"
-msgstr " (ещё выполняется)"
+msgid " (STILL RUNNING)"
+msgstr " (ВЫПОЛНЯЕТСЯ)"
 
 msgid ""
 "\n"
@@ -3730,8 +3711,8 @@ msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: неправильное значение lnum: %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: невозможно найти строку %ld"
+msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get: невозможно найти строку %ld в буфере %d %s"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Неправильное значение указателя блока 3"
@@ -3790,6 +3771,9 @@ msgstr ""
 msgid "While opening file \""
 msgstr "при открытии файла: \""
 
+msgid "      CANNOT BE FOUND"
+msgstr "      НЕ НАЙДЕНО"
+
 msgid "      NEWER than swap file!\n"
 msgstr "                    Более СВЕЖИЙ, чем своп-файл!\n"
 
@@ -3828,6 +3812,9 @@ msgstr ""
 "\"\n"
 "    чтобы избежать появления этого сообщения в будущем.\n"
 
+msgid "Found a swap file that is not useful, deleting it"
+msgstr "Найден бесполезный своп-файл, удаляю"
+
 msgid "Swap file \""
 msgstr "Своп-файл \""
 
@@ -3874,9 +3861,6 @@ msgstr "E326: Обнаружено слишком много своп-файлов"
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Компонент пути к элементу меню не является подменю"
 
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: Меню в этом режиме не существует"
-
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: Нет меню %s"
@@ -3976,19 +3960,6 @@ msgstr ""
 "&D Потерять все\n"
 "&C Отмена"
 
-msgid "Select Directory dialog"
-msgstr "Выбор каталога"
-
-msgid "Save File dialog"
-msgstr "Сохранение файла"
-
-msgid "Open File dialog"
-msgstr "Открытие файла"
-
-msgid "E338: Sorry, no file browser in console mode"
-msgstr ""
-"E338: Извините, но в консольном режиме нет проводника по файловой системе"
-
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Недостаточно параметров для printf()"
 
@@ -3998,28 +3969,25 @@ msgstr "E807: Ожидался параметр типа с плавающей точкой для printf()"
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Слишком много параметров для printf()"
 
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: Предупреждение: Изменение файла с правами только для чтения"
-
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr "Введите номер и <Enter> или щёлкните мышью (пусто для отмены): "
 
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "Введите номер и <Enter> (пусто для отмены): "
 
-msgid "1 more line"
-msgstr "Добавлена одна строка"
-
-msgid "1 line less"
-msgstr "Убрана одна строка"
-
-#, c-format
-msgid "%ld more lines"
-msgstr "Добавлено строк: %ld"
-
-#, c-format
-msgid "%ld fewer lines"
-msgstr "Убрано строк: %ld"
+#, c-format
+msgid "%ld more line"
+msgid_plural "%ld more lines"
+msgstr[0] "Добавлена %ld строка"
+msgstr[1] "Добавлено %ld строки"
+msgstr[2] "Добавлено %ld строк"
+
+#, c-format
+msgid "%ld line less"
+msgid_plural "%ld fewer lines"
+msgstr[0] "Убрана %ld строка"
+msgstr[1] "Убрано %ld строки"
+msgstr[2] "Убрано %ld строк"
 
 msgid " (Interrupted)"
 msgstr " (Прервано)"
@@ -4027,6 +3995,16 @@ msgstr " (Прервано)"
 msgid "Beep!"
 msgstr "Би-би!"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: Ошибка записи во временный файл"
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld секунду назад"
+msgstr[1] "%ld секунды назад"
+msgstr[2] "%ld секунд назад"
+
 msgid "ERROR: "
 msgstr "ОШИБКА: "
 
@@ -4046,12 +4024,8 @@ msgstr ""
 "[вызовы] re/malloc() всего %lu, free() всего %lu\n"
 "\n"
 
-msgid "E340: Line is becoming too long"
-msgstr "E340: Строка становится слишком длинной"
-
-#, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Внутренняя ошибка: lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(0, )"
+msgstr "E341: Внутренняя ошибка: lalloc(0, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4076,41 +4050,14 @@ msgstr "E548: Требуется ввести цифру"
 msgid "E549: Illegal percentage"
 msgstr "E549: Недопустимое значение процентов"
 
-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 "
-"followed by '%s'."
-msgstr ""
-"E343: Неправильно задан путь: '**[число]' должно быть либо в конце пути, "
-"либо за ним должно следовать '%s'"
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Каталог \"%s\" не найден в пути для смены каталога"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Файл \"%s\" в известных каталогах не найден"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: В пути смены каталога больше нет каталогов \"%s\""
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: В известных каталогах больше нет файлов \"%s\""
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: Неправильный режим доступа к информации о соединении с NetBeans: \"%s\""
 
 #, c-format
-msgid "E658: NetBeans connection lost for buffer %ld"
-msgstr "E658: Потеряно соединение с NetBeans для буфера %ld"
+msgid "E658: NetBeans connection lost for buffer %d"
+msgstr "E658: Потеряно соединение с NetBeans для буфера %d"
 
 msgid "E838: netbeans is not supported with this GUI"
 msgstr "E838: NetBeans не поддерживается с этим графическим интерфейсом"
@@ -4125,12 +4072,6 @@ msgstr "E505: %s открыт только для чтения (добавьте !, чтобы обойти проверку)"
 msgid "E349: No identifier under cursor"
 msgstr "E349: Нет имени в позиции курсора"
 
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: Значением опции 'operatorfunc' является пустая строка"
-
-msgid "E775: Eval feature not available"
-msgstr "E775: eval недоступна"
-
 msgid "Warning: terminal cannot highlight"
 msgstr "Предупреждение: терминал не может выполнять подсветку"
 
@@ -4154,101 +4095,32 @@ msgid "Type  :qa!  and press <Enter> to 
 msgstr ""
 "Введите  :qa!  и нажмите <Enter> для отмены всех изменений и выхода из Vim"
 
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "Изменены отступы в 1 строке (%s 1 раз)"
-
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "Изменены отступы в 1 строке (%s %d раз)"
-
-#, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "Изменены отступы, %ld строк (%s 1 раз)"
-
-#, c-format
-msgid "%ld lines %sed %d times"
-msgstr "Изменены отступы, %ld строк (%s %d раз)"
-
-#, c-format
-msgid "%ld lines to indent... "
-msgstr "Изменяются отступы строках (%ld)..."
-
-msgid "1 line indented "
-msgstr "Изменён отступ в одной строке "
-
-#, c-format
-msgid "%ld lines indented "
-msgstr "Изменены отступы в строках (%ld) "
-
-msgid "E748: No previously used register"
-msgstr "E748: Нет предыдущего использованного регистра"
+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Введите  :qa  и нажмите <Enter> для выхода из Vim"
+
+#, c-format
+msgid "%ld line %sed %d time"
+msgid_plural "%ld line %sed %d times"
+msgstr[0] "Изменены отступы, %ld строка %s %d раз"
+msgstr[1] "Изменены отступы, %ld строка %s %d раза"
+msgstr[2] "Изменены отступы, %ld строка %s %d раз"
+
+#, c-format
+msgid "%ld lines %sed %d time"
+msgid_plural "%ld lines %sed %d times"
+msgstr[0] "Изменены отступы, %ld строк %s %d раз"
+msgstr[1] "Изменены отступы, %ld строк %s %d раза"
+msgstr[2] "Изменены отступы, %ld строк %s %d раз"
 
 msgid "cannot yank; delete anyway"
 msgstr "скопировать не удалось, удаление выполнено"
 
-msgid "1 line changed"
-msgstr "изменена 1 строка"
-
-#, c-format
-msgid "%ld lines changed"
-msgstr "изменено строк: %ld"
-
-#, c-format
-msgid "freeing %ld lines"
-msgstr "очищено строк: %ld"
-
-#, c-format
-msgid " into \"%c"
-msgstr " в \"%c"
-
-#, c-format
-msgid "block of 1 line yanked%s"
-msgstr "скопирован блок из одной строки%s"
-
-#, c-format
-msgid "1 line yanked%s"
-msgstr "скопирована одна строка%s"
-
-#, c-format
-msgid "block of %ld lines yanked%s"
-msgstr "скопирован блок из %ld строк%s"
-
-#, c-format
-msgid "%ld lines yanked%s"
-msgstr "скопировано %ld строк%s"
-
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: В регистре %s ничего нет"
-
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- Регистры ---"
-
-msgid "Illegal register name"
-msgstr "Недопустимое имя регистра"
-
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# Регистры:\n"
-
-#, c-format
-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: шаблон поиска и регистр выражения не могут содержать двух или более "
-"строк"
+#, c-format
+msgid "%ld line changed"
+msgid_plural "%ld lines changed"
+msgstr[0] "изменена %ld строка"
+msgstr[1] "изменено %ld строки"
+msgstr[2] "изменено %ld строк"
 
 #, c-format
 msgid "%ld Cols; "
@@ -4282,8 +4154,11 @@ msgstr ""
 msgid "(+%lld for BOM)"
 msgstr "(+%lld с учётом BOM)"
 
-msgid "Thanks for flying Vim"
-msgstr "Благодарим за использование Vim"
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: Значением опции 'operatorfunc' является пустая строка"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: eval недоступна"
 
 msgid "E518: Unknown option"
 msgstr "E518: Неизвестная опция"
@@ -4294,6 +4169,9 @@ msgstr "E519: Опция не поддерживается"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Не допускается в режимной строке"
 
+msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
+msgstr "E992: Не допускается в режимной строке при отключённом 'modelineexpr'"
+
 msgid "E846: Key code not set"
 msgstr "E846: Код клавиши не установлен"
 
@@ -4303,98 +4181,6 @@ msgstr "E521: После = требуется указать число"
 msgid "E522: Not found in termcap"
 msgstr "E522: Не обнаружено в termcap"
 
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: Недопустимый символ <%s>"
-
-#, c-format
-msgid "For option %s"
-msgstr "Для опции %s"
-
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: Значение опции 'term' не может быть пустой строкой"
-
-msgid "E530: Cannot change term in GUI"
-msgstr "E530: В графическом интерфейсе изменять терминал невозможно"
-
-msgid "E531: Use \":gui\" to start the GUI"
-msgstr "E531: Для запуска графического интерфейса используйте \":gui\""
-
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: Значения опций 'backupext' и 'patchmode' равны"
-
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834: Конфликтует со значением 'listchars'"
-
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835: Конфликтует со значением 'fillchars'"
-
-msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-msgstr "E617: Не может быть изменено в графическом интерфейсе GTK+ 2"
-
-#, c-format
-msgid "E950: Cannot convert between %s and %s"
-msgstr "E950: Невозможно преобразовать %s и %s"
-
-msgid "E524: Missing colon"
-msgstr "E524: Пропущено двоеточие"
-
-msgid "E525: Zero length string"
-msgstr "E525: Строка с нулевой длиной"
-
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: Пропущено число после <%s>"
-
-msgid "E527: Missing comma"
-msgstr "E527: Пропущена запятая"
-
-msgid "E528: Must specify a ' value"
-msgstr "E528: Необходимо указать значение для '"
-
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: Содержит непечатный символ или символ двойной ширины"
-
-msgid "E596: Invalid font(s)"
-msgstr "E596: Неправильные шрифты"
-
-msgid "E597: can't select fontset"
-msgstr "E597: Невозможно выбрать шрифтовой набор"
-
-msgid "E598: Invalid fontset"
-msgstr "E598: Неправильный шрифтовой набор"
-
-msgid "E533: can't select wide font"
-msgstr "E533: Невозможно выбрать шрифт с символами двойной ширины"
-
-msgid "E534: Invalid wide font"
-msgstr "E534: Неправильный шрифт с символами двойной ширины"
-
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: Неправильный символ после <%c>"
-
-msgid "E536: comma required"
-msgstr "E536: Требуется запятая"
-
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr ""
-"E537: Значение опция 'commentstring' должно быть пустой строкой или "
-"содержать %s"
-
-msgid "E538: No mouse support"
-msgstr "E538: Мышь не поддерживается"
-
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: Незакрытая последовательность выражения"
-
-msgid "E541: too many items"
-msgstr "E541: Слишком много элементов"
-
-msgid "E542: unbalanced groups"
-msgstr "E542: Несбалансированные группы"
-
 msgid "E946: Cannot make a terminal with running job modifiable"
 msgstr "E946: Невозможно сделать терминал изменённым с запущенным заданием"
 
@@ -4456,12 +4242,93 @@ msgid "E356: get_varp ERROR"
 msgstr "E356: ОШИБКА get_varp"
 
 #, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': Нет соответствующего символа для %s"
-
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': Лишние символы после точки с запятой: %s"
+msgid "E539: Illegal character <%s>"
+msgstr "E539: Недопустимый символ <%s>"
+
+#, c-format
+msgid "For option %s"
+msgstr "Для опции %s"
+
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: Незакрытая последовательность выражения"
+
+msgid "E541: too many items"
+msgstr "E541: Слишком много элементов"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: Несбалансированные группы"
+
+msgid "E529: Cannot set 'term' to empty string"
+msgstr "E529: Значение опции 'term' не может быть пустой строкой"
+
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: В графическом интерфейсе изменять терминал невозможно"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: Для запуска графического интерфейса используйте \":gui\""
+
+msgid "E589: 'backupext' and 'patchmode' are equal"
+msgstr "E589: Значения опций 'backupext' и 'patchmode' равны"
+
+msgid "E834: Conflicts with value of 'listchars'"
+msgstr "E834: Конфликтует со значением 'listchars'"
+
+msgid "E835: Conflicts with value of 'fillchars'"
+msgstr "E835: Конфликтует со значением 'fillchars'"
+
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: Не может быть изменено в графическом интерфейсе GTK+ 2"
+
+#, c-format
+msgid "E950: Cannot convert between %s and %s"
+msgstr "E950: Невозможно преобразовать %s и %s"
+
+msgid "E524: Missing colon"
+msgstr "E524: Пропущено двоеточие"
+
+msgid "E525: Zero length string"
+msgstr "E525: Строка с нулевой длиной"
+
+#, c-format
+msgid "E526: Missing number after <%s>"
+msgstr "E526: Пропущено число после <%s>"
+
+msgid "E527: Missing comma"
+msgstr "E527: Пропущена запятая"
+
+msgid "E528: Must specify a ' value"
+msgstr "E528: Необходимо указать значение для '"
+
+msgid "E595: 'showbreak' contains unprintable or wide character"
+msgstr "E595: 'showbreak' содержит непечатный или широкий символ"
+
+msgid "E596: Invalid font(s)"
+msgstr "E596: Неправильные шрифты"
+
+msgid "E597: can't select fontset"
+msgstr "E597: Невозможно выбрать шрифтовой набор"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: Неправильный шрифтовой набор"
+
+msgid "E533: can't select wide font"
+msgstr "E533: Невозможно выбрать шрифт с символами двойной ширины"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: Неправильный шрифт с символами двойной ширины"
+
+#, c-format
+msgid "E535: Illegal character after <%c>"
+msgstr "E535: Неправильный символ после <%c>"
+
+msgid "E536: comma required"
+msgstr "E536: Требуется запятая"
+
+#, c-format
+msgid "E537: 'commentstring' must be empty or contain %s"
+msgstr ""
+"E537: Значение опция 'commentstring' должно быть пустой строкой или "
+"содержать %s"
 
 msgid "cannot open "
 msgstr "невозможно открыть "
@@ -4555,6 +4422,10 @@ msgstr ""
 "\n"
 "Vim: Ошибка X\n"
 
+#, c-format
+msgid "restoring display %s"
+msgstr "восстановление дисплея %s"
+
 msgid "Testing the X display failed"
 msgstr "Проверка дисплея X завершена неудачно"
 
@@ -4651,15 +4522,6 @@ msgstr "XSMP неудачно выполнено SmcOpenConnection: %s"
 msgid "At line"
 msgstr "В строке"
 
-msgid "Could not load vim32.dll!"
-msgstr "Невозможно загрузить vim32.dll!"
-
-msgid "VIM Error"
-msgstr "Ошибка VIM"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "Невозможно исправить указатели функций для DLL!"
-
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: Перехвачено событие %s\n"
@@ -4692,6 +4554,26 @@ msgstr "Предупреждение Vim"
 msgid "shell returned %d"
 msgstr "завершение работы оболочки с кодом %d"
 
+msgid "E278: Cannot put a terminal buffer in a popup window"
+msgstr "E278: Невозможно разместить буфер терминала во всплывающем окне"
+
+#, c-format
+msgid "E997: Tabpage not found: %d"
+msgstr "E997: Вкладка не найдена: %d"
+
+#, c-format
+msgid "E993: window %d is not a popup window"
+msgstr "E993: Окно %d не является всплывающим окном"
+
+msgid "E994: Not allowed in a popup window"
+msgstr "E994: Не допускается во всплывающем окне"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: Первое использование \":profile start {имя-файла}\""
+
+msgid "E553: No more items"
+msgstr "E553: Больше нет элементов"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: Изменён список текущих расположений"
 
@@ -4724,9 +4606,6 @@ msgstr "E378: В значении опции 'errorformat' отсутствует шаблон"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Имя каталога не задано или равно пустой строке"
 
-msgid "E553: No more items"
-msgstr "E553: Больше нет элементов"
-
 msgid "E924: Current window was closed"
 msgstr "E924: Текущее окно было закрыто"
 
@@ -4770,6 +4649,10 @@ msgid "E777: String or List expected"
 msgstr "E777: Требуется строка или список"
 
 #, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: Неправильное действие: '%s'"
+
+#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: Недопустимый элемент в %s%%[]"
 
@@ -4809,38 +4692,30 @@ msgstr "E69: Пропущена ] после %s%%["
 msgid "E70: Empty %s%%[]"
 msgstr "E70: Пустое %s%%[]"
 
+msgid "E956: Cannot use pattern recursively"
+msgstr "E956: Невозможно использовать шаблон рекурсивно"
+
+#, c-format
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: Синтаксическая ошибка в %s{...}"
+
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (рег. выражение НКА) невозможно повторить %s"
+
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: после \\%#= может быть только 0, 1 или 2. Будет использоваться "
+"автоматическая машина"
+
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Включено отслеживание движка рег. выражений для шаблона: "
+
 msgid "E65: Illegal back reference"
 msgstr "E65: Недопустимая обратная ссылка"
 
-msgid "E339: Pattern too long"
-msgstr "E339: Слишком длинный шаблон"
-
-msgid "E50: Too many \\z("
-msgstr "E50: Слишком много \\z("
-
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: Слишком много %s("
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: Нет пары для \\z("
-
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: Недопустимый символ после %s@"
-
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: Слишком много сложных конструкций %s{...}"
-
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: Вложенные %s*"
-
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: Вложенные %s%c"
-
 msgid "E63: invalid use of \\_"
 msgstr "E63: Недопустимое использование \\_"
 
@@ -4860,26 +4735,37 @@ msgid "E71: Invalid character after %s%%
 msgstr "E71: Недопустимый символ после %s%%"
 
 #, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: Синтаксическая ошибка в %s{...}"
+msgid "E59: invalid character after %s@"
+msgstr "E59: Недопустимый символ после %s@"
+
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: Слишком много сложных конструкций %s{...}"
+
+#, c-format
+msgid "E61: Nested %s*"
+msgstr "E61: Вложенные %s*"
+
+#, c-format
+msgid "E62: Nested %s%c"
+msgstr "E62: Вложенные %s%c"
+
+msgid "E50: Too many \\z("
+msgstr "E50: Слишком много \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Слишком много %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: Нет пары для \\z("
+
+msgid "E339: Pattern too long"
+msgstr "E339: Слишком длинный шаблон"
 
 msgid "External submatches:\n"
 msgstr "Внешние подсоответствия:\n"
 
-#, c-format
-msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (рег. выражение НКА) невозможно повторить %s"
-
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: после \\%#= может быть только 0, 1 или 2. Будет использоваться "
-"автоматическая машина"
-
-msgid "Switching to backtracking RE engine for pattern: "
-msgstr "Включено отслеживание движка рег. выражений для шаблона: "
-
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (НКА) неожиданный конец регулярного выражения"
 
@@ -4888,8 +4774,8 @@ msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (рег. выражение НКА) неожиданный %c"
 
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
-msgstr "E877: (рег. выражение НКА) неправильный класс символов: %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
+msgstr "E877: (рег. выражение НКА) неправильный класс символов: %d"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4924,6 +4810,10 @@ msgstr "E879: (рег. выражение НКА) слишком много \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (рег. выражение НКА) ошибка корректного завершения"
 
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr ""
+"Невозможно открыть файл временного журнала для записи, вывод на stderr..."
+
 msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (рег. выражение НКА) невозможно взять из стека!"
 
@@ -4940,17 +4830,48 @@ msgstr "E876: (рег. выражение НКА) недостаточно места для хранения всего НКА"
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (НКА) невозможно выделить память для прохода ветви!"
 
+msgid "E748: No previously used register"
+msgstr "E748: Нет предыдущего использованного регистра"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "очищено строк: %ld"
+
+#, c-format
+msgid " into \"%c"
+msgstr " в \"%c"
+
+#, c-format
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "скопирован блок из %ld строки%s"
+msgstr[1] "скопирован блок из %ld строк%s"
+msgstr[2] "скопирован блок из %ld строк%s"
+
+#, c-format
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "скопировано %ld строка%s"
+msgstr[1] "скопировано %ld строки%s"
+msgstr[2] "скопировано %ld строк%s"
+
+#, c-format
+msgid "E353: Nothing in register %s"
+msgstr "E353: В регистре %s ничего нет"
+
 msgid ""
-"Could not open temporary log file for writing, displaying on stderr... "
-msgstr ""
-"Невозможно открыть файл временного журнала для записи, вывод на stderr..."
-
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(НКА) невозможно открыть %s!"
-
-msgid "Could not open temporary log file for writing "
-msgstr "Невозможно открыть файл временного журнала для записи"
+"\n"
+"Type Name Content"
+msgstr ""
+"\n"
+"Тип Имя Содержимое"
+
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: шаблон поиска и регистр выражения не могут содержать двух или более "
+"строк"
 
 msgid " VREPLACE"
 msgstr " ВИРТУАЛЬНАЯ ЗАМЕНА"
@@ -5004,6 +4925,81 @@ msgid "recording"
 msgstr "запись"
 
 #, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "Поиск \"%s\" в \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "Поиск \"%s\""
+
+#, c-format
+msgid "not found in '%s': \"%s\""
+msgstr "не найдено в '%s': \"%s\""
+
+msgid "Source Vim script"
+msgstr "Выполнить сценарий Vim"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Нельзя считать каталог: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "невозможно считать \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "строка %ld: невозможно считать \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "считывание сценария \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "строка %ld: считывание \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "считывание сценария %s завершено"
+
+#, c-format
+msgid "continuing in %s"
+msgstr "продолжение в %s"
+
+msgid "modeline"
+msgstr "режимная строка"
+
+msgid "--cmd argument"
+msgstr "--cmd параметр"
+
+msgid "-c argument"
+msgstr "-c параметр"
+
+msgid "environment variable"
+msgstr "переменная окружения"
+
+msgid "error handler"
+msgstr "обработчик ошибки"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr ""
+"W15: Предупреждение: неправильный разделитель строки. Возможно пропущено ^M"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: Команда :scriptencoding используется вне файла сценария"
+
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptencoding используется вне загружаемого файла"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion не поддерживается: %d"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: Команда :finish используется вне файла сценария"
+
+#, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Неправильная строка поиска: %s"
 
@@ -5059,18 +5055,74 @@ msgstr "E388: Определение не найдено"
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Шаблон не найден"
 
-msgid "Substitute "
-msgstr "Замена "
-
-#, c-format
+msgid "Save View"
+msgstr "Сохранение вида"
+
+msgid "Save Session"
+msgstr "Сохранение сеанса"
+
+msgid "Save Setup"
+msgstr "Сохранение настроек"
+
+msgid "[Deleted]"
+msgstr "[Удалено]"
+
 msgid ""
 "\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# Последний %sШаблон поиска:\n"
-"~"
+"--- Signs ---"
+msgstr ""
+"\n"
+"--- Значки ---"
+
+#, c-format
+msgid "Signs for %s:"
+msgstr "Значки для %s:"
+
+#, c-format
+msgid "  group=%s"
+msgstr "  группа=%s"
+
+#, c-format
+msgid "    line=%ld  id=%d%s  name=%s  priority=%d"
+msgstr "    строка=%ld  id=%d%s  имя=%s  приоритет=%d"
+
+msgid "E612: Too many signs defined"
+msgstr "E612: Определено слишком много значков"
+
+#, c-format
+msgid "E239: Invalid sign text: %s"
+msgstr "E239: Неправильный текст значка: %s"
+
+#, c-format
+msgid "E155: Unknown sign: %s"
+msgstr "E155: Неизвестный значок: %s"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Невозможно изменить значок %s"
+
+msgid "E159: Missing sign number"
+msgstr "E159: Пропущен номер значка"
+
+#, c-format
+msgid "E157: Invalid sign ID: %d"
+msgstr "E157: Неправильный ID значка: %d"
+
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: Невозможно перейти к буферу без имени"
+
+#, c-format
+msgid "E160: Unknown sign command: %s"
+msgstr "E160: Неизвестная команда значка %s"
+
+msgid "E156: Missing sign name"
+msgstr "E156: Пропущено имя значка"
+
+msgid " (NOT FOUND)"
+msgstr " (НЕ НАЙДЕНО)"
+
+msgid " (not supported)"
+msgstr " (не поддерживается)"
 
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: Проверка правописания выключена"
@@ -5094,21 +5146,6 @@ msgstr "E797: Буфер удалён при выполнении автокоманды SpellFileMissing"
 msgid "Warning: region %s not supported"
 msgstr "Предупреждение: регион %s не поддерживается"
 
-msgid "Sorry, no suggestions"
-msgstr "Извините, нет предположений"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Извините, только %ld предположений"
-
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Заменить \"%.*s\" на:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
 msgid "E752: No previous spell replacement"
 msgstr "E752: Нет предыдущей замены правописания"
 
@@ -5185,10 +5222,6 @@ msgid "Conversion in %s not supported: f
 msgstr "Преобразование в %s не поддерживается: из %s в %s"
 
 #, c-format
-msgid "Conversion in %s not supported"
-msgstr "Преобразование в %s не поддерживается"
-
-#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Неправильное значение FLAG в %s, строка %d: %s"
 
@@ -5406,8 +5439,8 @@ msgid "E751: Output file name must not h
 msgstr "E751: Имя выходного файла не должно содержать названия региона"
 
 #, c-format
-msgid "E754: Only up to %ld regions supported"
-msgstr "E754: Поддерживается не более %ld регионов"
+msgid "E754: Only up to %d regions supported"
+msgstr "E754: Поддерживается не более %d регионов"
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5424,8 +5457,8 @@ msgid "Done!"
 msgstr "Завершено!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %ld entries"
-msgstr "E765: 'spellfile' не содержит %ld элементов"
+msgid "E765: 'spellfile' does not have %d entries"
+msgstr "E765: 'spellfile' не содержит %d элементов"
 
 #, c-format
 msgid "Word '%.*s' removed from %s"
@@ -5441,9 +5474,27 @@ msgstr "E763: Символы слов отличаются в файлах правописания"
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: Повторяющийся символ в элементе MAP"
 
+msgid "Sorry, no suggestions"
+msgstr "Извините, нет предположений"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Извините, только %ld предположений"
+
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Заменить \"%.*s\" на:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
 msgid "No Syntax items defined for this buffer"
 msgstr "Синтаксические элементы для данного буфера не определены"
 
+msgid "'redrawtime' exceeded, syntax highlighting disabled"
+msgstr "превышено 'redrawtime', подсветка синтаксиса отключена"
+
 msgid "syntax conceal on"
 msgstr "синтаксическое скрытие включено"
 
@@ -5472,6 +5523,9 @@ msgstr "синтаксическая проверка правописания по умолчанию"
 msgid "syntax iskeyword "
 msgstr "синтаксическое ключевое слово"
 
+msgid "syntax iskeyword not set"
+msgstr "синтаксическое ключевое слово не установлено"
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Синтаксический кластер %s не найден"
@@ -5611,76 +5665,18 @@ msgid ""
 msgstr ""
 "  ВСЕГО       КОЛ.  СООТВ. ОТСТАЮЩИЙ    СРЕДНИЙ    ИМЯ                ШАБЛОН"
 
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: Рекурсивная петля при загрузке syncolor.vim"
-
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: Группа подсветки синтаксиса %s не найдена"
-
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: Не хватает параметров: \":highlight link %s\""
-
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: Слишком много параметров: \":highlight link %s\""
-
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: У группы есть настройки, пропускается highlight link"
-
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: Неожиданный знак равенства: %s"
-
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: Пропущен знак равенства: %s"
-
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: Пропущен параметр: %s"
-
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: Недопустимое значение: %s"
-
-msgid "E419: FG color unknown"
-msgstr "E419: Неизвестный цвет текста"
-
-msgid "E420: BG color unknown"
-msgstr "E420: Неизвестный цвет фона"
-
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: Имя или номер цвета не известно: %s"
-
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: Слишком длинный код терминала: %s"
-
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: Недопустимый параметр: %s"
-
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: Используется слишком много разных атрибутов подсветки синтаксиса"
-
-msgid "E669: Unprintable character in group name"
-msgstr "E669: Непечатный символ в имени группы"
-
-msgid "W18: Invalid character in group name"
-msgstr "W18: Недопустимый символ в имени группы"
-
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: Слишком много групп подсветки и синтаксиса"
-
 msgid "E555: at bottom of tag stack"
 msgstr "E555: Внизу стека меток"
 
 msgid "E556: at top of tag stack"
 msgstr "E556: Наверху стека меток"
 
+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: Невозможно изменить стек меток внутри tagfunc"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: Неправильное возвращаемое значение из tagfunc"
+
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Невозможно перейти в позицию до первой совпадающей метки"
 
@@ -5688,12 +5684,6 @@ msgstr "E425: Невозможно перейти в позицию до первой совпадающей метки"
 msgid "E426: tag not found: %s"
 msgstr "E426: Метка не найдена: %s"
 
-msgid "  # pri kind tag"
-msgstr "  # при тип  метка"
-
-msgid "file\n"
-msgstr "файл\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: Есть только одна совпадающая метка"
 
@@ -5718,6 +5708,12 @@ msgstr " Используется метка с символами в другом регистре!"
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Файл \"%s\" не существует"
 
+msgid "  # pri kind tag"
+msgstr "  # при тип  метка"
+
+msgid "file\n"
+msgstr "файл\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5733,9 +5729,6 @@ msgstr "Поиск в файле меток %s"
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Путь к файлу меток %s обрезан\n"
 
-msgid "Ignoring long line in tags file"
-msgstr "Игнорирование длинной строки в файле tags"
-
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Ошибка формата в файле меток \"%s\""
@@ -5751,6 +5744,9 @@ msgstr "E432: Файл меток не отсортирован: %s"
 msgid "E433: No tags file"
 msgstr "E433: Файл меток не обнаружен"
 
+msgid "Ignoring long line in tags file"
+msgstr "Игнорирование длинной строки в файле tags"
+
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Не найден шаблон метки"
 
@@ -5794,8 +5790,15 @@ msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "Невозможно открыть $VIMRUNTIME/rgb.txt"
 
 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: Неправильный атрибут: %s"
+
+msgid "E279: Sorry, ++shell is not supported on this system"
+msgstr "E279: ++shell не поддерживается на данной системе"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
-msgstr "Убить задание в \"%s\"?"
+msgstr "Завершить задание в \"%s\"?"
 
 msgid "Terminal"
 msgstr "Терминал"
@@ -5812,6 +5815,9 @@ msgstr "выполнение"
 msgid "finished"
 msgstr "завершено"
 
+msgid "E958: Job already finished"
+msgstr "E958: Задание уже завершено"
+
 #, c-format
 msgid "E953: File exists: %s"
 msgstr "E953: Файл существует: %s"
@@ -5819,6 +5825,41 @@ msgstr "E953: Файл существует: %s"
 msgid "E955: Not a terminal buffer"
 msgstr "E955: Не является буфером терминала"
 
+msgid "E982: ConPTY is not available"
+msgstr "E982: ConPTY недоступен"
+
+#, c-format
+msgid "E971: Property type %s does not exist"
+msgstr "E971: Тип свойства %s не существует"
+
+#, c-format
+msgid "E964: Invalid column number: %ld"
+msgstr "E964: Неправильный номер столбца: %ld"
+
+#, c-format
+msgid "E966: Invalid line number: %ld"
+msgstr "E966: Неправильный номер строки: %ld"
+
+msgid "E965: missing property type name"
+msgstr "E965: Пропущено имя для типа свойства"
+
+msgid "E275: Cannot add text property to unloaded buffer"
+msgstr "E275: Невозможно добавить текстовое свойство для выгруженного буфера"
+
+msgid "E967: text property info corrupted"
+msgstr "E967: Информация о текстовом свойстве повреждена"
+
+msgid "E968: Need at least one of 'id' or 'type'"
+msgstr "E968: Необходимо 'id' или 'type'"
+
+#, c-format
+msgid "E969: Property type %s already defined"
+msgstr "E969: Тип свойства %s уже определён"
+
+#, c-format
+msgid "E970: Unknown highlight group name: '%s'"
+msgstr "E970: Неизвестное имя группы подсветки: %s"
+
 msgid "new shell started\n"
 msgstr "запуск новой оболочки\n"
 
@@ -5951,10 +5992,6 @@ msgstr "Нечего отменять"
 msgid "number changes  when               saved"
 msgstr " номер  измен.  когда              сохранено"
 
-#, c-format
-msgid "%ld seconds ago"
-msgstr "%ldс назад"
-
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: Объединение отмен не допускается после отмены"
 
@@ -5964,6 +6001,67 @@ msgstr "E439: Повреждён список отмены"
 msgid "E440: undo line missing"
 msgstr "E440: Потеряна строка отмены"
 
+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    Имя               Пар. Адрес   Дополн.     Определение"
+
+msgid "No user-defined commands found"
+msgstr "Команды, определённые пользователем, не обнаружены."
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: Неправильное значение типа адреса: %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: Неправильное значение дополнения: %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr ""
+"E468: Параметр автодополнения можно использовать только с особым дополнением"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Особое дополнение требует указания параметра функции"
+
+msgid "E175: No attribute specified"
+msgstr "E175: Параметр не задан"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: Неправильное количество параметров"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: Число-приставку нельзя указывать дважды"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: Неправильное значение числа-приставки по умолчанию"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: Для -complete требуется указать параметр"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: Для -addr требуется указать параметр"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: Команда уже существует, добавьте ! чтобы заменить: %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: Неправильное имя команды"
+
+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: Зарезервированное имя не может использоваться для команд пользователя"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: Нет такой команды пользователя: %s"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: Функция %s уже существует. Добавьте !, чтобы заменить её."
@@ -5986,6 +6084,9 @@ msgstr "E125: Недопустимый параметр: %s"
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Повторяющееся имя параметра: %s"
 
+msgid "E989: Non-default argument follows default argument"
+msgstr "E989: Параметр не по умолчанию следует за параметром по умолчанию"
+
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: Слишком много параметров для функции %s"
@@ -6021,6 +6122,10 @@ msgid "E117: Unknown function: %s"
 msgstr "E117: Неизвестная функция: %s"
 
 #, c-format
+msgid "E276: Cannot use function as a method: %s"
+msgstr "E276: Невозможно использовать функцию как метод: %s"
+
+#, c-format
 msgid "E933: Function was deleted: %s"
 msgstr "E933: Функция удалена: %s"
 
@@ -6089,22 +6194,36 @@ msgid "E133: :return not inside a functi
 msgstr "E133: команда :return вне функции"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Пропущены скобки: %s"
+msgid "%s (%s, compiled %s)"
+msgstr "%s (%s, собрано %s)"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"Графическая/консольная версия для MS-Windows 64 бита"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"Графическая/консольная версия для MS-Windows 32 бита"
 
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
-"Версия с графическим интерфейсом для MS-Windows 64 бит"
+"Графическая версия для MS-Windows 64 бита"
 
 msgid ""
 "\n"
 "MS-Windows 32-bit GUI version"
 msgstr ""
 "\n"
-"Версия с графическим интерфейсом для MS-Windows 32 бит"
+"Графическая версия для MS-Windows 32 бита"
 
 msgid " with OLE support"
 msgstr " с поддержкой OLE"
@@ -6114,14 +6233,14 @@ msgid ""
 "MS-Windows 64-bit console version"
 msgstr ""
 "\n"
-"Консольная версия для MS-Windows 64 бит"
+"Консольная версия для MS-Windows 64 бита"
 
 msgid ""
 "\n"
 "MS-Windows 32-bit console version"
 msgstr ""
 "\n"
-"Консольная версия для MS-Windows 32 бит"
+"Консольная версия для MS-Windows 32 бита"
 
 msgid ""
 "\n"
@@ -6365,12 +6484,187 @@ msgstr "наберите :help register<Enter>   для получения информации     "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "меню Справка->Помощь/Регистрация для получения информации       "
 
+msgid ""
+"\n"
+"# Buffer list:\n"
+msgstr ""
+"\n"
+"# Список буферов:\n"
+
+#, c-format
+msgid ""
+"\n"
+"# %s History (newest to oldest):\n"
+msgstr ""
+"\n"
+"# %s, история (начиная от свежего к старому):\n"
+
+msgid "Command Line"
+msgstr "Командная строка"
+
+msgid "Search String"
+msgstr "Строка поиска"
+
+msgid "Expression"
+msgstr "Выражение"
+
+msgid "Input Line"
+msgstr "Строка ввода"
+
+msgid "Debug Line"
+msgstr "Строка отладки"
+
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Строк с '|', точно скопировано:\n"
+
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo: %s в строке: "
+
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr ""
+"E136: viminfo: Слишком много ошибок, остальная часть файла будет пропущена"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# глобальные переменные:\n"
+
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# Последняя строка для замены:\n"
+"$"
+
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# Последний %sШаблон поиска:\n"
+"~"
+
+msgid "Substitute "
+msgstr "Замена "
+
+msgid "Illegal register name"
+msgstr "Недопустимое имя регистра"
+
+msgid ""
+"\n"
+"# Registers:\n"
+msgstr ""
+"\n"
+"# Регистры:\n"
+
+#, c-format
+msgid "E574: Unknown register type %d"
+msgstr "E574: Неизвестный тип регистра %d"
+
+msgid ""
+"\n"
+"# History of marks within files (newest to oldest):\n"
+msgstr ""
+"\n"
+"# История местных отметок (от более свежих к старым):\n"
+
+msgid ""
+"\n"
+"# File marks:\n"
+msgstr ""
+"\n"
+"# Глобальные отметки:\n"
+
+msgid ""
+"\n"
+"# Jumplist (newest first):\n"
+msgstr ""
+"\n"
+"# Список прыжков (сначала более свежие):\n"
+
+msgid "Missing '>'"
+msgstr "Пропущена '>'"
+
+msgid "Illegal starting char"
+msgstr "Недопустимый начальный символ"
+
+#, c-format
+msgid "# This viminfo file was generated by Vim %s.\n"
+msgstr "# Этот файл viminfo автоматически создан Vim %s.\n"
+
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# Его можно (осторожно!) редактировать.\n"
+"\n"
+
+msgid "# Value of 'encoding' when this file was written\n"
+msgstr "# Значение опции 'encoding' в момент записи файла\n"
+
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "Чтение файла viminfo \"%s\"%s%s%s"
+
+msgid " info"
+msgstr " инфо"
+
+msgid " marks"
+msgstr " отметок"
+
+msgid " oldfiles"
+msgstr " старых файлов"
+
+msgid " FAILED"
+msgstr " НЕУДАЧНО"
+
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: Права на запись файла viminfo отсутствуют: %s"
+
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: Слишком много временных файлов viminfo, таких как %s"
+
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: Невозможно записать файл viminfo %s!"
+
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "Запись файла viminfo \"%s\""
+
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: Невозможно переименовать файл viminfo в %s!"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: Невозможно открыть файл viminfo для чтения"
+
 msgid "Already only one window"
 msgstr "На экране всего одно окно"
 
+#, c-format
+msgid "E92: Buffer %ld not found"
+msgstr "E92: Буфер %ld не найден"
+
 msgid "E441: There is no preview window"
 msgstr "E441: Окно предпросмотра отсутствует"
 
+msgid "E242: Can't split a window while closing another"
+msgstr "E242: Невозможно разделить окно при закрытии другого"
+
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: Окно не может быть одновременно слева вверху и справа внизу"
 
@@ -6380,8 +6674,8 @@ msgstr "E443: Невозможно поменять местами, пока другое окно разделено"
 msgid "E444: Cannot close last window"
 msgstr "E444: Нельзя закрыть последнее окно"
 
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: Нельзя закрыть окно автокоманд"
+msgid "E813: Cannot close autocmd or popup window"
+msgstr "E813: Нельзя закрыть окно автокоманд или всплывающее окно"
 
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: Нельзя закрыть окно, останется только окно автокоманд"
@@ -6389,32 +6683,6 @@ msgstr "E814: Нельзя закрыть окно, останется только окно автокоманд"
 msgid "E445: Other window contains changes"
 msgstr "E445: В другом окне есть несохранённые изменения"
 
-msgid "E446: No file name under cursor"
-msgstr "E446: Нет имени файла в позиции курсора"
-
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Файл \"%s\" не найден по известным путям"
-
-#, c-format
-msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E799: Неверный ID: %ld (должен быть больше или равен 1)"
-
-#, c-format
-msgid "E801: ID already taken: %ld"
-msgstr "E801: ID уже занят: %ld"
-
-msgid "List or number required"
-msgstr "Требуется список или число"
-
-#, c-format
-msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
-msgstr "E802: Неверный ID: %ld (должен быть больше или равен 1)"
-
-#, c-format
-msgid "E803: ID not found: %ld"
-msgstr "E803: ID не найден: %ld"
-
 #, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: Невозможно загрузить библиотеку %s"
@@ -6439,6 +6707,9 @@ msgstr "Сравнить с помощью Vim"
 msgid "Edit with &Vim"
 msgstr "Ре&дактировать с помощью Vim"
 
+msgid "Edit with existing Vim"
+msgstr "Редактировать в запущенном Vim"
+
 msgid "Edit with existing Vim - "
 msgstr "Редактировать в запущенном Vim — "
 
@@ -6520,9 +6791,6 @@ msgstr "E685: Внутренняя ошибка: %s"
 msgid "Interrupted"
 msgstr "Прервано"
 
-msgid "E14: Invalid address"
-msgstr "E14: Недопустимый адрес"
-
 msgid "E474: Invalid argument"
 msgstr "E474: Недопустимый параметр"
 
@@ -6531,6 +6799,10 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: Недопустимый параметр: %s"
 
 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: Повторяющийся параметр: %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: Недопустимое значение параметра: %s"
 
@@ -6592,8 +6864,8 @@ msgstr ""
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: Иврит выключен при компиляции\n"
 
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: Фарси выключено при компиляции\n"
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27: Поддержка Персидского была удалена\n"
 
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: Арабский выключен при компиляции\n"
@@ -6700,6 +6972,21 @@ msgid "E45: 'readonly' option is set (ad
 msgstr "E45: Включена опция 'readonly' (добавьте !, чтобы обойти проверку)"
 
 #, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: Неопределённая переменная: %s"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: Неправильный тип переменной для %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: Недопустимое имя переменной: %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: Невозможно изменить существующую переменную"
+
+#, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: Невозможно изменить переменную только для чтения \"%s\""
 
@@ -6707,6 +6994,9 @@ msgstr "E46: Невозможно изменить переменную только для чтения \"%s\""
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: Невозможно изменить переменную в песочнице: \"%s\""
 
+msgid "E928: String required"
+msgstr "E928: Требуется строка"
+
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: Невозможно использовать пустой ключ для словаря"
 
@@ -6718,6 +7008,13 @@ msgid "E684: list index out of range: %l
 msgstr "E684: Индекс списка за пределами диапазона: %ld"
 
 #, c-format
+msgid "E979: Blob index out of range: %ld"
+msgstr "E979: Индекс блоба за пределами диапазона: %ld"
+
+msgid "E978: Invalid operation for Blob"
+msgstr "E978: Недопустимая операция для блоба"
+
+#, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: Слишком много параметров для функции %s"
 
@@ -6728,10 +7025,17 @@ msgstr "E716: Нет ключа в словаре: %s"
 msgid "E714: List required"
 msgstr "E714: Требуется список"
 
+msgid "E897: List or Blob required"
+msgstr "E897: Требуется список или блоб"
+
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: Параметр %s должен быть списком или словарём"
 
+#, c-format
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896: Параметр %s должен быть списком, словарём или блобом"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Ошибка при чтении файла ошибок"
 
@@ -6797,6 +7101,10 @@ msgstr "E939: Требуется положительный счётчик"
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: Использование <SID> вне контекста сценария"
 
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Пропущены скобки: %s"
+
 msgid "E449: Invalid expression received"
 msgstr "E449: Получено недопустимое выражение"
 
@@ -6836,6 +7144,16 @@ msgstr "E919: Каталог не найден в '%s': \"%s\""
 msgid "E952: Autocommand caused recursive behavior"
 msgstr "E952: Автокоманда вызвала рекурсивное поведение"
 
+msgid "E328: Menu only exists in another mode"
+msgstr "E328: Меню в этом режиме не существует"
+
+msgid "E957: Invalid window number"
+msgstr "E957: Неверный номер окна"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: Параметр %s должен быть списком"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "Поиск будет продолжен с КОНЦА документа"
 
@@ -6938,7 +7256,7 @@ msgstr ""
 "последовательности %d"
 
 msgid "list constructor does not accept keyword arguments"
-msgstr "Конструктор списка не допускает ключевые слова как аргументы"
+msgstr "Конструктор списка не допускает ключевые слова как параметры"
 
 msgid "list index out of range"
 msgstr "Индекс списка за пределами диапазона"
@@ -7108,4 +7426,64 @@ msgstr ""
 "Ошибка при установке пути: sys.path не является списком\n"
 "Следует добавить vim.VIM_SPECIAL_PATH в sys.path"
 
-
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Файлы Vim (*.vim)\t*.vim\n"
+"Все файлы (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "Все файлы (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"Все файлы (*.*)\t*.*\n"
+"Исходный код C (*.c, *.h)\t*.c;*.h\n"
+"Исходный код C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Исходный код VB (*.bas, *.frm)\t*.bas;*.frm\n"
+"Файлы Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Файлы Vim (*.vim)\t*.vim\n"
+"Все файлы (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "Все файлы (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"Все файлы (*)\t*\n"
+"Исходный код C (*.c, *.h)\t*.c;*.h\n"
+"Исходный код C++ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Файлы Vim (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid "GVim"
+msgstr "GVim"
+
+msgid "Text Editor"
+msgstr "Текстовый редактор"
+
+msgid "Edit text files"
+msgstr "Редактирование текстовых файлов"
+
+msgid "Text;editor;"
+msgstr "текст;текстовый редактор"
+
+msgid "gvim"
+msgstr "gvim"
+
+msgid "Vim"
+msgstr "Vim"
--- a/src/po/tr.po
+++ b/src/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-09 19:57+0300\n"
+"POT-Creation-Date: 2019-11-12 13:17+0300\n"
 "PO-Revision-Date: 2019-10-09 19:58+0300\n"
 "Last-Translator: Emir SARI <bitigchi@me.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -173,7 +173,8 @@ msgstr "E88: İlk arabellekten öncesine gidilemez"
 #, c-format
 msgid "E89: No write since last change for buffer %d (add ! to override)"
 msgstr ""
-"E89: Arabellek %d son değişiklikten sonra yazılmadı (yoksaymak için ! ekleyin)"
+"E89: Arabellek %d son değişiklikten sonra yazılmadı (yoksaymak için ! "
+"ekleyin)"
 
 msgid "E948: Job still running (add ! to end the job)"
 msgstr "E948: İş hâlâ sürüyor (bitirmek için ! ekleyin)"
@@ -336,13 +337,18 @@ msgstr "E949: Dosya yazma sırasında değiştirildi"
 msgid "E512: Close failed"
 msgstr "E512: Kapatma başarısız oldu"
 
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr ""
+"E513: Yazma hatası, dönüştürme başarısız (yoksaymak için kodlamayı boş " 
+"bırakın)"
+
 #, c-format
 msgid ""
 "E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Yazma hatası, %ld. satırda dönüştürme başarısız (yoksaymak için dosya "
-"kodlamasını boş yapın)"
+"E513: Yazma hatası, %ld. satırda dönüştürme başarısız (yoksaymak için "
+"kodlamayı boş bırakın)"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: Yazma hatası (dosya sistemi dolu mu?)"
@@ -469,7 +475,8 @@ msgid "E821: File is encrypted with unkn
 msgstr "E821: Dosya bilinmeyen bir yöntemle şifrelenmiş"
 
 msgid "Warning: Using a weak encryption method; see :help 'cm'"
-msgstr "Uyarı: Zayıf bir şifreleme yöntemi kullanılıyor; bilgi için: :help 'cm'"
+msgstr ""
+"Uyarı: Zayıf bir şifreleme yöntemi kullanılıyor; bilgi için: :help 'cm'"
 
 msgid "Enter encryption key: "
 msgstr "Şifreleme anahtarı girin: "
@@ -585,11 +592,13 @@ msgid "E99: Current buffer is not in dif
 msgstr "E99: Şu anki arabellek karşılaştırma kipinde değil"
 
 msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: Karşılaştırma kipindeki başka hiçbir arabellek değiştirilebilir değil"
+msgstr ""
+"E793: Karşılaştırma kipindeki başka hiçbir arabellek değiştirilebilir değil"
 
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: Karşılaştırma kipinde başka hiçbir arabellek yok"
 
+
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: Arabellek \"%s\" bulunamıyor"
@@ -701,7 +710,8 @@ msgid "E274: No white space allowed befo
 msgstr "E274: Ayraçtan önce boşluğa izin verilmez"
 
 msgid "E689: Can only index a List, Dictionary or Blob"
-msgstr "E689: Yalnızca bir liste, sözlük, veya ikili geniş nesne dizinlenebilir"
+msgstr ""
+"E689: Yalnızca bir liste, sözlük, veya ikili geniş nesne dizinlenebilir"
 
 msgid "E708: [:] must come last"
 msgstr "E708: [:] en son gelmelidir"
@@ -790,7 +800,7 @@ msgid "E913: Using a Channel as a Number
 msgstr "E913: Bir kanalı sayı olarak kullanma"
 
 msgid "E974: Using a Blob as a Number"
-msgstr "E974: Bir ikili geniş nesneyi sayı olarak kullanma" 
+msgstr "E974: Bir ikili geniş nesneyi sayı olarak kullanma"
 
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: Bir Funcref'i Kayan olarak kullanma"
@@ -844,6 +854,10 @@ msgstr ""
 msgid " line "
 msgstr " satır "
 
+msgid "E977: Can only compare Blob with Blob"
+msgstr "E977: Bir ikili geniş öğe yalnızca bir başkası ile "
+"karşılaştırılabilir"
+
 msgid "E691: Can only compare List with List"
 msgstr "E691: Bir liste yalnızca başka bir liste ile karşılaştırılabilir"
 
@@ -1114,14 +1128,14 @@ msgstr "Dosya Düzenle"
 
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr ""
-"E143: yeni %s arabelleğini otokomutlar beklenmedik bir biçimde sildi"
+msgstr "E143: yeni %s arabelleğini otokomutlar beklenmedik bir biçimde sildi"
 
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: :z için sayısal olmayan değişken"
 
 msgid "E145: Shell commands and some functionality not allowed in rvim"
-msgstr "E145: rvim içinde kabuk komutları ve bazı işlevselliklere izin verilmez"
+msgstr ""
+"E145: rvim içinde kabuk komutları ve bazı işlevselliklere izin verilmez"
 
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Düzenli ifadeler harflerle sınırlandırılamaz"
@@ -1248,12 +1262,15 @@ msgstr "Şu anki %sdil: \"%s\""
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: \"%s\" diline ayarlanamıyor"
 
-msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
+msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Ex kipine giriliyor. Normal kipe geri dönmek için \"visual\" yazın."
 
 msgid "E501: At end-of-file"
 msgstr "E501: Dosyanın sonunda"
 
+msgid "Executing: %s"
+msgstr "Çalıştırılıyor: %s"
+
 msgid "E169: Command too recursive"
 msgstr "E169: Komut çok özyinelemeli"
 
@@ -1288,9 +1305,10 @@ msgstr "E494: w veya w>> kullanın"
 msgid ""
 "INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX"
 msgstr ""
-"DAHİLİ: EX_DFLALL; ADDR_NONE, ADDR_UNSIGNED veya ADDR_QUICKFIX ile birlikte " 
+"DAHİLİ: EX_DFLALL; ADDR_NONE, ADDR_UNSIGNED veya ADDR_QUICKFIX ile birlikte "
 "kullanılamıyor"
 
+
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Üzgünüm, komut bu sürümde mevcut değil"
 
@@ -1338,6 +1356,10 @@ msgstr "Takas dosyası yok"
 msgid "Append File"
 msgstr "Dosya iliştir"
 
+msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
+msgstr "E747: Dizin değiştirilemiyor, arabellekte değişiklik yapılmış "
+"(yoksaymak için ! ekleyin)"
+
 msgid "E186: No previous directory"
 msgstr "E186: Öncesinde dizin yok"
 
@@ -1365,7 +1387,7 @@ msgstr "Yeniden yönlendirmeyi kaydet"
 
 #, c-format
 msgid "E739: Cannot create directory: %s"
-msgstr "E739: Dizin oluşturulamıyor: %s" 
+msgstr "E739: Dizin oluşturulamıyor: %s"
 
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
@@ -1659,8 +1681,8 @@ msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr ""
-"W12: Uyarı: \"%s\" dosyası Vim'deki arabellek de dahil olmak üzere"
-"değiştirildi"
+"W12: Uyarı: \"%s\" dosyası Vim'deki arabellek de dahil olmak "
+"üzeredeğiştirildi"
 
 msgid "See \":help W12\" for more info."
 msgstr "Ek bilgi için \":help W12\" yazın."
@@ -1674,7 +1696,8 @@ msgstr "Ek bilgi için \":help W11\" yazın."
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: Uyarı: \"%s\" dosyasının kipi düzenleme başladığından beri değişti"
+msgstr ""
+"W16: Uyarı: \"%s\" dosyasının kipi düzenleme başladığından beri değişti"
 
 msgid "See \":help W16\" for more info."
 msgstr "Ek bilgi için \":help W16\" yazın."
@@ -1733,8 +1756,8 @@ msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
 msgstr ""
-"E343: Geçersiz yol: '**[number]' yolun sonunda olmalı veya arkasından '%s'"
-"eklenmelidir"
+"E343: Geçersiz yol: '**[number]' yolun sonunda olmalı veya arkasından "
+"'%s'eklenmelidir"
 
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
@@ -2487,8 +2510,7 @@ msgstr "E836: Bu Vim :py3 komutundan sonra :python komutunu çalıştıramaz"
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
-msgstr ""
-"E263: Üzgünüm, bu komut etkin değil, Python kitaplığı yüklenemedi"
+msgstr "E263: Üzgünüm, bu komut etkin değil, Python kitaplığı yüklenemedi"
 
 msgid ""
 "E887: Sorry, this command is disabled, the Python's site module could not be "
@@ -2507,8 +2529,7 @@ msgstr "E265: $_ bir dizi örneği olmalıdır"
 
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
-msgstr ""
-"E266: Üzgünüm, bu komut etkin değil, Ruby kitaplığı yüklenemedi."
+msgstr "E266: Üzgünüm, bu komut etkin değil, Ruby kitaplığı yüklenemedi."
 
 msgid "E267: unexpected return"
 msgstr "E267: Beklenmeyen dönüş"
@@ -2574,15 +2595,18 @@ msgstr "arabellek/pencere komutu oluşturulamadı: öge şu anda siliniyor"
 
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
-msgstr ""
-"geri çağırma komutu kaydedilemiyor: arabellek/pencere zaten siliniyor"
+msgstr "geri çağırma komutu kaydedilemiyor: arabellek/pencere zaten siliniyor"
 
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
 msgstr ""
-"E280: ONULMAZ TCL HATASI: Başvuru listesi hasar görmüş! Lütfen bunu "
-"vim-dev@vim.org adresine bildirin"
+"E280: ONULMAZ TCL HATASI: Başvuru listesi hasar görmüş! Lütfen bunu vim-"
+"dev@vim.org adresine bildirin"
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"geri çağırma komutu kaydedilemiyor: arabellek/pencere başvurusu bulunamadı"
 
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
@@ -2608,6 +2632,16 @@ msgstr "E573: Geçersiz sunucu kimliği kullanıldı: %s"
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VİM oturumu kayıt değeri düzgün oluşturulmamış. Silindi!"
 
+#, c-format
+msgid "%ld lines to indent... "
+msgstr "girintilenecek %ld satır... "
+
+#, c-format
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld satır girintilendi "
+msgstr[1] "%ld satır girintilendi"
+
 msgid " Keyword completion (^N^P)"
 msgstr " Anahtar sözcük tamamlaması (^N^P)"
 
@@ -2769,6 +2803,7 @@ msgstr "Sonrasında değişken eksik:"
 msgid "Garbage after option argument"
 msgstr "Seçenek değişkeninden sonra anlamsız veri"
 
+
 msgid "Invalid argument for"
 msgstr "Şunun için geçersiz değişken:"
 
@@ -2830,7 +2865,7 @@ msgid "-t tag          edit file where t
 msgstr "-t etiket       etiket tanımlanan dosyaları düzenle"
 
 msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [hatalıd.]  hata içeren ilk dosyayı düzenle"
+msgstr "-q [hatalıd.]   hata içeren ilk dosyayı düzenle"
 
 msgid ""
 "\n"
@@ -2849,15 +2884,15 @@ msgid ""
 "   or:"
 msgstr ""
 "\n"
-"   veya:"
+"    veya:"
 
 msgid ""
 "\n"
 "Where case is ignored prepend / to make flag upper case"
 msgstr ""
 "\n"
-"BÜYÜK/küçük harfin yoksayıldığı yerde bayrağı BÜYÜK harfli yapmak için" 
-"başına / koyun"
+"BÜYÜK/küçük harfin yoksayıldığı yerde bayrağı BÜYÜK harfli yapmak "
+"içinbaşına / koyun"
 
 msgid ""
 "\n"
@@ -2959,7 +2994,7 @@ msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tİbranice kipinde başla"
 
 msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <uçbirim>\t Uçbirim türünü <uçbirim>'e ayarla"
+msgstr "-T <uçbirim>\t\tUçbirim türünü <uçbirim>'e ayarla"
 
 msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
 msgstr "--not-a-term\t\tGirdi/Çıktının bir uçbirime olmadığı uyarısını atla"
@@ -2995,10 +3030,13 @@ msgid "--cmd <command>\tExecute <command
 msgstr "--cmd <komut>\tHerhangi bir vimrc dosyası yüklemeden <komut> çalıştır"
 
 msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <komut>\t\tİlk dosyayı açtıktan sonra <komut> komutunu çalıştır"
+msgstr "-c <komut>\t\tİlk dosyayı yükleyip <komut> komutunu çalıştır"
+
+msgid "-S <session>\t\tSource file <session> after loading the first file"
+msgstr "-S <oturum>\t\tİlk dosyayı yükleyip <oturum> dosyasını kaynak al"
 
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <betikal>\tNormal kip komutlarını <betikal> dosyasından oku"
+msgstr "-s <betikal>\t\tNormal kip komutlarını <betikal> dosyasından oku"
 
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <betikçik>\tGirilen tüm komutları <betikçik> dosyasına iliştir"
@@ -3015,9 +3053,12 @@ msgstr "-display <ekran>\tVim'i bu belirtilen X sunucusuna bağla"
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\tX sunucusuna bağlama"
 
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr ""
+"--remote <dosya>\tOlanaklıysa bir Vim sunucusuda <dosya> düzenler"
+
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
-msgstr ""
-"--remote-silent <dosya>  Aynısı, yalnızca sunucu yoksa şikayet etmez"
+msgstr "--remote-silent <dosya>  Aynısı, yalnızca sunucu yoksa şikayet etmez"
 
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
@@ -3035,11 +3076,12 @@ msgstr ""
 "--remote-tab[-wait][-silent] <dosya>  --remote, artı sekme sayfası kullanır"
 
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-msgstr "--remote-send <anahtar>\tBir Vim sunucusuna <anahtar> gönderir ve çıkar"
+msgstr ""
+"--remote-send <anahtar>\tBir Vim sunucusuna <anahtar> gönderir ve çıkar"
 
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
 msgstr ""
-"--remote-expr <ifade>\t<ifade>'leri bir Vim sunucusunda değerlendirir ve " 
+"--remote-expr <ifade>\t<ifade>'leri bir Vim sunucusunda değerlendirir ve "
 "sonuçları yazdırır"
 
 msgid "--serverlist\t\tList available Vim server names and exit"
@@ -3049,13 +3091,13 @@ msgid "--servername <name>\tSend to/beco
 msgstr "--servername <ad>\t<ad> Vim sunucusuna gönder veya sunucu ol"
 
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr "--startuptime <dosya>\tBaşlangıç zamanlama iletilerini <dosya>'ya yaz"
+msgstr "--startuptime <dsy>\tBaşlangıç zamanlama iletilerini <dosya>'ya yaz"
 
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\t .viminfo yerine <viminfo> kullan"
+msgstr "-i <viminfo>\t\t.viminfo yerine <viminfo> kullan"
 
 msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
-msgstr "--clean\t\t'nocompatible', Vim öntanımlıları, eklenti yok, viminfo yok"
+msgstr "--clean\t\t'nocompatible', Vim öntanımlıları, eklenti-viminfo yok"
 
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h veya --help\tYardımı (bu iletiyi) yazdırır ve çıkar"
@@ -3116,7 +3158,8 @@ msgstr ""
 "-scrollbarwidth <gnşlk>  Kaydırma çubuğu için <gnşlk> genişlik (kısa: -sw)"
 
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-msgstr "-menuheight <yükseklik>\t<yükseklik> menü çubuğu yüksekliği (kısa: -mh)"
+msgstr ""
+"-menuheight <yükseklik>\t<yükseklik> menü çubuğu yüksekliği (kısa: -mh)"
 
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\tTersine dönmüş video kullan (kısa: -rv)"
@@ -3231,7 +3274,6 @@ msgid ""
 msgstr ""
 "\n"
 "satır değiştir  sütun metin"
-""
 
 msgid "E543: Not a valid codepage"
 msgstr "E543: Geçerli bir kod sayfası değil"
@@ -3383,8 +3425,8 @@ msgid ""
 "If you wrote the text file after changing the crypt key press enter"
 msgstr ""
 "\n"
-"Metin dosyasını şifreleme anahtarını değiştirdikten sonra yazdıysanız Enter'a"
-"basın"
+"Metin dosyasını şifreleme anahtarını değiştirdikten sonra yazdıysanız "
+"Enter'abasın"
 
 msgid ""
 "\n"
@@ -3448,7 +3490,8 @@ msgstr ""
 "(Bu dosyası başka bir adla kaydetmek isteyebilir\n"
 
 msgid "and run diff with the original file to check for changes)"
-msgstr "ve orijinal dosya ile (varsa) karşılaştırmasını yapmak isteyebilirsiniz)"
+msgstr ""
+"ve orijinal dosya ile (varsa) karşılaştırmasını yapmak isteyebilirsiniz)"
 
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr "Kurtarma tamamlandı. Arabellek içeriği dosya içeriğine eşit."
@@ -3462,6 +3505,7 @@ msgstr ""
 "Bu .swp dosyasını silmeniz iyi olur.\n"
 "\n"
 
+
 msgid "Swap files found:"
 msgstr "Takas dosyası bulundu:"
 
@@ -3571,9 +3615,8 @@ msgstr "E314: Koruma başarısız oldu"
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: geçersiz satır numarası: %ld"
 
-#, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: %ld. satır bulunamıyor"
+msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get: %ld. satır %d %s arabelleğinde bulunamıyor"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Blok 3 gösterge kimliği yanlış"
@@ -3699,6 +3742,21 @@ msgstr ""
 "Çı&k\n"
 "Du&rdur"
 
+msgid ""
+"&Open Read-Only\n"
+"&Edit anyway\n"
+"&Recover\n"
+"&Delete it\n"
+"&Quit\n"
+"&Abort"
+msgstr ""
+"&Saltokunur aç\n"
+"&Düzenle\n"
+"Kur&tar\n"
+"S&il\n"
+"Çı&k\n"
+"Du&rdur"
+
 msgid "E326: Too many swap files found"
 msgstr "E326: Çok fazla takas dosyası bulundu"
 
@@ -3761,7 +3819,7 @@ msgid "E354: Invalid register name: '%s'
 msgstr "E354: Geçersiz yazmaç adı: '%s'"
 
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "İletileri Türkçeye çeviren: Emir SARI <bitigchi@me.com>"
+msgstr "Türkçeye çeviren: Emir SARI <bitigchi@me.com>"
 
 msgid "Interrupt: "
 msgstr "Yarıda kes: "
@@ -3838,6 +3896,12 @@ msgstr "Bip!"
 msgid "E677: Error writing temp file"
 msgstr "E677: Geçici dosya yazılırken hata"
 
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "%ld saniye önce"
+msgstr[1] "%ld saniye önce"
+
 msgid "ERROR: "
 msgstr "HATA: "
 
@@ -3885,7 +3949,8 @@ msgstr "E549: İzin verilmeyen yüzde"
 
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-msgstr "E668: NetBeans bağlantı bilgisi dosyası için yanlış erişim kipi: \"%s\""
+msgstr ""
+"E668: NetBeans bağlantı bilgisi dosyası için yanlış erişim kipi: \"%s\""
 
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %d"
@@ -3922,6 +3987,10 @@ msgstr "E662: Değişiklik listesinin başında"
 msgid "E663: At end of changelist"
 msgstr "E663: Değişiklik listesinin sonunda"
 
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr ""
+"Değişikliklerden vazgeçip Vim'den çıkmak için :qa! yazıp <Enter>'a basın"
+
 msgid "Type  :qa  and press <Enter> to exit Vim"
 msgstr "Vim'den çıkmak için :qa yazıp <Enter>'a basın"
 
@@ -3937,16 +4006,6 @@ msgid_plural "%ld lines %sed %d times"
 msgstr[0] "%ld satır, %s %d kez"
 msgstr[1] "%ld satır, %s %d kez"
 
-#, c-format
-msgid "%ld lines to indent... "
-msgstr "girintilenecek %ld satır... "
-
-#, c-format
-msgid "%ld line indented "
-msgid_plural "%ld lines indented "
-msgstr[0] "%ld satır girintilendi "
-msgstr[1] "%ld satır girintilendi"
-
 msgid "cannot yank; delete anyway"
 msgstr "kopyalanamıyor, silindi"
 
@@ -3980,8 +4039,8 @@ msgid ""
 "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
 "%lld of %lld"
 msgstr ""
-"Sütun %s/%s; Satır %ld/%ld; Sözcük %lld/%lld; Karakter %lld/%lld; "
-"Bit %lld/%lld"
+"Sütun %s/%s; Satır %ld/%ld; Sözcük %lld/%lld; Karakter %lld/%lld; Bit %lld/"
+"%lld"
 
 #, c-format
 msgid "(+%lld for BOM)"
@@ -4131,8 +4190,8 @@ msgstr "E527: Eksik virgül"
 msgid "E528: Must specify a ' value"
 msgstr "E528: Bir ' değeri belirtmeli"
 
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: Yazdırılamaz veya geniş karakter içeriyor"
+msgid "E595: 'showbreak' contains unprintable or wide character"
+msgstr "E595: 'showbreak' yazdırılamaz veya geniş karakter içeriyor"
 
 msgid "E596: Invalid font(s)"
 msgstr "E596: Geçersiz font(lar)"
@@ -4160,9 +4219,6 @@ msgstr "E536: Virgül gerekli"
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' boş olmalı veya %s içermeli"
 
-msgid "E538: No mouse support"
-msgstr "E538: Fare desteği mevcut değil"
-
 msgid "cannot open "
 msgstr "Açılamıyor: "
 
@@ -4242,11 +4298,12 @@ msgstr "E244: İzin verilmeyen nitelik adı: \"%s\", bulunduğu yazıtipi: \"%s\""
 
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
-msgstr "E245: İzin verilmeyen karakter '%c', bulunduğu yer: \"%s\" yazıtipi adı"
+msgstr ""
+"E245: İzin verilmeyen karakter '%c', bulunduğu yer: \"%s\" yazıtipi adı"
 
 #, c-format
 msgid "Opening the X display took %ld msec"
-msgstr "X ekranını açma %ld milisaniye sürdü" 
+msgstr "X ekranını açma %ld milisaniye sürdü"
 
 msgid ""
 "\n"
@@ -4643,6 +4700,7 @@ msgstr "E879: (BSO düzenli ifadesi) Çok fazla \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (BSO düzenli ifadesi) Düzgün sonlandırma hatası"
 
+
 msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (BSO) Yığın çıkartılamadı!"
 
@@ -4654,7 +4712,8 @@ msgstr ""
 "fazla durum bırakıldı"
 
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr "E876: (BSO düzenli ifadesi) Tüm BSO'yu depolamak için yeterli alan yok "
+msgstr ""
+"E876: (BSO düzenli ifadesi) Tüm BSO'yu depolamak için yeterli alan yok "
 
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (BSO) Dal gezinmesi için bellek ayrılamadı!"
@@ -4686,12 +4745,6 @@ msgstr[1] "%ld satır kopyalandı%s"
 msgid "E353: Nothing in register %s"
 msgstr "E353: Yazmaç %s boş"
 
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- Yazmaçlar ---"
 
 msgid ""
 "E883: search pattern and expression register may not contain two or more "
@@ -4852,7 +4905,7 @@ msgid "in path ---\n"
 msgstr "yolda ---\n"
 
 msgid "  (Already listed)"
-msgstr " (Halihazırda listelenmiş)"
+msgstr " (Hâlihazırda listelenmiş)"
 
 msgid "  NOT FOUND"
 msgstr " BULUNAMADI"
@@ -5086,6 +5139,10 @@ msgstr "%s içinde %d. satırda yanlış COMPOUNDSYLMAX değeri: %s"
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "%s içinde %d. satırda yanlış CHECKCOMPOUNDPATTERN değeri: %s"
 
+msgid "Different combining flag in continued affix block in %s line %d: %s"
+msgstr ""
+"%s içinde %d. satırdaki sürdürülen ek bloğunda farklı birleştirici bayrak: %s"
+
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "%s içinde %d. satırda yinelenen ek: %s"
@@ -5282,7 +5339,7 @@ msgstr "Sözcük '%.*s', %s içinden çıkartıldı"
 
 #, c-format
 msgid "Word '%.*s' added to %s"
-msgstr "Sözcük '%.*s', %s bünyesine eklendi"
+msgstr "Sözcük '%.*s', %s dosyasına eklendi"
 
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Sözcük karakterleri yazım dosyaları arasında ayrımlı"
@@ -5544,9 +5601,6 @@ msgstr "Etiket dosyası %s aranıyor"
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: %s için etiket dosyası yolu kırpıldı\n"
 
-msgid "Ignoring long line in tags file"
-msgstr "Etiket dosyasındaki uzun satır yoksayılıyor"
-
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Etiket dosyası \"%s\" içinde biçim hatası"
@@ -5562,6 +5616,9 @@ msgstr "E432: Etiket dosyası sıralanmadı: %s"
 msgid "E433: No tags file"
 msgstr "E433: Etiket dosyası yok"
 
+msgid "Ignoring long line in tags file"
+msgstr "Etiket dosyasındaki uzun satır yoksayılıyor"
+
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Etiket dizgisi bulunamıyor"
 
@@ -5608,6 +5665,9 @@ msgstr "$VIMRUNTIME/rgb.txt açılamıyor"
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Geçersiz öznitelik: %s"
 
+msgid "E279: Sorry, ++shell is not supported on this system"
+msgstr "E279: Üzgünüm, ++shell bu sistemde desteklenmiyor"
+
 #, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "\"%s\" içindeki iş sonlandırılsın mı?"
@@ -5757,10 +5817,10 @@ msgid "Finished reading undo file %s"
 msgstr "%s geri al dosyasının okunması bitti"
 
 msgid "Already at oldest change"
-msgstr "Halihazırda en eski değişiklik üzerinde"
+msgstr "Hâlihazırda en eski değişiklik üzerinde"
 
 msgid "Already at newest change"
-msgstr "Halihazırda en yeni değişiklik üzerinde"
+msgstr "Hâlihazırda en yeni değişiklik üzerinde"
 
 #, c-format
 msgid "E830: Undo number %ld not found"
@@ -5803,12 +5863,6 @@ msgstr "Geri alınacak bir şey yok"
 msgid "number changes  when               saved"
 msgstr "kaydedildiğinde numara             değişir"
 
-#, c-format
-msgid "%ld second ago"
-msgid_plural "%ld seconds ago"
-msgstr[0] "%ld saniye önce"
-msgstr[1] "%ld saniye önce"
-
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: Geri al sonrasında geri almalar birleştirilemez"
 
@@ -6010,7 +6064,7 @@ msgstr "E133: :return bir işlev içinde değil"
 
 #, c-format
 msgid "%s (%s, compiled %s)"
-msgstr "%s (%s, %s derlendi)"
+msgstr "%s (%s, %s tarihinde derlendi)"
 
 msgid ""
 "\n"
@@ -6174,7 +6228,7 @@ msgid "with Cocoa GUI."
 msgstr "(Cocoa grafik arabirim ile)."
 
 msgid "  Features included (+) or not (-):\n"
-msgstr " İçerilen özellikler (+), içerilmeyenler (-) ile gösterilir:\n"
+msgstr "İçerilen özellikler (+), içerilmeyenler (-) ile gösterilir:\n"
 
 msgid "   system vimrc file: \""
 msgstr "          sistem vimrc dosyası: \""
@@ -6237,7 +6291,7 @@ msgid "version "
 msgstr "sürüm: "
 
 msgid "by Bram Moolenaar et al."
-msgstr "geliştirme: Bram Moolenaar ve diğerleri" 
+msgstr "geliştirme: Bram Moolenaar ve diğerleri"
 
 msgid "Vim is open source and freely distributable"
 msgstr "Vim açık kaynaklıdır ve özgürce dağıtılabilir"
@@ -6291,10 +6345,10 @@ msgid "Become a registered Vim user!"
 msgstr "Kayıtlı bir Vim kullanıcısı olun!"
 
 msgid "type  :help sponsor<Enter>    for information "
-msgstr "bilgi için:            :help sponsor<Enter>   "
+msgstr "bilgi için             :help sponsor<Enter>   "
 
 msgid "type  :help register<Enter>   for information "
-msgstr "bilgi için:            :help register<Enter>  "
+msgstr "bilgi için             :help register<Enter>  "
 
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "bilgi için: menü -> Yardım -> Sponsorluk/Kayıt   "
@@ -6304,7 +6358,7 @@ msgid ""
 "# Buffer list:\n"
 msgstr ""
 "\n"
-"# Arabellek listesi:\n"""
+"# Arabellek listesi:\n"
 
 #, c-format
 msgid ""
@@ -6504,6 +6558,7 @@ msgstr "E370: %s kitaplığı yüklenemedi"
 msgid "Sorry, this command is disabled: the Perl library could not be loaded."
 msgstr "Üzgünüm, bu komut etkin değil: Perl kitaplığı yüklenemedi."
 
+
 msgid "Edit with &multiple Vims"
 msgstr "Birden &fazla Vim ile düzenle"
 
@@ -6525,6 +6580,7 @@ msgstr "Mevcut Vim ile düzenle - "
 msgid "Edits the selected file(s) with Vim"
 msgstr "Seçili dosyaları Vim ile düzenler"
 
+
 msgid "gvimext.dll error"
 msgstr "gvimext.dll hatası"
 
@@ -6658,16 +6714,16 @@ msgid "E477: No ! allowed"
 msgstr "E477: ! imine izin verilmiyor"
 
 msgid "E25: GUI cannot be used: Not enabled at compile time"
-msgstr "E25: Grafik arabirim kullanılamıyor: Derlemede etkinleştirilmemiş"
+msgstr "E25: Grafik arabirim kullanılamıyor: Derlenirken etkinleştirilmemiş"
 
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-msgstr "E26: İbranice kullanılamıyor: Derlemede etkinleştirilmemiş\n"
+msgstr "E26: İbranice kullanılamıyor: Derlenirken etkinleştirilmemiş\n"
 
 msgid "E27: Farsi support has been removed\n"
 msgstr "E27: Farsça desteği kaldırıldı\n"
 
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-msgstr "E800: Arapça kullanılamıyor: Derlemede etkinleştirilmemiş\n"
+msgstr "E800: Arapça kullanılamıyor: Derlenirken etkinleştirilmemiş\n"
 
 #, c-format
 msgid "E28: No such highlight group name: %s"
@@ -6831,6 +6887,9 @@ msgstr "E897: Liste veya ikili geniş nesne gerekli"
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: %s ögesinin değişkeni bir liste veya sözlük olmalıdır"
 
+msgid "E896: Argument of %s must be a List, Dictionary or Blob"
+msgstr "E896: %s değişkeni bir liste, sözlük veya ikili geniş nesne olmalıdır"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Hata dosyası okunurken hata"
 
@@ -6986,7 +7045,8 @@ msgstr "bytes() veya str() örneği bekleniyordu, %s geldi"
 msgid ""
 "expected int(), long() or something supporting coercing to long(), but got %s"
 msgstr ""
-"int(), long() veya long()'a baskıyı destekleyen bir şey bekleniyordu, %s geldi"
+"int(), long() veya long()'a baskıyı destekleyen bir şey bekleniyordu, %s "
+"geldi"
 
 #, c-format
 msgid "expected int() or something supporting coercing to int(), but got %s"
@@ -7024,7 +7084,8 @@ msgstr "imp.find_module() sonucu olarak 3 çoklu öge bekleniyordu, %s geldi"
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
 msgstr ""
-"imp.find_module() sonucu olarak 3 tuple bekleniyordu, %d boyutlu çok öge geldi"
+"imp.find_module() sonucu olarak 3 tuple bekleniyordu, %d boyutlu çok öge "
+"geldi"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
 msgstr "iç hata: imp.find_module BOŞ bir çoklu öge döndürdü"
@@ -7254,7 +7315,7 @@ msgstr ""
 "Tüm Dosyalar (*)\t*\n"
 "C kaynak dosyaları (*.c, *.h)\t*.c;*.h\n"
 "C++ kaynak dosyaları (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
-"Vim dosyaları (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"""
+"Vim dosyaları (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
 
 msgid "GVim"
 msgstr "GVim"
@@ -7263,7 +7324,7 @@ msgid "Text Editor"
 msgstr "Metin Düzenleyici"
 
 msgid "Edit text files"
-msgstr "Metin dosyaları düzenle"
+msgstr "Metin dosyaları düzenleyin"
 
 msgid "Text;editor;"
 msgstr "Metin;düzenleyici;"
--- a/src/po/vim.desktop.in
+++ b/src/po/vim.desktop.in
@@ -63,7 +63,6 @@ Comment[pl]=Edytuj pliki tekstowe
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
-Comment[ru]=Редактор текстовых файлов
 Comment[sk]=Úprava textových súborov
 Comment[sl]=Urejanje datotek z besedili
 Comment[sq]=Përpuno files teksti