vim-patch:f37506f60f87

Updated runtime files.  Remove HiLink commands.

https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c

338 files changed, 16864 insertions, 19883 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b40f91ff35..ffcd373ada 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7589,7 +7589,7 @@ timer_start({time}, {callback} [, {options}])
 		busy or Vim is not waiting for input the time will be longer.
 
 		{callback} is the function to call.  It can be the name of a
-		function or a Funcref.  It is called with one argument, which
+		function or a |Funcref|.  It is called with one argument, which
 		is the timer ID.  The callback is only invoked when Vim is
 		waiting for input.
 
diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim
index 5ade809a1f..b232e826cd 100644
--- a/runtime/syntax/a65.vim
+++ b/runtime/syntax/a65.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	xa 6502 cross assembler
 " Maintainer:	Clemens Kirchgatterer <clemens@1541.org>
-" Last Change:	2014 Jan 05
+" Last Change:	2016 Aug 31
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -136,20 +136,18 @@ syn match  a65Continue	"\\$" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink a65Section	Special
-HiLink a65Address	Special
-HiLink a65Comment	Comment
-HiLink a65PreProc	PreProc
-HiLink a65Number	Number
-HiLink a65String	String
-HiLink a65Type	Statement
-HiLink a65Opcode	Type
-HiLink a65PC		Error
-HiLink a65Todo	Todo
-HiLink a65HiLo	Number
-
-delcommand HiLink
+
+hi def link a65Section	Special
+hi def link a65Address	Special
+hi def link a65Comment	Comment
+hi def link a65PreProc	PreProc
+hi def link a65Number	Number
+hi def link a65String	String
+hi def link a65Type	Statement
+hi def link a65Opcode	Type
+hi def link a65PC		Error
+hi def link a65Todo	Todo
+hi def link a65HiLo	Number
+
 
 let b:current_syntax = "a65"
diff --git a/runtime/syntax/abap.vim b/runtime/syntax/abap.vim
index ac5504a952..c2857a5f30 100644
--- a/runtime/syntax/abap.vim
+++ b/runtime/syntax/abap.vim
@@ -169,29 +169,27 @@ syn match   abapTodo     "\#EC\W\+\w\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink abapError          Error
-HiLink abapComment        Comment
-HiLink abapInclude        Include
-HiLink abapStatement      Statement
-HiLink abapComplexStatement      Statement
-HiLink abapSpecial        Special
-HiLink abapNamespace      Special
-HiLink abapSpecialTables  Special
-HiLink abapSymbolOperator abapOperator
-HiLink abapOperator       Operator
-HiLink abapCharString     String
-HiLink abapString         String
-HiLink abapFloat          Float
-HiLink abapTypes          Type
-HiLink abapSymbol         Structure
-HiLink abapStructure      Structure
-HiLink abapField          Variable
-HiLink abapNumber         Number
-HiLink abapHex            Number
-
-delcommand HiLink
+
+hi def link abapError          Error
+hi def link abapComment        Comment
+hi def link abapInclude        Include
+hi def link abapStatement      Statement
+hi def link abapComplexStatement      Statement
+hi def link abapSpecial        Special
+hi def link abapNamespace      Special
+hi def link abapSpecialTables  Special
+hi def link abapSymbolOperator abapOperator
+hi def link abapOperator       Operator
+hi def link abapCharString     String
+hi def link abapString         String
+hi def link abapFloat          Float
+hi def link abapTypes          Type
+hi def link abapSymbol         Structure
+hi def link abapStructure      Structure
+hi def link abapField          Variable
+hi def link abapNumber         Number
+hi def link abapHex            Number
+
 
 let b:current_syntax = "abap"
 
diff --git a/runtime/syntax/abaqus.vim b/runtime/syntax/abaqus.vim
index ddf0255845..db2717f818 100644
--- a/runtime/syntax/abaqus.vim
+++ b/runtime/syntax/abaqus.vim
@@ -23,15 +23,13 @@ syn match abaqusBadLine	"^\s\+\*.*" display
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink abaqusComment	Comment
-HiLink abaqusKeyword	Statement
-HiLink abaqusParameter	Identifier
-HiLink abaqusValue	Constant
-HiLink abaqusBadLine    Error
+hi def link abaqusComment	Comment
+hi def link abaqusKeyword	Statement
+hi def link abaqusParameter	Identifier
+hi def link abaqusValue	Constant
+hi def link abaqusBadLine    Error
 
-delcommand HiLink
 
 let b:current_syntax = "abaqus"
diff --git a/runtime/syntax/abc.vim b/runtime/syntax/abc.vim
index 68f0cf16ff..1a7b3bf4be 100644
--- a/runtime/syntax/abc.vim
+++ b/runtime/syntax/abc.vim
@@ -34,19 +34,17 @@ syn match abcComment "%.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink abcComment		Comment
-HiLink abcHeadField		Type
-HiLink abcBodyField		Special
-HiLink abcBar			Statement
-HiLink abcTuple			Statement
-HiLink abcBroken			Statement
-HiLink abcTie			Statement
-HiLink abcGuitarChord	Identifier
-HiLink abcNote			Constant
-
-delcommand HiLink
+
+hi def link abcComment		Comment
+hi def link abcHeadField		Type
+hi def link abcBodyField		Special
+hi def link abcBar			Statement
+hi def link abcTuple			Statement
+hi def link abcBroken			Statement
+hi def link abcTie			Statement
+hi def link abcGuitarChord	Identifier
+hi def link abcNote			Constant
+
 
 let b:current_syntax = "abc"
 
diff --git a/runtime/syntax/abel.vim b/runtime/syntax/abel.vim
index dfa872f422..67d7e4f786 100644
--- a/runtime/syntax/abel.vim
+++ b/runtime/syntax/abel.vim
@@ -121,39 +121,37 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink abelHeader		abelStatement
-HiLink abelSection		abelStatement
-HiLink abelDeclaration	abelStatement
-HiLink abelLogicalOperator	abelOperator
-HiLink abelRangeOperator	abelOperator
-HiLink abelAlternateOperator	abelOperator
-HiLink abelArithmeticOperator	abelOperator
-HiLink abelRelationalOperator	abelOperator
-HiLink abelAssignmentOperator	abelOperator
-HiLink abelTruthTableOperator	abelOperator
-HiLink abelSpecifier		abelStatement
-HiLink abelOperator		abelStatement
-HiLink abelStatement		Statement
-HiLink abelIdentifier		Identifier
-HiLink abelTypeId		abelType
-HiLink abelTypeIdChar		abelType
-HiLink abelType		Type
-HiLink abelNumber		abelString
-HiLink abelString		String
-HiLink abelConstant		Constant
-HiLink abelComment		Comment
-HiLink abelExtension		abelSpecial
-HiLink abelSpecialChar	abelSpecial
-HiLink abelTypeIdEnd		abelSpecial
-HiLink abelSpecial		Special
-HiLink abelDirective		PreProc
-HiLink abelTodo		Todo
-HiLink abelError		Error
-
-delcommand HiLink
+hi def link abelHeader		abelStatement
+hi def link abelSection		abelStatement
+hi def link abelDeclaration	abelStatement
+hi def link abelLogicalOperator	abelOperator
+hi def link abelRangeOperator	abelOperator
+hi def link abelAlternateOperator	abelOperator
+hi def link abelArithmeticOperator	abelOperator
+hi def link abelRelationalOperator	abelOperator
+hi def link abelAssignmentOperator	abelOperator
+hi def link abelTruthTableOperator	abelOperator
+hi def link abelSpecifier		abelStatement
+hi def link abelOperator		abelStatement
+hi def link abelStatement		Statement
+hi def link abelIdentifier		Identifier
+hi def link abelTypeId		abelType
+hi def link abelTypeIdChar		abelType
+hi def link abelType		Type
+hi def link abelNumber		abelString
+hi def link abelString		String
+hi def link abelConstant		Constant
+hi def link abelComment		Comment
+hi def link abelExtension		abelSpecial
+hi def link abelSpecialChar	abelSpecial
+hi def link abelTypeIdEnd		abelSpecial
+hi def link abelSpecial		Special
+hi def link abelDirective		PreProc
+hi def link abelTodo		Todo
+hi def link abelError		Error
+
 
 let b:current_syntax = "abel"
 
diff --git a/runtime/syntax/acedb.vim b/runtime/syntax/acedb.vim
index 43cec3ac29..2c2cd701b7 100644
--- a/runtime/syntax/acedb.vim
+++ b/runtime/syntax/acedb.vim
@@ -84,26 +84,24 @@ syn region	acedbString	start=/"/ end=/"/ skip=/\\"/ oneline
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink acedbMagic	Special
-HiLink acedbHyb	Special
-HiLink acedbType	Type
-HiLink acedbOption	Type
-HiLink acedbSubclass	Type
-HiLink acedbSubtag	Include
-HiLink acedbFlag	Include
-HiLink acedbTag	Include
-HiLink acedbClass	Todo
-HiLink acedbHelp	Todo
-HiLink acedbXref	Identifier
-HiLink acedbModifier	Label
-HiLink acedbComment	Comment
-HiLink acedbBlock	ModeMsg
-HiLink acedbNumber	Number
-HiLink acedbString	String
+hi def link acedbMagic	Special
+hi def link acedbHyb	Special
+hi def link acedbType	Type
+hi def link acedbOption	Type
+hi def link acedbSubclass	Type
+hi def link acedbSubtag	Include
+hi def link acedbFlag	Include
+hi def link acedbTag	Include
+hi def link acedbClass	Todo
+hi def link acedbHelp	Todo
+hi def link acedbXref	Identifier
+hi def link acedbModifier	Label
+hi def link acedbComment	Comment
+hi def link acedbBlock	ModeMsg
+hi def link acedbNumber	Number
+hi def link acedbString	String
 
-delcommand HiLink
 
 let b:current_syntax = "acedb"
 
diff --git a/runtime/syntax/aflex.vim b/runtime/syntax/aflex.vim
index 21b78d0d85..aa8b5f84fe 100644
--- a/runtime/syntax/aflex.vim
+++ b/runtime/syntax/aflex.vim
@@ -63,21 +63,19 @@ syn sync match aflexSyncPat	groupthere aflexPatBlock	"^%%$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink	aflexSlashQuote	aflexPat
-HiLink	aflexBrace		aflexPat
-HiLink aflexAbbrvComment	aflexPatComment
+hi def link aflexSlashQuote	aflexPat
+hi def link aflexBrace		aflexPat
+hi def link aflexAbbrvComment	aflexPatComment
 
-HiLink	aflexAbbrv		SpecialChar
-HiLink	aflexAbbrvRegExp	Macro
-HiLink	aflexCFunctions	Function
-HiLink	aflexMorePat	SpecialChar
-HiLink	aflexPat		Function
-HiLink	aflexPatComment	Comment
-HiLink	aflexPatString	Function
-HiLink	aflexPatTag		Special
-HiLink	aflexSep		Delimiter
-delcommand HiLink
+hi def link aflexAbbrv		SpecialChar
+hi def link aflexAbbrvRegExp	Macro
+hi def link aflexCFunctions	Function
+hi def link aflexMorePat	SpecialChar
+hi def link aflexPat		Function
+hi def link aflexPatComment	Comment
+hi def link aflexPatString	Function
+hi def link aflexPatTag		Special
+hi def link aflexSep		Delimiter
 
 let b:current_syntax = "aflex"
 
diff --git a/runtime/syntax/ahdl.vim b/runtime/syntax/ahdl.vim
index 82f3918de8..664bd3837d 100644
--- a/runtime/syntax/ahdl.vim
+++ b/runtime/syntax/ahdl.vim
@@ -64,20 +64,18 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink ahdlNumber		ahdlString
-HiLink ahdlMegafunction	ahdlIdentifier
-HiLink ahdlSpecialChar	SpecialChar
-HiLink ahdlKeyword		Statement
-HiLink ahdlString		String
-HiLink ahdlComment		Comment
-HiLink ahdlIdentifier		Identifier
-HiLink ahdlOperator		Operator
-HiLink ahdlTodo		Todo
-
-delcommand HiLink
+hi def link ahdlNumber		ahdlString
+hi def link ahdlMegafunction	ahdlIdentifier
+hi def link ahdlSpecialChar	SpecialChar
+hi def link ahdlKeyword		Statement
+hi def link ahdlString		String
+hi def link ahdlComment		Comment
+hi def link ahdlIdentifier		Identifier
+hi def link ahdlOperator		Operator
+hi def link ahdlTodo		Todo
+
 
 let b:current_syntax = "ahdl"
 " vim:ts=8
diff --git a/runtime/syntax/amiga.vim b/runtime/syntax/amiga.vim
index e094cfc744..eab9f66169 100644
--- a/runtime/syntax/amiga.vim
+++ b/runtime/syntax/amiga.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	AmigaDos
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:     7
+" Last Change:	Aug 31, 2016
+" Version:     9
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_AMIGA
 
 " quit when a syntax file was already loaded
@@ -69,22 +69,20 @@ syn match	amiComment	";.*$" contains=amiCommentGroup
 syn sync lines=50
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink amiAlias	Type
-HiLink amiComment	Comment
-HiLink amiDev	Type
-HiLink amiEcho	String
-HiLink amiElse	Statement
-HiLink amiError	Error
-HiLink amiKey	Statement
-HiLink amiNumber	Number
-HiLink amiString	String
-HiLink amiTest	Special
-
-delcommand HiLink
+if !exists("skip_amiga_syntax_inits")
+
+  hi def link amiAlias	Type
+  hi def link amiComment	Comment
+  hi def link amiDev	Type
+  hi def link amiEcho	String
+  hi def link amiElse	Statement
+  hi def link amiError	Error
+  hi def link amiKey	Statement
+  hi def link amiNumber	Number
+  hi def link amiString	String
+  hi def link amiTest	Special
 
+endif
 let b:current_syntax = "amiga"
 
 " vim:ts=15
diff --git a/runtime/syntax/aml.vim b/runtime/syntax/aml.vim
index 1b975ccabe..46621edbe9 100644
--- a/runtime/syntax/aml.vim
+++ b/runtime/syntax/aml.vim
@@ -121,26 +121,24 @@ syn region amlSkip matchgroup=amlOutput start="&type" end="$" contains=amlVar
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink amlComment	Comment
-HiLink amlNumber	Number
-HiLink amlQuote	String
-HiLink amlVar	Identifier
-HiLink amlVar2	Identifier
-HiLink amlFunction	PreProc
-HiLink amlDir	Statement
-HiLink amlDir2	Statement
-HiLink amlDirSym	Statement
-HiLink amlOutput	Statement
-HiLink amlArcCmd	ModeMsg
-HiLink amlFormedCmd	amlArcCmd
-HiLink amlTabCmd	amlArcCmd
-HiLink amlInfoCmd	amlArcCmd
-HiLink amlVtrCmd	amlArcCmd
-HiLink amlFormed	amlArcCmd
-HiLink amlTab	amlArcCmd
-
-delcommand HiLink
+
+hi def link amlComment	Comment
+hi def link amlNumber	Number
+hi def link amlQuote	String
+hi def link amlVar	Identifier
+hi def link amlVar2	Identifier
+hi def link amlFunction	PreProc
+hi def link amlDir	Statement
+hi def link amlDir2	Statement
+hi def link amlDirSym	Statement
+hi def link amlOutput	Statement
+hi def link amlArcCmd	ModeMsg
+hi def link amlFormedCmd	amlArcCmd
+hi def link amlTabCmd	amlArcCmd
+hi def link amlInfoCmd	amlArcCmd
+hi def link amlVtrCmd	amlArcCmd
+hi def link amlFormed	amlArcCmd
+hi def link amlTab	amlArcCmd
+
 
 let b:current_syntax = "aml"
diff --git a/runtime/syntax/ampl.vim b/runtime/syntax/ampl.vim
index 99a683a0f4..ad78f7d729 100644
--- a/runtime/syntax/ampl.vim
+++ b/runtime/syntax/ampl.vim
@@ -114,26 +114,24 @@ syn keyword amplTodo contained	 TODO FIXME XXX
 
 
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink amplEntityKeyword	Keyword
-HiLink amplType		Type
-HiLink amplStatement		Statement
-HiLink amplOperators		Operator
-HiLink amplBasicOperators	Operator
-HiLink amplConditional	Conditional
-HiLink amplRepeat		Repeat
-HiLink amplStrings		String
-HiLink amplNumerics		Number
-HiLink amplSetFunction	Function
-HiLink amplBuiltInFunction	Function
-HiLink amplRandomGenerator	Function
-HiLink amplComment		Comment
-HiLink amplDotSuffix		Special
-HiLink amplPiecewise		Special
-
-delcommand HiLink
+hi def link amplEntityKeyword	Keyword
+hi def link amplType		Type
+hi def link amplStatement		Statement
+hi def link amplOperators		Operator
+hi def link amplBasicOperators	Operator
+hi def link amplConditional	Conditional
+hi def link amplRepeat		Repeat
+hi def link amplStrings		String
+hi def link amplNumerics		Number
+hi def link amplSetFunction	Function
+hi def link amplBuiltInFunction	Function
+hi def link amplRandomGenerator	Function
+hi def link amplComment		Comment
+hi def link amplDotSuffix		Special
+hi def link amplPiecewise		Special
+
 
 let b:current_syntax = "ampl"
 
diff --git a/runtime/syntax/antlr.vim b/runtime/syntax/antlr.vim
index 2ac38d7747..9b0b061ae1 100644
--- a/runtime/syntax/antlr.vim
+++ b/runtime/syntax/antlr.vim
@@ -46,10 +46,8 @@ syn match antlrSep "[|:]\|\.\."
 syn keyword antlrActionToken TOKEN SKIP MORE SPECIAL_TOKEN
 syn keyword antlrError DEBUG IGNORE_IN_BNF
 
-command -nargs=+ HiLink hi def link <args>
-HiLink antlrSep Statement
-HiLink antlrPackages Statement
-delcommand HiLink
+hi def link antlrSep Statement
+hi def link antlrPackages Statement
 
 let b:current_syntax = "antlr"
 
diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim
index b556fa350d..e2315db0d7 100644
--- a/runtime/syntax/apache.vim
+++ b/runtime/syntax/apache.vim
@@ -174,30 +174,28 @@ syn match apacheSection "<\/\=\(<IfVersion\)[^>]*>" contains=apacheAnything
 syn keyword apacheDeclaration VirtualDocumentRoot VirtualDocumentRootIP VirtualScriptAlias VirtualScriptAliasIP
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink apacheAllowOverride apacheDeclaration
-HiLink apacheAllowOverrideValue apacheOption
-HiLink apacheAuthType apacheDeclaration
-HiLink apacheAuthTypeValue apacheOption
-HiLink apacheOptionOption apacheOption
-HiLink apacheDeclaration Function
-HiLink apacheAnything apacheOption
-HiLink apacheOption Number
-HiLink apacheComment Comment
-HiLink apacheFixme Todo
-HiLink apacheLimitSectionKeyword apacheLimitSection
-HiLink apacheLimitSection apacheSection
-HiLink apacheSection Label
-HiLink apacheMethodOption Type
-HiLink apacheAllowDeny Include
-HiLink apacheAllowDenyValue Identifier
-HiLink apacheOrder Special
-HiLink apacheOrderValue String
-HiLink apacheString String
-HiLink apacheError Error
-HiLink apacheUserID Number
+hi def link apacheAllowOverride apacheDeclaration
+hi def link apacheAllowOverrideValue apacheOption
+hi def link apacheAuthType apacheDeclaration
+hi def link apacheAuthTypeValue apacheOption
+hi def link apacheOptionOption apacheOption
+hi def link apacheDeclaration Function
+hi def link apacheAnything apacheOption
+hi def link apacheOption Number
+hi def link apacheComment Comment
+hi def link apacheFixme Todo
+hi def link apacheLimitSectionKeyword apacheLimitSection
+hi def link apacheLimitSection apacheSection
+hi def link apacheSection Label
+hi def link apacheMethodOption Type
+hi def link apacheAllowDeny Include
+hi def link apacheAllowDenyValue Identifier
+hi def link apacheOrder Special
+hi def link apacheOrderValue String
+hi def link apacheString String
+hi def link apacheError Error
+hi def link apacheUserID Number
 
-delcommand HiLink
 
 let b:current_syntax = "apache"
diff --git a/runtime/syntax/apachestyle.vim b/runtime/syntax/apachestyle.vim
index 53d5907b9e..3695a11421 100644
--- a/runtime/syntax/apachestyle.vim
+++ b/runtime/syntax/apachestyle.vim
@@ -39,16 +39,14 @@ syn match  apTagError	contained /[^>]</ms=s+1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink apComment	Comment
-HiLink apOption	Keyword
-"HiLink apLastValue	Identifier		ugly?
-HiLink apTag		Special
-HiLink apTagOption	Identifier
-HiLink apTagError	Error
+hi def link apComment	Comment
+hi def link apOption	Keyword
+"hi def link apLastValue	Identifier		ugly?
+hi def link apTag		Special
+hi def link apTagOption	Identifier
+hi def link apTagError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "apachestyle"
 " vim: ts=8
diff --git a/runtime/syntax/asm.vim b/runtime/syntax/asm.vim
index 501f5f0872..492e3e8e92 100644
--- a/runtime/syntax/asm.vim
+++ b/runtime/syntax/asm.vim
@@ -101,28 +101,26 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink asmSection	Special
-HiLink asmLabel	Label
-HiLink asmComment	Comment
-HiLink asmTodo	Todo
-HiLink asmDirective	Statement
+hi def link asmSection	Special
+hi def link asmLabel	Label
+hi def link asmComment	Comment
+hi def link asmTodo	Todo
+hi def link asmDirective	Statement
 
-HiLink asmInclude	Include
-HiLink asmCond	PreCondit
-HiLink asmMacro	Macro
+hi def link asmInclude	Include
+hi def link asmCond	PreCondit
+hi def link asmMacro	Macro
 
-HiLink hexNumber	Number
-HiLink decNumber	Number
-HiLink octNumber	Number
-HiLink binNumber	Number
+hi def link hexNumber	Number
+hi def link decNumber	Number
+hi def link octNumber	Number
+hi def link binNumber	Number
 
-HiLink asmIdentifier	Identifier
-HiLink asmType	Type
+hi def link asmIdentifier	Identifier
+hi def link asmType	Type
 
-delcommand HiLink
 
 let b:current_syntax = "asm"
 
diff --git a/runtime/syntax/asm68k.vim b/runtime/syntax/asm68k.vim
index ace56c854e..1607507909 100644
--- a/runtime/syntax/asm68k.vim
+++ b/runtime/syntax/asm68k.vim
@@ -326,7 +326,6 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " Comment Constant Error Identifier PreProc Special Statement Todo Type
@@ -338,42 +337,41 @@ command -nargs=+ HiLink hi def link <args>
 " Statement		Conditional Exception Keyword Label Operator Repeat
 " Type		StorageClass Structure Typedef
 
-HiLink asm68kComment		Comment
-HiLink asm68kTodo		Todo
+hi def link asm68kComment		Comment
+hi def link asm68kTodo		Todo
 
-HiLink hexNumber		Number		" Constant
-HiLink octNumber		Number		" Constant
-HiLink binNumber		Number		" Constant
-HiLink decNumber		Number		" Constant
-HiLink floatNumber		Number		" Constant
-HiLink floatExponent		Number		" Constant
-HiLink floatE			SpecialChar	" Statement
-"HiLink floatE		Number		" Constant
+hi def link hexNumber		Number		" Constant
+hi def link octNumber		Number		" Constant
+hi def link binNumber		Number		" Constant
+hi def link decNumber		Number		" Constant
+hi def link floatNumber		Number		" Constant
+hi def link floatExponent		Number		" Constant
+hi def link floatE			SpecialChar	" Statement
+"hi def link floatE		Number		" Constant
 
-HiLink asm68kImmediate	SpecialChar	" Statement
-"HiLink asm68kSymbol		Constant
+hi def link asm68kImmediate	SpecialChar	" Statement
+"hi def link asm68kSymbol		Constant
 
-HiLink asm68kString		String		" Constant
-HiLink asm68kCharError	Error
-HiLink asm68kStringError	Error
+hi def link asm68kString		String		" Constant
+hi def link asm68kCharError	Error
+hi def link asm68kStringError	Error
 
-HiLink asm68kReg		Identifier
-HiLink asm68kOperator		Identifier
+hi def link asm68kReg		Identifier
+hi def link asm68kOperator		Identifier
 
-HiLink asm68kInclude		Include		" PreProc
-HiLink asm68kMacro		Macro		" PreProc
-HiLink asm68kMacroParam	Keyword		" Statement
+hi def link asm68kInclude		Include		" PreProc
+hi def link asm68kMacro		Macro		" PreProc
+hi def link asm68kMacroParam	Keyword		" Statement
 
-HiLink asm68kDirective	Special
-HiLink asm68kPreCond		Special
+hi def link asm68kDirective	Special
+hi def link asm68kPreCond		Special
 
 
-HiLink asm68kOpcode		Statement
-HiLink asm68kCond		Conditional	" Statement
-HiLink asm68kRepeat		Repeat		" Statement
+hi def link asm68kOpcode		Statement
+hi def link asm68kCond		Conditional	" Statement
+hi def link asm68kRepeat		Repeat		" Statement
 
-HiLink asm68kLabel		Type
-delcommand HiLink
+hi def link asm68kLabel		Type
 
 let b:current_syntax = "asm68k"
 
diff --git a/runtime/syntax/asmh8300.vim b/runtime/syntax/asmh8300.vim
index 5134c512e7..8560fb7ae4 100644
--- a/runtime/syntax/asmh8300.vim
+++ b/runtime/syntax/asmh8300.vim
@@ -54,16 +54,14 @@ runtime! syntax/asm.vim
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink asmOpcode  Statement
-HiLink asmRegister  Identifier
+hi def link asmOpcode  Statement
+hi def link asmRegister  Identifier
 
 " My default-color overrides:
 "hi asmOpcode ctermfg=yellow
 "hi asmReg	ctermfg=lightmagenta
 
-delcommand HiLink
 
 let b:current_syntax = "asmh8300"
 
diff --git a/runtime/syntax/asn.vim b/runtime/syntax/asn.vim
index 8b553e884c..e90c7e079c 100644
--- a/runtime/syntax/asn.vim
+++ b/runtime/syntax/asn.vim
@@ -48,25 +48,23 @@ syn sync ccomment asnComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink asnDefinition	Function
-HiLink asnBraces		Function
-HiLink asnStructure	Statement
-HiLink asnBoolValue	Boolean
-HiLink asnSpecial		Special
-HiLink asnString		String
-HiLink asnCharacter	Character
-HiLink asnSpecialCharacter	asnSpecial
-HiLink asnNumber		asnValue
-HiLink asnComment		Comment
-HiLink asnLineComment	asnComment
-HiLink asnType		Type
-HiLink asnTypeInfo		PreProc
-HiLink asnValue		Number
-HiLink asnExternal		Include
-HiLink asnTagModifier	Function
-HiLink asnFieldOption	Type
-delcommand HiLink
+hi def link asnDefinition	Function
+hi def link asnBraces		Function
+hi def link asnStructure	Statement
+hi def link asnBoolValue	Boolean
+hi def link asnSpecial		Special
+hi def link asnString		String
+hi def link asnCharacter	Character
+hi def link asnSpecialCharacter	asnSpecial
+hi def link asnNumber		asnValue
+hi def link asnComment		Comment
+hi def link asnLineComment	asnComment
+hi def link asnType		Type
+hi def link asnTypeInfo		PreProc
+hi def link asnValue		Number
+hi def link asnExternal		Include
+hi def link asnTagModifier	Function
+hi def link asnFieldOption	Type
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/syntax/aspvbs.vim b/runtime/syntax/aspvbs.vim
index 07273e190b..f0861d8b5a 100644
--- a/runtime/syntax/aspvbs.vim
+++ b/runtime/syntax/aspvbs.vim
@@ -158,22 +158,20 @@ syn sync match htmlHighlight grouphere htmlTag "%>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-"HiLink AspVBScript		Special
-HiLink AspVBSLineNumber	Comment
-HiLink AspVBSNumber		Number
-HiLink AspVBSError		Error
-HiLink AspVBSStatement	Statement
-HiLink AspVBSString		String
-HiLink AspVBSComment		Comment
-HiLink AspVBSTodo		Todo
-HiLink AspVBSFunction		Identifier
-HiLink AspVBSMethods		PreProc
-HiLink AspVBSEvents		Special
-HiLink AspVBSTypeSpecifier	Type
-
-delcommand HiLink
+
+"hi def link AspVBScript		Special
+hi def link AspVBSLineNumber	Comment
+hi def link AspVBSNumber		Number
+hi def link AspVBSError		Error
+hi def link AspVBSStatement	Statement
+hi def link AspVBSString		String
+hi def link AspVBSComment		Comment
+hi def link AspVBSTodo		Todo
+hi def link AspVBSFunction		Identifier
+hi def link AspVBSMethods		PreProc
+hi def link AspVBSEvents		Special
+hi def link AspVBSTypeSpecifier	Type
+
 
 let b:current_syntax = "aspvbs"
 
diff --git a/runtime/syntax/asterisk.vim b/runtime/syntax/asterisk.vim
index c562b85575..4a922d3f11 100644
--- a/runtime/syntax/asterisk.vim
+++ b/runtime/syntax/asterisk.vim
@@ -57,33 +57,31 @@ syn match       asteriskSetting         "^host\s*=\s*\(dynamic\|\(\d\{1,3}\.\d\{
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink        asteriskComment		Comment
-HiLink        asteriskExten		String
-HiLink        asteriskContext         Preproc
-HiLink        asteriskPattern         Type
-HiLink        asteriskApp             Statement
-HiLink        asteriskInclude         Preproc
-HiLink        asteriskIncludeBad	Error
-HiLink        asteriskPriority        Preproc
-HiLink        asteriskLabel           Type
-HiLink        asteriskVar             String
-HiLink        asteriskVarLen          Function
-HiLink        asteriskExp             Type
-HiLink        asteriskCodecsPermit    Preproc
-HiLink        asteriskCodecs          String
-HiLink        asteriskType            Statement
-HiLink        asteriskTypeType        Type
-HiLink        asteriskAuth            String
-HiLink        asteriskAuthType        Type
-HiLink        asteriskIPRange         Identifier
-HiLink        asteriskIP              Identifier
-HiLink        asteriskPort            Identifier
-HiLink        asteriskHostname        Identifier
-HiLink        asteriskSetting         Statement
-HiLink        asteriskError           Error
-delcommand HiLink
+hi def link        asteriskComment		Comment
+hi def link        asteriskExten		String
+hi def link        asteriskContext         Preproc
+hi def link        asteriskPattern         Type
+hi def link        asteriskApp             Statement
+hi def link        asteriskInclude         Preproc
+hi def link        asteriskIncludeBad	Error
+hi def link        asteriskPriority        Preproc
+hi def link        asteriskLabel           Type
+hi def link        asteriskVar             String
+hi def link        asteriskVarLen          Function
+hi def link        asteriskExp             Type
+hi def link        asteriskCodecsPermit    Preproc
+hi def link        asteriskCodecs          String
+hi def link        asteriskType            Statement
+hi def link        asteriskTypeType        Type
+hi def link        asteriskAuth            String
+hi def link        asteriskAuthType        Type
+hi def link        asteriskIPRange         Identifier
+hi def link        asteriskIP              Identifier
+hi def link        asteriskPort            Identifier
+hi def link        asteriskHostname        Identifier
+hi def link        asteriskSetting         Statement
+hi def link        asteriskError           Error
 
 let b:current_syntax = "asterisk" 
 " vim: ts=8 sw=2
diff --git a/runtime/syntax/asteriskvm.vim b/runtime/syntax/asteriskvm.vim
index 357b29936f..fa55af5451 100644
--- a/runtime/syntax/asteriskvm.vim
+++ b/runtime/syntax/asteriskvm.vim
@@ -33,19 +33,17 @@ syn match       comma                   "[,|]" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink        asteriskvmComment Comment
-HiLink        asteriskvmContext         Identifier
-HiLink        asteriskvmZone            Type
-HiLink        zoneName                String
-HiLink        zoneDef                 String
-HiLink        asteriskvmSetting         Type
-HiLink        asteriskvmSettingBool     Type
-
-HiLink        asteriskvmMailbox         Statement
-HiLink        mailboxEmail            String
-delcommand HiLink
+
+hi def link        asteriskvmComment Comment
+hi def link        asteriskvmContext         Identifier
+hi def link        asteriskvmZone            Type
+hi def link        zoneName                String
+hi def link        zoneDef                 String
+hi def link        asteriskvmSetting         Type
+hi def link        asteriskvmSettingBool     Type
+
+hi def link        asteriskvmMailbox         Statement
+hi def link        mailboxEmail            String
 
 let b:current_syntax = "asteriskvm"
 
diff --git a/runtime/syntax/atlas.vim b/runtime/syntax/atlas.vim
index 30e136941f..1cdceab4ce 100644
--- a/runtime/syntax/atlas.vim
+++ b/runtime/syntax/atlas.vim
@@ -59,28 +59,26 @@ syn sync maxlines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink atlasConditional	Conditional
-HiLink atlasRepeat		Repeat
-HiLink atlasStatement	Statement
-HiLink atlasNumber		Number
-HiLink atlasHexNumber	Number
-HiLink atlasOctalNumber	Number
-HiLink atlasBinNumber	Number
-HiLink atlasDecimalNumber	Float
-HiLink atlasFormatString	String
-HiLink atlasString		String
-HiLink atlasComment		Comment
-HiLink atlasComment2		Comment
-HiLink atlasInclude		Include
-HiLink atlasDefine		Macro
-HiLink atlasReserved		PreCondit
-HiLink atlasStorageClass	StorageClass
-HiLink atlasIdentifier	NONE
-HiLink atlasSpecial		Special
-
-delcommand HiLink
+
+hi def link atlasConditional	Conditional
+hi def link atlasRepeat		Repeat
+hi def link atlasStatement	Statement
+hi def link atlasNumber		Number
+hi def link atlasHexNumber	Number
+hi def link atlasOctalNumber	Number
+hi def link atlasBinNumber	Number
+hi def link atlasDecimalNumber	Float
+hi def link atlasFormatString	String
+hi def link atlasString		String
+hi def link atlasComment		Comment
+hi def link atlasComment2		Comment
+hi def link atlasInclude		Include
+hi def link atlasDefine		Macro
+hi def link atlasReserved		PreCondit
+hi def link atlasStorageClass	StorageClass
+hi def link atlasIdentifier	NONE
+hi def link atlasSpecial		Special
+
 
 let b:current_syntax = "atlas"
 
diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim
index b34f7516b2..2a215a9e04 100644
--- a/runtime/syntax/automake.vim
+++ b/runtime/syntax/automake.vim
@@ -54,25 +54,23 @@ syn region  automakeMakeBString start=+`+  skip=+\\`+  end=+`+  contains=makeIde
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink automakePrimary     Statement
-HiLink automakeSecondary   Type
-HiLink automakeExtra       Special
-HiLink automakeOptions     Special
-HiLink automakeClean       Special
-HiLink automakeSubdirs     Statement
-HiLink automakeConditional PreProc
-HiLink automakeSubst       PreProc
-HiLink automakeComment1    makeComment
-HiLink automakeComment2    makeComment
-HiLink automakeMakeError   makeError
-HiLink automakeBadSubst    makeError
-HiLink automakeMakeDString makeDString
-HiLink automakeMakeSString makeSString
-HiLink automakeMakeBString makeBString
+hi def link automakePrimary     Statement
+hi def link automakeSecondary   Type
+hi def link automakeExtra       Special
+hi def link automakeOptions     Special
+hi def link automakeClean       Special
+hi def link automakeSubdirs     Statement
+hi def link automakeConditional PreProc
+hi def link automakeSubst       PreProc
+hi def link automakeComment1    makeComment
+hi def link automakeComment2    makeComment
+hi def link automakeMakeError   makeError
+hi def link automakeBadSubst    makeError
+hi def link automakeMakeDString makeDString
+hi def link automakeMakeSString makeSString
+hi def link automakeMakeBString makeBString
 
-delcommand HiLink
 
 let b:current_syntax = "automake"
 
diff --git a/runtime/syntax/ave.vim b/runtime/syntax/ave.vim
index ae36939364..3e82a8bc9b 100644
--- a/runtime/syntax/ave.vim
+++ b/runtime/syntax/ave.vim
@@ -57,25 +57,23 @@ syn match aveTypos	"!="
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting+yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink aveStatement		Statement
+hi def link aveStatement		Statement
 
-HiLink aveString		String
-HiLink aveNumber		Number
+hi def link aveString		String
+hi def link aveNumber		Number
 
-HiLink aveFixVariables	Special
-HiLink aveVariables		Identifier
-HiLink globalVariables	Special
-HiLink aveConst		Special
+hi def link aveFixVariables	Special
+hi def link aveVariables		Identifier
+hi def link globalVariables	Special
+hi def link aveConst		Special
 
-HiLink aveClassMethods	Function
+hi def link aveClassMethods	Function
 
-HiLink aveOperator		Operator
-HiLink aveComment		Comment
+hi def link aveOperator		Operator
+hi def link aveComment		Comment
 
-HiLink aveTypos		Error
+hi def link aveTypos		Error
 
-delcommand HiLink
 
 let b:current_syntax = "ave"
diff --git a/runtime/syntax/ayacc.vim b/runtime/syntax/ayacc.vim
index 9f5ec566ee..6fb6aec85d 100644
--- a/runtime/syntax/ayacc.vim
+++ b/runtime/syntax/ayacc.vim
@@ -47,28 +47,26 @@ syn match	ayaccSep	"^[ \t]*%}"
 syn match	ayaccCurlyError	"[{}]"
 syn region	ayaccAction	matchgroup=ayaccCurly start="{" end="}" contains=ALLBUT,@ayaccActionGroup
 
-command -nargs=+ HiLink hi def link <args>
 
 " Internal ayacc highlighting links
-HiLink ayaccBrkt	ayaccStmt
-HiLink ayaccKey	ayaccStmt
-HiLink ayaccOper	ayaccStmt
-HiLink ayaccUnionStart	ayaccKey
+hi def link ayaccBrkt	ayaccStmt
+hi def link ayaccKey	ayaccStmt
+hi def link ayaccOper	ayaccStmt
+hi def link ayaccUnionStart	ayaccKey
 
 " External ayacc highlighting links
-HiLink ayaccCurly	Delimiter
-HiLink ayaccCurlyError	Error
-HiLink ayaccDefinition	Function
-HiLink ayaccDelim	Function
-HiLink ayaccKeyActn	Special
-HiLink ayaccSectionSep	Todo
-HiLink ayaccSep	Delimiter
-HiLink ayaccStmt	Statement
-HiLink ayaccType	Type
+hi def link ayaccCurly	Delimiter
+hi def link ayaccCurlyError	Error
+hi def link ayaccDefinition	Function
+hi def link ayaccDelim	Function
+hi def link ayaccKeyActn	Special
+hi def link ayaccSectionSep	Todo
+hi def link ayaccSep	Delimiter
+hi def link ayaccStmt	Statement
+hi def link ayaccType	Type
 
 " since Bram doesn't like my Delimiter :|
-HiLink Delimiter	Type
-delcommand HiLink
+hi def link Delimiter	Type
 
 let b:current_syntax = "ayacc"
 
diff --git a/runtime/syntax/b.vim b/runtime/syntax/b.vim
index 95f5ad7275..01532be75d 100644
--- a/runtime/syntax/b.vim
+++ b/runtime/syntax/b.vim
@@ -68,48 +68,46 @@ syn sync ccomment bComment minlines=10
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink bLabel	Label
-HiLink bUserLabel	Label
-HiLink bConditional	Conditional
-HiLink bRepeat	Repeat
-HiLink bLogic	Special
-HiLink bCharacter	Character
-HiLink bSpecialCharacter bSpecial
-HiLink bNumber	Number
-HiLink bFloat	Float
-HiLink bOctalError	bError
-HiLink bParenError	bError
-" HiLink bInParen	bError
-HiLink bCommentError	bError
-HiLink bBoolean	Identifier
-HiLink bConstant	Identifier
-HiLink bGuard	Identifier
-HiLink bOperator	Operator
-HiLink bKeywords	Operator
-HiLink bOps		Identifier
-HiLink bStructure	Structure
-HiLink bStorageClass	StorageClass
-HiLink bInclude	Include
-HiLink bPreProc	PreProc
-HiLink bDefine	Macro
-HiLink bIncluded	bString
-HiLink bError	Error
-HiLink bStatement	Statement
-HiLink bPreCondit	PreCondit
-HiLink bType		Type
-HiLink bCommentError	bError
-HiLink bCommentString bString
-HiLink bComment2String bString
-HiLink bCommentSkip	bComment
-HiLink bString	String
-HiLink bComment	Comment
-HiLink bSpecial	SpecialChar
-HiLink bTodo		Todo
+hi def link bLabel	Label
+hi def link bUserLabel	Label
+hi def link bConditional	Conditional
+hi def link bRepeat	Repeat
+hi def link bLogic	Special
+hi def link bCharacter	Character
+hi def link bSpecialCharacter bSpecial
+hi def link bNumber	Number
+hi def link bFloat	Float
+hi def link bOctalError	bError
+hi def link bParenError	bError
+" hi def link bInParen	bError
+hi def link bCommentError	bError
+hi def link bBoolean	Identifier
+hi def link bConstant	Identifier
+hi def link bGuard	Identifier
+hi def link bOperator	Operator
+hi def link bKeywords	Operator
+hi def link bOps		Identifier
+hi def link bStructure	Structure
+hi def link bStorageClass	StorageClass
+hi def link bInclude	Include
+hi def link bPreProc	PreProc
+hi def link bDefine	Macro
+hi def link bIncluded	bString
+hi def link bError	Error
+hi def link bStatement	Statement
+hi def link bPreCondit	PreCondit
+hi def link bType		Type
+hi def link bCommentError	bError
+hi def link bCommentString bString
+hi def link bComment2String bString
+hi def link bCommentSkip	bComment
+hi def link bString	String
+hi def link bComment	Comment
+hi def link bSpecial	SpecialChar
+hi def link bTodo		Todo
 "hi link bIdentifier	Identifier
-delcommand HiLink
 
 let b:current_syntax = "b"
 
diff --git a/runtime/syntax/baan.vim b/runtime/syntax/baan.vim
index 917562bcf7..9a42a43918 100644
--- a/runtime/syntax/baan.vim
+++ b/runtime/syntax/baan.vim
@@ -1888,31 +1888,29 @@ syn keyword baanBshell bclm.set.desktop
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink baanConditional	Conditional
-HiLink baan3gl		Statement
-HiLink baan3glpre		PreProc
-HiLink baan4gl		Statement
-HiLink baan4glh		Statement
-HiLink baansql		Statement
-HiLink baansqlh		Statement
-HiLink baanDalHook		Statement
-HiLink baanNumber		Number
-HiLink baanString		String
-HiLink baanOpenStringError	Error
-HiLink baanConstant		Constant
-HiLink baanComment		Comment
-HiLink baanCommenth		Comment
-HiLink baanUncommented	Comment
-HiLink baanDLLUsage		Comment
-HiLink baanFunUsage		Comment
-HiLink baanIdentifier		Normal
-HiLink baanBshell		Function
-HiLink baanType		Type
-HiLink baanStorageClass	StorageClass
+hi def link baanConditional	Conditional
+hi def link baan3gl		Statement
+hi def link baan3glpre		PreProc
+hi def link baan4gl		Statement
+hi def link baan4glh		Statement
+hi def link baansql		Statement
+hi def link baansqlh		Statement
+hi def link baanDalHook		Statement
+hi def link baanNumber		Number
+hi def link baanString		String
+hi def link baanOpenStringError	Error
+hi def link baanConstant		Constant
+hi def link baanComment		Comment
+hi def link baanCommenth		Comment
+hi def link baanUncommented	Comment
+hi def link baanDLLUsage		Comment
+hi def link baanFunUsage		Comment
+hi def link baanIdentifier		Normal
+hi def link baanBshell		Function
+hi def link baanType		Type
+hi def link baanStorageClass	StorageClass
 
-delcommand HiLink
 
 let b:current_syntax = "baan"
 
diff --git a/runtime/syntax/basic.vim b/runtime/syntax/basic.vim
index 6384913e39..488ddc0ec4 100644
--- a/runtime/syntax/basic.vim
+++ b/runtime/syntax/basic.vim
@@ -141,25 +141,23 @@ syn match   basicMathsOperator   "-\|=\|[:<>+\*^/\\]\|AND\|OR"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink basicLabel		Label
-HiLink basicConditional	Conditional
-HiLink basicRepeat		Repeat
-HiLink basicLineNumber	Comment
-HiLink basicNumber		Number
-HiLink basicError		Error
-HiLink basicStatement	Statement
-HiLink basicString		String
-HiLink basicComment		Comment
-HiLink basicSpecial		Special
-HiLink basicTodo		Todo
-HiLink basicFunction		Identifier
-HiLink basicTypeSpecifier Type
-HiLink basicFilenumber basicTypeSpecifier
+hi def link basicLabel		Label
+hi def link basicConditional	Conditional
+hi def link basicRepeat		Repeat
+hi def link basicLineNumber	Comment
+hi def link basicNumber		Number
+hi def link basicError		Error
+hi def link basicStatement	Statement
+hi def link basicString		String
+hi def link basicComment		Comment
+hi def link basicSpecial		Special
+hi def link basicTodo		Todo
+hi def link basicFunction		Identifier
+hi def link basicTypeSpecifier Type
+hi def link basicFilenumber basicTypeSpecifier
 "hi basicMathsOperator term=bold cterm=bold gui=bold
 
-delcommand HiLink
 
 let b:current_syntax = "basic"
 
diff --git a/runtime/syntax/bc.vim b/runtime/syntax/bc.vim
index bf4a62afc9..4cd9d6388a 100644
--- a/runtime/syntax/bc.vim
+++ b/runtime/syntax/bc.vim
@@ -51,18 +51,16 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink bcKeyword		Statement
-HiLink bcType		Type
-HiLink bcConstant		Constant
-HiLink bcNumber		Number
-HiLink bcComment		Comment
-HiLink bcString		String
-HiLink bcSpecialChar		SpecialChar
-HiLink bcParenError		Error
-
-delcommand HiLink
+
+hi def link bcKeyword		Statement
+hi def link bcType		Type
+hi def link bcConstant		Constant
+hi def link bcNumber		Number
+hi def link bcComment		Comment
+hi def link bcString		String
+hi def link bcSpecialChar		SpecialChar
+hi def link bcParenError		Error
+
 
 let b:current_syntax = "bc"
 " vim: ts=8
diff --git a/runtime/syntax/bib.vim b/runtime/syntax/bib.vim
index 24b80b51b7..f96553ec8d 100644
--- a/runtime/syntax/bib.vim
+++ b/runtime/syntax/bib.vim
@@ -101,17 +101,15 @@ syn sync minlines=50
 " =====================
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink bibType	Identifier
-HiLink bibEntryKw	Statement
-HiLink bibNSEntryKw	PreProc
-HiLink bibKey		Special
-HiLink bibVariable	Constant
-HiLink bibUnescapedSpecial	Error
-HiLink bibComment	Comment
-HiLink bibComment2	Comment
-delcommand HiLink
+
+hi def link bibType	Identifier
+hi def link bibEntryKw	Statement
+hi def link bibNSEntryKw	PreProc
+hi def link bibKey		Special
+hi def link bibVariable	Constant
+hi def link bibUnescapedSpecial	Error
+hi def link bibComment	Comment
+hi def link bibComment2	Comment
 
 let b:current_syntax = "bib"
 
diff --git a/runtime/syntax/bindzone.vim b/runtime/syntax/bindzone.vim
index f2372556b1..df3c789d98 100644
--- a/runtime/syntax/bindzone.vim
+++ b/runtime/syntax/bindzone.vim
@@ -68,31 +68,29 @@ syn match       zoneComment     /;.*/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink zoneDirective    Macro
+hi def link zoneDirective    Macro
 
-HiLink zoneUnknown      Error
+hi def link zoneUnknown      Error
 
-HiLink zoneOrigin       Statement
-HiLink zoneOwnerName    Statement
-HiLink zoneDomain       Identifier
+hi def link zoneOrigin       Statement
+hi def link zoneOwnerName    Statement
+hi def link zoneDomain       Identifier
 
-HiLink zoneSpecial      Special
-HiLink zoneTTL          Constant
-HiLink zoneClass        Include
-HiLink zoneRRType       Type
+hi def link zoneSpecial      Special
+hi def link zoneTTL          Constant
+hi def link zoneClass        Include
+hi def link zoneRRType       Type
 
-HiLink zoneIPAddr       Number
-HiLink zoneIP6Addr      Number
-HiLink zoneText         String
-HiLink zoneNumber       Number
-HiLink zoneSerial       Special
+hi def link zoneIPAddr       Number
+hi def link zoneIP6Addr      Number
+hi def link zoneText         String
+hi def link zoneNumber       Number
+hi def link zoneSerial       Special
 
-HiLink zoneErrParen     Error
-HiLink zoneComment      Comment
+hi def link zoneErrParen     Error
+hi def link zoneComment      Comment
 
-delcommand HiLink
 
 let b:current_syntax = "bindzone"
 
diff --git a/runtime/syntax/blank.vim b/runtime/syntax/blank.vim
index 53ef556a9f..6d2e3fd7bd 100644
--- a/runtime/syntax/blank.vim
+++ b/runtime/syntax/blank.vim
@@ -26,13 +26,11 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink blankInstruction      Statement
-HiLink blankNumber	       Number
-HiLink blankString	       String
+hi def link blankInstruction      Statement
+hi def link blankNumber	       Number
+hi def link blankString	       String
 
-delcommand HiLink
 
 let b:current_syntax = "blank"
 
diff --git a/runtime/syntax/bst.vim b/runtime/syntax/bst.vim
index 995f1da464..5ebef16460 100644
--- a/runtime/syntax/bst.vim
+++ b/runtime/syntax/bst.vim
@@ -54,18 +54,16 @@ syn keyword bstField          volume year
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bstComment           Comment
-HiLink bstString            String
-HiLink bstCommand           PreProc
-HiLink bstBuiltIn           Statement
-HiLink bstField             Special
-HiLink bstNumber            Number
-HiLink bstType              Type
-HiLink bstIdentifier        Identifier
-HiLink bstError             Error
-delcommand HiLink
+hi def link bstComment           Comment
+hi def link bstString            String
+hi def link bstCommand           PreProc
+hi def link bstBuiltIn           Statement
+hi def link bstField             Special
+hi def link bstNumber            Number
+hi def link bstType              Type
+hi def link bstIdentifier        Identifier
+hi def link bstError             Error
 
 let b:current_syntax = "bst"
 
diff --git a/runtime/syntax/btm.vim b/runtime/syntax/btm.vim
index 133a51b127..4f9253ff9f 100644
--- a/runtime/syntax/btm.vim
+++ b/runtime/syntax/btm.vim
@@ -182,36 +182,34 @@ syn keyword btmCommand	vscrput y
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink btmLabel		Special
-HiLink btmLabelMark		Special
-HiLink btmCmdDivider		Special
-HiLink btmConditional		btmStatement
-HiLink btmDotBoolOp		btmStatement
-HiLink btmRepeat		btmStatement
-HiLink btmEchoCommand	btmStatement
-HiLink btmEchoParam		btmStatement
-HiLink btmStatement		Statement
-HiLink btmTodo		Todo
-HiLink btmString		String
-HiLink btmNumber		Number
-HiLink btmComment		Comment
-HiLink btmArgument		Identifier
-HiLink btmVariable		Identifier
-HiLink btmEcho		String
-HiLink btmBIFMatch		btmStatement
-HiLink btmBuiltInFunc		btmStatement
-HiLink btmBuiltInVar		btmStatement
-HiLink btmSpecialVar		btmStatement
-HiLink btmCommand		btmStatement
+
+hi def link btmLabel		Special
+hi def link btmLabelMark		Special
+hi def link btmCmdDivider		Special
+hi def link btmConditional		btmStatement
+hi def link btmDotBoolOp		btmStatement
+hi def link btmRepeat		btmStatement
+hi def link btmEchoCommand	btmStatement
+hi def link btmEchoParam		btmStatement
+hi def link btmStatement		Statement
+hi def link btmTodo		Todo
+hi def link btmString		String
+hi def link btmNumber		Number
+hi def link btmComment		Comment
+hi def link btmArgument		Identifier
+hi def link btmVariable		Identifier
+hi def link btmEcho		String
+hi def link btmBIFMatch		btmStatement
+hi def link btmBuiltInFunc		btmStatement
+hi def link btmBuiltInVar		btmStatement
+hi def link btmSpecialVar		btmStatement
+hi def link btmCommand		btmStatement
 
 "optional highlighting
-"HiLink btmShowTab		Error
-"HiLink btmShowTabc		Error
-"hiLink btmIdentifier		Identifier
+"hi def link btmShowTab		Error
+"hi def link btmShowTabc		Error
+"hi def link btmIdentifier		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "btm"
 
diff --git a/runtime/syntax/bzr.vim b/runtime/syntax/bzr.vim
index 11450ba996..43178b8a1a 100644
--- a/runtime/syntax/bzr.vim
+++ b/runtime/syntax/bzr.vim
@@ -38,15 +38,13 @@ syn sync match bzrSync  grouphere bzrRegion "^-\{14} This line and the following
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bzrRemoved    Constant
-HiLink bzrAdded      Identifier
-HiLink bzrModified   Special
-HiLink bzrRenamed    Special
-HiLink bzrUnchanged  Special
-HiLink bzrUnknown    Special
+hi def link bzrRemoved    Constant
+hi def link bzrAdded      Identifier
+hi def link bzrModified   Special
+hi def link bzrRenamed    Special
+hi def link bzrUnchanged  Special
+hi def link bzrUnknown    Special
 
-delcommand HiLink
 
 let b:current_syntax = "bzr"
diff --git a/runtime/syntax/cabal.vim b/runtime/syntax/cabal.vim
index 0ba2704eba..6641294a31 100644
--- a/runtime/syntax/cabal.vim
+++ b/runtime/syntax/cabal.vim
@@ -103,18 +103,16 @@ syn match	cabalStatement	"\cversion"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cabalVersion       Number
-HiLink cabalTruth         Boolean
-HiLink cabalComment       Comment
-HiLink cabalStatement     Statement
-HiLink cabalCategory      Type
-HiLink cabalFunction      Function
-HiLink cabalConditional   Conditional
-HiLink cabalOperator      Operator
-HiLink cabalCompiler      Constant
-delcommand HiLink
+hi def link cabalVersion       Number
+hi def link cabalTruth         Boolean
+hi def link cabalComment       Comment
+hi def link cabalStatement     Statement
+hi def link cabalCategory      Type
+hi def link cabalFunction      Function
+hi def link cabalConditional   Conditional
+hi def link cabalOperator      Operator
+hi def link cabalCompiler      Constant
 
 let b:current_syntax = "cabal"
 
diff --git a/runtime/syntax/cf.vim b/runtime/syntax/cf.vim
index 63d976d9ce..6310bc3bde 100644
--- a/runtime/syntax/cf.vim
+++ b/runtime/syntax/cf.vim
@@ -379,61 +379,58 @@ syn region	cfqueryTag	contained start=+<cfquery+ end=+>+ keepend contains=cfTagN
 syn region	cfSqlregion	start=+<cfquery\_[^>]*>+ keepend end=+</cfquery>+me=s-1 matchgroup=NONE contains=@cfSql,cfComment,@htmlTagNameCluster,cfqueryTag,cfHashRegion
 
 " Define the highlighting.
-command -nargs=+ CfHiLink hi def link <args>
 
 if exists("d_noinclude_html")
   " The default html-style highlighting copied from html.vim.
-  CfHiLink htmlTag		Function
-  CfHiLink htmlEndTag		Identifier
-  CfHiLink htmlArg		Type
-  CfHiLink htmlTagName		htmlStatement
-  CfHiLink htmlValue		String
-  CfHiLink htmlPreProc		PreProc
-  CfHiLink htmlString		String
-  CfHiLink htmlStatement	Statement
-  CfHiLink htmlValue		String
-  CfHiLink htmlTagError		htmlError
-  CfHiLink htmlError		Error
+  hi def link htmlTag		Function
+  hi def link htmlEndTag		Identifier
+  hi def link htmlArg		Type
+  hi def link htmlTagName		htmlStatement
+  hi def link htmlValue		String
+  hi def link htmlPreProc		PreProc
+  hi def link htmlString		String
+  hi def link htmlStatement	Statement
+  hi def link htmlValue		String
+  hi def link htmlTagError		htmlError
+  hi def link htmlError		Error
 endif
 
-CfHiLink cfTagName		Statement
-CfHiLink cfCustomTagName	Statement
-CfHiLink cfArg			Type
-CfHiLink cfFunctionName		Function
-CfHiLink cfHashRegion		PreProc
-CfHiLink cfComment		Comment
-CfHiLink cfCommentTodo		Todo
-CfHiLink cfOperator		Operator
-CfHiLink cfOperatorMatch	Operator
-CfHiLink cfScope		Title
-CfHiLink cfBool			Constant
-
-CfHiLink cfscriptBlock		Special
-CfHiLink cfscriptTag		htmlTag
-CfHiLink cfSetRegion		PreProc
-CfHiLink cfSetLHSRegion		htmlTag
-CfHiLink cfSetTagEnd		htmlTag
-
-CfHiLink cfScriptLineComment	Comment
-CfHiLink cfScriptComment	Comment
-CfHiLink cfScriptStringS	String
-CfHiLink cfScriptStringD	String
-CfHiLink cfScriptNumber		cfScriptValue
-CfHiLink cfScriptConditional	Conditional
-CfHiLink cfScriptRepeat		Repeat
-CfHiLink cfScriptBranch		Conditional
-CfHiLink cfScriptSpecial	Type
-CfHiLink cfScriptStatement	Statement
-CfHiLink cfScriptBraces		Function
-CfHiLink cfScriptKeyword	Function
-CfHiLink cfScriptError		Error
-CfHiLink cfDeprecatedTag	Error
-CfHiLink cfDeprecatedFunction	Error
-CfHiLink cfScrParenError	cfScriptError
-
-CfHiLink cfqueryTag		htmlTag
-
-delcommand CfHiLink
+hi def link cfTagName		Statement
+hi def link cfCustomTagName	Statement
+hi def link cfArg			Type
+hi def link cfFunctionName		Function
+hi def link cfHashRegion		PreProc
+hi def link cfComment		Comment
+hi def link cfCommentTodo		Todo
+hi def link cfOperator		Operator
+hi def link cfOperatorMatch	Operator
+hi def link cfScope		Title
+hi def link cfBool			Constant
+
+hi def link cfscriptBlock		Special
+hi def link cfscriptTag		htmlTag
+hi def link cfSetRegion		PreProc
+hi def link cfSetLHSRegion		htmlTag
+hi def link cfSetTagEnd		htmlTag
+
+hi def link cfScriptLineComment	Comment
+hi def link cfScriptComment	Comment
+hi def link cfScriptStringS	String
+hi def link cfScriptStringD	String
+hi def link cfScriptNumber		cfScriptValue
+hi def link cfScriptConditional	Conditional
+hi def link cfScriptRepeat		Repeat
+hi def link cfScriptBranch		Conditional
+hi def link cfScriptSpecial	Type
+hi def link cfScriptStatement	Statement
+hi def link cfScriptBraces		Function
+hi def link cfScriptKeyword	Function
+hi def link cfScriptError		Error
+hi def link cfDeprecatedTag	Error
+hi def link cfDeprecatedFunction	Error
+hi def link cfScrParenError	cfScriptError
+
+hi def link cfqueryTag		htmlTag
 
 let b:current_syntax = "cf"
 
diff --git a/runtime/syntax/cfg.vim b/runtime/syntax/cfg.vim
index c57b6f8711..a50297d418 100644
--- a/runtime/syntax/cfg.vim
+++ b/runtime/syntax/cfg.vim
@@ -34,17 +34,15 @@ syn match  CfgComment	"\/\/.*"
 
 " Define the default hightlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink CfgOnOff     Label
-HiLink CfgComment	Comment
-HiLink CfgSection	Type
-HiLink CfgString	String
-HiLink CfgParams    Keyword
-HiLink CfgValues    Constant
-HiLink CfgDirectory Directory
-HiLink UncPath      Directory
-
-delcommand HiLink
+hi def link CfgOnOff     Label
+hi def link CfgComment	Comment
+hi def link CfgSection	Type
+hi def link CfgString	String
+hi def link CfgParams    Keyword
+hi def link CfgValues    Constant
+hi def link CfgDirectory Directory
+hi def link UncPath      Directory
+
 
 let b:current_syntax = "cfg"
 " vim:ts=8
diff --git a/runtime/syntax/ch.vim b/runtime/syntax/ch.vim
index 05a1fcbdd6..61f475bc99 100644
--- a/runtime/syntax/ch.vim
+++ b/runtime/syntax/ch.vim
@@ -26,14 +26,12 @@ syn keyword	chStructure	class
 syn keyword	chType		string_t array
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
-
-HiLink chAccess		chStatement
-HiLink chExceptions		Exception
-HiLink chStatement		Statement
-HiLink chType			Type
-HiLink chStructure		Structure
-delcommand HiLink
+
+hi def link chAccess		chStatement
+hi def link chExceptions		Exception
+hi def link chStatement		Statement
+hi def link chType			Type
+hi def link chStructure		Structure
 
 let b:current_syntax = "ch"
 
diff --git a/runtime/syntax/change.vim b/runtime/syntax/change.vim
index ae90f348bf..a92767e903 100644
--- a/runtime/syntax/change.vim
+++ b/runtime/syntax/change.vim
@@ -19,12 +19,10 @@ syn region changeToMaterial start="^@y.*$"ms=e+1 end="^@z.*$"me=s-1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink changeFromMaterial String
-HiLink changeToMaterial Statement
+hi def link changeFromMaterial String
+hi def link changeToMaterial Statement
 
-delcommand HiLink
 
 let b:current_syntax = "change"
 
diff --git a/runtime/syntax/changelog.vim b/runtime/syntax/changelog.vim
index fc55fb528f..cf9021ef05 100644
--- a/runtime/syntax/changelog.vim
+++ b/runtime/syntax/changelog.vim
@@ -39,21 +39,19 @@ syn match	changelogNumber	contained "[.-]*[0-9]\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink changelogText		Normal
-HiLink changelogBullet	Type
-HiLink changelogColon		Type
-HiLink changelogFiles		Comment
-HiLink changelogFuncs	Comment
-HiLink changelogHeader	Statement
-HiLink changelogMail		Special
-HiLink changelogNumber	Number
-HiLink changelogMonth		Number
-HiLink changelogDay		Number
-HiLink changelogError		Folded
-
-delcommand HiLink
+
+hi def link changelogText		Normal
+hi def link changelogBullet	Type
+hi def link changelogColon		Type
+hi def link changelogFiles		Comment
+hi def link changelogFuncs	Comment
+hi def link changelogHeader	Statement
+hi def link changelogMail		Special
+hi def link changelogNumber	Number
+hi def link changelogMonth		Number
+hi def link changelogDay		Number
+hi def link changelogError		Folded
+
 
 let b:current_syntax = "changelog"
 
diff --git a/runtime/syntax/cheetah.vim b/runtime/syntax/cheetah.vim
index c1860def3c..9567ecbbca 100644
--- a/runtime/syntax/cheetah.vim
+++ b/runtime/syntax/cheetah.vim
@@ -34,16 +34,14 @@ syn region  cheetahMultiLineComment start="#\*" end="\*#"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cheetahPlaceHolder Identifier
-HiLink cheetahDirective PreCondit
-HiLink cheetahKeyword Define
-HiLink cheetahContinuation Special
-HiLink cheetahComment Comment
-HiLink cheetahMultiLineComment Comment
+hi def link cheetahPlaceHolder Identifier
+hi def link cheetahDirective PreCondit
+hi def link cheetahKeyword Define
+hi def link cheetahContinuation Special
+hi def link cheetahComment Comment
+hi def link cheetahMultiLineComment Comment
 
-delcommand HiLink
 
 let b:current_syntax = "cheetah"
 
diff --git a/runtime/syntax/chill.vim b/runtime/syntax/chill.vim
index 6ccb32c4c3..b95df68bc8 100644
--- a/runtime/syntax/chill.vim
+++ b/runtime/syntax/chill.vim
@@ -122,58 +122,56 @@ exec "syn sync ccomment chillComment minlines=" . chill_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink chillLabel	Label
-HiLink chillUserLabel	Label
-HiLink chillConditional	Conditional
-" hi chillConditional	term=bold ctermfg=red guifg=red gui=bold
-
-HiLink chillRepeat	Repeat
-HiLink chillProcess	Repeat
-HiLink chillSignal	Repeat
-HiLink chillCharacter	Character
-HiLink chillSpecialCharacter chillSpecial
-HiLink chillNumber	Number
-HiLink chillFloat	Float
-HiLink chillOctalError	chillError
-HiLink chillParenError	chillError
-HiLink chillInParen	chillError
-HiLink chillCommentError	chillError
-HiLink chillSpaceError	chillError
-HiLink chillOperator	Operator
-HiLink chillStructure	Structure
-HiLink chillBlock	Operator
-HiLink chillScope	Operator
-"hi chillEDML     term=underline ctermfg=DarkRed guifg=Red
-HiLink chillEDML	PreProc
-"hi chillBoolConst	term=bold ctermfg=brown guifg=brown
-HiLink chillBoolConst	Constant
-"hi chillLogical	term=bold ctermfg=brown guifg=brown
-HiLink chillLogical	Constant
-HiLink chillStorageClass	StorageClass
-HiLink chillInclude	Include
-HiLink chillPreProc	PreProc
-HiLink chillDefine	Macro
-HiLink chillIncluded	chillString
-HiLink chillError	Error
-HiLink chillStatement	Statement
-HiLink chillPreCondit	PreCondit
-HiLink chillType	Type
-HiLink chillCommentError	chillError
-HiLink chillCommentString chillString
-HiLink chillComment2String chillString
-HiLink chillCommentSkip	chillComment
-HiLink chillString	String
-HiLink chillComment	Comment
-" hi chillComment	term=None ctermfg=lightblue guifg=lightblue
-HiLink chillSpecial	SpecialChar
-HiLink chillTodo	Todo
-HiLink chillBlock	Statement
-"HiLink chillIdentifier	Identifier
-HiLink chillBracket	Delimiter
-
-delcommand HiLink
+
+hi def link chillLabel	Label
+hi def link chillUserLabel	Label
+hi def link chillConditional	Conditional
+" hi def link chillConditional	term=bold ctermfg=red guifg=red gui=bold
+
+hi def link chillRepeat	Repeat
+hi def link chillProcess	Repeat
+hi def link chillSignal	Repeat
+hi def link chillCharacter	Character
+hi def link chillSpecialCharacter chillSpecial
+hi def link chillNumber	Number
+hi def link chillFloat	Float
+hi def link chillOctalError	chillError
+hi def link chillParenError	chillError
+hi def link chillInParen	chillError
+hi def link chillCommentError	chillError
+hi def link chillSpaceError	chillError
+hi def link chillOperator	Operator
+hi def link chillStructure	Structure
+hi def link chillBlock	Operator
+hi def link chillScope	Operator
+"hi def link chillEDML     term=underline ctermfg=DarkRed guifg=Red
+hi def link chillEDML	PreProc
+"hi def link chillBoolConst	term=bold ctermfg=brown guifg=brown
+hi def link chillBoolConst	Constant
+"hi def link chillLogical	term=bold ctermfg=brown guifg=brown
+hi def link chillLogical	Constant
+hi def link chillStorageClass	StorageClass
+hi def link chillInclude	Include
+hi def link chillPreProc	PreProc
+hi def link chillDefine	Macro
+hi def link chillIncluded	chillString
+hi def link chillError	Error
+hi def link chillStatement	Statement
+hi def link chillPreCondit	PreCondit
+hi def link chillType	Type
+hi def link chillCommentError	chillError
+hi def link chillCommentString chillString
+hi def link chillComment2String chillString
+hi def link chillCommentSkip	chillComment
+hi def link chillString	String
+hi def link chillComment	Comment
+" hi def link chillComment	term=None ctermfg=lightblue guifg=lightblue
+hi def link chillSpecial	SpecialChar
+hi def link chillTodo	Todo
+hi def link chillBlock	Statement
+"hi def link chillIdentifier	Identifier
+hi def link chillBracket	Delimiter
+
 
 let b:current_syntax = "chill"
 
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
index 057d005cae..b765682547 100644
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -69,31 +69,29 @@ syn keyword	clStatement	clear clear_eol clear_eos close copy create unique with
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink clifError	Error
-HiLink clSpaceError	Error
-HiLink clWhile		Repeat
-HiLink clConditional	Conditional
-HiLink clDebug		Debug
-HiLink clNeedsWork	Todo
-HiLink clTodo		Todo
-HiLink clComment	Comment
-HiLink clProcedure	Procedure
-HiLink clBreak		Procedure
-HiLink clInclude	Include
-HiLink clSetOption	Statement
-HiLink clSet		Identifier
-HiLink clPreProc	PreProc
-HiLink clOperator	Operator
-HiLink clNumber		Number
-HiLink clString		String
-HiLink clQuote		Delimiter
-HiLink clReserved	Identifier
-HiLink clFunction	Function
-HiLink clStatement	Statement
-
-delcommand HiLink
+
+hi def link clifError	Error
+hi def link clSpaceError	Error
+hi def link clWhile		Repeat
+hi def link clConditional	Conditional
+hi def link clDebug		Debug
+hi def link clNeedsWork	Todo
+hi def link clTodo		Todo
+hi def link clComment	Comment
+hi def link clProcedure	Procedure
+hi def link clBreak		Procedure
+hi def link clInclude	Include
+hi def link clSetOption	Statement
+hi def link clSet		Identifier
+hi def link clPreProc	PreProc
+hi def link clOperator	Operator
+hi def link clNumber		Number
+hi def link clString		String
+hi def link clQuote		Delimiter
+hi def link clReserved	Identifier
+hi def link clFunction	Function
+hi def link clStatement	Statement
+
 
 let b:current_syntax = "cl"
 
diff --git a/runtime/syntax/clean.vim b/runtime/syntax/clean.vim
index 13ddfaba3c..70bf654fb7 100644
--- a/runtime/syntax/clean.vim
+++ b/runtime/syntax/clean.vim
@@ -50,40 +50,38 @@ syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)\s*\(in
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
  " Comments
- HiLink cleanComment      Comment
+ hi def link cleanComment      Comment
  " Constants and denotations
- HiLink cleanStringDenot  String
- HiLink cleanCharDenot    Character
- HiLink cleanIntegerDenot Number
- HiLink cleanBoolDenot    Boolean
- HiLink cleanRealDenot    Float
+ hi def link cleanStringDenot  String
+ hi def link cleanCharDenot    Character
+ hi def link cleanIntegerDenot Number
+ hi def link cleanBoolDenot    Boolean
+ hi def link cleanRealDenot    Float
  " Identifiers
  " Statements
- HiLink cleanTypeClass    Keyword
- HiLink cleanConditional  Conditional
- HiLink cleanLabel		Label
- HiLink cleanKeyword      Keyword
+ hi def link cleanTypeClass    Keyword
+ hi def link cleanConditional  Conditional
+ hi def link cleanLabel		Label
+ hi def link cleanKeyword      Keyword
  " Generic Preprocessing
- HiLink cleanIncludeKeyword      Include
- HiLink cleanModuleSystem PreProc
+ hi def link cleanIncludeKeyword      Include
+ hi def link cleanModuleSystem PreProc
  " Type
- HiLink cleanBasicType    Type
- HiLink cleanSpecialType  Type
- HiLink cleanFuncTypeDef  Typedef
+ hi def link cleanBasicType    Type
+ hi def link cleanSpecialType  Type
+ hi def link cleanFuncTypeDef  Typedef
  " Special
- HiLink cleanSpecial      Special
- HiLink cleanList			Special
- HiLink cleanArray		Special
- HiLink cleanRecord		Special
- HiLink cleanTuple		Special
+ hi def link cleanSpecial      Special
+ hi def link cleanList			Special
+ hi def link cleanArray		Special
+ hi def link cleanRecord		Special
+ hi def link cleanTuple		Special
  " Error
  " Todo
- HiLink cleanTodo         Todo
+ hi def link cleanTodo         Todo
 
-delcommand HiLink
 
 let b:current_syntax = "clean"
 
diff --git a/runtime/syntax/clipper.vim b/runtime/syntax/clipper.vim
index 4eb7db2f7a..38ba9a4fe9 100644
--- a/runtime/syntax/clipper.vim
+++ b/runtime/syntax/clipper.vim
@@ -112,23 +112,21 @@ syntax match clipperComment		"^\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink clipperConditional		Conditional
-HiLink clipperRepeat			Repeat
-HiLink clipperNumber			Number
-HiLink clipperInclude		Include
-HiLink clipperComment		Comment
-HiLink clipperOperator		Operator
-HiLink clipperStorageClass		StorageClass
-HiLink clipperStatement		Statement
-HiLink clipperString			String
-HiLink clipperFunction		Function
-HiLink clipperLineContinuation	Special
-HiLink clipperDelimiters		Delimiter
-HiLink clipperUserVariable		Identifier
-
-delcommand HiLink
+
+hi def link clipperConditional		Conditional
+hi def link clipperRepeat			Repeat
+hi def link clipperNumber			Number
+hi def link clipperInclude		Include
+hi def link clipperComment		Comment
+hi def link clipperOperator		Operator
+hi def link clipperStorageClass		StorageClass
+hi def link clipperStatement		Statement
+hi def link clipperString			String
+hi def link clipperFunction		Function
+hi def link clipperLineContinuation	Special
+hi def link clipperDelimiters		Delimiter
+hi def link clipperUserVariable		Identifier
+
 
 let b:current_syntax = "clipper"
 
diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
index 8e73e329e0..4cc21da8fe 100644
--- a/runtime/syntax/cmake.vim
+++ b/runtime/syntax/cmake.vim
@@ -50,23 +50,21 @@ syn keyword cmakeTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cmakeStatement Statement
-HiLink cmakeComment Comment
-HiLink cmakeString String
-HiLink cmakeVariableValue Type
-HiLink cmakeRegistry Underlined
-HiLink cmakeArguments Identifier
-HiLink cmakeArgument Constant
-HiLink cmakeEnvironment Special
-HiLink cmakeOperators Operator
-HiLink cmakeMacro PreProc
-HiLink cmakeError Error
-HiLink cmakeTodo TODO
-HiLink cmakeEscaped Special
+hi def link cmakeStatement Statement
+hi def link cmakeComment Comment
+hi def link cmakeString String
+hi def link cmakeVariableValue Type
+hi def link cmakeRegistry Underlined
+hi def link cmakeArguments Identifier
+hi def link cmakeArgument Constant
+hi def link cmakeEnvironment Special
+hi def link cmakeOperators Operator
+hi def link cmakeMacro PreProc
+hi def link cmakeError Error
+hi def link cmakeTodo TODO
+hi def link cmakeEscaped Special
 
-delcommand HiLink
 
 let b:current_syntax = "cmake"
 
diff --git a/runtime/syntax/cobol.vim b/runtime/syntax/cobol.vim
index a63e8b3873..2d481bba0b 100644
--- a/runtime/syntax/cobol.vim
+++ b/runtime/syntax/cobol.vim
@@ -151,43 +151,41 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cobolBAD      Error
-HiLink cobolBadID    Error
-HiLink cobolBadLine  Error
+hi def link cobolBAD      Error
+hi def link cobolBadID    Error
+hi def link cobolBadLine  Error
 if exists("g:cobol_legacy_code")
-    HiLink cobolMarker   Comment
+    hi def link cobolMarker   Comment
 else
-    HiLink cobolMarker   Error
+    hi def link cobolMarker   Error
 endif
-HiLink cobolCALLs    Function
-HiLink cobolComment  Comment
-HiLink cobolKeys     Comment
-HiLink cobolAreaB    Special
-HiLink cobolCompiler PreProc
-HiLink cobolCondFlow Special
-HiLink cobolCopy     PreProc
-HiLink cobolDeclA    cobolDecl
-HiLink cobolDecl     Type
-HiLink cobolExtras   Special
-HiLink cobolGoTo     Special
-HiLink cobolConstant Constant
-HiLink cobolNumber   Constant
-HiLink cobolPic      Constant
-HiLink cobolReserved Statement
-HiLink cobolDivision Label
-HiLink cobolSection  Label
-HiLink cobolParagraph Label
-HiLink cobolDivisionName  Keyword
-HiLink cobolSectionName   Keyword
-HiLink cobolParagraphName Keyword
-HiLink cobolString   Constant
-HiLink cobolTodo     Todo
-HiLink cobolWatch    Special
-HiLink cobolIndicator Special
-
-delcommand HiLink
+hi def link cobolCALLs    Function
+hi def link cobolComment  Comment
+hi def link cobolKeys     Comment
+hi def link cobolAreaB    Special
+hi def link cobolCompiler PreProc
+hi def link cobolCondFlow Special
+hi def link cobolCopy     PreProc
+hi def link cobolDeclA    cobolDecl
+hi def link cobolDecl     Type
+hi def link cobolExtras   Special
+hi def link cobolGoTo     Special
+hi def link cobolConstant Constant
+hi def link cobolNumber   Constant
+hi def link cobolPic      Constant
+hi def link cobolReserved Statement
+hi def link cobolDivision Label
+hi def link cobolSection  Label
+hi def link cobolParagraph Label
+hi def link cobolDivisionName  Keyword
+hi def link cobolSectionName   Keyword
+hi def link cobolParagraphName Keyword
+hi def link cobolString   Constant
+hi def link cobolTodo     Todo
+hi def link cobolWatch    Special
+hi def link cobolIndicator Special
+
 
 let b:current_syntax = "cobol"
 
diff --git a/runtime/syntax/config.vim b/runtime/syntax/config.vim
index 1bb5c2f3e9..c6d4e6b363 100644
--- a/runtime/syntax/config.vim
+++ b/runtime/syntax/config.vim
@@ -35,19 +35,17 @@ syn region  configstring matchgroup=configfunction start="AC_MSG_[A-Z]*\ze([^[]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink configdelimiter Delimiter
-HiLink configoperator  Operator
-HiLink configcomment   Comment
-HiLink configDnl  	 Comment
-HiLink configfunction  Function
-HiLink confignumber    Number
-HiLink configkeyword   Keyword
-HiLink configspecial   Special
-HiLink configstring    String
-
-delcommand HiLink
+
+hi def link configdelimiter Delimiter
+hi def link configoperator  Operator
+hi def link configcomment   Comment
+hi def link configDnl  	 Comment
+hi def link configfunction  Function
+hi def link confignumber    Number
+hi def link configkeyword   Keyword
+hi def link configspecial   Special
+hi def link configstring    String
+
 
 let b:current_syntax = "config"
 
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index be7381ea6a..d669206b3e 100644
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -53,22 +53,20 @@ endif
 syn match cppMinMax "[<>]?"
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
-HiLink cppAccess		cppStatement
-HiLink cppCast		cppStatement
-HiLink cppExceptions		Exception
-HiLink cppOperator		Operator
-HiLink cppStatement		Statement
-HiLink cppModifier		Type
-HiLink cppType		Type
-HiLink cppStorageClass	StorageClass
-HiLink cppStructure		Structure
-HiLink cppBoolean		Boolean
-HiLink cppConstant		Constant
-HiLink cppRawStringDelimiter	Delimiter
-HiLink cppRawString		String
-HiLink cppNumber		Number
-delcommand HiLink
+hi def link cppAccess		cppStatement
+hi def link cppCast		cppStatement
+hi def link cppExceptions		Exception
+hi def link cppOperator		Operator
+hi def link cppStatement		Statement
+hi def link cppModifier		Type
+hi def link cppType		Type
+hi def link cppStorageClass	StorageClass
+hi def link cppStructure		Structure
+hi def link cppBoolean		Boolean
+hi def link cppConstant		Constant
+hi def link cppRawStringDelimiter	Delimiter
+hi def link cppRawString		String
+hi def link cppNumber		Number
 
 let b:current_syntax = "cpp"
 
diff --git a/runtime/syntax/crontab.vim b/runtime/syntax/crontab.vim
index ed20254925..5e38ffaafe 100644
--- a/runtime/syntax/crontab.vim
+++ b/runtime/syntax/crontab.vim
@@ -37,32 +37,30 @@ syntax match crontabPercent "[^\\]%.*"lc=1 contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink crontabMin		Number
-HiLink crontabHr		PreProc
-HiLink crontabDay		Type
+hi def link crontabMin		Number
+hi def link crontabHr		PreProc
+hi def link crontabDay		Type
 
-HiLink crontabMnth		Number
-HiLink crontabMnth12		Number
-HiLink crontabMnthS		Number
-HiLink crontabMnthN		Number
+hi def link crontabMnth		Number
+hi def link crontabMnth12		Number
+hi def link crontabMnthS		Number
+hi def link crontabMnthN		Number
 
-HiLink crontabDow		PreProc
-HiLink crontabDow7		PreProc
-HiLink crontabDowS		PreProc
-HiLink crontabDowN		PreProc
+hi def link crontabDow		PreProc
+hi def link crontabDow7		PreProc
+hi def link crontabDowS		PreProc
+hi def link crontabDowN		PreProc
 
-HiLink crontabNick		Special
-HiLink crontabVar		Identifier
-HiLink crontabPercent		Special
+hi def link crontabNick		Special
+hi def link crontabVar		Identifier
+hi def link crontabPercent		Special
 
 " comment out next line for to suppress unix commands coloring.
-HiLink crontabCmd		Statement
+hi def link crontabCmd		Statement
 
-HiLink crontabCmnt		Comment
+hi def link crontabCmnt		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "crontab"
 
diff --git a/runtime/syntax/csc.vim b/runtime/syntax/csc.vim
index f4ce62c876..6e5d8b9f37 100644
--- a/runtime/syntax/csc.vim
+++ b/runtime/syntax/csc.vim
@@ -156,35 +156,33 @@ exec "sy sync ccomment cscComment minlines=" . csc_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi cscVarName term=bold ctermfg=9 gui=bold guifg=blue
 
-HiLink	cscNumber	Number
-HiLink	cscOctal	Number
-HiLink	cscFloat	Float
-HiLink	cscParenE	Error
-HiLink	cscCommentE	Error
-HiLink	cscSpaceE	Error
-HiLink	cscError	Error
-HiLink	cscString	String
-HiLink	cscComment	Comment
-HiLink	cscTodo		Todo
-HiLink	cscStatement	Statement
-HiLink	cscIfError	Error
-HiLink	cscEqError	Error
-HiLink	cscFunction	Statement
-HiLink	cscCondition	Statement
-HiLink	cscWarn		WarningMsg
-
-HiLink	cscComE	Error
-HiLink	cscCom	Statement
-HiLink	cscComW	WarningMsg
-
-HiLink	cscBPMacro	Identifier
-HiLink	cscBPW		WarningMsg
-
-delcommand HiLink
+hi def link cscNumber	Number
+hi def link cscOctal	Number
+hi def link cscFloat	Float
+hi def link cscParenE	Error
+hi def link cscCommentE	Error
+hi def link cscSpaceE	Error
+hi def link cscError	Error
+hi def link cscString	String
+hi def link cscComment	Comment
+hi def link cscTodo		Todo
+hi def link cscStatement	Statement
+hi def link cscIfError	Error
+hi def link cscEqError	Error
+hi def link cscFunction	Statement
+hi def link cscCondition	Statement
+hi def link cscWarn		WarningMsg
+
+hi def link cscComE	Error
+hi def link cscCom	Statement
+hi def link cscComW	WarningMsg
+
+hi def link cscBPMacro	Identifier
+hi def link cscBPW		WarningMsg
+
 
 let b:current_syntax = "csc"
 
diff --git a/runtime/syntax/csh.vim b/runtime/syntax/csh.vim
index 973a3550dc..c134aa7ef3 100644
--- a/runtime/syntax/csh.vim
+++ b/runtime/syntax/csh.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	C-shell (csh)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	11
+" Last Change:	Aug 31, 2016
+" Version:	13
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_CSH
 
 " quit when a syntax file was already loaded
@@ -100,44 +100,43 @@ syn match cshNumber	"-\=\<\d\+\>"
 syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**\z(\h\w*\)\**" matchgroup=cshRedir end="^\z1$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink cshArgv		cshVariables
-HiLink cshBckQuote	cshCommand
-HiLink cshDblQuote	cshString
-HiLink cshExtVar	cshVariables
-HiLink cshHereDoc	cshString
-HiLink cshNoEndlineBQ	cshNoEndline
-HiLink cshNoEndlineDQ	cshNoEndline
-HiLink cshNoEndlineSQ	cshNoEndline
-HiLink cshQtyWord	cshVariables
-HiLink cshRedir		cshOperator
-HiLink cshSelector	cshVariables
-HiLink cshSetStmt	cshStatement
-HiLink cshSetVariables	cshVariables
-HiLink cshSnglQuote	cshString
-HiLink cshSubst		cshVariables
-
-HiLink cshCommand	Statement
-HiLink cshComment	Comment
-HiLink cshConditional	Conditional
-HiLink cshIdentifier	Error
-HiLink cshModifier	Special
-HiLink cshNoEndline	Error
-HiLink cshNumber	Number
-HiLink cshOperator	Operator
-HiLink cshRedir		Statement
-HiLink cshRepeat	Repeat
-HiLink cshShellVariables	Special
-HiLink cshSpecial	Special
-HiLink cshStatement	Statement
-HiLink cshString	String
-HiLink cshSubstError	Error
-HiLink cshTodo		Todo
-HiLink cshVariables	Type
-
-delcommand HiLink
+if !exists("skip_csh_syntax_inits")
+
+  hi def link cshArgv		cshVariables
+  hi def link cshBckQuote	cshCommand
+  hi def link cshDblQuote	cshString
+  hi def link cshExtVar	cshVariables
+  hi def link cshHereDoc	cshString
+  hi def link cshNoEndlineBQ	cshNoEndline
+  hi def link cshNoEndlineDQ	cshNoEndline
+  hi def link cshNoEndlineSQ	cshNoEndline
+  hi def link cshQtyWord	cshVariables
+  hi def link cshRedir		cshOperator
+  hi def link cshSelector	cshVariables
+  hi def link cshSetStmt	cshStatement
+  hi def link cshSetVariables	cshVariables
+  hi def link cshSnglQuote	cshString
+  hi def link cshSubst		cshVariables
+
+  hi def link cshCommand	Statement
+  hi def link cshComment	Comment
+  hi def link cshConditional	Conditional
+  hi def link cshIdentifier	Error
+  hi def link cshModifier	Special
+  hi def link cshNoEndline	Error
+  hi def link cshNumber	Number
+  hi def link cshOperator	Operator
+  hi def link cshRedir		Statement
+  hi def link cshRepeat	Repeat
+  hi def link cshShellVariables	Special
+  hi def link cshSpecial	Special
+  hi def link cshStatement	Statement
+  hi def link cshString	String
+  hi def link cshSubstError	Error
+  hi def link cshTodo		Todo
+  hi def link cshVariables	Type
+
+endif
 
 let b:current_syntax = "csh"
 
diff --git a/runtime/syntax/csp.vim b/runtime/syntax/csp.vim
index a5460cddbb..8001b1fe7e 100644
--- a/runtime/syntax/csp.vim
+++ b/runtime/syntax/csp.vim
@@ -147,37 +147,35 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " (For vim version <=5.7, the command groups are defined in
 " $VIMRUNTIME/syntax/synload.vim )
-HiLink cspComment			Comment
-HiLink cspNumber			Number
-HiLink cspConditional			Conditional
-HiLink cspOperator			Delimiter
-HiLink cspKeyword			Keyword
-HiLink cspReserved			SpecialChar
-HiLink cspInclude			Error
-HiLink cspIncludeKeyword		Include
-HiLink cspIncludeArg			Include
-HiLink cspAssert			PreCondit
-HiLink cspType			Type
-HiLink cspProcess			Function
-HiLink cspTodo			Todo
-HiLink cspOldRttComment		Define
-HiLink cspRttPragmaKeyword		Define
-HiLink cspSdlRttComment		Define
-HiLink cspRttPragmaArg		Define
-HiLink cspRttPragmaSdlArg		Define
-HiLink cspRttPragmaSdlName		Default
-HiLink cspRttPragmaSdlTailArg		Define
-HiLink cspRttPragmaSdlTransName	Default
-HiLink cspRttPragmaSdlTransTailArg	Define
-HiLink cspReservedIdentifier	Error
+hi def link cspComment			Comment
+hi def link cspNumber			Number
+hi def link cspConditional			Conditional
+hi def link cspOperator			Delimiter
+hi def link cspKeyword			Keyword
+hi def link cspReserved			SpecialChar
+hi def link cspInclude			Error
+hi def link cspIncludeKeyword		Include
+hi def link cspIncludeArg			Include
+hi def link cspAssert			PreCondit
+hi def link cspType			Type
+hi def link cspProcess			Function
+hi def link cspTodo			Todo
+hi def link cspOldRttComment		Define
+hi def link cspRttPragmaKeyword		Define
+hi def link cspSdlRttComment		Define
+hi def link cspRttPragmaArg		Define
+hi def link cspRttPragmaSdlArg		Define
+hi def link cspRttPragmaSdlName		Default
+hi def link cspRttPragmaSdlTailArg		Define
+hi def link cspRttPragmaSdlTransName	Default
+hi def link cspRttPragmaSdlTransTailArg	Define
+hi def link cspReservedIdentifier	Error
 " (Currently unused vim method: Debug)
 
-delcommand HiLink
 
 let b:current_syntax = "csp"
 
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index e8c2c85318..3dc3f5c2d6 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -514,130 +514,128 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink cssComment Comment
-HiLink cssVendor Comment
-HiLink cssHacks Comment
-HiLink cssTagName Statement
-HiLink cssDeprecated Error
-HiLink cssSelectorOp Special
-HiLink cssSelectorOp2 Special
-HiLink cssAttrComma Special
-
-HiLink cssAnimationProp cssProp
-HiLink cssBackgroundProp cssProp
-HiLink cssBorderProp cssProp
-HiLink cssBoxProp cssProp
-HiLink cssColorProp cssProp
-HiLink cssContentForPagedMediaProp cssProp
-HiLink cssDimensionProp cssProp
-HiLink cssFlexibleBoxProp cssProp
-HiLink cssFontProp cssProp
-HiLink cssGeneratedContentProp cssProp
-HiLink cssGridProp cssProp
-HiLink cssHyerlinkProp cssProp
-HiLink cssLineboxProp cssProp
-HiLink cssListProp cssProp
-HiLink cssMarqueeProp cssProp
-HiLink cssMultiColumnProp cssProp
-HiLink cssPagedMediaProp cssProp
-HiLink cssPositioningProp cssProp
-HiLink cssPrintProp cssProp
-HiLink cssRubyProp cssProp
-HiLink cssSpeechProp cssProp
-HiLink cssTableProp cssProp
-HiLink cssTextProp cssProp
-HiLink cssTransformProp cssProp
-HiLink cssTransitionProp cssProp
-HiLink cssUIProp cssProp
-HiLink cssIEUIProp cssProp
-HiLink cssAuralProp cssProp
-HiLink cssRenderProp cssProp
-HiLink cssMobileTextProp cssProp
-
-HiLink cssAnimationAttr cssAttr
-HiLink cssBackgroundAttr cssAttr
-HiLink cssBorderAttr cssAttr
-HiLink cssBoxAttr cssAttr
-HiLink cssContentForPagedMediaAttr cssAttr
-HiLink cssDimensionAttr cssAttr
-HiLink cssFlexibleBoxAttr cssAttr
-HiLink cssFontAttr cssAttr
-HiLink cssGeneratedContentAttr cssAttr
-HiLink cssGridAttr cssAttr
-HiLink cssHyerlinkAttr cssAttr
-HiLink cssLineboxAttr cssAttr
-HiLink cssListAttr cssAttr
-HiLink cssMarginAttr cssAttr
-HiLink cssMarqueeAttr cssAttr
-HiLink cssMultiColumnAttr cssAttr
-HiLink cssPaddingAttr cssAttr
-HiLink cssPagedMediaAttr cssAttr
-HiLink cssPositioningAttr cssAttr
-HiLink cssGradientAttr cssAttr
-HiLink cssPrintAttr cssAttr
-HiLink cssRubyAttr cssAttr
-HiLink cssSpeechAttr cssAttr
-HiLink cssTableAttr cssAttr
-HiLink cssTextAttr cssAttr
-HiLink cssTransformAttr cssAttr
-HiLink cssTransitionAttr cssAttr
-HiLink cssUIAttr cssAttr
-HiLink cssIEUIAttr cssAttr
-HiLink cssAuralAttr cssAttr
-HiLink cssRenderAttr cssAttr
-HiLink cssCommonAttr cssAttr
-
-HiLink cssPseudoClassId PreProc
-HiLink cssPseudoClassLang Constant
-HiLink cssValueLength Number
-HiLink cssValueInteger Number
-HiLink cssValueNumber Number
-HiLink cssValueAngle Number
-HiLink cssValueTime Number
-HiLink cssValueFrequency Number
-HiLink cssFunction Constant
-HiLink cssURL String
-HiLink cssFunctionName Function
-HiLink cssFunctionComma Function
-HiLink cssColor Constant
-HiLink cssIdentifier Function
-HiLink cssInclude Include
-HiLink cssIncludeKeyword atKeyword
-HiLink cssImportant Special
-HiLink cssBraces Function
-HiLink cssBraceError Error
-HiLink cssError Error
-HiLink cssUnicodeEscape Special
-HiLink cssStringQQ String
-HiLink cssStringQ String
-HiLink cssAttributeSelector String
-HiLink cssMedia atKeyword
-HiLink cssMediaType Special
-HiLink cssMediaComma Normal
-HiLink cssMediaKeyword Statement
-HiLink cssMediaProp cssProp
-HiLink cssMediaAttr cssAttr
-HiLink cssPage atKeyword
-HiLink cssPagePseudo PreProc
-HiLink cssPageMargin atKeyword
-HiLink cssPageProp cssProp
-HiLink cssKeyFrame atKeyword
-HiLink cssKeyFrameSelector Constant
-HiLink cssFontDescriptor Special
-HiLink cssFontDescriptorFunction Constant
-HiLink cssFontDescriptorProp cssProp
-HiLink cssFontDescriptorAttr cssAttr
-HiLink cssUnicodeRange Constant
-HiLink cssClassName Function
-HiLink cssClassNameDot Function
-HiLink cssProp StorageClass
-HiLink cssAttr Constant
-HiLink cssUnitDecorators Number
-HiLink cssNoise Noise
-HiLink atKeyword PreProc
-delcommand HiLink
+
+hi def link cssComment Comment
+hi def link cssVendor Comment
+hi def link cssHacks Comment
+hi def link cssTagName Statement
+hi def link cssDeprecated Error
+hi def link cssSelectorOp Special
+hi def link cssSelectorOp2 Special
+hi def link cssAttrComma Special
+
+hi def link cssAnimationProp cssProp
+hi def link cssBackgroundProp cssProp
+hi def link cssBorderProp cssProp
+hi def link cssBoxProp cssProp
+hi def link cssColorProp cssProp
+hi def link cssContentForPagedMediaProp cssProp
+hi def link cssDimensionProp cssProp
+hi def link cssFlexibleBoxProp cssProp
+hi def link cssFontProp cssProp
+hi def link cssGeneratedContentProp cssProp
+hi def link cssGridProp cssProp
+hi def link cssHyerlinkProp cssProp
+hi def link cssLineboxProp cssProp
+hi def link cssListProp cssProp
+hi def link cssMarqueeProp cssProp
+hi def link cssMultiColumnProp cssProp
+hi def link cssPagedMediaProp cssProp
+hi def link cssPositioningProp cssProp
+hi def link cssPrintProp cssProp
+hi def link cssRubyProp cssProp
+hi def link cssSpeechProp cssProp
+hi def link cssTableProp cssProp
+hi def link cssTextProp cssProp
+hi def link cssTransformProp cssProp
+hi def link cssTransitionProp cssProp
+hi def link cssUIProp cssProp
+hi def link cssIEUIProp cssProp
+hi def link cssAuralProp cssProp
+hi def link cssRenderProp cssProp
+hi def link cssMobileTextProp cssProp
+
+hi def link cssAnimationAttr cssAttr
+hi def link cssBackgroundAttr cssAttr
+hi def link cssBorderAttr cssAttr
+hi def link cssBoxAttr cssAttr
+hi def link cssContentForPagedMediaAttr cssAttr
+hi def link cssDimensionAttr cssAttr
+hi def link cssFlexibleBoxAttr cssAttr
+hi def link cssFontAttr cssAttr
+hi def link cssGeneratedContentAttr cssAttr
+hi def link cssGridAttr cssAttr
+hi def link cssHyerlinkAttr cssAttr
+hi def link cssLineboxAttr cssAttr
+hi def link cssListAttr cssAttr
+hi def link cssMarginAttr cssAttr
+hi def link cssMarqueeAttr cssAttr
+hi def link cssMultiColumnAttr cssAttr
+hi def link cssPaddingAttr cssAttr
+hi def link cssPagedMediaAttr cssAttr
+hi def link cssPositioningAttr cssAttr
+hi def link cssGradientAttr cssAttr
+hi def link cssPrintAttr cssAttr
+hi def link cssRubyAttr cssAttr
+hi def link cssSpeechAttr cssAttr
+hi def link cssTableAttr cssAttr
+hi def link cssTextAttr cssAttr
+hi def link cssTransformAttr cssAttr
+hi def link cssTransitionAttr cssAttr
+hi def link cssUIAttr cssAttr
+hi def link cssIEUIAttr cssAttr
+hi def link cssAuralAttr cssAttr
+hi def link cssRenderAttr cssAttr
+hi def link cssCommonAttr cssAttr
+
+hi def link cssPseudoClassId PreProc
+hi def link cssPseudoClassLang Constant
+hi def link cssValueLength Number
+hi def link cssValueInteger Number
+hi def link cssValueNumber Number
+hi def link cssValueAngle Number
+hi def link cssValueTime Number
+hi def link cssValueFrequency Number
+hi def link cssFunction Constant
+hi def link cssURL String
+hi def link cssFunctionName Function
+hi def link cssFunctionComma Function
+hi def link cssColor Constant
+hi def link cssIdentifier Function
+hi def link cssInclude Include
+hi def link cssIncludeKeyword atKeyword
+hi def link cssImportant Special
+hi def link cssBraces Function
+hi def link cssBraceError Error
+hi def link cssError Error
+hi def link cssUnicodeEscape Special
+hi def link cssStringQQ String
+hi def link cssStringQ String
+hi def link cssAttributeSelector String
+hi def link cssMedia atKeyword
+hi def link cssMediaType Special
+hi def link cssMediaComma Normal
+hi def link cssMediaKeyword Statement
+hi def link cssMediaProp cssProp
+hi def link cssMediaAttr cssAttr
+hi def link cssPage atKeyword
+hi def link cssPagePseudo PreProc
+hi def link cssPageMargin atKeyword
+hi def link cssPageProp cssProp
+hi def link cssKeyFrame atKeyword
+hi def link cssKeyFrameSelector Constant
+hi def link cssFontDescriptor Special
+hi def link cssFontDescriptorFunction Constant
+hi def link cssFontDescriptorProp cssProp
+hi def link cssFontDescriptorAttr cssAttr
+hi def link cssUnicodeRange Constant
+hi def link cssClassName Function
+hi def link cssClassNameDot Function
+hi def link cssProp StorageClass
+hi def link cssAttr Constant
+hi def link cssUnitDecorators Number
+hi def link cssNoise Noise
+hi def link atKeyword PreProc
 
 let b:current_syntax = "css"
 
diff --git a/runtime/syntax/cterm.vim b/runtime/syntax/cterm.vim
index 8510f62cc7..1b6cb2893f 100644
--- a/runtime/syntax/cterm.vim
+++ b/runtime/syntax/cterm.vim
@@ -140,39 +140,37 @@ syn match   ctermSpecialCharacter	"'\\.'"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink ctermStatement		Statement
-HiLink ctermFunction		Statement
-HiLink ctermStrFunction	Statement
-HiLink ctermIntFunction	Statement
-HiLink ctermLabel		Statement
-HiLink ctermConditional	Statement
-HiLink ctermRepeat		Statement
-HiLink ctermLibFunc		UserDefFunc
-HiLink ctermType		Type
-HiLink ctermFuncArg		PreCondit
-
-HiLink ctermPreVarRO		PreCondit
-HiLink ctermPreVarRW		PreConditBold
-HiLink ctermVar		Type
-
-HiLink ctermComment		Comment
-
-HiLink ctermCharacter		SpecialChar
-HiLink ctermSpecial		Special
-HiLink ctermSpecialCharacter	SpecialChar
-HiLink ctermSymbols		Special
-HiLink ctermString		String
-HiLink ctermTodo		Todo
-HiLink ctermOperator		Statement
-HiLink ctermNumber		Number
+
+hi def link ctermStatement		Statement
+hi def link ctermFunction		Statement
+hi def link ctermStrFunction	Statement
+hi def link ctermIntFunction	Statement
+hi def link ctermLabel		Statement
+hi def link ctermConditional	Statement
+hi def link ctermRepeat		Statement
+hi def link ctermLibFunc		UserDefFunc
+hi def link ctermType		Type
+hi def link ctermFuncArg		PreCondit
+
+hi def link ctermPreVarRO		PreCondit
+hi def link ctermPreVarRW		PreConditBold
+hi def link ctermVar		Type
+
+hi def link ctermComment		Comment
+
+hi def link ctermCharacter		SpecialChar
+hi def link ctermSpecial		Special
+hi def link ctermSpecialCharacter	SpecialChar
+hi def link ctermSymbols		Special
+hi def link ctermString		String
+hi def link ctermTodo		Todo
+hi def link ctermOperator		Statement
+hi def link ctermNumber		Number
 
 " redefine the colors
 "hi PreConditBold	term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold
 "hi Special	term=bold ctermfg=6 guifg=SlateBlue gui=underline
 
-delcommand HiLink
 
 let b:current_syntax = "cterm"
 
diff --git a/runtime/syntax/cupl.vim b/runtime/syntax/cupl.vim
index 58540b63d4..5b93b0db93 100644
--- a/runtime/syntax/cupl.vim
+++ b/runtime/syntax/cupl.vim
@@ -93,30 +93,28 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink cuplHeader	cuplStatement
-HiLink cuplLogicalOperator	 cuplOperator
-HiLink cuplRangeOperator	 cuplOperator
-HiLink cuplArithmeticOperator cuplOperator
-HiLink cuplAssignmentOperator cuplOperator
-HiLink cuplEqualityOperator	 cuplOperator
-HiLink cuplTruthTableOperator cuplOperator
-HiLink cuplOperator	cuplStatement
-HiLink cuplFunction	cuplStatement
-HiLink cuplStatement Statement
-HiLink cuplNumberRange cuplNumber
-HiLink cuplNumber	  cuplString
-HiLink cuplString	String
-HiLink cuplComment	Comment
-HiLink cuplExtension   cuplSpecial
-HiLink cuplSpecialChar cuplSpecial
-HiLink cuplSpecial	Special
-HiLink cuplDirective PreProc
-HiLink cuplTodo	Todo
-
-delcommand HiLink
+hi def link cuplHeader	cuplStatement
+hi def link cuplLogicalOperator	 cuplOperator
+hi def link cuplRangeOperator	 cuplOperator
+hi def link cuplArithmeticOperator cuplOperator
+hi def link cuplAssignmentOperator cuplOperator
+hi def link cuplEqualityOperator	 cuplOperator
+hi def link cuplTruthTableOperator cuplOperator
+hi def link cuplOperator	cuplStatement
+hi def link cuplFunction	cuplStatement
+hi def link cuplStatement Statement
+hi def link cuplNumberRange cuplNumber
+hi def link cuplNumber	  cuplString
+hi def link cuplString	String
+hi def link cuplComment	Comment
+hi def link cuplExtension   cuplSpecial
+hi def link cuplSpecialChar cuplSpecial
+hi def link cuplSpecial	Special
+hi def link cuplDirective PreProc
+hi def link cuplTodo	Todo
+
 
 let b:current_syntax = "cupl"
 
diff --git a/runtime/syntax/cuplsim.vim b/runtime/syntax/cuplsim.vim
index d0c9ec34f5..36eb4c3555 100644
--- a/runtime/syntax/cuplsim.vim
+++ b/runtime/syntax/cuplsim.vim
@@ -47,19 +47,17 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " append to the highlighting links in cupl.vim
 " The default highlighting.
-HiLink cuplsimOrder		cuplStatement
-HiLink cuplsimBase		cuplStatement
-HiLink cuplsimBaseType	cuplStatement
-HiLink cuplsimVectors		cuplStatement
-HiLink cuplsimStimulus	cuplNumber
-HiLink cuplsimOutput		cuplNumber
-HiLink cuplsimOrderFormat	cuplNumber
+hi def link cuplsimOrder		cuplStatement
+hi def link cuplsimBase		cuplStatement
+hi def link cuplsimBaseType	cuplStatement
+hi def link cuplsimVectors		cuplStatement
+hi def link cuplsimStimulus	cuplNumber
+hi def link cuplsimOutput		cuplNumber
+hi def link cuplsimOrderFormat	cuplNumber
 
-delcommand HiLink
 
 let b:current_syntax = "cuplsim"
 " vim:ts=8
diff --git a/runtime/syntax/cvs.vim b/runtime/syntax/cvs.vim
index 4a01c2b8a8..3eac191637 100644
--- a/runtime/syntax/cvs.vim
+++ b/runtime/syntax/cvs.vim
@@ -18,15 +18,13 @@ syn match cvsDir   contained "\S\+$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cvsLine		Comment
-HiLink cvsDir		cvsFile
-HiLink cvsFile		Constant
-HiLink cvsFiles		cvsCom
-HiLink cvsTag		cvsCom
-HiLink cvsCom		Statement
+hi def link cvsLine		Comment
+hi def link cvsDir		cvsFile
+hi def link cvsFile		Constant
+hi def link cvsFiles		cvsCom
+hi def link cvsTag		cvsCom
+hi def link cvsCom		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cvs"
diff --git a/runtime/syntax/cweb.vim b/runtime/syntax/cweb.vim
index 1d6e0fdec6..4e06b3646d 100644
--- a/runtime/syntax/cweb.vim
+++ b/runtime/syntax/cweb.vim
@@ -57,11 +57,9 @@ syntax match webIgnoredStuff "@@"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink webRestrictedTeX String
+hi def link webRestrictedTeX String
 
-delcommand HiLink
 
 let b:current_syntax = "cweb"
 
diff --git a/runtime/syntax/cynlib.vim b/runtime/syntax/cynlib.vim
index 5338c613d9..24ad2a2e31 100644
--- a/runtime/syntax/cynlib.vim
+++ b/runtime/syntax/cynlib.vim
@@ -63,14 +63,12 @@ syn keyword	cynlibType	   In Out InST OutST Int Uint Const Cynclock
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cynlibOperator   Operator
-HiLink cynlibMacro      Statement
-HiLink cynlibFunction   Statement
-HiLink cynlibppMacro      Statement
-HiLink cynlibType       Type
+hi def link cynlibOperator   Operator
+hi def link cynlibMacro      Statement
+hi def link cynlibFunction   Statement
+hi def link cynlibppMacro      Statement
+hi def link cynlibType       Type
 
-delcommand HiLink
 
 let b:current_syntax = "cynlib"
diff --git a/runtime/syntax/cynpp.vim b/runtime/syntax/cynpp.vim
index ee54eb6a44..3064b11a63 100644
--- a/runtime/syntax/cynpp.vim
+++ b/runtime/syntax/cynpp.vim
@@ -42,11 +42,9 @@ syn keyword     cynppMacro      Instantiate
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cLabel		Label
-HiLink cynppMacro  Statement
+hi def link cLabel		Label
+hi def link cynppMacro  Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cynpp"
diff --git a/runtime/syntax/dcd.vim b/runtime/syntax/dcd.vim
index bde1d3d95e..058d272375 100644
--- a/runtime/syntax/dcd.vim
+++ b/runtime/syntax/dcd.vim
@@ -38,16 +38,14 @@ syn region  dcdComment		start="\*" end="\;"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dcdFunction		Identifier
-HiLink dcdLabel		Constant
-HiLink dcdConditional		Conditional
-HiLink dcdDisplay		Type
-HiLink dcdStatement		Statement
-HiLink dcdSpecial		Special
-HiLink dcdComment		Comment
+hi def link dcdFunction		Identifier
+hi def link dcdLabel		Constant
+hi def link dcdConditional		Conditional
+hi def link dcdDisplay		Type
+hi def link dcdStatement		Statement
+hi def link dcdSpecial		Special
+hi def link dcdComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "dcd"
diff --git a/runtime/syntax/dcl.vim b/runtime/syntax/dcl.vim
index 621c70f470..b973db3434 100644
--- a/runtime/syntax/dcl.vim
+++ b/runtime/syntax/dcl.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	DCL (Digital Command Language - vms)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	May 02, 2016
-" Version:	9
+" Last Change:	Aug 31, 2016
+" Version:	11
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_DCL
 
 " quit when a syntax file was already loaded
@@ -108,42 +108,41 @@ syn region  dclFuncList	matchgroup=Delimiter start="(" matchgroup=Delimiter end=
 syn match   dclError	")"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink dclLogOper	dclError
-HiLink dclLogical	dclOper
-HiLink dclLogSep	dclSep
-
-HiLink dclAssign	Operator
-HiLink dclCmdProc	Special
-HiLink dclCmdProcStart	Operator
-HiLink dclComment	Comment
-HiLink dclContinue	Statement
-HiLink dclDevice	Identifier
-HiLink dclDirPath	Identifier
-HiLink dclDirPath	Identifier
-HiLink dclDirSep	Delimiter
-HiLink dclError	Error
-HiLink dclExe		Statement
-HiLink dclFilename	NONE
-HiLink dclGotoLabel	Label
-HiLink dclInstr	Statement
-HiLink dclLexical	Function
-HiLink dclMdfy	Type
-HiLink dclMdfyBrkt	Delimiter
-HiLink dclMdfySep	Delimiter
-HiLink dclMdfySet	Type
-HiLink dclMdfySetString	String
-HiLink dclNumber	Number
-HiLink dclOper	Operator
-HiLink dclParam	Special
-HiLink dclSep		Delimiter
-HiLink dclStart	Delimiter
-HiLink dclString	String
-HiLink dclTodo	Todo
-
-delcommand HiLink
+if !exists("skip_dcl_syntax_inits")
+
+ hi def link dclLogOper	dclError
+ hi def link dclLogical	dclOper
+ hi def link dclLogSep	dclSep
+
+ hi def link dclAssign	Operator
+ hi def link dclCmdProc	Special
+ hi def link dclCmdProcStart	Operator
+ hi def link dclComment	Comment
+ hi def link dclContinue	Statement
+ hi def link dclDevice	Identifier
+ hi def link dclDirPath	Identifier
+ hi def link dclDirPath	Identifier
+ hi def link dclDirSep	Delimiter
+ hi def link dclError	Error
+ hi def link dclExe		Statement
+ hi def link dclFilename	NONE
+ hi def link dclGotoLabel	Label
+ hi def link dclInstr	Statement
+ hi def link dclLexical	Function
+ hi def link dclMdfy	Type
+ hi def link dclMdfyBrkt	Delimiter
+ hi def link dclMdfySep	Delimiter
+ hi def link dclMdfySet	Type
+ hi def link dclMdfySetString	String
+ hi def link dclNumber	Number
+ hi def link dclOper	Operator
+ hi def link dclParam	Special
+ hi def link dclSep		Delimiter
+ hi def link dclStart	Delimiter
+ hi def link dclString	String
+ hi def link dclTodo	Todo
+
+endif
 
 let b:current_syntax = "dcl"
 
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index 3668ea531f..a10e4ad342 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2016 Apr 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -34,21 +34,17 @@ syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail
 syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses,debchangelogLP oneline
 
 " Associate our matches and regions with pretty colours
-command -nargs=+ HiLink hi def link <args>
-
-HiLink debchangelogHeader		Error
-HiLink debchangelogFooter		Identifier
-HiLink debchangelogEntry		Normal
-HiLink debchangelogCloses		Statement
-HiLink debchangelogLP			Statement
-HiLink debchangelogFirstKV		Identifier
-HiLink debchangelogOtherKV		Identifier
-HiLink debchangelogName		Comment
-HiLink debchangelogVersion		Identifier
-HiLink debchangelogTarget		Identifier
-HiLink debchangelogEmail		Special
-
-delcommand HiLink
+hi def link debchangelogHeader  Error
+hi def link debchangelogFooter  Identifier
+hi def link debchangelogEntry   Normal
+hi def link debchangelogCloses  Statement
+hi def link debchangelogLP      Statement
+hi def link debchangelogFirstKV Identifier
+hi def link debchangelogOtherKV Identifier
+hi def link debchangelogName    Comment
+hi def link debchangelogVersion Identifier
+hi def link debchangelogTarget  Identifier
+hi def link debchangelogEmail   Special
 
 let b:current_syntax = "debchangelog"
 
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 4d354c4bd2..b52c496c95 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2015 Oct 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -26,7 +26,7 @@ syn match debControlSpace " "
 
 let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)'
 let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386'
-      \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips\|powerpcspe\|powerpc\|ppc64el'
+      \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips64el\|mips\|powerpcspe\|powerpc\|ppc64el'
       \ . '\|ppc64\|s390x\|s390\|sh3eb\|sh3\|sh4eb\|sh4\|sh\|sparc64\|sparc\|x32\)'
 let s:pairs = 'hurd-i386\|kfreebsd-i386\|kfreebsd-amd64\|knetbsd-i386\|kopensolaris-i386\|netbsd-alpha\|netbsd-i386'
 
@@ -84,30 +84,26 @@ syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Inde
 syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell
 
 " Associate our matches and regions with pretty colours
-command -nargs=+ HiLink hi def link <args>
-
-HiLink debcontrolKey		Keyword
-HiLink debcontrolField	Normal
-HiLink debcontrolStrictField	Error
-HiLink debcontrolDeprecatedKey	Error
-HiLink debcontrolMultiField	Normal
-HiLink debcontrolArchitecture	Normal
-HiLink debcontrolMultiArch	Normal
-HiLink debcontrolName		Normal
-HiLink debcontrolPriority	Normal
-HiLink debcontrolSection	Normal
-HiLink debcontrolPackageType	Normal
-HiLink debcontrolVariable	Identifier
-HiLink debcontrolEmail	Identifier
-HiLink debcontrolVcsSvn	Identifier
-HiLink debcontrolVcsCvs	Identifier
-HiLink debcontrolVcsGit	Identifier
-HiLink debcontrolHTTPUrl	Identifier
-HiLink debcontrolDmUpload	Identifier
-HiLink debcontrolComment	Comment
-HiLink debcontrolElse		Special
-
-delcommand HiLink
+hi def link debcontrolKey           Keyword
+hi def link debcontrolField         Normal
+hi def link debcontrolStrictField   Error
+hi def link debcontrolDeprecatedKey Error
+hi def link debcontrolMultiField    Normal
+hi def link debcontrolArchitecture  Normal
+hi def link debcontrolMultiArch     Normal
+hi def link debcontrolName          Normal
+hi def link debcontrolPriority      Normal
+hi def link debcontrolSection       Normal
+hi def link debcontrolPackageType   Normal
+hi def link debcontrolVariable      Identifier
+hi def link debcontrolEmail         Identifier
+hi def link debcontrolVcsSvn        Identifier
+hi def link debcontrolVcsCvs        Identifier
+hi def link debcontrolVcsGit        Identifier
+hi def link debcontrolHTTPUrl       Identifier
+hi def link debcontrolDmUpload      Identifier
+hi def link debcontrolComment       Comment
+hi def link debcontrolElse          Special
 
 let b:current_syntax = "debcontrol"
 
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index 5383602ef4..232e727e81 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2016 Apr 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -25,7 +25,7 @@ let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
       \
-      \ 'precise', 'trusty', 'wily', 'xenial', 'yakkety', 'devel'
+      \ 'precise', 'trusty', 'xenial', 'yakkety', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
@@ -34,7 +34,7 @@ let s:unsupported = [
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy',
-      \ 'utopic', 'vivid'
+      \ 'utopic', 'vivid', 'wily'
       \ ]
 let &cpo=s:cpo
 
diff --git a/runtime/syntax/def.vim b/runtime/syntax/def.vim
index cfae2112e9..a17714c41e 100644
--- a/runtime/syntax/def.vim
+++ b/runtime/syntax/def.vim
@@ -30,16 +30,14 @@ syn match   defNumber	"0x\x\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink defComment	Comment
-HiLink defKeyword	Keyword
-HiLink defStorage	StorageClass
-HiLink defString	String
-HiLink defNumber	Number
-HiLink defOrdinal	Operator
+hi def link defComment	Comment
+hi def link defKeyword	Keyword
+hi def link defStorage	StorageClass
+hi def link defString	String
+hi def link defNumber	Number
+hi def link defOrdinal	Operator
 
-delcommand HiLink
 
 let b:current_syntax = "def"
 
diff --git a/runtime/syntax/desc.vim b/runtime/syntax/desc.vim
index fa0189a3dc..84b9cd0f34 100644
--- a/runtime/syntax/desc.vim
+++ b/runtime/syntax/desc.vim
@@ -61,30 +61,28 @@ syn region descTagRegion start=/^\[\(F\|FLAG\)\]/ end=/$/ contains=descTag,descF
 syn region descTagRegion start=/^\[\(L\|LICENSE\)\]/ end=/$/ contains=descTag,descLicense
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink descFlag		Identifier
-HiLink descLicense		Identifier
-HiLink descCategory		Identifier
+hi def link descFlag		Identifier
+hi def link descLicense		Identifier
+hi def link descCategory		Identifier
 
-HiLink descTag		Type
-HiLink descUrl		Underlined
-HiLink descEmail		Underlined
+hi def link descTag		Type
+hi def link descUrl		Underlined
+hi def link descEmail		Underlined
 
 " priority tag colors
-HiLink descInstallX		Boolean
-HiLink descInstallO		Type
-HiLink descDash		Operator
-HiLink descDigit		Number
-HiLink descCompilePriority	Number
+hi def link descInstallX		Boolean
+hi def link descInstallO		Type
+hi def link descDash		Operator
+hi def link descDigit		Number
+hi def link descCompilePriority	Number
 
 " download tag colors
-HiLink descSum		Number
-HiLink descTarball		Underlined
+hi def link descSum		Number
+hi def link descTarball		Underlined
 
 " tag region colors
-HiLink descText		Comment
+hi def link descText		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "desc"
diff --git a/runtime/syntax/desktop.vim b/runtime/syntax/desktop.vim
index efab6d5f6f..915107887a 100644
--- a/runtime/syntax/desktop.vim
+++ b/runtime/syntax/desktop.vim
@@ -77,32 +77,30 @@ syn match   dtALocale /\[.\{-}\]\s*=\@=/ containedin=ALL
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dtGroup		 Special
-HiLink dtComment	 Comment
-HiLink dtDelim		 String
+hi def link dtGroup		 Special
+hi def link dtComment	 Comment
+hi def link dtDelim		 String
 
-HiLink dtLocaleKey	 Type
-HiLink dtLocaleName	 Identifier
-HiLink dtXLocale	 Identifier
-HiLink dtALocale	 Identifier
+hi def link dtLocaleKey	 Type
+hi def link dtLocaleName	 Identifier
+hi def link dtXLocale	 Identifier
+hi def link dtALocale	 Identifier
 
-HiLink dtNumericKey	 Type
+hi def link dtNumericKey	 Type
 
-HiLink dtBooleanKey	 Type
-HiLink dtBooleanValue	 Constant
+hi def link dtBooleanKey	 Type
+hi def link dtBooleanValue	 Constant
 
-HiLink dtStringKey	 Type
+hi def link dtStringKey	 Type
 
-HiLink dtExecKey	 Type
-HiLink dtExecParam	 Special
-HiLink dtTypeKey	 Type
-HiLink dtTypeValue	 Constant
-HiLink dtNotStLabel	 Type
-HiLink dtXAddKey	 Type
+hi def link dtExecKey	 Type
+hi def link dtExecParam	 Special
+hi def link dtTypeKey	 Type
+hi def link dtTypeValue	 Constant
+hi def link dtNotStLabel	 Type
+hi def link dtXAddKey	 Type
 
-delcommand HiLink
 
 let b:current_syntax = "desktop"
 
diff --git a/runtime/syntax/diva.vim b/runtime/syntax/diva.vim
index 02fc46dcbb..127a0b4663 100644
--- a/runtime/syntax/diva.vim
+++ b/runtime/syntax/diva.vim
@@ -78,20 +78,18 @@ syn match divaGeomFunctions		"\<geom\u\a\+\(45\|90\)\=("he=e-1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink divaDRCKeywords		Statement
-HiLink divaMeasKeywords		Statement
-HiLink divaCtrlFunctions	Conditional
-HiLink divaExtFunctions		Function
-HiLink divaDRCFunctions		Function
-HiLink divaFunctions		Function
-HiLink divaLayerFunctions	Function
-HiLink divaChkFunctions		Function
-HiLink divaLVSFunctions		Function
-HiLink divaGeomFunctions	Function
+hi def link divaDRCKeywords		Statement
+hi def link divaMeasKeywords		Statement
+hi def link divaCtrlFunctions	Conditional
+hi def link divaExtFunctions		Function
+hi def link divaDRCFunctions		Function
+hi def link divaFunctions		Function
+hi def link divaLayerFunctions	Function
+hi def link divaChkFunctions		Function
+hi def link divaLVSFunctions		Function
+hi def link divaGeomFunctions	Function
 
-delcommand HiLink
 
 let b:current_syntax = "diva"
 
diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
index a7104d37ec..d3ca4de0e2 100644
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -66,20 +66,18 @@ syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink djangoTagBlock PreProc
-HiLink djangoVarBlock PreProc
-HiLink djangoStatement Statement
-HiLink djangoFilter Identifier
-HiLink djangoArgument Constant
-HiLink djangoTagError Error
-HiLink djangoVarError Error
-HiLink djangoError Error
-HiLink djangoComment Comment
-HiLink djangoComBlock Comment
-HiLink djangoTodo Todo
+hi def link djangoTagBlock PreProc
+hi def link djangoVarBlock PreProc
+hi def link djangoStatement Statement
+hi def link djangoFilter Identifier
+hi def link djangoArgument Constant
+hi def link djangoTagError Error
+hi def link djangoVarError Error
+hi def link djangoError Error
+hi def link djangoComment Comment
+hi def link djangoComBlock Comment
+hi def link djangoTodo Todo
 
-delcommand HiLink
 
 let b:current_syntax = "django"
diff --git a/runtime/syntax/docbk.vim b/runtime/syntax/docbk.vim
index 3bc8049565..809f2894e6 100644
--- a/runtime/syntax/docbk.vim
+++ b/runtime/syntax/docbk.vim
@@ -172,16 +172,14 @@ syn region docbkCite   start="<citation>"lc=10 end="</citation>"me=e-11 contains
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 hi def DocbkBold term=bold cterm=bold gui=bold
 
-HiLink docbkKeyword	Statement
-HiLink docbkRegion	DocbkBold
-HiLink docbkTitle	Title
-HiLink docbkRemark	Comment
-HiLink docbkCite	Constant
+hi def link docbkKeyword	Statement
+hi def link docbkRegion	DocbkBold
+hi def link docbkTitle	Title
+hi def link docbkRemark	Comment
+hi def link docbkCite	Constant
 
-delcommand HiLink
 
 let b:current_syntax = "docbk"
 
diff --git a/runtime/syntax/dosbatch.vim b/runtime/syntax/dosbatch.vim
index b7f49ca4e9..249e6f7c46 100644
--- a/runtime/syntax/dosbatch.vim
+++ b/runtime/syntax/dosbatch.vim
@@ -109,40 +109,38 @@ syn keyword dosbatchImplicit    vol xcopy
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dosbatchTodo		Todo
+hi def link dosbatchTodo		Todo
 
-HiLink dosbatchStatement	Statement
-HiLink dosbatchCommands	dosbatchStatement
-HiLink dosbatchLabel		Label
-HiLink dosbatchConditional	Conditional
-HiLink dosbatchRepeat		Repeat
+hi def link dosbatchStatement	Statement
+hi def link dosbatchCommands	dosbatchStatement
+hi def link dosbatchLabel		Label
+hi def link dosbatchConditional	Conditional
+hi def link dosbatchRepeat		Repeat
 
-HiLink dosbatchOperator       Operator
-HiLink dosbatchEchoOperator   dosbatchOperator
-HiLink dosbatchIfOperator     dosbatchOperator
+hi def link dosbatchOperator       Operator
+hi def link dosbatchEchoOperator   dosbatchOperator
+hi def link dosbatchIfOperator     dosbatchOperator
 
-HiLink dosbatchArgument	Identifier
-HiLink dosbatchIdentifier     Identifier
-HiLink dosbatchVariable	dosbatchIdentifier
+hi def link dosbatchArgument	Identifier
+hi def link dosbatchIdentifier     Identifier
+hi def link dosbatchVariable	dosbatchIdentifier
 
-HiLink dosbatchSpecialChar	SpecialChar
-HiLink dosbatchString		String
-HiLink dosbatchNumber		Number
-HiLink dosbatchInteger	dosbatchNumber
-HiLink dosbatchHex		dosbatchNumber
-HiLink dosbatchBinary		dosbatchNumber
-HiLink dosbatchOctal		dosbatchNumber
+hi def link dosbatchSpecialChar	SpecialChar
+hi def link dosbatchString		String
+hi def link dosbatchNumber		Number
+hi def link dosbatchInteger	dosbatchNumber
+hi def link dosbatchHex		dosbatchNumber
+hi def link dosbatchBinary		dosbatchNumber
+hi def link dosbatchOctal		dosbatchNumber
 
-HiLink dosbatchComment	Comment
-HiLink dosbatchImplicit	Function
+hi def link dosbatchComment	Comment
+hi def link dosbatchImplicit	Function
 
-HiLink dosbatchSwitch		Special
+hi def link dosbatchSwitch		Special
 
-HiLink dosbatchCmd		PreProc
+hi def link dosbatchCmd		PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "dosbatch"
 
diff --git a/runtime/syntax/dosini.vim b/runtime/syntax/dosini.vim
index 2d8086b2d1..ccc5e86f1b 100644
--- a/runtime/syntax/dosini.vim
+++ b/runtime/syntax/dosini.vim
@@ -26,14 +26,12 @@ syn match  dosiniComment  "^[#;].*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dosiniNumber   Number
-HiLink dosiniHeader   Special
-HiLink dosiniComment  Comment
-HiLink dosiniLabel    Type
+hi def link dosiniNumber   Number
+hi def link dosiniHeader   Special
+hi def link dosiniComment  Comment
+hi def link dosiniLabel    Type
 
-delcommand HiLink
 
 let b:current_syntax = "dosini"
 
diff --git a/runtime/syntax/dot.vim b/runtime/syntax/dot.vim
index e6a5d9a109..0fdd6ea080 100644
--- a/runtime/syntax/dot.vim
+++ b/runtime/syntax/dot.vim
@@ -72,27 +72,25 @@ syn sync maxlines=500
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dotParErr	 Error
-HiLink dotBraceErr	 Error
-HiLink dotBrackErr	 Error
+hi def link dotParErr	 Error
+hi def link dotBraceErr	 Error
+hi def link dotBrackErr	 Error
 
-HiLink dotComment	 Comment
-HiLink dotTodo	 Todo
+hi def link dotComment	 Comment
+hi def link dotTodo	 Todo
 
-HiLink dotParEncl	 Keyword
-HiLink dotBrackEncl	 Keyword
-HiLink dotBraceEncl	 Keyword
+hi def link dotParEncl	 Keyword
+hi def link dotBrackEncl	 Keyword
+hi def link dotBraceEncl	 Keyword
 
-HiLink dotKeyword	 Keyword
-HiLink dotType	 Type
-HiLink dotKeyChar	 Keyword
+hi def link dotKeyword	 Keyword
+hi def link dotType	 Type
+hi def link dotKeyChar	 Keyword
 
-HiLink dotString	 String
-HiLink dotIdentifier	 Identifier
+hi def link dotString	 String
+hi def link dotIdentifier	 Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "dot"
 
diff --git a/runtime/syntax/dracula.vim b/runtime/syntax/dracula.vim
index b60e4846ed..a373dc200c 100644
--- a/runtime/syntax/dracula.vim
+++ b/runtime/syntax/dracula.vim
@@ -59,15 +59,13 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink draculaIdentifier Identifier
-HiLink draculaStatement  Statement
-HiLink draculaType       Type
-HiLink draculaComment    Comment
-HiLink draculaPreProc    PreProc
+hi def link draculaIdentifier Identifier
+hi def link draculaStatement  Statement
+hi def link draculaType       Type
+hi def link draculaComment    Comment
+hi def link draculaPreProc    PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "dracula"
 
diff --git a/runtime/syntax/dtd.vim b/runtime/syntax/dtd.vim
index e00c70d115..ae0bd1288e 100644
--- a/runtime/syntax/dtd.vim
+++ b/runtime/syntax/dtd.vim
@@ -127,32 +127,30 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink dtdFunction		Function
-HiLink dtdTag		Normal
-HiLink dtdType		Type
-HiLink dtdAttrType		dtdType
-HiLink dtdAttrDef		dtdType
-HiLink dtdConstant		Constant
-HiLink dtdString		dtdConstant
-HiLink dtdEnum		dtdConstant
-HiLink dtdCard		dtdFunction
-
-HiLink dtdEntity		Statement
-HiLink dtdEntityPunct	dtdType
-HiLink dtdParamEntityInst	dtdConstant
-HiLink dtdParamEntityPunct	dtdType
-HiLink dtdParamEntityDecl	dtdType
-HiLink dtdParamEntityDPunct dtdComment
-
-HiLink dtdComment		Comment
-HiLink dtdTagName		Statement
-HiLink dtdError		Error
-HiLink dtdTodo		Todo
-
-delcommand HiLink
+hi def link dtdFunction		Function
+hi def link dtdTag		Normal
+hi def link dtdType		Type
+hi def link dtdAttrType		dtdType
+hi def link dtdAttrDef		dtdType
+hi def link dtdConstant		Constant
+hi def link dtdString		dtdConstant
+hi def link dtdEnum		dtdConstant
+hi def link dtdCard		dtdFunction
+
+hi def link dtdEntity		Statement
+hi def link dtdEntityPunct	dtdType
+hi def link dtdParamEntityInst	dtdConstant
+hi def link dtdParamEntityPunct	dtdType
+hi def link dtdParamEntityDecl	dtdType
+hi def link dtdParamEntityDPunct dtdComment
+
+hi def link dtdComment		Comment
+hi def link dtdTagName		Statement
+hi def link dtdError		Error
+hi def link dtdTodo		Todo
+
 
 let &cpo = s:dtd_cpo_save
 unlet s:dtd_cpo_save
diff --git a/runtime/syntax/dtml.vim b/runtime/syntax/dtml.vim
index 0cc2729f79..cb09de8091 100644
--- a/runtime/syntax/dtml.vim
+++ b/runtime/syntax/dtml.vim
@@ -190,16 +190,14 @@ syn match   htmlTagN     contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagN
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dtmlIsTag			PreProc
-HiLink dtmlAttribute		Identifier
-HiLink dtmlMethod			Function
-HiLink dtmlComment		Comment
-HiLink dtmlTODO			Todo
-HiLink dtmlSpecialChar    Special
+hi def link dtmlIsTag			PreProc
+hi def link dtmlAttribute		Identifier
+hi def link dtmlMethod			Function
+hi def link dtmlComment		Comment
+hi def link dtmlTODO			Todo
+hi def link dtmlSpecialChar    Special
 
-delcommand HiLink
 
 let b:current_syntax = "dtml"
 
diff --git a/runtime/syntax/dylan.vim b/runtime/syntax/dylan.vim
index 95684e5016..345e932e60 100644
--- a/runtime/syntax/dylan.vim
+++ b/runtime/syntax/dylan.vim
@@ -61,33 +61,31 @@ syn region	dylanHeader	start="^[Mm]odule:" end="^$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanBlock		PreProc
-HiLink dylanBoolean		Boolean
-HiLink dylanCharacter		Character
-HiLink dylanClass		Structure
-HiLink dylanClassMods		StorageClass
-HiLink dylanComment		Comment
-HiLink dylanConditional	Conditional
-HiLink dylanConstant		Constant
-HiLink dylanException		Exception
-HiLink dylanHeader		Macro
-HiLink dylanImport		Include
-HiLink dylanLabel		Label
-HiLink dylanMiscMods		StorageClass
-HiLink dylanNumber		Number
-HiLink dylanOther		Keyword
-HiLink dylanOperator		Operator
-HiLink dylanParamDefs		Keyword
-HiLink dylanPrecondit		PreCondit
-HiLink dylanRepeat		Repeat
-HiLink dylanSimpleDefs	Keyword
-HiLink dylanStatement		Macro
-HiLink dylanString		String
-HiLink dylanVariable		Identifier
+hi def link dylanBlock		PreProc
+hi def link dylanBoolean		Boolean
+hi def link dylanCharacter		Character
+hi def link dylanClass		Structure
+hi def link dylanClassMods		StorageClass
+hi def link dylanComment		Comment
+hi def link dylanConditional	Conditional
+hi def link dylanConstant		Constant
+hi def link dylanException		Exception
+hi def link dylanHeader		Macro
+hi def link dylanImport		Include
+hi def link dylanLabel		Label
+hi def link dylanMiscMods		StorageClass
+hi def link dylanNumber		Number
+hi def link dylanOther		Keyword
+hi def link dylanOperator		Operator
+hi def link dylanParamDefs		Keyword
+hi def link dylanPrecondit		PreCondit
+hi def link dylanRepeat		Repeat
+hi def link dylanSimpleDefs	Keyword
+hi def link dylanStatement		Macro
+hi def link dylanString		String
+hi def link dylanVariable		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "dylan"
 
diff --git a/runtime/syntax/dylanintr.vim b/runtime/syntax/dylanintr.vim
index aaf2d740f0..692db34985 100644
--- a/runtime/syntax/dylanintr.vim
+++ b/runtime/syntax/dylanintr.vim
@@ -24,17 +24,15 @@ syn match	dylanintrInclude	"^\s*#\s*include\>\s*["<]" contains=intrIncluded
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanintrInfo		Special
-HiLink dylanintrInterface	Operator
-HiLink dylanintrMods		Type
-HiLink dylanintrClass		StorageClass
-HiLink dylanintrType		Type
-HiLink dylanintrIncluded	String
-HiLink dylanintrInclude	Include
+hi def link dylanintrInfo		Special
+hi def link dylanintrInterface	Operator
+hi def link dylanintrMods		Type
+hi def link dylanintrClass		StorageClass
+hi def link dylanintrType		Type
+hi def link dylanintrIncluded	String
+hi def link dylanintrInclude	Include
 
-delcommand HiLink
 
 let b:current_syntax = "dylanintr"
 
diff --git a/runtime/syntax/dylanlid.vim b/runtime/syntax/dylanlid.vim
index c7d2664005..dae0bf94b1 100644
--- a/runtime/syntax/dylanlid.vim
+++ b/runtime/syntax/dylanlid.vim
@@ -19,12 +19,10 @@ syn sync	lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanlidInfo		Type
-HiLink dylanlidEntry		String
+hi def link dylanlidInfo		Type
+hi def link dylanlidEntry		String
 
-delcommand HiLink
 
 let b:current_syntax = "dylanlid"
 
diff --git a/runtime/syntax/ecd.vim b/runtime/syntax/ecd.vim
index 728cf28116..1276f2bd9d 100644
--- a/runtime/syntax/ecd.vim
+++ b/runtime/syntax/ecd.vim
@@ -30,17 +30,15 @@ syn match  ecdTagError	contained "[^>]<"ms=s+1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ecdComment	Comment
-HiLink ecdAttr	Type
-HiLink ecdAttrN	Statement
-HiLink ecdAttrV	Value
-HiLink ecdTag		Function
-HiLink ecdTagN	Statement
-HiLink ecdTagError	Error
+hi def link ecdComment	Comment
+hi def link ecdAttr	Type
+hi def link ecdAttrN	Statement
+hi def link ecdAttrV	Value
+hi def link ecdTag		Function
+hi def link ecdTagN	Statement
+hi def link ecdTagError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "ecd"
 " vim: ts=8
diff --git a/runtime/syntax/edif.vim b/runtime/syntax/edif.vim
index 21c7ec7a03..002c9f89e1 100644
--- a/runtime/syntax/edif.vim
+++ b/runtime/syntax/edif.vim
@@ -34,14 +34,12 @@ syn match       edifError       ")"
 syntax sync fromstart
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
-
-HiLink edifInString		SpecialChar
-HiLink edifKeyword		Keyword
-HiLink edifNumber		Number
-HiLink edifInStringError	edifError
-HiLink edifError		Error
-HiLink edifString		String
-delcommand HiLink
+
+hi def link edifInString		SpecialChar
+hi def link edifKeyword		Keyword
+hi def link edifNumber		Number
+hi def link edifInStringError	edifError
+hi def link edifError		Error
+hi def link edifString		String
 
 let b:current_syntax = "edif"
diff --git a/runtime/syntax/eiffel.vim b/runtime/syntax/eiffel.vim
index 0ee5ea091f..c6634871cc 100644
--- a/runtime/syntax/eiffel.vim
+++ b/runtime/syntax/eiffel.vim
@@ -139,59 +139,57 @@ syn sync lines=40
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink eiffelKeyword		Statement
-HiLink eiffelProperty		Statement
-HiLink eiffelInheritClause	Statement
-HiLink eiffelStatement	Statement
-HiLink eiffelDeclaration	Statement
-HiLink eiffelAssertion	Statement
-HiLink eiffelDebug		Statement
-HiLink eiffelException	Statement
-HiLink eiffelGenericCreate	Statement
+hi def link eiffelKeyword		Statement
+hi def link eiffelProperty		Statement
+hi def link eiffelInheritClause	Statement
+hi def link eiffelStatement	Statement
+hi def link eiffelDeclaration	Statement
+hi def link eiffelAssertion	Statement
+hi def link eiffelDebug		Statement
+hi def link eiffelException	Statement
+hi def link eiffelGenericCreate	Statement
 
-HiLink eiffelAgent		Statement
-HiLink eiffelConvert		Statement
+hi def link eiffelAgent		Statement
+hi def link eiffelConvert		Statement
 
-HiLink eiffelTopStruct	PreProc
+hi def link eiffelTopStruct	PreProc
 
-HiLink eiffelAll		Special
-HiLink eiffelAnchored		Special
-HiLink eiffelBitType		Special
+hi def link eiffelAll		Special
+hi def link eiffelAnchored		Special
+hi def link eiffelBitType		Special
 
 
-HiLink eiffelBool		Boolean
-HiLink eiffelString		String
-HiLink eiffelCharacter	Character
-HiLink eiffelClassName	Type
-HiLink eiffelNumber		Number
+hi def link eiffelBool		Boolean
+hi def link eiffelString		String
+hi def link eiffelCharacter	Character
+hi def link eiffelClassName	Type
+hi def link eiffelNumber		Number
 
-HiLink eiffelStringEscape	Special
+hi def link eiffelStringEscape	Special
 
-HiLink eiffelOperator		Special
-HiLink eiffelArray		Special
-HiLink eiffelExport		Special
-HiLink eiffelCreation		Special
-HiLink eiffelBrackets		Special
-HiLink eiffelGeneric		Special
-HiLink eiffelGenericDecl	Special
-HiLink eiffelConstraint	Special
-HiLink eiffelCreate		Special
+hi def link eiffelOperator		Special
+hi def link eiffelArray		Special
+hi def link eiffelExport		Special
+hi def link eiffelCreation		Special
+hi def link eiffelBrackets		Special
+hi def link eiffelGeneric		Special
+hi def link eiffelGenericDecl	Special
+hi def link eiffelConstraint	Special
+hi def link eiffelCreate		Special
 
-HiLink eiffelPredefined	Constant
+hi def link eiffelPredefined	Constant
 
-HiLink eiffelComment		Comment
+hi def link eiffelComment		Comment
 
-HiLink eiffelError		Error
-HiLink eiffelBadConstant	Error
-HiLink eiffelStringError	Error
-HiLink eiffelParenError	Error
-HiLink eiffelBracketError	Error
+hi def link eiffelError		Error
+hi def link eiffelBadConstant	Error
+hi def link eiffelStringError	Error
+hi def link eiffelParenError	Error
+hi def link eiffelBracketError	Error
 
-HiLink eiffelTodo		Todo
+hi def link eiffelTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "eiffel"
 
diff --git a/runtime/syntax/elf.vim b/runtime/syntax/elf.vim
index 7835f550fc..e695dbc79a 100644
--- a/runtime/syntax/elf.vim
+++ b/runtime/syntax/elf.vim
@@ -61,23 +61,21 @@ syn match elfPunct "[,;]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink elfComment Comment
-HiLink elfPPCom Include
-HiLink elfKeyword Keyword
-HiLink elfSpecial Special
-HiLink elfEnvironment Special
-HiLink elfBraceError Error
-HiLink elfConditional Conditional
-HiLink elfMacro Function
-HiLink elfNumber Number
-HiLink elfString String
-HiLink elfParens Delimiter
-HiLink elfPunct Delimiter
-
-delcommand HiLink
+hi def link elfComment Comment
+hi def link elfPPCom Include
+hi def link elfKeyword Keyword
+hi def link elfSpecial Special
+hi def link elfEnvironment Special
+hi def link elfBraceError Error
+hi def link elfConditional Conditional
+hi def link elfMacro Function
+hi def link elfNumber Number
+hi def link elfString String
+hi def link elfParens Delimiter
+hi def link elfPunct Delimiter
+
 
 let b:current_syntax = "elf"
 
diff --git a/runtime/syntax/elmfilt.vim b/runtime/syntax/elmfilt.vim
index 5858946648..ec97af038d 100644
--- a/runtime/syntax/elmfilt.vim
+++ b/runtime/syntax/elmfilt.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Elm Filter rules
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	6
+" Last Change:	Aug 31, 2016
+" Version:	8
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_ELMFILT
 
 " quit when a syntax file was already loaded
@@ -35,25 +35,24 @@ syn region	elmfiltString	contained	start="'" skip="'\(\\\\\)*\\['%]" end="'"	con
 syn match	elmfiltSpaceError	contained	"\s.*$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink elmfiltAction	Statement
-HiLink elmfiltArg	Special
-HiLink elmfiltComment	Comment
-HiLink elmfiltCond	Statement
-HiLink elmfiltIf	Statement
-HiLink elmfiltMatch	Special
-HiLink elmfiltMatchError	Error
-HiLink elmfiltNumber	Number
-HiLink elmfiltOper	Operator
-HiLink elmfiltOperKey	Type
-HiLink elmfiltParenError	Error
-HiLink elmfiltSpaceError	Error
-HiLink elmfiltString	String
-HiLink elmfiltThenError	Error
-
-delcommand HiLink
+if !exists("skip_elmfilt_syntax_inits")
+
+  hi def link elmfiltAction	Statement
+  hi def link elmfiltArg	Special
+  hi def link elmfiltComment	Comment
+  hi def link elmfiltCond	Statement
+  hi def link elmfiltIf	Statement
+  hi def link elmfiltMatch	Special
+  hi def link elmfiltMatchError	Error
+  hi def link elmfiltNumber	Number
+  hi def link elmfiltOper	Operator
+  hi def link elmfiltOperKey	Type
+  hi def link elmfiltParenError	Error
+  hi def link elmfiltSpaceError	Error
+  hi def link elmfiltString	String
+  hi def link elmfiltThenError	Error
+
+endif
 
 let b:current_syntax = "elmfilt"
 " vim: ts=9
diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim
index a49f24ed14..11b763409b 100644
--- a/runtime/syntax/erlang.vim
+++ b/runtime/syntax/erlang.vim
@@ -143,106 +143,104 @@ let s:old_style = (exists("g:erlang_old_style_highlight") &&
                   \g:erlang_old_style_highlight == 1)
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Comments
-HiLink erlangComment Comment
-HiLink erlangCommentAnnotation Special
-HiLink erlangTodo Todo
-HiLink erlangShebang Comment
+hi def link erlangComment Comment
+hi def link erlangCommentAnnotation Special
+hi def link erlangTodo Todo
+hi def link erlangShebang Comment
 
 " Numbers
-HiLink erlangNumberInteger Number
-HiLink erlangNumberFloat Float
+hi def link erlangNumberInteger Number
+hi def link erlangNumberFloat Float
 
 " Strings, atoms, characters
-HiLink erlangString String
+hi def link erlangString String
 
 if s:old_style
-HiLink erlangQuotedAtom Type
+hi def link erlangQuotedAtom Type
 else
-HiLink erlangQuotedAtom String
+hi def link erlangQuotedAtom String
 endif
 
-HiLink erlangStringModifier Special
-HiLink erlangQuotedAtomModifier Special
-HiLink erlangModifier Special
+hi def link erlangStringModifier Special
+hi def link erlangQuotedAtomModifier Special
+hi def link erlangModifier Special
 
 " Operators, separators
-HiLink erlangOperator Operator
-HiLink erlangRightArrow Operator
+hi def link erlangOperator Operator
+hi def link erlangRightArrow Operator
 if s:old_style
-HiLink erlangBracket Normal
-HiLink erlangPipe Normal
+hi def link erlangBracket Normal
+hi def link erlangPipe Normal
 else
-HiLink erlangBracket Delimiter
-HiLink erlangPipe Delimiter
+hi def link erlangBracket Delimiter
+hi def link erlangPipe Delimiter
 endif
 
 " Atoms, functions, variables, macros
 if s:old_style
-HiLink erlangAtom Normal
-HiLink erlangLocalFuncCall Normal
-HiLink erlangLocalFuncRef Normal
-HiLink erlangGlobalFuncCall Function
-HiLink erlangGlobalFuncRef Function
-HiLink erlangVariable Normal
-HiLink erlangMacro Normal
-HiLink erlangRecord Normal
+hi def link erlangAtom Normal
+hi def link erlangLocalFuncCall Normal
+hi def link erlangLocalFuncRef Normal
+hi def link erlangGlobalFuncCall Function
+hi def link erlangGlobalFuncRef Function
+hi def link erlangVariable Normal
+hi def link erlangMacro Normal
+hi def link erlangRecord Normal
 else
-HiLink erlangAtom String
-HiLink erlangLocalFuncCall Normal
-HiLink erlangLocalFuncRef Normal
-HiLink erlangGlobalFuncCall Normal
-HiLink erlangGlobalFuncRef Normal
-HiLink erlangVariable Identifier
-HiLink erlangMacro Macro
-HiLink erlangRecord Structure
+hi def link erlangAtom String
+hi def link erlangLocalFuncCall Normal
+hi def link erlangLocalFuncRef Normal
+hi def link erlangGlobalFuncCall Normal
+hi def link erlangGlobalFuncRef Normal
+hi def link erlangVariable Identifier
+hi def link erlangMacro Macro
+hi def link erlangRecord Structure
 endif
 
 " Bitstrings
 if !s:old_style
-HiLink erlangBitType Type
+hi def link erlangBitType Type
 endif
 
 " Constants and Directives
 if s:old_style
-HiLink erlangAttribute Type
-HiLink erlangMacroDef Type
-HiLink erlangUnknownAttribute Normal
-HiLink erlangInclude Type
-HiLink erlangRecordDef Type
-HiLink erlangDefine Type
-HiLink erlangPreCondit Type
-HiLink erlangType Type
+hi def link erlangAttribute Type
+hi def link erlangMacroDef Type
+hi def link erlangUnknownAttribute Normal
+hi def link erlangInclude Type
+hi def link erlangRecordDef Type
+hi def link erlangDefine Type
+hi def link erlangPreCondit Type
+hi def link erlangType Type
 else
-HiLink erlangAttribute Keyword
-HiLink erlangMacroDef Macro
-HiLink erlangUnknownAttribute Normal
-HiLink erlangInclude Include
-HiLink erlangRecordDef Keyword
-HiLink erlangDefine Define
-HiLink erlangPreCondit PreCondit
-HiLink erlangType Type
+hi def link erlangAttribute Keyword
+hi def link erlangMacroDef Macro
+hi def link erlangUnknownAttribute Normal
+hi def link erlangInclude Include
+hi def link erlangRecordDef Keyword
+hi def link erlangDefine Define
+hi def link erlangPreCondit PreCondit
+hi def link erlangType Type
 endif
 
 " Keywords
-HiLink erlangKeyword Keyword
+hi def link erlangKeyword Keyword
 
 " Build-in-functions (BIFs)
-HiLink erlangBIF Function
+hi def link erlangBIF Function
 
 if s:old_style
-HiLink erlangBoolean Statement
-HiLink erlangExtra Statement
-HiLink erlangSignal Statement
+hi def link erlangBoolean Statement
+hi def link erlangExtra Statement
+hi def link erlangSignal Statement
 else
-HiLink erlangBoolean Boolean
-HiLink erlangExtra Statement
-HiLink erlangSignal Statement
+hi def link erlangBoolean Boolean
+hi def link erlangExtra Statement
+hi def link erlangSignal Statement
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "erlang"
 
diff --git a/runtime/syntax/esqlc.vim b/runtime/syntax/esqlc.vim
index ea36d66e1a..792e5d37f3 100644
--- a/runtime/syntax/esqlc.vim
+++ b/runtime/syntax/esqlc.vim
@@ -46,15 +46,13 @@ syntax keyword esqlcStatement	truncate update
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink esqlcOperator	Operator
-HiLink esqlcStatement	Statement
-HiLink esqlcKeyword	esqlcSpecial
-HiLink esqlcSpecial	Special
-HiLink esqlcPreProc	PreProc
+hi def link esqlcOperator	Operator
+hi def link esqlcStatement	Statement
+hi def link esqlcKeyword	esqlcSpecial
+hi def link esqlcSpecial	Special
+hi def link esqlcPreProc	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "esqlc"
 
diff --git a/runtime/syntax/esterel.vim b/runtime/syntax/esterel.vim
index 0540843cd8..b0105216d7 100644
--- a/runtime/syntax/esterel.vim
+++ b/runtime/syntax/esterel.vim
@@ -62,19 +62,17 @@ syn match esterelNone			"\<else\s\+if\>$"
 syn match esterelNone			"\<else\s\+if\>\s"
 
 " Class Linking
-command -nargs=+ HiLink hi def link <args>
 
-HiLink esterelStatement		Statement
-HiLink esterelType			Type
-HiLink esterelComment		Comment
-HiLink esterelBoolean		Number
-HiLink esterelExpressions	Number
-HiLink esterelIO			String
-HiLink esterelOperator		Type
-HiLink esterelSysCall		Type
-HiLink esterelFunctions		Type
-HiLink esterelSpecial		Special
+hi def link esterelStatement		Statement
+hi def link esterelType			Type
+hi def link esterelComment		Comment
+hi def link esterelBoolean		Number
+hi def link esterelExpressions	Number
+hi def link esterelIO			String
+hi def link esterelOperator		Type
+hi def link esterelSysCall		Type
+hi def link esterelFunctions		Type
+hi def link esterelSpecial		Special
 
-delcommand HiLink
 
 let b:current_syntax = "esterel"
diff --git a/runtime/syntax/eviews.vim b/runtime/syntax/eviews.vim
index 7d039c2122..03cfb25e60 100644
--- a/runtime/syntax/eviews.vim
+++ b/runtime/syntax/eviews.vim
@@ -63,26 +63,24 @@ syn match eParenError /[\]}]/ contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink eComment     Comment
-HiLink eConstant    Identifier
-HiLink eStringId    Identifier
-HiLink eCommand     Type
-HiLink eString      String
-HiLink eNumber      Number
-HiLink eBoolean     Boolean
-HiLink eFloat       Float
-HiLink eConditional Conditional
-HiLink eProgLang    Statement
-HiLink eOVP	      Statement
-HiLink eStdCmd      Statement
-HiLink eIdentifier  Normal
-HiLink eDelimiter   Delimiter
-HiLink eError       Error
-HiLink eBraceError  Error
-HiLink eCurlyError  Error
-HiLink eParenError  Error
-delcommand HiLink
+hi def link eComment     Comment
+hi def link eConstant    Identifier
+hi def link eStringId    Identifier
+hi def link eCommand     Type
+hi def link eString      String
+hi def link eNumber      Number
+hi def link eBoolean     Boolean
+hi def link eFloat       Float
+hi def link eConditional Conditional
+hi def link eProgLang    Statement
+hi def link eOVP	      Statement
+hi def link eStdCmd      Statement
+hi def link eIdentifier  Normal
+hi def link eDelimiter   Delimiter
+hi def link eError       Error
+hi def link eBraceError  Error
+hi def link eCurlyError  Error
+hi def link eParenError  Error
 
 let b:current_syntax="eviews"
 
diff --git a/runtime/syntax/exim.vim b/runtime/syntax/exim.vim
index f9017acb1e..4edc0d7948 100644
--- a/runtime/syntax/exim.vim
+++ b/runtime/syntax/exim.vim
@@ -88,20 +88,18 @@ syn keyword eximKeyword server_prompts server_condition client_send
 syn keyword eximKeyword server_secret client_name client_secret
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink eximComment Comment
-HiLink eximFixme Todo
-HiLink eximEnd Keyword
-HiLink eximNumber Number
-HiLink eximDriverName Constant
-HiLink eximConstant Constant
-HiLink eximTime Constant
-HiLink eximKeyword Type
-HiLink eximSpecialChar Special
-HiLink eximMacroName Preproc
-HiLink eximTransport Identifier
+hi def link eximComment Comment
+hi def link eximFixme Todo
+hi def link eximEnd Keyword
+hi def link eximNumber Number
+hi def link eximDriverName Constant
+hi def link eximConstant Constant
+hi def link eximTime Constant
+hi def link eximKeyword Type
+hi def link eximSpecialChar Special
+hi def link eximMacroName Preproc
+hi def link eximTransport Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "exim"
diff --git a/runtime/syntax/expect.vim b/runtime/syntax/expect.vim
index 4f05259fc1..75cbd3eddf 100644
--- a/runtime/syntax/expect.vim
+++ b/runtime/syntax/expect.vim
@@ -79,26 +79,24 @@ syn match   expectSharpBang	"\%^#!.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink expectSharpBang	PreProc
-HiLink expectVariables	Special
-HiLink expectCommand		Function
-HiLink expectStatement	Statement
-HiLink expectConditional	Conditional
-HiLink expectRepeat		Repeat
-HiLink expectExpectOpts	Keyword
-HiLink expectOutVar		Special
-HiLink expectSpecial		Special
-HiLink expectNumber		Number
-
-HiLink expectString		String
-
-HiLink expectComment		Comment
-HiLink expectTodo		Todo
-"HiLink expectIdentifier	Identifier
-
-delcommand HiLink
+
+hi def link expectSharpBang	PreProc
+hi def link expectVariables	Special
+hi def link expectCommand		Function
+hi def link expectStatement	Statement
+hi def link expectConditional	Conditional
+hi def link expectRepeat		Repeat
+hi def link expectExpectOpts	Keyword
+hi def link expectOutVar		Special
+hi def link expectSpecial		Special
+hi def link expectNumber		Number
+
+hi def link expectString		String
+
+hi def link expectComment		Comment
+hi def link expectTodo		Todo
+"hi def link expectIdentifier	Identifier
+
 
 let b:current_syntax = "expect"
 
diff --git a/runtime/syntax/exports.vim b/runtime/syntax/exports.vim
index aa6b76a5b0..55efbb1e50 100644
--- a/runtime/syntax/exports.vim
+++ b/runtime/syntax/exports.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	exports
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	5
+" Last Change:	Aug 31, 2016
+" Version:	7
 " Notes:		This file includes both SysV and BSD 'isms
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_EXPORTS
 
@@ -36,24 +36,23 @@ syn match exportsSeparator	"[,:]"
 syn match exportsComment	"^\s*#.*$"	contains=@Spell
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_exports_syntax_inits")
 
-HiLink exportsKeyOptSet	exportsKeySettings
-HiLink exportsOptSet	exportsSettings
+  hi def link exportsKeyOptSet	exportsKeySettings
+  hi def link exportsOptSet	exportsSettings
 
-HiLink exportsComment	Comment
-HiLink exportsKeyOptions	Type
-HiLink exportsKeySettings	Keyword
-HiLink exportsOptions	Constant
-HiLink exportsSeparator	Constant
-HiLink exportsSettings	Constant
+  hi def link exportsComment	Comment
+  hi def link exportsKeyOptions	Type
+  hi def link exportsKeySettings	Keyword
+  hi def link exportsOptions	Constant
+  hi def link exportsSeparator	Constant
+  hi def link exportsSettings	Constant
 
-HiLink exportsOptError	Error
-HiLink exportsOptSetError	Error
-HiLink exportsSetError	Error
+  hi def link exportsOptError	Error
+  hi def link exportsOptSetError	Error
+  hi def link exportsSetError	Error
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "exports"
 " vim: ts=10
diff --git a/runtime/syntax/falcon.vim b/runtime/syntax/falcon.vim
index 1f6fefa9ff..e022c7a54a 100644
--- a/runtime/syntax/falcon.vim
+++ b/runtime/syntax/falcon.vim
@@ -163,34 +163,32 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting
 if !exists("did_falcon_syn_inits")
-    command -nargs=+ HiLink hi def link <args>
-
-    HiLink falconKeyword          Keyword
-    HiLink falconCommentString    String
-    HiLink falconTodo             Todo
-    HiLink falconConditional      Keyword
-    HiLink falconRepeat           Repeat
-    HiLink falconcommentSkip      Comment
-    HiLink falconComment          Comment
-    HiLink falconCommentL         Comment
-    HiLink falconConst            Constant
-    HiLink falconConstants        Constant
-    HiLink falconOperator         Operator
-    HiLink falconSymbol           Normal
-    HiLink falconSpaceError       Error
-    HiLink falconHexadecimal      Number
-    HiLink falconOctal            Number
-    HiLink falconIntLiteral       Number
-    HiLink falconFloatLiteral     Float
-    HiLink falconStringEscape     Special
-    HiLink falconStringDelimiter  Delimiter
-    HiLink falconString           String
-    HiLink falconBool             Constant
-    HiLink falconSharpBang        PreProc
-    HiLink falconInclude          Include
-    HiLink falconSymbol           Constant
-    HiLink falconSymbolOther      Delimiter
-    delcommand HiLink
+
+    hi def link falconKeyword          Keyword
+    hi def link falconCommentString    String
+    hi def link falconTodo             Todo
+    hi def link falconConditional      Keyword
+    hi def link falconRepeat           Repeat
+    hi def link falconcommentSkip      Comment
+    hi def link falconComment          Comment
+    hi def link falconCommentL         Comment
+    hi def link falconConst            Constant
+    hi def link falconConstants        Constant
+    hi def link falconOperator         Operator
+    hi def link falconSymbol           Normal
+    hi def link falconSpaceError       Error
+    hi def link falconHexadecimal      Number
+    hi def link falconOctal            Number
+    hi def link falconIntLiteral       Number
+    hi def link falconFloatLiteral     Float
+    hi def link falconStringEscape     Special
+    hi def link falconStringDelimiter  Delimiter
+    hi def link falconString           String
+    hi def link falconBool             Constant
+    hi def link falconSharpBang        PreProc
+    hi def link falconInclude          Include
+    hi def link falconSymbol           Constant
+    hi def link falconSymbolOther      Delimiter
 endif
 
 let b:current_syntax = "falcon"
diff --git a/runtime/syntax/fdcc.vim b/runtime/syntax/fdcc.vim
index 422fd31dae..f7b296b9c6 100644
--- a/runtime/syntax/fdcc.vim
+++ b/runtime/syntax/fdcc.vim
@@ -56,47 +56,45 @@ syn region fdccBlank matchgroup=fdccLCAddress start=/^LC_ADDRESS$/ end=/^END LC_
 
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink fdccBlank		 Blank
-
-HiLink fdccTodo		 Todo
-HiLink fdccComment		 Comment
-HiLink fdccVariable		 Type
-
-HiLink fdccLCIdentification	 Statement
-HiLink fdccLCCtype		 Statement
-HiLink fdccLCCollate		 Statement
-HiLink fdccLCMonetary		 Statement
-HiLink fdccLCNumeric		 Statement
-HiLink fdccLCTime		 Statement
-HiLink fdccLCMessages		 Statement
-HiLink fdccLCPaper		 Statement
-HiLink fdccLCTelephone	 Statement
-HiLink fdccLCMeasurement	 Statement
-HiLink fdccLCName		 Statement
-HiLink fdccLCAddress		 Statement
-
-HiLink fdccUnicodeInValid	 Error
-HiLink fdccUnicodeValid	 String
-HiLink fdccString		 String
-HiLink fdccNumber		 Blank
-
-HiLink fdccKeywordIdentification fdccKeyword
-HiLink fdccKeywordCtype	   fdccKeyword
-HiLink fdccKeywordCollate	   fdccKeyword
-HiLink fdccKeywordMonetary	   fdccKeyword
-HiLink fdccKeywordNumeric	   fdccKeyword
-HiLink fdccKeywordTime	   fdccKeyword
-HiLink fdccKeywordMessages	   fdccKeyword
-HiLink fdccKeywordPaper	   fdccKeyword
-HiLink fdccKeywordTelephone	   fdccKeyword
-HiLink fdccKeywordMeasurement    fdccKeyword
-HiLink fdccKeywordName	   fdccKeyword
-HiLink fdccKeywordAddress	   fdccKeyword
-HiLink fdccKeyword		   Identifier
-
-delcommand HiLink
+
+hi def link fdccBlank		 Blank
+
+hi def link fdccTodo		 Todo
+hi def link fdccComment		 Comment
+hi def link fdccVariable		 Type
+
+hi def link fdccLCIdentification	 Statement
+hi def link fdccLCCtype		 Statement
+hi def link fdccLCCollate		 Statement
+hi def link fdccLCMonetary		 Statement
+hi def link fdccLCNumeric		 Statement
+hi def link fdccLCTime		 Statement
+hi def link fdccLCMessages		 Statement
+hi def link fdccLCPaper		 Statement
+hi def link fdccLCTelephone	 Statement
+hi def link fdccLCMeasurement	 Statement
+hi def link fdccLCName		 Statement
+hi def link fdccLCAddress		 Statement
+
+hi def link fdccUnicodeInValid	 Error
+hi def link fdccUnicodeValid	 String
+hi def link fdccString		 String
+hi def link fdccNumber		 Blank
+
+hi def link fdccKeywordIdentification fdccKeyword
+hi def link fdccKeywordCtype	   fdccKeyword
+hi def link fdccKeywordCollate	   fdccKeyword
+hi def link fdccKeywordMonetary	   fdccKeyword
+hi def link fdccKeywordNumeric	   fdccKeyword
+hi def link fdccKeywordTime	   fdccKeyword
+hi def link fdccKeywordMessages	   fdccKeyword
+hi def link fdccKeywordPaper	   fdccKeyword
+hi def link fdccKeywordTelephone	   fdccKeyword
+hi def link fdccKeywordMeasurement    fdccKeyword
+hi def link fdccKeywordName	   fdccKeyword
+hi def link fdccKeywordAddress	   fdccKeyword
+hi def link fdccKeyword		   Identifier
+
 
 let b:current_syntax = "fdcc"
 
diff --git a/runtime/syntax/fgl.vim b/runtime/syntax/fgl.vim
index e45e31c395..1b75d137b6 100644
--- a/runtime/syntax/fgl.vim
+++ b/runtime/syntax/fgl.vim
@@ -117,19 +117,17 @@ syn sync ccomment fglComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink fglComment	Comment
-"HiLink fglKeyword	fglSpecial
-HiLink fglKeyword	fglStatement
-HiLink fglNumber	Number
-HiLink fglOperator	fglStatement
-HiLink fglSpecial	Special
-HiLink fglStatement	Statement
-HiLink fglString	String
-HiLink fglType	Type
+hi def link fglComment	Comment
+"hi def link fglKeyword	fglSpecial
+hi def link fglKeyword	fglStatement
+hi def link fglNumber	Number
+hi def link fglOperator	fglStatement
+hi def link fglSpecial	Special
+hi def link fglStatement	Statement
+hi def link fglString	String
+hi def link fglType	Type
 
-delcommand HiLink
 
 let b:current_syntax = "fgl"
 
diff --git a/runtime/syntax/focexec.vim b/runtime/syntax/focexec.vim
index 54f4c0d55a..a75aed47cb 100644
--- a/runtime/syntax/focexec.vim
+++ b/runtime/syntax/focexec.vim
@@ -67,23 +67,21 @@ syn match   focexecComment	"-\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink focexecString1		String
-HiLink focexecString2		String
-HiLink focexecNumber		Number
-HiLink focexecComment		Comment
-HiLink focexecTable		Keyword
-HiLink focexecModify		Keyword
-HiLink focexecNormal		Keyword
-HiLink focexecSet		Keyword
-HiLink focexecDash		Keyword
-HiLink focexecFileDef		Keyword
-HiLink focexecJoin		Keyword
-HiLink focexecAmperVar	Identifier
-HiLink focexecFuse		Function
+hi def link focexecString1		String
+hi def link focexecString2		String
+hi def link focexecNumber		Number
+hi def link focexecComment		Comment
+hi def link focexecTable		Keyword
+hi def link focexecModify		Keyword
+hi def link focexecNormal		Keyword
+hi def link focexecSet		Keyword
+hi def link focexecDash		Keyword
+hi def link focexecFileDef		Keyword
+hi def link focexecJoin		Keyword
+hi def link focexecAmperVar	Identifier
+hi def link focexecFuse		Function
 
-delcommand HiLink
 
 let b:current_syntax = "focexec"
 
diff --git a/runtime/syntax/form.vim b/runtime/syntax/form.vim
index abd1c489dd..b8cb87c905 100644
--- a/runtime/syntax/form.vim
+++ b/runtime/syntax/form.vim
@@ -107,26 +107,25 @@ syn sync ccomment formComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink formConditional	Conditional
-HiLink formNumber		Number
-HiLink formStatement		Statement
-HiLink formComment		Comment
-HiLink formPreProc		PreProc
-HiLink formDirective		PreProc
-HiLink formType		Type
-HiLink formString		String
-HiLink formNestedString	String
-HiLink formReserved           Error
-HiLink formTodo               Todo
-HiLink formSpecial            SpecialChar
+
+hi def link formConditional	Conditional
+hi def link formNumber		Number
+hi def link formStatement		Statement
+hi def link formComment		Comment
+hi def link formPreProc		PreProc
+hi def link formDirective		PreProc
+hi def link formType		Type
+hi def link formString		String
+hi def link formNestedString	String
+hi def link formReserved           Error
+hi def link formTodo               Todo
+hi def link formSpecial            SpecialChar
 
 if !exists("form_enhanced_color")
-HiLink formHeaderStatement	Statement
+hi def link formHeaderStatement	Statement
 else
 " enhanced color mode
-HiLink formHeaderStatement	HeaderStatement
+hi def link formHeaderStatement	HeaderStatement
 " dark and a light background for local types
 if &background == "dark"
 hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold
@@ -140,7 +139,6 @@ hi Statement guifg=LightYellow
 endif
 endif
 
-delcommand HiLink
 
   let b:current_syntax = "form"
 
diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim
index 2559779f54..35fafd4349 100644
--- a/runtime/syntax/forth.vim
+++ b/runtime/syntax/forth.vim
@@ -283,47 +283,45 @@ syn region forthDeprecated start='locals|' end='|'
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink forthTodo Todo
-HiLink forthOperators Operator
-HiLink forthMath Number
-HiLink forthInteger Number
-HiLink forthFloat Float
-HiLink forthStack Special
-HiLink forthRstack Special
-HiLink forthFStack Special
-HiLink forthSP Special
-HiLink forthMemory Function
-HiLink forthAdrArith Function
-HiLink forthMemBlks Function
-HiLink forthCond Conditional
-HiLink forthLoop Repeat
-HiLink forthColonDef Define
-HiLink forthEndOfColonDef Define
-HiLink forthDefine Define
-HiLink forthDebug Debug
-HiLink forthAssembler Include
-HiLink forthCharOps Character
-HiLink forthConversion String
-HiLink forthForth Statement
-HiLink forthVocs Statement
-HiLink forthString String
-HiLink forthComment Comment
-HiLink forthClassDef Define
-HiLink forthEndOfClassDef Define
-HiLink forthObjectDef Define
-HiLink forthEndOfObjectDef Define
-HiLink forthInclude Include
-HiLink forthLocals Type " nothing else uses type and locals must stand out
-HiLink forthDeprecated Error " if you must, change to Type
-HiLink forthFileMode Function
-HiLink forthFileWords Statement
-HiLink forthBlocks Statement
-HiLink forthSpaceError Error
-
-delcommand HiLink
+hi def link forthTodo Todo
+hi def link forthOperators Operator
+hi def link forthMath Number
+hi def link forthInteger Number
+hi def link forthFloat Float
+hi def link forthStack Special
+hi def link forthRstack Special
+hi def link forthFStack Special
+hi def link forthSP Special
+hi def link forthMemory Function
+hi def link forthAdrArith Function
+hi def link forthMemBlks Function
+hi def link forthCond Conditional
+hi def link forthLoop Repeat
+hi def link forthColonDef Define
+hi def link forthEndOfColonDef Define
+hi def link forthDefine Define
+hi def link forthDebug Debug
+hi def link forthAssembler Include
+hi def link forthCharOps Character
+hi def link forthConversion String
+hi def link forthForth Statement
+hi def link forthVocs Statement
+hi def link forthString String
+hi def link forthComment Comment
+hi def link forthClassDef Define
+hi def link forthEndOfClassDef Define
+hi def link forthObjectDef Define
+hi def link forthEndOfObjectDef Define
+hi def link forthInclude Include
+hi def link forthLocals Type " nothing else uses type and locals must stand out
+hi def link forthDeprecated Error " if you must, change to Type
+hi def link forthFileMode Function
+hi def link forthFileWords Statement
+hi def link forthBlocks Statement
+hi def link forthSpaceError Error
+
 
 let b:current_syntax = "forth"
 
diff --git a/runtime/syntax/foxpro.vim b/runtime/syntax/foxpro.vim
index b329368b34..795859eac9 100644
--- a/runtime/syntax/foxpro.vim
+++ b/runtime/syntax/foxpro.vim
@@ -691,28 +691,26 @@ syn sync minlines=1 maxlines=3
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink foxproSpecial  Special
-HiLink foxproAtSymbol Special
-HiLink foxproAtCmd    Statement
-HiLink foxproPreProc  PreProc
-HiLink foxproFunc     Identifier
-HiLink foxproCmd      Statement
-HiLink foxproEnBlk    Type
-HiLink foxproSysVar   String
-HiLink foxproString   String
-HiLink foxproConst    Constant
-HiLink foxproNumber   Number
-HiLink foxproFloat    Float
-HiLink foxproComment  Comment
-HiLink foxproParenErr Error
-HiLink foxproCBConst  PreProc
-HiLink foxproCBField  Special
-HiLink foxproCBVar    Identifier
-HiLink foxproCBWin    Special
-HiLink foxproCBObject Identifier
+hi def link foxproSpecial  Special
+hi def link foxproAtSymbol Special
+hi def link foxproAtCmd    Statement
+hi def link foxproPreProc  PreProc
+hi def link foxproFunc     Identifier
+hi def link foxproCmd      Statement
+hi def link foxproEnBlk    Type
+hi def link foxproSysVar   String
+hi def link foxproString   String
+hi def link foxproConst    Constant
+hi def link foxproNumber   Number
+hi def link foxproFloat    Float
+hi def link foxproComment  Comment
+hi def link foxproParenErr Error
+hi def link foxproCBConst  PreProc
+hi def link foxproCBField  Special
+hi def link foxproCBVar    Identifier
+hi def link foxproCBWin    Special
+hi def link foxproCBObject Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "foxpro"
diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim
index a17fc809a5..39c1a00b39 100644
--- a/runtime/syntax/fstab.vim
+++ b/runtime/syntax/fstab.vim
@@ -228,58 +228,56 @@ syn match fsFreqPass /\s\+.\{-}$/ contains=@fsFreqPassCluster,@fsGeneralCluster
 " Whole line comments
 syn match fsCommentLine /^#.*$/ contains=@Spell
 
-command! -nargs=+ HiLink hi def link <args>
 
-HiLink fsOperator Operator
-HiLink fsComment Comment
-HiLink fsCommentLine Comment
+hi def link fsOperator Operator
+hi def link fsComment Comment
+hi def link fsCommentLine Comment
 
-HiLink fsTypeKeyword Type
-HiLink fsDeviceKeyword Identifier
-HiLink fsDeviceLabel String
-HiLink fsDeviceUUID String
-HiLink fsDeviceSshfs String
-HiLink fsFreqPassNumber Number
+hi def link fsTypeKeyword Type
+hi def link fsDeviceKeyword Identifier
+hi def link fsDeviceLabel String
+hi def link fsDeviceUUID String
+hi def link fsDeviceSshfs String
+hi def link fsFreqPassNumber Number
 
 if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
-HiLink fsTypeUnknown Error
+hi def link fsTypeUnknown Error
 endif
 
 if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1
-HiLink fsDeviceError Error
+hi def link fsDeviceError Error
 endif
 
-HiLink fsMountPointError Error
-HiLink fsMountPointKeyword Keyword
-HiLink fsFreqPassError Error
-
-HiLink fsOptionsGeneral Type
-HiLink fsOptionsKeywords Keyword
-HiLink fsOptionsNumber Number
-HiLink fsOptionsNumberOctal Number
-HiLink fsOptionsString String
-HiLink fsOptionsSize Number
-HiLink fsOptionsExt2Check String
-HiLink fsOptionsExt2Errors String
-HiLink fsOptionsExt3Journal String
-HiLink fsOptionsExt3Data String
-HiLink fsOptionsExt4Journal String
-HiLink fsOptionsExt4Data String
-HiLink fsOptionsExt4Barrier Number
-HiLink fsOptionsFatCheck String
-HiLink fsOptionsConv String
-HiLink fsOptionsFatType Number
-HiLink fsOptionsYesNo String
-HiLink fsOptionsHpfsCase String
-HiLink fsOptionsIsoMap String
-HiLink fsOptionsReiserHash String
-HiLink fsOptionsSshYesNoAsk String
-HiLink fsOptionsUfsType String
-HiLink fsOptionsUfsError String
-
-HiLink fsOptionsVfatShortname String
-
-delcommand HiLink
+hi def link fsMountPointError Error
+hi def link fsMountPointKeyword Keyword
+hi def link fsFreqPassError Error
+
+hi def link fsOptionsGeneral Type
+hi def link fsOptionsKeywords Keyword
+hi def link fsOptionsNumber Number
+hi def link fsOptionsNumberOctal Number
+hi def link fsOptionsString String
+hi def link fsOptionsSize Number
+hi def link fsOptionsExt2Check String
+hi def link fsOptionsExt2Errors String
+hi def link fsOptionsExt3Journal String
+hi def link fsOptionsExt3Data String
+hi def link fsOptionsExt4Journal String
+hi def link fsOptionsExt4Data String
+hi def link fsOptionsExt4Barrier Number
+hi def link fsOptionsFatCheck String
+hi def link fsOptionsConv String
+hi def link fsOptionsFatType Number
+hi def link fsOptionsYesNo String
+hi def link fsOptionsHpfsCase String
+hi def link fsOptionsIsoMap String
+hi def link fsOptionsReiserHash String
+hi def link fsOptionsSshYesNoAsk String
+hi def link fsOptionsUfsType String
+hi def link fsOptionsUfsError String
+
+hi def link fsOptionsVfatShortname String
+
 
 let b:current_syntax = "fstab"
 
diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim
index 677f948172..25a21d184e 100644
--- a/runtime/syntax/gdb.vim
+++ b/runtime/syntax/gdb.vim
@@ -85,18 +85,16 @@ exec "syn sync ccomment gdbComment minlines=" . gdb_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink gdbFuncDef	Function
-HiLink gdbComment	Comment
-HiLink gdbStatement	Statement
-HiLink gdbString	String
-HiLink gdbCharacter	Character
-HiLink gdbVariable	Identifier
-HiLink gdbSet		Constant
-HiLink gdbInfo	Type
-HiLink gdbDocument	Special
-HiLink gdbNumber	Number
-delcommand HiLink
+hi def link gdbFuncDef	Function
+hi def link gdbComment	Comment
+hi def link gdbStatement	Statement
+hi def link gdbString	String
+hi def link gdbCharacter	Character
+hi def link gdbVariable	Identifier
+hi def link gdbSet		Constant
+hi def link gdbInfo	Type
+hi def link gdbDocument	Special
+hi def link gdbNumber	Number
 
 let b:current_syntax = "gdb"
 
diff --git a/runtime/syntax/gdmo.vim b/runtime/syntax/gdmo.vim
index d9cebae1de..009f402ffa 100644
--- a/runtime/syntax/gdmo.vim
+++ b/runtime/syntax/gdmo.vim
@@ -62,23 +62,21 @@ syn sync ccomment gdmoComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gdmoCategory	      Structure
-HiLink gdmoRelationship     Macro
-HiLink gdmoDefinition       Statement
-HiLink gdmoReference	      Type
-HiLink gdmoExtension	      Operator
-HiLink gdmoBraces	      Function
-HiLink gdmoSpecial	      Special
-HiLink gdmoString	      String
-HiLink gdmoCharacter	      Character
-HiLink gdmoSpecialCharacter gdmoSpecial
-HiLink gdmoComment	      Comment
-HiLink gdmoLineComment      gdmoComment
-HiLink gdmoType	      Type
+hi def link gdmoCategory	      Structure
+hi def link gdmoRelationship     Macro
+hi def link gdmoDefinition       Statement
+hi def link gdmoReference	      Type
+hi def link gdmoExtension	      Operator
+hi def link gdmoBraces	      Function
+hi def link gdmoSpecial	      Special
+hi def link gdmoString	      String
+hi def link gdmoCharacter	      Character
+hi def link gdmoSpecialCharacter gdmoSpecial
+hi def link gdmoComment	      Comment
+hi def link gdmoLineComment      gdmoComment
+hi def link gdmoType	      Type
 
-delcommand HiLink
 
 let b:current_syntax = "gdmo"
 
diff --git a/runtime/syntax/gedcom.vim b/runtime/syntax/gedcom.vim
index 40a17863f8..cd09e0fa22 100644
--- a/runtime/syntax/gedcom.vim
+++ b/runtime/syntax/gedcom.vim
@@ -39,17 +39,15 @@ syntax match gedcom_date ".*" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink gedcom_record Statement
-HiLink gedcom_id Comment
-HiLink gedcom_ii PreProc
-HiLink gedcom_in Type
-HiLink gedcom_name PreProc
-HiLink gedcom_cname Type
-HiLink gedcom_surname Identifier
-HiLink gedcom_date Constant
-
-delcommand HiLink
+
+hi def link gedcom_record Statement
+hi def link gedcom_id Comment
+hi def link gedcom_ii PreProc
+hi def link gedcom_in Type
+hi def link gedcom_name PreProc
+hi def link gedcom_cname Type
+hi def link gedcom_surname Identifier
+hi def link gedcom_date Constant
+
 
 let b:current_syntax = "gedcom"
diff --git a/runtime/syntax/gkrellmrc.vim b/runtime/syntax/gkrellmrc.vim
index 9840a90346..f005ca2dc8 100644
--- a/runtime/syntax/gkrellmrc.vim
+++ b/runtime/syntax/gkrellmrc.vim
@@ -48,30 +48,28 @@ syn keyword gkrellmrcStyleCmd StyleMeter StyleChart StylePanel
 syn keyword gkrellmrcStyleItem textcolor alt_textcolor font alt_font transparency border label_position margin margins left_margin right_margin top_margin bottom_margin krell_depth krell_yoff krell_x_hot krell_expand krell_left_margin krell_right_margin
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gkrellmrcComment Comment
-HiLink gkrellmrcFixme Todo
+hi def link gkrellmrcComment Comment
+hi def link gkrellmrcFixme Todo
 
-HiLink gkrellmrcString gkrellmrcConstant
-HiLink gkrellmrcNumber gkrellmrcConstant
-HiLink gkrellmrcRGBColor gkrellmrcConstant
-HiLink gkrellmrcExpandMode gkrellmrcConstant
-HiLink gkrellmrcConstant Constant
+hi def link gkrellmrcString gkrellmrcConstant
+hi def link gkrellmrcNumber gkrellmrcConstant
+hi def link gkrellmrcRGBColor gkrellmrcConstant
+hi def link gkrellmrcExpandMode gkrellmrcConstant
+hi def link gkrellmrcConstant Constant
 
-HiLink gkrellmrcMeterName gkrellmrcClass
-HiLink gkrellmrcChartName gkrellmrcClass
-HiLink gkrellmrcSpecialClassName gkrellmrcClass
-HiLink gkrellmrcClass Type
+hi def link gkrellmrcMeterName gkrellmrcClass
+hi def link gkrellmrcChartName gkrellmrcClass
+hi def link gkrellmrcSpecialClassName gkrellmrcClass
+hi def link gkrellmrcClass Type
 
-HiLink gkrellmrcGlobal gkrellmrcItem
-HiLink gkrellmrcBuiltinExt gkrellmrcItem
-HiLink gkrellmrcStyleItem gkrellmrcItem
-HiLink gkrellmrcItem Function
+hi def link gkrellmrcGlobal gkrellmrcItem
+hi def link gkrellmrcBuiltinExt gkrellmrcItem
+hi def link gkrellmrcStyleItem gkrellmrcItem
+hi def link gkrellmrcItem Function
 
-HiLink gkrellmrcSetCmd Special
-HiLink gkrellmrcStyleCmd Statement
+hi def link gkrellmrcSetCmd Special
+hi def link gkrellmrcStyleCmd Statement
 
-delcommand HiLink
 
 let b:current_syntax = "gkrellmrc"
diff --git a/runtime/syntax/gnuplot.vim b/runtime/syntax/gnuplot.vim
index 38aadffa28..7777cc9e46 100644
--- a/runtime/syntax/gnuplot.vim
+++ b/runtime/syntax/gnuplot.vim
@@ -501,45 +501,43 @@ syn keyword gnuplotStatement	unset update
 
 " ---- Define the default highlighting ---- "
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " ---- Comments ---- "
-HiLink gnuplotComment		Comment
+hi def link gnuplotComment		Comment
 
 " ---- Constants ---- "
-HiLink gnuplotString		String
-HiLink gnuplotNumber		Number
-HiLink gnuplotFloat		Float
+hi def link gnuplotString		String
+hi def link gnuplotNumber		Number
+hi def link gnuplotFloat		Float
 
 " ---- Identifiers ---- "
-HiLink gnuplotIdentifier	Identifier
+hi def link gnuplotIdentifier	Identifier
 
 " ---- Statements ---- "
-HiLink gnuplotConditional	Conditional
-HiLink gnuplotRepeat		Repeat
-HiLink gnuplotKeyword		Keyword
-HiLink gnuplotOperator	Operator
+hi def link gnuplotConditional	Conditional
+hi def link gnuplotRepeat		Repeat
+hi def link gnuplotKeyword		Keyword
+hi def link gnuplotOperator	Operator
 
 " ---- PreProcs ---- "
-HiLink gnuplotMacro		Macro
+hi def link gnuplotMacro		Macro
 
 " ---- Types ---- "
-HiLink gnuplotStatement	Type
-HiLink gnuplotFunc		Identifier
+hi def link gnuplotStatement	Type
+hi def link gnuplotFunc		Identifier
 
 " ---- Specials ---- "
-HiLink gnuplotSpecial		Special
-HiLink gnuplotUnit		Special
-HiLink gnuplotExternal	Special
+hi def link gnuplotSpecial		Special
+hi def link gnuplotUnit		Special
+hi def link gnuplotExternal	Special
 
 " ---- Errors ---- "
-HiLink gnuplotError		Error
-HiLink gnuplotOctalError	Error
+hi def link gnuplotError		Error
+hi def link gnuplotOctalError	Error
 
 " ---- Todos ---- "
-HiLink gnuplotTodo		Todo
+hi def link gnuplotTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "gnuplot"
 
diff --git a/runtime/syntax/godoc.vim b/runtime/syntax/godoc.vim
index 3a07903a77..0603f51c83 100644
--- a/runtime/syntax/godoc.vim
+++ b/runtime/syntax/godoc.vim
@@ -10,11 +10,9 @@ endif
 syn case match
 syn match godocTitle "^\([A-Z][A-Z ]*\)$"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink godocTitle Title
+hi def link godocTitle Title
 
-delcommand HiLink
 
 let b:current_syntax = 'godoc'
 
diff --git a/runtime/syntax/gp.vim b/runtime/syntax/gp.vim
index 2e898dad5d..aecf7df48b 100644
--- a/runtime/syntax/gp.vim
+++ b/runtime/syntax/gp.vim
@@ -58,26 +58,24 @@ syntax region gpParen		transparent start='(' end=')' contains=ALLBUT,gpParenErro
 syntax match gpParenError	")"
 syntax match gpInParen contained "[{}]"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gpConditional		Conditional
-HiLink gpRepeat		Repeat
-HiLink gpError		Error
-HiLink gpParenError		gpError
-HiLink gpInParen		gpError
-HiLink gpStatement		Statement
-HiLink gpString		String
-HiLink gpComment		Comment
-HiLink gpInterface		Type
-HiLink gpInput		Type
-HiLink gpInterfaceKey		Statement
-HiLink gpFunction		Function
-HiLink gpScope		Type
+hi def link gpConditional		Conditional
+hi def link gpRepeat		Repeat
+hi def link gpError		Error
+hi def link gpParenError		gpError
+hi def link gpInParen		gpError
+hi def link gpStatement		Statement
+hi def link gpString		String
+hi def link gpComment		Comment
+hi def link gpInterface		Type
+hi def link gpInput		Type
+hi def link gpInterfaceKey		Statement
+hi def link gpFunction		Function
+hi def link gpScope		Type
 " contained ones
-HiLink gpSpecial		Special
-HiLink gpTodo			Todo
-HiLink gpArgs			Type
-delcommand HiLink
+hi def link gpSpecial		Special
+hi def link gpTodo			Todo
+hi def link gpArgs			Type
 
 let b:current_syntax = "gp"
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/grads.vim b/runtime/syntax/grads.vim
index 0f09483fed..50be14bb22 100644
--- a/runtime/syntax/grads.vim
+++ b/runtime/syntax/grads.vim
@@ -51,25 +51,23 @@ syn match gradsComment	"\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't hgs highlighting+yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gradsStatement		Statement
+hi def link gradsStatement		Statement
 
-HiLink gradsString		String
-HiLink gradsNumber		Number
+hi def link gradsString		String
+hi def link gradsNumber		Number
 
-HiLink gradsFixVariables	Special
-HiLink gradsVariables		Identifier
-HiLink gradsglobalVariables	Special
-HiLink gradsConst		Special
+hi def link gradsFixVariables	Special
+hi def link gradsVariables		Identifier
+hi def link gradsglobalVariables	Special
+hi def link gradsConst		Special
 
-HiLink gradsClassMethods	Function
+hi def link gradsClassMethods	Function
 
-HiLink gradsOperator		Operator
-HiLink gradsComment		Comment
+hi def link gradsOperator		Operator
+hi def link gradsComment		Comment
 
-HiLink gradsTypos		Error
+hi def link gradsTypos		Error
 
-delcommand HiLink
 
 let b:current_syntax = "grads"
diff --git a/runtime/syntax/gretl.vim b/runtime/syntax/gretl.vim
index 40eb544610..671142a9ea 100644
--- a/runtime/syntax/gretl.vim
+++ b/runtime/syntax/gretl.vim
@@ -62,25 +62,23 @@ syn region gBlockComment matchgroup=gCommentStart start="(\*" end="\*)"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink gComment      Comment
-HiLink gCommentStart Comment
-HiLink gBlockComment Comment
-HiLink gString       String
-HiLink gNumber       Number
-HiLink gBoolean      Boolean
-HiLink gFloat        Float
-HiLink gCommands     Repeat	
-HiLink gGenrFunc     Type
-HiLink gDelimiter    Delimiter
-HiLink gError        Error
-HiLink gBraceError   Error
-HiLink gCurlyError   Error
-HiLink gParenError   Error
-HiLink gIdentifier   Normal
-HiLink gVariable     Identifier
-HiLink gArrow	       Repeat
-delcommand HiLink
+hi def link gComment      Comment
+hi def link gCommentStart Comment
+hi def link gBlockComment Comment
+hi def link gString       String
+hi def link gNumber       Number
+hi def link gBoolean      Boolean
+hi def link gFloat        Float
+hi def link gCommands     Repeat	
+hi def link gGenrFunc     Type
+hi def link gDelimiter    Delimiter
+hi def link gError        Error
+hi def link gBraceError   Error
+hi def link gCurlyError   Error
+hi def link gParenError   Error
+hi def link gIdentifier   Normal
+hi def link gVariable     Identifier
+hi def link gArrow	       Repeat
 
 let b:current_syntax="gretl"
 
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 84e3779e75..2245b79d04 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -56,9 +56,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ GroovyHiLink hi def link <args>
-
 " ##########################
 " Java stuff taken from java.vim
 " some characters that cannot be in a groovy program (outside a string)
@@ -138,9 +135,9 @@ if exists("groovy_highlight_groovy_lang_ids") || exists("groovy_highlight_groovy
   syn keyword groovyJavaLangObject clone equals finalize getClass hashCode
   syn keyword groovyJavaLangObject notify notifyAll toString wait
 
-  GroovyHiLink groovyLangClass                   groovyConstant
-  GroovyHiLink groovyJavaLangClass               groovyExternal
-  GroovyHiLink groovyJavaLangObject              groovyConstant
+  hi def link groovyLangClass                   groovyConstant
+  hi def link groovyJavaLangClass               groovyExternal
+  hi def link groovyJavaLangObject              groovyConstant
   syn cluster groovyTop add=groovyJavaLangObject,groovyJavaLangClass,groovyLangClass
   syn cluster groovyClasses add=groovyJavaLangClass,groovyLangClass
 endif
@@ -214,9 +211,9 @@ syn region  groovyComment          start="/\*"  end="\*/" contains=@groovyCommen
 syn match   groovyCommentStar      contained "^\s*\*[^/]"me=e-1
 syn match   groovyCommentStar      contained "^\s*\*$"
 syn match   groovyLineComment      "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
-GroovyHiLink groovyCommentString groovyString
-GroovyHiLink groovyComment2String groovyString
-GroovyHiLink groovyCommentCharacter groovyCharacter
+hi def link groovyCommentString groovyString
+hi def link groovyComment2String groovyString
+hi def link groovyCommentCharacter groovyCharacter
 
 syn cluster groovyTop add=groovyComment,groovyLineComment
 
@@ -257,12 +254,12 @@ endif
 " syn region groovyELExpr start=+${+ end=+}+ keepend contained
 syn match groovyELExpr /\${.\{-}}/ contained
 syn match groovyELExpr /\$[a-zA-Z_][a-zA-Z0-9_.]*/ contained
-GroovyHiLink groovyELExpr Identifier
+hi def link groovyELExpr Identifier
 
 " TODO: better matching. I am waiting to understand how it really works in groovy
 " syn region  groovyClosureParamsBraces          start=+|+ end=+|+ contains=groovyClosureParams
 " syn match groovyClosureParams	"[ a-zA-Z0-9_*]\+" contained
-" GroovyHiLink groovyClosureParams Identifier
+" hi def link groovyClosureParams Identifier
 
 " next line disabled, it can cause a crash for a long line
 "syn match   groovyStringError      +"\([^"\\]\|\\.\)*$+
@@ -323,21 +320,21 @@ if exists("groovy_highlight_debug")
 
   syn cluster groovyTop add=groovyDebug
 
-  GroovyHiLink groovyDebug                 Debug
-  GroovyHiLink groovyDebugString           DebugString
-  GroovyHiLink groovyDebugStringError      groovyError
-  GroovyHiLink groovyDebugType             DebugType
-  GroovyHiLink groovyDebugBoolean          DebugBoolean
-  GroovyHiLink groovyDebugNumber           Debug
-  GroovyHiLink groovyDebugSpecial          DebugSpecial
-  GroovyHiLink groovyDebugSpecialCharacter DebugSpecial
-  GroovyHiLink groovyDebugCharacter        DebugString
-  GroovyHiLink groovyDebugParen            Debug
-
-  GroovyHiLink DebugString               String
-  GroovyHiLink DebugSpecial              Special
-  GroovyHiLink DebugBoolean              Boolean
-  GroovyHiLink DebugType                 Type
+  hi def link groovyDebug                 Debug
+  hi def link groovyDebugString           DebugString
+  hi def link groovyDebugStringError      groovyError
+  hi def link groovyDebugType             DebugType
+  hi def link groovyDebugBoolean          DebugBoolean
+  hi def link groovyDebugNumber           Debug
+  hi def link groovyDebugSpecial          DebugSpecial
+  hi def link groovyDebugSpecialCharacter DebugSpecial
+  hi def link groovyDebugCharacter        DebugString
+  hi def link groovyDebugParen            Debug
+
+  hi def link DebugString               String
+  hi def link DebugSpecial              Special
+  hi def link DebugBoolean              Boolean
+  hi def link DebugType                 Type
 endif
 
 " Match all Exception classes
@@ -371,7 +368,7 @@ exec "syn sync ccomment groovyComment minlines=" . groovy_minlines
 
 if exists("groovy_mark_braces_in_parens_as_errors")
   syn match groovyInParen          contained "[{}]"
-  GroovyHiLink groovyInParen        groovyError
+  hi def link groovyInParen        groovyError
   syn cluster groovyTop add=groovyInParen
 endif
 
@@ -380,7 +377,7 @@ syn region  groovyParenT  transparent matchgroup=groovyParen  start="("  end=")"
 syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="(" end=")" contains=@groovyTop,groovyParenT2 contained
 syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="(" end=")" contains=@groovyTop,groovyParenT  contained
 syn match   groovyParenError       ")"
-GroovyHiLink groovyParenError       groovyError
+hi def link groovyParenError       groovyError
 
 " catch errors caused by wrong square parenthesis
 syn region  groovyParenT  transparent matchgroup=groovyParen  start="\["  end="\]" contains=@groovyTop,groovyParenT1
@@ -390,56 +387,54 @@ syn match   groovyParenError       "\]"
 
 " ###############################
 " java.vim default highlighting
-GroovyHiLink groovyFuncDef		Function
-GroovyHiLink groovyBraces		Function
-GroovyHiLink groovyBranch		Conditional
-GroovyHiLink groovyUserLabelRef	groovyUserLabel
-GroovyHiLink groovyLabel		Label
-GroovyHiLink groovyUserLabel		Label
-GroovyHiLink groovyConditional	Conditional
-GroovyHiLink groovyRepeat		Repeat
-GroovyHiLink groovyExceptions		Exception
-GroovyHiLink groovyAssert 		Statement
-GroovyHiLink groovyStorageClass	StorageClass
-GroovyHiLink groovyMethodDecl		groovyStorageClass
-GroovyHiLink groovyClassDecl		groovyStorageClass
-GroovyHiLink groovyScopeDecl		groovyStorageClass
-GroovyHiLink groovyBoolean		Boolean
-GroovyHiLink groovySpecial		Special
-GroovyHiLink groovySpecialError	Error
-GroovyHiLink groovySpecialCharError	Error
-GroovyHiLink groovyString		String
-GroovyHiLink groovyRegexChar		String
-GroovyHiLink groovyCharacter		Character
-GroovyHiLink groovySpecialChar	SpecialChar
-GroovyHiLink groovyNumber		Number
-GroovyHiLink groovyError		Error
-GroovyHiLink groovyStringError	Error
-GroovyHiLink groovyStatement		Statement
-GroovyHiLink groovyOperator		Operator
-GroovyHiLink groovyComment		Comment
-GroovyHiLink groovyDocComment		Comment
-GroovyHiLink groovyLineComment	Comment
-GroovyHiLink groovyConstant		Constant
-GroovyHiLink groovyTypedef		Typedef
-GroovyHiLink groovyTodo		Todo
-
-GroovyHiLink groovyCommentTitle	SpecialComment
-GroovyHiLink groovyDocTags		Special
-GroovyHiLink groovyDocParam		Function
-GroovyHiLink groovyCommentStar	groovyComment
-
-GroovyHiLink groovyType		Type
-GroovyHiLink groovyExternal		Include
-
-GroovyHiLink htmlComment		Special
-GroovyHiLink htmlCommentPart		Special
-GroovyHiLink groovySpaceError		Error
-GroovyHiLink groovyJDKBuiltin         Special
-GroovyHiLink groovyJDKOperOverl       Operator
-GroovyHiLink groovyJDKMethods         Function
-
-delcommand GroovyHiLink
+hi def link groovyFuncDef		Function
+hi def link groovyBraces		Function
+hi def link groovyBranch		Conditional
+hi def link groovyUserLabelRef	groovyUserLabel
+hi def link groovyLabel		Label
+hi def link groovyUserLabel		Label
+hi def link groovyConditional	Conditional
+hi def link groovyRepeat		Repeat
+hi def link groovyExceptions		Exception
+hi def link groovyAssert 		Statement
+hi def link groovyStorageClass	StorageClass
+hi def link groovyMethodDecl		groovyStorageClass
+hi def link groovyClassDecl		groovyStorageClass
+hi def link groovyScopeDecl		groovyStorageClass
+hi def link groovyBoolean		Boolean
+hi def link groovySpecial		Special
+hi def link groovySpecialError	Error
+hi def link groovySpecialCharError	Error
+hi def link groovyString		String
+hi def link groovyRegexChar		String
+hi def link groovyCharacter		Character
+hi def link groovySpecialChar	SpecialChar
+hi def link groovyNumber		Number
+hi def link groovyError		Error
+hi def link groovyStringError	Error
+hi def link groovyStatement		Statement
+hi def link groovyOperator		Operator
+hi def link groovyComment		Comment
+hi def link groovyDocComment		Comment
+hi def link groovyLineComment	Comment
+hi def link groovyConstant		Constant
+hi def link groovyTypedef		Typedef
+hi def link groovyTodo		Todo
+
+hi def link groovyCommentTitle	SpecialComment
+hi def link groovyDocTags		Special
+hi def link groovyDocParam		Function
+hi def link groovyCommentStar	groovyComment
+
+hi def link groovyType		Type
+hi def link groovyExternal		Include
+
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link groovySpaceError		Error
+hi def link groovyJDKBuiltin         Special
+hi def link groovyJDKOperOverl       Operator
+hi def link groovyJDKMethods         Function
 
 
 let b:current_syntax = "groovy"
diff --git a/runtime/syntax/gtkrc.vim b/runtime/syntax/gtkrc.vim
index e3a555006b..9c1bc2abb8 100644
--- a/runtime/syntax/gtkrc.vim
+++ b/runtime/syntax/gtkrc.vim
@@ -79,50 +79,48 @@ syn sync minlines=50
 syn sync match gtkrcSyncClass groupthere NONE "^\s*class\>"
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
-
-HiLink gtkrcComment Comment
-HiLink gtkrcFixme Todo
-
-HiLink gtkrcInclude Preproc
-
-HiLink gtkrcACString gtkrcString
-HiLink gtkrcBString gtkrcString
-HiLink gtkrcString String
-HiLink gtkrcNumber Number
-HiLink gtkrcStateName gtkrcConstant
-HiLink gtkrcPriorityName gtkrcConstant
-HiLink gtkrcTextDirName gtkrcConstant
-HiLink gtkrcSettingsName Function
-HiLink gtkrcStockName Function
-HiLink gtkrcConstant Constant
-
-HiLink gtkrcPathSpecial gtkrcSpecial
-HiLink gtkrcWPathSpecial gtkrcSpecial
-HiLink gtkrcRGBColor gtkrcSpecial
-HiLink gtkrcKeyMod gtkrcSpecial
-HiLink gtkrcSpecial Special
-
-HiLink gtkrcTop gtkrcKeyword
-HiLink gtkrcPathSet gtkrcKeyword
-HiLink gtkrcStyleKeyword gtkrcKeyword
-HiLink gtkrcFunction gtkrcKeyword
-HiLink gtkrcBind gtkrcKeyword
-HiLink gtkrcKeyword Keyword
-
-HiLink gtkrcClassNameGnome gtkrcGtkClass
-HiLink gtkrcClassName gtkrcGtkClass
-HiLink gtkrcFunctionName gtkrcGtkClass
-HiLink gtkrcGtkClass Type
-
-HiLink gtkrcImage gtkrcOtherword
-HiLink gtkrcOtherword Function
-
-HiLink gtkrcParenError gtkrcError
-HiLink gtkrcBraceError gtkrcError
-HiLink gtkrcBracketError gtkrcError
-HiLink gtkrcError Error
-
-delcommand HiLink
+
+hi def link gtkrcComment Comment
+hi def link gtkrcFixme Todo
+
+hi def link gtkrcInclude Preproc
+
+hi def link gtkrcACString gtkrcString
+hi def link gtkrcBString gtkrcString
+hi def link gtkrcString String
+hi def link gtkrcNumber Number
+hi def link gtkrcStateName gtkrcConstant
+hi def link gtkrcPriorityName gtkrcConstant
+hi def link gtkrcTextDirName gtkrcConstant
+hi def link gtkrcSettingsName Function
+hi def link gtkrcStockName Function
+hi def link gtkrcConstant Constant
+
+hi def link gtkrcPathSpecial gtkrcSpecial
+hi def link gtkrcWPathSpecial gtkrcSpecial
+hi def link gtkrcRGBColor gtkrcSpecial
+hi def link gtkrcKeyMod gtkrcSpecial
+hi def link gtkrcSpecial Special
+
+hi def link gtkrcTop gtkrcKeyword
+hi def link gtkrcPathSet gtkrcKeyword
+hi def link gtkrcStyleKeyword gtkrcKeyword
+hi def link gtkrcFunction gtkrcKeyword
+hi def link gtkrcBind gtkrcKeyword
+hi def link gtkrcKeyword Keyword
+
+hi def link gtkrcClassNameGnome gtkrcGtkClass
+hi def link gtkrcClassName gtkrcGtkClass
+hi def link gtkrcFunctionName gtkrcGtkClass
+hi def link gtkrcGtkClass Type
+
+hi def link gtkrcImage gtkrcOtherword
+hi def link gtkrcOtherword Function
+
+hi def link gtkrcParenError gtkrcError
+hi def link gtkrcBraceError gtkrcError
+hi def link gtkrcBracketError gtkrcError
+hi def link gtkrcError Error
+
 
 let b:current_syntax = "gtkrc"
diff --git a/runtime/syntax/hamster.vim b/runtime/syntax/hamster.vim
index f9aada251f..64d9598a71 100644
--- a/runtime/syntax/hamster.vim
+++ b/runtime/syntax/hamster.vim
@@ -357,15 +357,13 @@ syn sync ccomment hamsterHashComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink hamsterHashComment	Comment
-HiLink hamsterSpecial	Special
-HiLink hamsterStatement	Statement
-HiLink hamsterString	String
-HiLink hamsterFunction	Function
+hi def link hamsterHashComment	Comment
+hi def link hamsterSpecial	Special
+hi def link hamsterStatement	Statement
+hi def link hamsterString	String
+hi def link hamsterFunction	Function
 
-delcommand HiLink
 
 let b:current_syntax = "hamster"
 
diff --git a/runtime/syntax/haskell.vim b/runtime/syntax/haskell.vim
index 86d554ba36..11f4c35a58 100644
--- a/runtime/syntax/haskell.vim
+++ b/runtime/syntax/haskell.vim
@@ -126,58 +126,56 @@ syn region	cCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink hsModule			  hsStructure
-HiLink hsImport			  Include
-HiLink hsImportMod			  hsImport
-HiLink hsInfix			  PreProc
-HiLink hsStructure			  Structure
-HiLink hsStatement			  Statement
-HiLink hsConditional			  Conditional
-HiLink hsSpecialChar			  SpecialChar
-HiLink hsTypedef			  Typedef
-HiLink hsVarSym			  hsOperator
-HiLink hsConSym			  hsOperator
-HiLink hsOperator			  Operator
+
+hi def link hsModule			  hsStructure
+hi def link hsImport			  Include
+hi def link hsImportMod			  hsImport
+hi def link hsInfix			  PreProc
+hi def link hsStructure			  Structure
+hi def link hsStatement			  Statement
+hi def link hsConditional			  Conditional
+hi def link hsSpecialChar			  SpecialChar
+hi def link hsTypedef			  Typedef
+hi def link hsVarSym			  hsOperator
+hi def link hsConSym			  hsOperator
+hi def link hsOperator			  Operator
 if exists("hs_highlight_delimiters")
 " Some people find this highlighting distracting.
-HiLink hsDelimiter			  Delimiter
+hi def link hsDelimiter			  Delimiter
 endif
-HiLink hsSpecialCharError		  Error
-HiLink hsString			  String
-HiLink hsCharacter			  Character
-HiLink hsNumber			  Number
-HiLink hsFloat			  Float
-HiLink hsConditional			  Conditional
-HiLink hsLiterateComment		  hsComment
-HiLink hsBlockComment		  hsComment
-HiLink hsLineComment			  hsComment
-HiLink hsComment			  Comment
-HiLink hsPragma			  SpecialComment
-HiLink hsBoolean			  Boolean
-HiLink hsType			  Type
-HiLink hsMaybe			  hsEnumConst
-HiLink hsOrdering			  hsEnumConst
-HiLink hsEnumConst			  Constant
-HiLink hsDebug			  Debug
-
-HiLink cCppString		hsString
-HiLink cCommentStart		hsComment
-HiLink cCommentError		hsError
-HiLink cCommentStartError	hsError
-HiLink cInclude		Include
-HiLink cPreProc		PreProc
-HiLink cDefine		Macro
-HiLink cIncluded		hsString
-HiLink cError			Error
-HiLink cPreCondit		PreCondit
-HiLink cComment		Comment
-HiLink cCppSkip		cCppOut
-HiLink cCppOut2		cCppOut
-HiLink cCppOut		Comment
-
-delcommand HiLink
+hi def link hsSpecialCharError		  Error
+hi def link hsString			  String
+hi def link hsCharacter			  Character
+hi def link hsNumber			  Number
+hi def link hsFloat			  Float
+hi def link hsConditional			  Conditional
+hi def link hsLiterateComment		  hsComment
+hi def link hsBlockComment		  hsComment
+hi def link hsLineComment			  hsComment
+hi def link hsComment			  Comment
+hi def link hsPragma			  SpecialComment
+hi def link hsBoolean			  Boolean
+hi def link hsType			  Type
+hi def link hsMaybe			  hsEnumConst
+hi def link hsOrdering			  hsEnumConst
+hi def link hsEnumConst			  Constant
+hi def link hsDebug			  Debug
+
+hi def link cCppString		hsString
+hi def link cCommentStart		hsComment
+hi def link cCommentError		hsError
+hi def link cCommentStartError	hsError
+hi def link cInclude		Include
+hi def link cPreProc		PreProc
+hi def link cDefine		Macro
+hi def link cIncluded		hsString
+hi def link cError			Error
+hi def link cPreCondit		PreCondit
+hi def link cComment		Comment
+hi def link cCppSkip		cCppOut
+hi def link cCppOut2		cCppOut
+hi def link cCppOut		Comment
+
 
 let b:current_syntax = "haskell"
 
diff --git a/runtime/syntax/hb.vim b/runtime/syntax/hb.vim
index ab2fb7fbad..7bff1df9fb 100644
--- a/runtime/syntax/hb.vim
+++ b/runtime/syntax/hb.vim
@@ -61,22 +61,20 @@ syn match HBComment "^#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink HBhtmlString			 String
-HiLink HBhtmlTagN			 Function
-HiLink htmlSpecialChar		 String
+hi def link HBhtmlString			 String
+hi def link HBhtmlTagN			 Function
+hi def link htmlSpecialChar		 String
 
-HiLink HBInvalidLine Error
-HiLink HBFoobar Comment
+hi def link HBInvalidLine Error
+hi def link HBFoobar Comment
 hi HBFileName guibg=lightgray guifg=black
-HiLink HBDirectiveError Error
-HiLink HBDirectiveBlockEnd HBDirectiveKeyword
+hi def link HBDirectiveError Error
+hi def link HBDirectiveBlockEnd HBDirectiveKeyword
 hi HBDirectiveKeyword guibg=lightgray guifg=darkgreen
-HiLink HBComment Comment
-HiLink HBhtmlTagSk Statement
+hi def link HBComment Comment
+hi def link HBhtmlTagSk Statement
 
-delcommand HiLink
 
 syn sync match Normal grouphere NONE "^:\s*$"
 syn sync match Normal grouphere NONE "^:\s*lib\s\+[^ \t]\+$"
diff --git a/runtime/syntax/hercules.vim b/runtime/syntax/hercules.vim
index 2a786768dc..d305707662 100644
--- a/runtime/syntax/hercules.vim
+++ b/runtime/syntax/hercules.vim
@@ -99,22 +99,20 @@ syn sync      lines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink herculesStatement  Statement
-HiLink herculesType       Type
-HiLink herculesComment    Comment
-HiLink herculesPreProc    PreProc
-HiLink herculesTodo       Todo
-HiLink herculesOutput     Include
-HiLink herculesCmdCmnt    Identifier
-HiLink herculesNumber     Number
-HiLink herculesBraceError herculesError
-HiLink herculesCurlyError herculesError
-HiLink herculesParenError herculesError
-HiLink herculesError      Error
-
-delcommand HiLink
+
+hi def link herculesStatement  Statement
+hi def link herculesType       Type
+hi def link herculesComment    Comment
+hi def link herculesPreProc    PreProc
+hi def link herculesTodo       Todo
+hi def link herculesOutput     Include
+hi def link herculesCmdCmnt    Identifier
+hi def link herculesNumber     Number
+hi def link herculesBraceError herculesError
+hi def link herculesCurlyError herculesError
+hi def link herculesParenError herculesError
+hi def link herculesError      Error
+
 
 let b:current_syntax = "hercules"
 
diff --git a/runtime/syntax/hex.vim b/runtime/syntax/hex.vim
index d2637eaaea..35edf08e9f 100644
--- a/runtime/syntax/hex.vim
+++ b/runtime/syntax/hex.vim
@@ -66,25 +66,23 @@ syn region hexExtAdrBlock start="^:[0-9a-fA-F]\{7}[24]" skip="^:[0-9a-fA-F]\{7}0
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later
-HiLink hexRecStart            hexRecType
-HiLink hexDataByteCount       Constant
+hi def link hexRecStart            hexRecType
+hi def link hexDataByteCount       Constant
 hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
-HiLink hexDataAddress         Comment
-HiLink hexNoAddress           DiffAdd
-HiLink hexRecTypeUnknown      hexRecType
-HiLink hexRecType             WarningMsg
+hi def link hexDataAddress         Comment
+hi def link hexNoAddress           DiffAdd
+hi def link hexRecTypeUnknown      hexRecType
+hi def link hexRecType             WarningMsg
 hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
 hi def hexDataOdd             term=bold cterm=bold gui=bold
 hi def hexDataEven            term=NONE cterm=NONE gui=NONE
-HiLink hexDataUnexpected      Error
-HiLink hexExtendedAddress     hexDataAddress
-HiLink hexStartAddress        hexDataAddress
-HiLink hexChecksum            DiffChange
+hi def link hexDataUnexpected      Error
+hi def link hexExtendedAddress     hexDataAddress
+hi def link hexStartAddress        hexDataAddress
+hi def link hexChecksum            DiffChange
 
-delcommand HiLink
 
 let b:current_syntax = "hex"
 
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index ac31e4848d..336d8c9f44 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -18,9 +18,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ HtmlHiLink hi def link <args>
-
 syntax spell toplevel
 
 syn case ignore
@@ -164,7 +161,7 @@ if main_syntax != 'java' || exists("java_javascript")
   unlet b:current_syntax
   syn region  javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
   syn region  htmlScriptTag     contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
-  HtmlHiLink htmlScriptTag htmlTag
+  hi def link htmlScriptTag htmlTag
 
   " html events (i.e. arguments that include javascript commands)
   if exists("html_extended_events")
@@ -176,8 +173,8 @@ if main_syntax != 'java' || exists("java_javascript")
   endif
   syn region htmlEventSQ        contained start=+'+ms=s+1 end=+'+me=s-1 contains=@htmlJavaScript
   syn region htmlEventDQ        contained start=+"+ms=s+1 end=+"+me=s-1 contains=@htmlJavaScript
-  HtmlHiLink htmlEventSQ htmlEvent
-  HtmlHiLink htmlEventDQ htmlEvent
+  hi def link htmlEventSQ htmlEvent
+  hi def link htmlEventDQ htmlEvent
 
   " a javascript expression is used as an arg value
   syn region  javaScriptExpression contained start=+&{+ keepend end=+};+ contains=@htmlJavaScript,@htmlPreproc
@@ -200,7 +197,7 @@ if main_syntax != 'java' || exists("java_css")
   syn region cssStyle start=+<style+ keepend end=+</style>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc
   syn match htmlCssStyleComment contained "\(<!--\|-->\)"
   syn region htmlCssDefinition matchgroup=htmlArg start='style="' keepend matchgroup=htmlString end='"' contains=css.*Attr,css.*Prop,cssComment,cssLength,cssColor,cssURL,cssImportant,cssError,cssString,@htmlPreproc
-  HtmlHiLink htmlStyleArg htmlString
+  hi def link htmlStyleArg htmlString
 endif
 
 if main_syntax == "html"
@@ -214,33 +211,33 @@ if main_syntax == "html"
 endif
 
 " The default highlighting.
-HtmlHiLink htmlTag                     Function
-HtmlHiLink htmlEndTag                  Identifier
-HtmlHiLink htmlArg                     Type
-HtmlHiLink htmlTagName                 htmlStatement
-HtmlHiLink htmlSpecialTagName          Exception
-HtmlHiLink htmlValue                     String
-HtmlHiLink htmlSpecialChar             Special
+hi def link htmlTag                     Function
+hi def link htmlEndTag                  Identifier
+hi def link htmlArg                     Type
+hi def link htmlTagName                 htmlStatement
+hi def link htmlSpecialTagName          Exception
+hi def link htmlValue                     String
+hi def link htmlSpecialChar             Special
 
 if !exists("html_no_rendering")
-  HtmlHiLink htmlH1                      Title
-  HtmlHiLink htmlH2                      htmlH1
-  HtmlHiLink htmlH3                      htmlH2
-  HtmlHiLink htmlH4                      htmlH3
-  HtmlHiLink htmlH5                      htmlH4
-  HtmlHiLink htmlH6                      htmlH5
-  HtmlHiLink htmlHead                    PreProc
-  HtmlHiLink htmlTitle                   Title
-  HtmlHiLink htmlBoldItalicUnderline     htmlBoldUnderlineItalic
-  HtmlHiLink htmlUnderlineBold           htmlBoldUnderline
-  HtmlHiLink htmlUnderlineItalicBold     htmlBoldUnderlineItalic
-  HtmlHiLink htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
-  HtmlHiLink htmlItalicUnderline         htmlUnderlineItalic
-  HtmlHiLink htmlItalicBold              htmlBoldItalic
-  HtmlHiLink htmlItalicBoldUnderline     htmlBoldUnderlineItalic
-  HtmlHiLink htmlItalicUnderlineBold     htmlBoldUnderlineItalic
-  HtmlHiLink htmlLink                    Underlined
-  HtmlHiLink htmlLeadingSpace            None
+  hi def link htmlH1                      Title
+  hi def link htmlH2                      htmlH1
+  hi def link htmlH3                      htmlH2
+  hi def link htmlH4                      htmlH3
+  hi def link htmlH5                      htmlH4
+  hi def link htmlH6                      htmlH5
+  hi def link htmlHead                    PreProc
+  hi def link htmlTitle                   Title
+  hi def link htmlBoldItalicUnderline     htmlBoldUnderlineItalic
+  hi def link htmlUnderlineBold           htmlBoldUnderline
+  hi def link htmlUnderlineItalicBold     htmlBoldUnderlineItalic
+  hi def link htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
+  hi def link htmlItalicUnderline         htmlUnderlineItalic
+  hi def link htmlItalicBold              htmlBoldItalic
+  hi def link htmlItalicBoldUnderline     htmlBoldUnderlineItalic
+  hi def link htmlItalicUnderlineBold     htmlBoldUnderlineItalic
+  hi def link htmlLink                    Underlined
+  hi def link htmlLeadingSpace            None
   if !exists("html_my_rendering")
     hi def htmlBold                term=bold cterm=bold gui=bold
     hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
@@ -252,30 +249,28 @@ if !exists("html_no_rendering")
   endif
 endif
 
-HtmlHiLink htmlPreStmt            PreProc
-HtmlHiLink htmlPreError           Error
-HtmlHiLink htmlPreProc            PreProc
-HtmlHiLink htmlPreAttr            String
-HtmlHiLink htmlPreProcAttrName    PreProc
-HtmlHiLink htmlPreProcAttrError   Error
-HtmlHiLink htmlSpecial            Special
-HtmlHiLink htmlSpecialChar        Special
-HtmlHiLink htmlString             String
-HtmlHiLink htmlStatement          Statement
-HtmlHiLink htmlComment            Comment
-HtmlHiLink htmlCommentPart        Comment
-HtmlHiLink htmlValue              String
-HtmlHiLink htmlCommentError       htmlError
-HtmlHiLink htmlTagError           htmlError
-HtmlHiLink htmlEvent              javaScript
-HtmlHiLink htmlError              Error
-
-HtmlHiLink javaScript             Special
-HtmlHiLink javaScriptExpression   javaScript
-HtmlHiLink htmlCssStyleComment    Comment
-HtmlHiLink htmlCssDefinition      Special
-
-delcommand HtmlHiLink
+hi def link htmlPreStmt            PreProc
+hi def link htmlPreError           Error
+hi def link htmlPreProc            PreProc
+hi def link htmlPreAttr            String
+hi def link htmlPreProcAttrName    PreProc
+hi def link htmlPreProcAttrError   Error
+hi def link htmlSpecial            Special
+hi def link htmlSpecialChar        Special
+hi def link htmlString             String
+hi def link htmlStatement          Statement
+hi def link htmlComment            Comment
+hi def link htmlCommentPart        Comment
+hi def link htmlValue              String
+hi def link htmlCommentError       htmlError
+hi def link htmlTagError           htmlError
+hi def link htmlEvent              javaScript
+hi def link htmlError              Error
+
+hi def link javaScript             Special
+hi def link javaScriptExpression   javaScript
+hi def link htmlCssStyleComment    Comment
+hi def link htmlCssDefinition      Special
 
 let b:current_syntax = "html"
 
diff --git a/runtime/syntax/htmlos.vim b/runtime/syntax/htmlos.vim
index 530c046bac..b54ca7a921 100644
--- a/runtime/syntax/htmlos.vim
+++ b/runtime/syntax/htmlos.vim
@@ -115,33 +115,31 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink	 htmlosSpecialIdentifier	Operator
-HiLink	 htmlosIdentifier	Identifier
-HiLink	 htmlosStorageClass	StorageClass
-HiLink	 htmlosComment	Comment
-HiLink	 htmlosBoolean	Boolean
-HiLink	 htmlosStringSingle	String
-HiLink	 htmlosStringDouble	String
-HiLink	 htmlosNumber	Number
-HiLink	 htmlosFloat	Float
-HiLink	 htmlosFunctions	Function
-HiLink	 htmlosRepeat	Repeat
-HiLink	 htmlosConditional	Conditional
-HiLink	 htmlosLabel	Label
-HiLink	 htmlosStatement	Statement
-HiLink	 htmlosKeyword	Statement
-HiLink	 htmlosType	Type
-HiLink	 htmlosDefine	Define
-HiLink	 htmlosParent	Delimiter
-HiLink	 htmlosError	Error
-HiLink	 htmlosTodo	Todo
-HiLink	htmlosOperator	Operator
-HiLink	htmlosRelation	Operator
-
-delcommand HiLink
+hi def link htmlosSpecialIdentifier	Operator
+hi def link htmlosIdentifier	Identifier
+hi def link htmlosStorageClass	StorageClass
+hi def link htmlosComment	Comment
+hi def link htmlosBoolean	Boolean
+hi def link htmlosStringSingle	String
+hi def link htmlosStringDouble	String
+hi def link htmlosNumber	Number
+hi def link htmlosFloat	Float
+hi def link htmlosFunctions	Function
+hi def link htmlosRepeat	Repeat
+hi def link htmlosConditional	Conditional
+hi def link htmlosLabel	Label
+hi def link htmlosStatement	Statement
+hi def link htmlosKeyword	Statement
+hi def link htmlosType	Type
+hi def link htmlosDefine	Define
+hi def link htmlosParent	Delimiter
+hi def link htmlosError	Error
+hi def link htmlosTodo	Todo
+hi def link htmlosOperator	Operator
+hi def link htmlosRelation	Operator
+
 let b:current_syntax = "htmlos"
 
 if main_syntax == 'htmlos'
diff --git a/runtime/syntax/ia64.vim b/runtime/syntax/ia64.vim
index 10d069de3f..544fcd402c 100644
--- a/runtime/syntax/ia64.vim
+++ b/runtime/syntax/ia64.vim
@@ -262,34 +262,32 @@ syn match ia64data "stringz\=\(\(\(\.ua\)\=\(\.msb\|\.lsb\)\=\)\|\(\(\.msb\|\.ls
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 "put masm groups with our groups
-HiLink masmOperator	ia64operator
-HiLink masmDirective	ia64Directive
-HiLink masmOpcode	ia64Opcode
-HiLink masmIdentifier	ia64Identifier
-HiLink masmFloat	ia64Float
+hi def link masmOperator	ia64operator
+hi def link masmDirective	ia64Directive
+hi def link masmOpcode	ia64Opcode
+hi def link masmIdentifier	ia64Identifier
+hi def link masmFloat	ia64Float
 
 "ia64 specific stuff
-HiLink ia64Label	Define
-HiLink ia64Comment	Comment
-HiLink ia64Directive	Type
-HiLink ia64opcode	Statement
-HiLink ia64registers	Operator
-HiLink ia64string	String
-HiLink ia64Hex		Number
-HiLink ia64Binary	Number
-HiLink ia64Octal	Number
-HiLink ia64Float	Float
-HiLink ia64Decimal	Number
-HiLink ia64Identifier	Identifier
-HiLink ia64data		Type
-HiLink ia64delimiter	Delimiter
-HiLink ia64operator	Operator
-HiLink ia64Todo		Todo
+hi def link ia64Label	Define
+hi def link ia64Comment	Comment
+hi def link ia64Directive	Type
+hi def link ia64opcode	Statement
+hi def link ia64registers	Operator
+hi def link ia64string	String
+hi def link ia64Hex		Number
+hi def link ia64Binary	Number
+hi def link ia64Octal	Number
+hi def link ia64Float	Float
+hi def link ia64Decimal	Number
+hi def link ia64Identifier	Identifier
+hi def link ia64data		Type
+hi def link ia64delimiter	Delimiter
+hi def link ia64operator	Operator
+hi def link ia64Todo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "ia64"
 
diff --git a/runtime/syntax/icon.vim b/runtime/syntax/icon.vim
index 1bd12d3220..179d75cd28 100644
--- a/runtime/syntax/icon.vim
+++ b/runtime/syntax/icon.vim
@@ -155,47 +155,45 @@ exec "syn sync ccomment iconComment minlines=" . icon_minlines
 " Define the default highlighting.
 
 " Only when an item doesn't have highlighting
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 
-" HiLink iconSpecialCharacter	iconSpecial
-
-HiLink iconOctalError		iconError
-HiLink iconParenError		iconError
-HiLink iconInParen		iconError
-HiLink iconCommentError	iconError
-HiLink iconSpaceError		iconError
-HiLink iconCommentError	iconError
-HiLink iconIncluded		iconString
-HiLink iconCommentString	iconString
-HiLink iconComment2String	iconString
-HiLink iconCommentSkip	iconComment
-
-HiLink iconUserLabel		Label
-HiLink iconCharacter		Character
-HiLink iconNumber			Number
-HiLink iconRadix			Number
-HiLink iconFloat			Float
-HiLink iconInclude		Include
-HiLink iconPreProc		PreProc
-HiLink iconDefine			Macro
-HiLink iconError			Error
-HiLink iconStatement		Statement
-HiLink iconPreCondit		PreCondit
-HiLink iconString			String
-HiLink iconCset			String
-HiLink iconComment		Comment
-HiLink iconSpecial		SpecialChar
-HiLink iconTodo			Todo
-HiLink iconStorageClass	StorageClass
-HiLink iconFunction		Statement
-HiLink iconReserved		Label
-HiLink iconKeyword		Operator
-
-"HiLink iconIdentifier	Identifier
-
-delcommand HiLink
+" hi def link iconSpecialCharacter	iconSpecial
+
+hi def link iconOctalError		iconError
+hi def link iconParenError		iconError
+hi def link iconInParen		iconError
+hi def link iconCommentError	iconError
+hi def link iconSpaceError		iconError
+hi def link iconCommentError	iconError
+hi def link iconIncluded		iconString
+hi def link iconCommentString	iconString
+hi def link iconComment2String	iconString
+hi def link iconCommentSkip	iconComment
+
+hi def link iconUserLabel		Label
+hi def link iconCharacter		Character
+hi def link iconNumber			Number
+hi def link iconRadix			Number
+hi def link iconFloat			Float
+hi def link iconInclude		Include
+hi def link iconPreProc		PreProc
+hi def link iconDefine			Macro
+hi def link iconError			Error
+hi def link iconStatement		Statement
+hi def link iconPreCondit		PreCondit
+hi def link iconString			String
+hi def link iconCset			String
+hi def link iconComment		Comment
+hi def link iconSpecial		SpecialChar
+hi def link iconTodo			Todo
+hi def link iconStorageClass	StorageClass
+hi def link iconFunction		Statement
+hi def link iconReserved		Label
+hi def link iconKeyword		Operator
+
+"hi def link iconIdentifier	Identifier
+
 
 let b:current_syntax = "icon"
 
diff --git a/runtime/syntax/idl.vim b/runtime/syntax/idl.vim
index c51850b13a..6a4ce7e087 100644
--- a/runtime/syntax/idl.vim
+++ b/runtime/syntax/idl.vim
@@ -222,100 +222,98 @@ try
   if !exists("did_idl_syntax_inits")
     let did_idl_syntax_inits = 1
     " The default methods for highlighting.  Can be overridden later
-    command -nargs=+ HiLink hi def link <args>
-
-    HiLink idlInclude             Include
-    HiLink idlPreProc             PreProc
-    HiLink idlPreCondit           PreCondit
-    HiLink idlDefine              Macro
-    HiLink idlIncluded            String
-    HiLink idlString              String
-    HiLink idlComment             Comment
-    HiLink idlTodo                Todo
-    HiLink idlLiteral             Number
-    HiLink idlUuid                Number
-    HiLink idlType                Type
-    HiLink idlVariantType         idlType
-
-    HiLink idlModule              Keyword
-    HiLink idlInterface           Keyword
-    HiLink idlEnum                Keyword
-    HiLink idlStruct              Keyword
-    HiLink idlUnion               Keyword
-    HiLink idlTypedef             Keyword
-    HiLink idlException           Keyword
-    HiLink idlTypedefOtherTypeQualifier keyword
-
-    HiLink idlModuleName          Typedef
-    HiLink idlInterfaceName       Typedef
-    HiLink idlEnumName            Typedef
-    HiLink idlStructName          Typedef
-    HiLink idlUnionName           Typedef
-
-    HiLink idlBaseTypeInt         idlType
-    HiLink idlBaseType            idlType
-    HiLink idlSeqType             idlType
-    HiLink idlD1                  Paren
-    HiLink idlD2                  Paren
-    HiLink idlD3                  Paren
-    HiLink idlD4                  Paren
-    "HiLink idlArraySize          Paren
-    "HiLink idlArraySize1         Paren
-    HiLink idlModuleContent       Paren
-    HiLink idlUnionContent        Paren
-    HiLink idlStructContent       Paren
-    HiLink idlEnumContents        Paren
-    HiLink idlInterfaceContent    Paren
-
-    HiLink idlSimpDecl            Identifier
-    HiLink idlROAttr              StorageClass
-    HiLink idlAttr                Keyword
-    HiLink idlConst               StorageClass
-
-    HiLink idlOneWayOp            StorageClass
-    HiLink idlOp                  idlType
-    HiLink idlParmType            idlType
-    HiLink idlOpName              Function
-    HiLink idlOpParms             SpecialComment
-    HiLink idlParmName            Identifier
-    HiLink idlInheritFrom         Identifier
-    HiLink idlAttribute           SpecialComment
-
-    HiLink idlId                  Constant
-    "HiLink idlCase               Keyword
-    HiLink idlCaseLabel           Constant
-
-    HiLink idlErrorBracket        Error
-    HiLink idlErrorBrace          Error
-    HiLink idlErrorSquareBracket  Error
-
-    HiLink idlImport              Keyword
-    HiLink idlImportString        idlString
-    HiLink idlCoclassAttribute    StorageClass
-    HiLink idlLibrary             Keyword
-    HiLink idlImportlib           Keyword
-    HiLink idlCoclass             Keyword
-    HiLink idlLibraryName         Typedef
-    HiLink idlCoclassName         Typedef
-    " hi idlLibraryContent guifg=red
-    HiLink idlTypedefDecl         Typedef
-    HiLink idlDefEnum             Keyword
-    HiLink idlDefv1Enum           Keyword
-    HiLink idlDefEnumName         Typedef
-    HiLink idlDefEnumContents     Paren
-    HiLink idlDefBaseTypeInt      idlType
-    HiLink idlDefBaseType         idlType
-    HiLink idlDefSeqType          idlType
-    HiLink idlInterfaceSections   Label
+
+    hi def link idlInclude             Include
+    hi def link idlPreProc             PreProc
+    hi def link idlPreCondit           PreCondit
+    hi def link idlDefine              Macro
+    hi def link idlIncluded            String
+    hi def link idlString              String
+    hi def link idlComment             Comment
+    hi def link idlTodo                Todo
+    hi def link idlLiteral             Number
+    hi def link idlUuid                Number
+    hi def link idlType                Type
+    hi def link idlVariantType         idlType
+
+    hi def link idlModule              Keyword
+    hi def link idlInterface           Keyword
+    hi def link idlEnum                Keyword
+    hi def link idlStruct              Keyword
+    hi def link idlUnion               Keyword
+    hi def link idlTypedef             Keyword
+    hi def link idlException           Keyword
+    hi def link idlTypedefOtherTypeQualifier keyword
+
+    hi def link idlModuleName          Typedef
+    hi def link idlInterfaceName       Typedef
+    hi def link idlEnumName            Typedef
+    hi def link idlStructName          Typedef
+    hi def link idlUnionName           Typedef
+
+    hi def link idlBaseTypeInt         idlType
+    hi def link idlBaseType            idlType
+    hi def link idlSeqType             idlType
+    hi def link idlD1                  Paren
+    hi def link idlD2                  Paren
+    hi def link idlD3                  Paren
+    hi def link idlD4                  Paren
+    "hi def link idlArraySize          Paren
+    "hi def link idlArraySize1         Paren
+    hi def link idlModuleContent       Paren
+    hi def link idlUnionContent        Paren
+    hi def link idlStructContent       Paren
+    hi def link idlEnumContents        Paren
+    hi def link idlInterfaceContent    Paren
+
+    hi def link idlSimpDecl            Identifier
+    hi def link idlROAttr              StorageClass
+    hi def link idlAttr                Keyword
+    hi def link idlConst               StorageClass
+
+    hi def link idlOneWayOp            StorageClass
+    hi def link idlOp                  idlType
+    hi def link idlParmType            idlType
+    hi def link idlOpName              Function
+    hi def link idlOpParms             SpecialComment
+    hi def link idlParmName            Identifier
+    hi def link idlInheritFrom         Identifier
+    hi def link idlAttribute           SpecialComment
+
+    hi def link idlId                  Constant
+    "hi def link idlCase               Keyword
+    hi def link idlCaseLabel           Constant
+
+    hi def link idlErrorBracket        Error
+    hi def link idlErrorBrace          Error
+    hi def link idlErrorSquareBracket  Error
+
+    hi def link idlImport              Keyword
+    hi def link idlImportString        idlString
+    hi def link idlCoclassAttribute    StorageClass
+    hi def link idlLibrary             Keyword
+    hi def link idlImportlib           Keyword
+    hi def link idlCoclass             Keyword
+    hi def link idlLibraryName         Typedef
+    hi def link idlCoclassName         Typedef
+    " hi def link idlLibraryContent guifg=red
+    hi def link idlTypedefDecl         Typedef
+    hi def link idlDefEnum             Keyword
+    hi def link idlDefv1Enum           Keyword
+    hi def link idlDefEnumName         Typedef
+    hi def link idlDefEnumContents     Paren
+    hi def link idlDefBaseTypeInt      idlType
+    hi def link idlDefBaseType         idlType
+    hi def link idlDefSeqType          idlType
+    hi def link idlInterfaceSections   Label
 
     if exists("idlsyntax_showerror")
       if exists("idlsyntax_showerror_soft")
         hi default idlError guibg=#d0ffd0
       else
-        HiLink idlError Error
+        hi def link idlError Error
       endif
     endif
-    delcommand HiLink
   endif
 
   let b:current_syntax = "idl"
diff --git a/runtime/syntax/idlang.vim b/runtime/syntax/idlang.vim
index 6d639c9fa4..14e976ce05 100644
--- a/runtime/syntax/idlang.vim
+++ b/runtime/syntax/idlang.vim
@@ -217,26 +217,24 @@ syn keyword idlangRoutine XVOLUME_WRITE_IMAGE XYOUTS ZOOM ZOOM_24
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink idlangConditional	Conditional
-HiLink idlangRoutine	Type
-HiLink idlangStatement	Statement
-HiLink idlangContinueLine	Todo
-HiLink idlangRealNumber	Float
-HiLink idlangNumber	Number
-HiLink idlangString	String
-HiLink idlangOperator	Operator
-HiLink idlangComment	Comment
-HiLink idlangTodo	Todo
-HiLink idlangPreCondit	Identifier
-HiLink idlangDblCommaError	Error
-HiLink idlangStop	Error
-HiLink idlangStrucvar	PreProc
-HiLink idlangSystem	Identifier
-HiLink idlangKeyword	Special
-
-delcommand HiLink
+
+hi def link idlangConditional	Conditional
+hi def link idlangRoutine	Type
+hi def link idlangStatement	Statement
+hi def link idlangContinueLine	Todo
+hi def link idlangRealNumber	Float
+hi def link idlangNumber	Number
+hi def link idlangString	String
+hi def link idlangOperator	Operator
+hi def link idlangComment	Comment
+hi def link idlangTodo	Todo
+hi def link idlangPreCondit	Identifier
+hi def link idlangDblCommaError	Error
+hi def link idlangStop	Error
+hi def link idlangStrucvar	PreProc
+hi def link idlangSystem	Identifier
+hi def link idlangKeyword	Special
+
 
 let b:current_syntax = "idlang"
 " vim: ts=18
diff --git a/runtime/syntax/inform.vim b/runtime/syntax/inform.vim
index 4d833c7df2..e3e1b3e1f0 100644
--- a/runtime/syntax/inform.vim
+++ b/runtime/syntax/inform.vim
@@ -340,54 +340,52 @@ syn sync maxlines=500
 delcommand SynDisplay
 
 " The default highlighting.
-command -nargs=+ HiLink hi def link <args>
-
-HiLink informDefine		Define
-HiLink informType		Type
-HiLink informInclude		Include
-HiLink informPreCondit	PreCondit
-HiLink informPreProc		PreProc
-HiLink informGramPreProc	PreProc
-HiLink informAsm		Special
+
+hi def link informDefine		Define
+hi def link informType		Type
+hi def link informInclude		Include
+hi def link informPreCondit	PreCondit
+hi def link informPreProc		PreProc
+hi def link informGramPreProc	PreProc
+hi def link informAsm		Special
 if !exists("inform_suppress_obsolete")
-HiLink informAsmObsolete		informError
-HiLink informKeywordObsolete	informError
+hi def link informAsmObsolete		informError
+hi def link informKeywordObsolete	informError
 else
-HiLink informAsmObsolete		Special
-HiLink informKeywordObsolete	Keyword
+hi def link informAsmObsolete		Special
+hi def link informKeywordObsolete	Keyword
 endif
-HiLink informPredicate	Operator
-HiLink informSysFunc		Identifier
-HiLink informSysConst		Identifier
-HiLink informConditional	Conditional
-HiLink informRepeat		Repeat
-HiLink informStatement	Statement
-HiLink informOperator		Operator
-HiLink informKeyword		Keyword
-HiLink informGrammar		Keyword
-HiLink informDictString	String
-HiLink informNumber		Number
-HiLink informError		Error
-HiLink informString		String
-HiLink informComment		Comment
-HiLink informAccent		Special
-HiLink informStringUnicode	Special
-HiLink informStringCode	Special
-HiLink informTodo		Todo
+hi def link informPredicate	Operator
+hi def link informSysFunc		Identifier
+hi def link informSysConst		Identifier
+hi def link informConditional	Conditional
+hi def link informRepeat		Repeat
+hi def link informStatement	Statement
+hi def link informOperator		Operator
+hi def link informKeyword		Keyword
+hi def link informGrammar		Keyword
+hi def link informDictString	String
+hi def link informNumber		Number
+hi def link informError		Error
+hi def link informString		String
+hi def link informComment		Comment
+hi def link informAccent		Special
+hi def link informStringUnicode	Special
+hi def link informStringCode	Special
+hi def link informTodo		Todo
 if !exists("inform_highlight_simple")
-HiLink informLibAttrib	Identifier
-HiLink informLibProp	Identifier
-HiLink informLibObj		Identifier
-HiLink informLibRoutine	Identifier
-HiLink informLibVariable	Identifier
-HiLink informLibConst	Identifier
-HiLink informLibAction	Identifier
+hi def link informLibAttrib	Identifier
+hi def link informLibProp	Identifier
+hi def link informLibObj		Identifier
+hi def link informLibRoutine	Identifier
+hi def link informLibVariable	Identifier
+hi def link informLibConst	Identifier
+hi def link informLibAction	Identifier
 endif
-HiLink informBadDictString	informError
-HiLink informBadAccent	informError
-HiLink informBadStrUnicode	informError
+hi def link informBadDictString	informError
+hi def link informBadAccent	informError
+hi def link informBadStrUnicode	informError
 
-delcommand HiLink
 
 let b:current_syntax = "inform"
 
diff --git a/runtime/syntax/inittab.vim b/runtime/syntax/inittab.vim
index a743c82f82..82bf660105 100644
--- a/runtime/syntax/inittab.vim
+++ b/runtime/syntax/inittab.vim
@@ -42,24 +42,22 @@ syn match inittabProcessPlus "+" contained nextgroup=inittabProcess,inittabError
 syn region inittabProcess start="/" end="$" transparent oneline contained contains=@inittabSh,inittabComment
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink inittabComment Comment
-HiLink inittabFixme Todo
-HiLink inittabActionName Type
-HiLink inittabError Error
-HiLink inittabId Identifier
-HiLink inittabRunLevels Special
+hi def link inittabComment Comment
+hi def link inittabFixme Todo
+hi def link inittabActionName Type
+hi def link inittabError Error
+hi def link inittabId Identifier
+hi def link inittabRunLevels Special
 
-HiLink inittabColonProcess inittabColon
-HiLink inittabColonAction inittabColon
-HiLink inittabColonRunLevels inittabColon
-HiLink inittabColon PreProc
+hi def link inittabColonProcess inittabColon
+hi def link inittabColonAction inittabColon
+hi def link inittabColonRunLevels inittabColon
+hi def link inittabColon PreProc
 
-HiLink inittabShString String
-HiLink inittabShOption Special
-HiLink inittabShCommand Statement
+hi def link inittabShString String
+hi def link inittabShOption Special
+hi def link inittabShCommand Statement
 
-delcommand HiLink
 
 let b:current_syntax = "inittab"
diff --git a/runtime/syntax/ishd.vim b/runtime/syntax/ishd.vim
index 78d88b9c17..3c468e361f 100644
--- a/runtime/syntax/ishd.vim
+++ b/runtime/syntax/ishd.vim
@@ -385,26 +385,24 @@ syn region	ishdDefine		start="^\s*#\s*\(define\|undef\)\>" end="$" contains=ALLB
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ishdNumber	    Number
-HiLink ishdError	    Error
-HiLink ishdStatement	    Statement
-HiLink ishdString	    String
-HiLink ishdComment	    Comment
-HiLink ishdTodo	    Todo
-HiLink ishdFunction	    Identifier
-HiLink ishdConstant	    PreProc
-HiLink ishdType	    Type
-HiLink ishdInclude	    Include
-HiLink ishdDefine	    Macro
-HiLink ishdIncluded	    String
-HiLink ishdPreCondit	    PreCondit
-HiLink ishdHashIf0Skip   ishdHashIf0
-HiLink ishdHashIf0End    ishdHashIf0
-HiLink ishdHashIf0	    Comment
+hi def link ishdNumber	    Number
+hi def link ishdError	    Error
+hi def link ishdStatement	    Statement
+hi def link ishdString	    String
+hi def link ishdComment	    Comment
+hi def link ishdTodo	    Todo
+hi def link ishdFunction	    Identifier
+hi def link ishdConstant	    PreProc
+hi def link ishdType	    Type
+hi def link ishdInclude	    Include
+hi def link ishdDefine	    Macro
+hi def link ishdIncluded	    String
+hi def link ishdPreCondit	    PreCondit
+hi def link ishdHashIf0Skip   ishdHashIf0
+hi def link ishdHashIf0End    ishdHashIf0
+hi def link ishdHashIf0	    Comment
 
-delcommand HiLink
 
 let b:current_syntax = "ishd"
 
diff --git a/runtime/syntax/iss.vim b/runtime/syntax/iss.vim
index 63a453adac..e58c618b7f 100644
--- a/runtime/syntax/iss.vim
+++ b/runtime/syntax/iss.vim
@@ -103,35 +103,33 @@ syn keyword issTasksFlags checkedonce dontinheritcheck exclusive restart uncheck
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink issSection	Special
-HiLink issComment	Comment
-HiLink issDirective	Type
-HiLink issParam	Type
-HiLink issFolder	Special
-HiLink issString	String
-HiLink issURL	Include
-HiLink issPreProc	PreProc 
-
-HiLink issDirsFlags		Keyword
-HiLink issFilesCopyMode	Keyword
-HiLink issFilesAttribs	Keyword
-HiLink issFilesPermissions	Keyword
-HiLink issFilesFlags		Keyword
-HiLink issIconsFlags		Keyword
-HiLink issINIFlags		Keyword
-HiLink issRegRootKey		Keyword
-HiLink issRegValueType	Keyword
-HiLink issRegFlags		Keyword
-HiLink issRunFlags		Keyword
-HiLink issTypesFlags		Keyword
-HiLink issComponentsFlags	Keyword
-HiLink issInstallDeleteType	Keyword
-HiLink issTasksFlags		Keyword
-
-delcommand HiLink
+hi def link issSection	Special
+hi def link issComment	Comment
+hi def link issDirective	Type
+hi def link issParam	Type
+hi def link issFolder	Special
+hi def link issString	String
+hi def link issURL	Include
+hi def link issPreProc	PreProc 
+
+hi def link issDirsFlags		Keyword
+hi def link issFilesCopyMode	Keyword
+hi def link issFilesAttribs	Keyword
+hi def link issFilesPermissions	Keyword
+hi def link issFilesFlags		Keyword
+hi def link issIconsFlags		Keyword
+hi def link issINIFlags		Keyword
+hi def link issRegRootKey		Keyword
+hi def link issRegValueType	Keyword
+hi def link issRegFlags		Keyword
+hi def link issRunFlags		Keyword
+hi def link issTypesFlags		Keyword
+hi def link issComponentsFlags	Keyword
+hi def link issInstallDeleteType	Keyword
+hi def link issTasksFlags		Keyword
+
 
 let b:current_syntax = "iss"
 
diff --git a/runtime/syntax/ist.vim b/runtime/syntax/ist.vim
index f3f005bf00..e34edac272 100644
--- a/runtime/syntax/ist.vim
+++ b/runtime/syntax/ist.vim
@@ -39,19 +39,17 @@ syn match   IstTodo	   "DEBUG\|TODO"	 contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink IstInpSpec	Type
-HiLink IstOutSpec	Identifier
-HiLink IstString	String
-HiLink IstNumber	Number
-HiLink IstComment	Comment
-HiLink IstTodo	Todo
-HiLink IstSpecial	Special
-HiLink IstDoubleQuote	Label
-HiLink IstCharacter	Label
-
-delcommand HiLink
+
+hi def link IstInpSpec	Type
+hi def link IstOutSpec	Identifier
+hi def link IstString	String
+hi def link IstNumber	Number
+hi def link IstComment	Comment
+hi def link IstTodo	Todo
+hi def link IstSpecial	Special
+hi def link IstDoubleQuote	Label
+hi def link IstCharacter	Label
+
 
 let b:current_syntax = "ist"
 
diff --git a/runtime/syntax/jal.vim b/runtime/syntax/jal.vim
index ded2ecd3d1..460bc01752 100644
--- a/runtime/syntax/jal.vim
+++ b/runtime/syntax/jal.vim
@@ -169,68 +169,66 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink jalAcces		jalStatement
-HiLink jalBoolean		Boolean
-HiLink jalBit			Boolean
-HiLink jalComment		Comment
-HiLink jalConditional		Conditional
-HiLink jalConstant		Constant
-HiLink jalDelimiter		Identifier
-HiLink jalDirective		PreProc
-HiLink jalException		Exception
-HiLink jalFloat		Float
-HiLink jalFunction		Function
-HiLink jalPsudoVarsKey	Function
-HiLink jalLabel		Label
-HiLink jalMatrixDelimiter	Identifier
-HiLink jalModifier		Type
-HiLink jalNumber		Number
-HiLink jalBinNumber		Number
-HiLink jalHexNumber		Number
-HiLink jalOperator		Operator
-HiLink jalPredefined		Constant
-HiLink jalPreProc		PreProc
-HiLink jalRepeat		Repeat
-HiLink jalStatement		Statement
-HiLink jalString		String
-HiLink jalStringEscape	Special
-HiLink jalStringEscapeGPC	Special
-HiLink jalStringError		Error
-HiLink jalStruct		jalStatement
-HiLink jalSymbolOperator	jalOperator
-HiLink jalTodo		Todo
-HiLink jalType		Type
-HiLink jalUnclassified	Statement
-HiLink jalAsm			Assembler
-HiLink jalError		Error
-HiLink jalAsmKey		Statement
-HiLink jalPIC			Statement
-
-HiLink jalShowTab		Error
-
-HiLink picTodo		Todo
-HiLink picComment		Comment
-HiLink picDirective		Statement
-HiLink picLabel		Label
-HiLink picString		String
-
-HiLink picOpcode		Keyword
-HiLink picRegister		Structure
-HiLink picRegisterPart	Special
-HiLink picPinDir		SPecial
-HiLink picPortDir		SPecial
-
-HiLink picASCII		String
-HiLink picBinary		Number
-HiLink picDecimal		Number
-HiLink picHexadecimal		Number
-HiLink picOctal		Number
-
-HiLink picIdentifier		Identifier
-
-delcommand HiLink
+
+hi def link jalAcces		jalStatement
+hi def link jalBoolean		Boolean
+hi def link jalBit			Boolean
+hi def link jalComment		Comment
+hi def link jalConditional		Conditional
+hi def link jalConstant		Constant
+hi def link jalDelimiter		Identifier
+hi def link jalDirective		PreProc
+hi def link jalException		Exception
+hi def link jalFloat		Float
+hi def link jalFunction		Function
+hi def link jalPsudoVarsKey	Function
+hi def link jalLabel		Label
+hi def link jalMatrixDelimiter	Identifier
+hi def link jalModifier		Type
+hi def link jalNumber		Number
+hi def link jalBinNumber		Number
+hi def link jalHexNumber		Number
+hi def link jalOperator		Operator
+hi def link jalPredefined		Constant
+hi def link jalPreProc		PreProc
+hi def link jalRepeat		Repeat
+hi def link jalStatement		Statement
+hi def link jalString		String
+hi def link jalStringEscape	Special
+hi def link jalStringEscapeGPC	Special
+hi def link jalStringError		Error
+hi def link jalStruct		jalStatement
+hi def link jalSymbolOperator	jalOperator
+hi def link jalTodo		Todo
+hi def link jalType		Type
+hi def link jalUnclassified	Statement
+hi def link jalAsm			Assembler
+hi def link jalError		Error
+hi def link jalAsmKey		Statement
+hi def link jalPIC			Statement
+
+hi def link jalShowTab		Error
+
+hi def link picTodo		Todo
+hi def link picComment		Comment
+hi def link picDirective		Statement
+hi def link picLabel		Label
+hi def link picString		String
+
+hi def link picOpcode		Keyword
+hi def link picRegister		Structure
+hi def link picRegisterPart	Special
+hi def link picPinDir		SPecial
+hi def link picPortDir		SPecial
+
+hi def link picASCII		String
+hi def link picBinary		Number
+hi def link picDecimal		Number
+hi def link picHexadecimal		Number
+hi def link picOctal		Number
+
+hi def link picIdentifier		Identifier
+
 
 
 let b:current_syntax = "jal"
diff --git a/runtime/syntax/jam.vim b/runtime/syntax/jam.vim
index f165a78eff..fc7f49d1f0 100644
--- a/runtime/syntax/jam.vim
+++ b/runtime/syntax/jam.vim
@@ -161,79 +161,77 @@ syntax match    jamOperator3Error   "*/"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink jamCommentL		jamComment
-HiLink jamCommentL2		jamComment
-HiLink jamOperator3Error	jamError
-HiLink jamConditional	Conditional
-HiLink jamRepeat		Repeat
-HiLink jamCharacter		Character
-HiLink jamSpecialCharacter	jamSpecial
-HiLink jamNumber		Number
-HiLink jamParenError	jamError
-HiLink jamErrInParen	jamError
-HiLink jamErrInBracket	jamError
-HiLink jamCommentError	jamError
-HiLink jamSpaceError	jamError
-HiLink jamSpecialError	jamError
-HiLink jamOperator1		jamOperator
-HiLink jamOperator2		jamOperator
-HiLink jamOperator3		jamOperator
-HiLink jamOperator4		jamOperator
-HiLink jamOperator5		jamOperator
-HiLink jamOperator6		jamOperator
-HiLink jamOperator7		jamOperator
-HiLink jamOperator8		jamOperator
-HiLink jamOperator9		jamOperator
-HiLink jamOperator10	jamOperator
-HiLink jamOperator11	jamOperator
-HiLink jamOperator12	jamOperator
-HiLink jamOperator13	jamOperator
-HiLink jamOperator14	jamOperator
-HiLink jamError		Error
-HiLink jamStatement		Statement
-HiLink jamPreCondit		PreCondit
-HiLink jamCommentError	jamError
-HiLink jamCommentString	jamString
-HiLink jamComment2String	jamString
-HiLink jamCommentSkip	jamComment
-HiLink jamString		String
-HiLink jamComment		Comment
-HiLink jamSpecial		SpecialChar
-HiLink jamTodo		Todo
-HiLink jamCppSkip		jamCppOut
-HiLink jamCppOut2		jamCppOut
-HiLink jamCppOut		Comment
-HiLink jamDBState1		Identifier
-HiLink jamDBState2		Identifier
-HiLink jamSQLState1		jamSQL
-HiLink jamSQLState2		jamSQL
-HiLink jamLibFunc1		jamLibFunc
-HiLink jamLibFunc2		jamLibFunc
-HiLink jamLibFunc3		jamLibFunc
-HiLink jamLibFunc4		jamLibFunc
-HiLink jamLibFunc5		jamLibFunc
-HiLink jamLibFunc6		jamLibFunc
-HiLink jamLibFunc7		jamLibFunc
-HiLink jamLibFunc8		jamLibFunc
-HiLink jamLibFunc9		jamLibFunc
-HiLink jamVariable1		jamVariablen
-HiLink jamVariable2		jamVariablen
-HiLink jamVariable3		jamVariablen
-HiLink jamVariable4		jamVariablen
-HiLink jamVariable5		jamVariablen
-HiLink jamVariable6		jamVariablen
-HiLink jamVariable7		jamVariablen
-HiLink jamVariable8		jamVariablen
-HiLink jamVariable9		jamVariablen
-HiLink jamVariable10	jamVariablen
-HiLink jamVariablen		Constant
-HiLink jamSQL		Type
-HiLink jamLibFunc		PreProc
-HiLink jamOperator		Special
-
-delcommand HiLink
+
+hi def link jamCommentL		jamComment
+hi def link jamCommentL2		jamComment
+hi def link jamOperator3Error	jamError
+hi def link jamConditional	Conditional
+hi def link jamRepeat		Repeat
+hi def link jamCharacter		Character
+hi def link jamSpecialCharacter	jamSpecial
+hi def link jamNumber		Number
+hi def link jamParenError	jamError
+hi def link jamErrInParen	jamError
+hi def link jamErrInBracket	jamError
+hi def link jamCommentError	jamError
+hi def link jamSpaceError	jamError
+hi def link jamSpecialError	jamError
+hi def link jamOperator1		jamOperator
+hi def link jamOperator2		jamOperator
+hi def link jamOperator3		jamOperator
+hi def link jamOperator4		jamOperator
+hi def link jamOperator5		jamOperator
+hi def link jamOperator6		jamOperator
+hi def link jamOperator7		jamOperator
+hi def link jamOperator8		jamOperator
+hi def link jamOperator9		jamOperator
+hi def link jamOperator10	jamOperator
+hi def link jamOperator11	jamOperator
+hi def link jamOperator12	jamOperator
+hi def link jamOperator13	jamOperator
+hi def link jamOperator14	jamOperator
+hi def link jamError		Error
+hi def link jamStatement		Statement
+hi def link jamPreCondit		PreCondit
+hi def link jamCommentError	jamError
+hi def link jamCommentString	jamString
+hi def link jamComment2String	jamString
+hi def link jamCommentSkip	jamComment
+hi def link jamString		String
+hi def link jamComment		Comment
+hi def link jamSpecial		SpecialChar
+hi def link jamTodo		Todo
+hi def link jamCppSkip		jamCppOut
+hi def link jamCppOut2		jamCppOut
+hi def link jamCppOut		Comment
+hi def link jamDBState1		Identifier
+hi def link jamDBState2		Identifier
+hi def link jamSQLState1		jamSQL
+hi def link jamSQLState2		jamSQL
+hi def link jamLibFunc1		jamLibFunc
+hi def link jamLibFunc2		jamLibFunc
+hi def link jamLibFunc3		jamLibFunc
+hi def link jamLibFunc4		jamLibFunc
+hi def link jamLibFunc5		jamLibFunc
+hi def link jamLibFunc6		jamLibFunc
+hi def link jamLibFunc7		jamLibFunc
+hi def link jamLibFunc8		jamLibFunc
+hi def link jamLibFunc9		jamLibFunc
+hi def link jamVariable1		jamVariablen
+hi def link jamVariable2		jamVariablen
+hi def link jamVariable3		jamVariablen
+hi def link jamVariable4		jamVariablen
+hi def link jamVariable5		jamVariablen
+hi def link jamVariable6		jamVariablen
+hi def link jamVariable7		jamVariablen
+hi def link jamVariable8		jamVariablen
+hi def link jamVariable9		jamVariablen
+hi def link jamVariable10	jamVariablen
+hi def link jamVariablen		Constant
+hi def link jamSQL		Type
+hi def link jamLibFunc		PreProc
+hi def link jamOperator		Special
+
 
 let b:current_syntax = "jam"
 
diff --git a/runtime/syntax/jargon.vim b/runtime/syntax/jargon.vim
index 97b03c3478..415f2bc972 100644
--- a/runtime/syntax/jargon.vim
+++ b/runtime/syntax/jargon.vim
@@ -15,11 +15,9 @@ syn match jargonMark	/{[^}]*}/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink jargonChaptTitle	Title
-HiLink jargonEmailAddr	 Comment
-HiLink jargonUrl	 Comment
-HiLink jargonMark	Label
-delcommand HiLink
+hi def link jargonChaptTitle	Title
+hi def link jargonEmailAddr	 Comment
+hi def link jargonUrl	 Comment
+hi def link jargonMark	Label
 
 let b:current_syntax = "jargon"
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index c22c67bba3..89320597f1 100644
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -19,9 +19,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ JavaHiLink hi def link <args>
-
 " some characters that cannot be in a java program (outside a string)
 syn match javaError "[\\@`]"
 syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
@@ -30,7 +27,7 @@ syn match javaOK "\.\.\."
 
 " use separate name so that it can be deleted in javacc.vim
 syn match   javaError2 "#\|=<"
-JavaHiLink javaError2 javaError
+hi def link javaError2 javaError
 
 
 
@@ -73,32 +70,32 @@ if exists("java_highlight_all")  || exists("java_highlight_java")  || exists("ja
   syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
   syn cluster javaTop add=javaR_JavaLang
   syn cluster javaClasses add=javaR_JavaLang
-  JavaHiLink javaR_JavaLang javaR_Java
+  hi def link javaR_JavaLang javaR_Java
   syn keyword javaC_JavaLang Process RuntimePermission StringKeySet CharacterData01 Class ThreadLocal ThreadLocalMap CharacterData0E Package Character StringCoding Long ProcessImpl ProcessEnvironment Short AssertionStatusDirectives 1PackageInfoProxy UnicodeBlock InheritableThreadLocal AbstractStringBuilder StringEnvironment ClassLoader ConditionalSpecialCasing CharacterDataPrivateUse StringBuffer StringDecoder Entry StringEntry WrappedHook StringBuilder StrictMath State ThreadGroup Runtime CharacterData02 MethodArray Object CharacterDataUndefined Integer Gate Boolean Enum Variable Subset StringEncoder Void Terminator CharsetSD IntegerCache CharacterCache Byte CharsetSE Thread SystemClassLoaderAction CharacterDataLatin1 StringValues StackTraceElement Shutdown ShortCache String ConverterSD ByteCache Lock EnclosingMethodInfo Math Float Value Double SecurityManager LongCache ProcessBuilder StringEntrySet Compiler Number UNIXProcess ConverterSE ExternalData CaseInsensitiveComparator CharacterData00 NativeLibrary
   syn cluster javaTop add=javaC_JavaLang
   syn cluster javaClasses add=javaC_JavaLang
-  JavaHiLink javaC_JavaLang javaC_Java
+  hi def link javaC_JavaLang javaC_Java
   syn keyword javaE_JavaLang IncompatibleClassChangeError InternalError UnknownError ClassCircularityError AssertionError ThreadDeath IllegalAccessError NoClassDefFoundError ClassFormatError UnsupportedClassVersionError NoSuchFieldError VerifyError ExceptionInInitializerError InstantiationError LinkageError NoSuchMethodError Error UnsatisfiedLinkError StackOverflowError AbstractMethodError VirtualMachineError OutOfMemoryError
   syn cluster javaTop add=javaE_JavaLang
   syn cluster javaClasses add=javaE_JavaLang
-  JavaHiLink javaE_JavaLang javaE_Java
+  hi def link javaE_JavaLang javaE_Java
   syn keyword javaX_JavaLang CloneNotSupportedException Exception NoSuchMethodException IllegalAccessException NoSuchFieldException Throwable InterruptedException ClassNotFoundException InstantiationException
   syn cluster javaTop add=javaX_JavaLang
   syn cluster javaClasses add=javaX_JavaLang
-  JavaHiLink javaX_JavaLang javaX_Java
+  hi def link javaX_JavaLang javaX_Java
 
-  JavaHiLink javaR_Java javaR_
-  JavaHiLink javaC_Java javaC_
-  JavaHiLink javaE_Java javaE_
-  JavaHiLink javaX_Java javaX_
-  JavaHiLink javaX_		     javaExceptions
-  JavaHiLink javaR_		     javaExceptions
-  JavaHiLink javaE_		     javaExceptions
-  JavaHiLink javaC_		     javaConstant
+  hi def link javaR_Java javaR_
+  hi def link javaC_Java javaC_
+  hi def link javaE_Java javaE_
+  hi def link javaX_Java javaX_
+  hi def link javaX_		     javaExceptions
+  hi def link javaR_		     javaExceptions
+  hi def link javaE_		     javaExceptions
+  hi def link javaC_		     javaConstant
 
   syn keyword javaLangObject clone equals finalize getClass hashCode
   syn keyword javaLangObject notify notifyAll toString wait
-  JavaHiLink javaLangObject		     javaConstant
+  hi def link javaLangObject		     javaConstant
   syn cluster javaTop add=javaLangObject
 endif
 
@@ -141,9 +138,9 @@ syn region  javaComment		 start="/\*"  end="\*/" contains=@javaCommentSpecial,ja
 syn match   javaCommentStar	 contained "^\s*\*[^/]"me=e-1
 syn match   javaCommentStar	 contained "^\s*\*$"
 syn match   javaLineComment	 "//.*" contains=@javaCommentSpecial2,javaTodo,@Spell
-JavaHiLink javaCommentString javaString
-JavaHiLink javaComment2String javaString
-JavaHiLink javaCommentCharacter javaCharacter
+hi def link javaCommentString javaString
+hi def link javaComment2String javaString
+hi def link javaCommentCharacter javaCharacter
 
 syn cluster javaTop add=javaComment,javaLineComment
 
@@ -236,26 +233,26 @@ if exists("java_highlight_debug")
 
   syn cluster javaTop add=javaDebug
 
-  JavaHiLink javaDebug		 Debug
-  JavaHiLink javaDebugString		 DebugString
-  JavaHiLink javaDebugStringError	 javaError
-  JavaHiLink javaDebugType		 DebugType
-  JavaHiLink javaDebugBoolean		 DebugBoolean
-  JavaHiLink javaDebugNumber		 Debug
-  JavaHiLink javaDebugSpecial		 DebugSpecial
-  JavaHiLink javaDebugSpecialCharacter DebugSpecial
-  JavaHiLink javaDebugCharacter	 DebugString
-  JavaHiLink javaDebugParen		 Debug
-
-  JavaHiLink DebugString		 String
-  JavaHiLink DebugSpecial		 Special
-  JavaHiLink DebugBoolean		 Boolean
-  JavaHiLink DebugType		 Type
+  hi def link javaDebug		 Debug
+  hi def link javaDebugString		 DebugString
+  hi def link javaDebugStringError	 javaError
+  hi def link javaDebugType		 DebugType
+  hi def link javaDebugBoolean		 DebugBoolean
+  hi def link javaDebugNumber		 Debug
+  hi def link javaDebugSpecial		 DebugSpecial
+  hi def link javaDebugSpecialCharacter DebugSpecial
+  hi def link javaDebugCharacter	 DebugString
+  hi def link javaDebugParen		 Debug
+
+  hi def link DebugString		 String
+  hi def link DebugSpecial		 Special
+  hi def link DebugBoolean		 Boolean
+  hi def link DebugType		 Type
 endif
 
 if exists("java_mark_braces_in_parens_as_errors")
   syn match javaInParen		 contained "[{}]"
-  JavaHiLink javaInParen	javaError
+  hi def link javaInParen	javaError
   syn cluster javaTop add=javaInParen
 endif
 
@@ -270,7 +267,7 @@ syn region  javaParenT1 transparent matchgroup=javaParen1 start="\[" end="\]" co
 syn region  javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT  contained
 syn match   javaParenError	 "\]"
 
-JavaHiLink javaParenError	javaError
+hi def link javaParenError	javaError
 
 if exists("java_highlight_functions")
    syn match javaLambdaDef "([a-zA-Z0-9_<>\[\], \t]*)\s*->"
@@ -283,56 +280,54 @@ endif
 exec "syn sync ccomment javaComment minlines=" . java_minlines
 
 " The default highlighting.
-JavaHiLink javaLambdaDef		Function
-JavaHiLink javaFuncDef		Function
-JavaHiLink javaVarArg			Function
-JavaHiLink javaBraces			Function
-JavaHiLink javaBranch			Conditional
-JavaHiLink javaUserLabelRef		javaUserLabel
-JavaHiLink javaLabel			Label
-JavaHiLink javaUserLabel		Label
-JavaHiLink javaConditional		Conditional
-JavaHiLink javaRepeat			Repeat
-JavaHiLink javaExceptions		Exception
-JavaHiLink javaAssert			Statement
-JavaHiLink javaStorageClass		StorageClass
-JavaHiLink javaMethodDecl		javaStorageClass
-JavaHiLink javaClassDecl		javaStorageClass
-JavaHiLink javaScopeDecl		javaStorageClass
-JavaHiLink javaBoolean		Boolean
-JavaHiLink javaSpecial		Special
-JavaHiLink javaSpecialError		Error
-JavaHiLink javaSpecialCharError	Error
-JavaHiLink javaString			String
-JavaHiLink javaCharacter		Character
-JavaHiLink javaSpecialChar		SpecialChar
-JavaHiLink javaNumber			Number
-JavaHiLink javaError			Error
-JavaHiLink javaStringError		Error
-JavaHiLink javaStatement		Statement
-JavaHiLink javaOperator		Operator
-JavaHiLink javaComment		Comment
-JavaHiLink javaDocComment		Comment
-JavaHiLink javaLineComment		Comment
-JavaHiLink javaConstant		Constant
-JavaHiLink javaTypedef		Typedef
-JavaHiLink javaTodo			Todo
-JavaHiLink javaAnnotation		PreProc
-
-JavaHiLink javaCommentTitle		SpecialComment
-JavaHiLink javaDocTags		Special
-JavaHiLink javaDocParam		Function
-JavaHiLink javaDocSeeTagParam		Function
-JavaHiLink javaCommentStar		javaComment
-
-JavaHiLink javaType			Type
-JavaHiLink javaExternal		Include
-
-JavaHiLink htmlComment		Special
-JavaHiLink htmlCommentPart		Special
-JavaHiLink javaSpaceError		Error
-
-delcommand JavaHiLink
+hi def link javaLambdaDef		Function
+hi def link javaFuncDef		Function
+hi def link javaVarArg			Function
+hi def link javaBraces			Function
+hi def link javaBranch			Conditional
+hi def link javaUserLabelRef		javaUserLabel
+hi def link javaLabel			Label
+hi def link javaUserLabel		Label
+hi def link javaConditional		Conditional
+hi def link javaRepeat			Repeat
+hi def link javaExceptions		Exception
+hi def link javaAssert			Statement
+hi def link javaStorageClass		StorageClass
+hi def link javaMethodDecl		javaStorageClass
+hi def link javaClassDecl		javaStorageClass
+hi def link javaScopeDecl		javaStorageClass
+hi def link javaBoolean		Boolean
+hi def link javaSpecial		Special
+hi def link javaSpecialError		Error
+hi def link javaSpecialCharError	Error
+hi def link javaString			String
+hi def link javaCharacter		Character
+hi def link javaSpecialChar		SpecialChar
+hi def link javaNumber			Number
+hi def link javaError			Error
+hi def link javaStringError		Error
+hi def link javaStatement		Statement
+hi def link javaOperator		Operator
+hi def link javaComment		Comment
+hi def link javaDocComment		Comment
+hi def link javaLineComment		Comment
+hi def link javaConstant		Constant
+hi def link javaTypedef		Typedef
+hi def link javaTodo			Todo
+hi def link javaAnnotation		PreProc
+
+hi def link javaCommentTitle		SpecialComment
+hi def link javaDocTags		Special
+hi def link javaDocParam		Function
+hi def link javaDocSeeTagParam		Function
+hi def link javaCommentStar		javaComment
+
+hi def link javaType			Type
+hi def link javaExternal		Include
+
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link javaSpaceError		Error
 
 let b:current_syntax = "java"
 
diff --git a/runtime/syntax/javacc.vim b/runtime/syntax/javacc.vim
index 93d174097e..a80572d510 100644
--- a/runtime/syntax/javacc.vim
+++ b/runtime/syntax/javacc.vim
@@ -52,13 +52,11 @@ syn keyword javaccError DEBUG IGNORE_IN_BNF
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink javaccSpecToken Statement
-HiLink javaccActionToken Type
-HiLink javaccPackages javaScopeDecl
-HiLink javaccToken String
-HiLink javaccError Error
-delcommand HiLink
+hi def link javaccSpecToken Statement
+hi def link javaccActionToken Type
+hi def link javaccPackages javaScopeDecl
+hi def link javaccToken String
+hi def link javaccError Error
 
 let b:current_syntax = "javacc"
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index e3e8262d39..9589b1938f 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -80,42 +80,40 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink javaScriptComment		Comment
-HiLink javaScriptLineComment		Comment
-HiLink javaScriptCommentTodo		Todo
-HiLink javaScriptSpecial		Special
-HiLink javaScriptStringS		String
-HiLink javaScriptStringD		String
-HiLink javaScriptCharacter		Character
-HiLink javaScriptSpecialCharacter	javaScriptSpecial
-HiLink javaScriptNumber		javaScriptValue
-HiLink javaScriptConditional		Conditional
-HiLink javaScriptRepeat		Repeat
-HiLink javaScriptBranch		Conditional
-HiLink javaScriptOperator		Operator
-HiLink javaScriptType			Type
-HiLink javaScriptStatement		Statement
-HiLink javaScriptFunction		Function
-HiLink javaScriptBraces		Function
-HiLink javaScriptError		Error
-HiLink javaScrParenError		javaScriptError
-HiLink javaScriptNull			Keyword
-HiLink javaScriptBoolean		Boolean
-HiLink javaScriptRegexpString		String
-
-HiLink javaScriptIdentifier		Identifier
-HiLink javaScriptLabel		Label
-HiLink javaScriptException		Exception
-HiLink javaScriptMessage		Keyword
-HiLink javaScriptGlobal		Keyword
-HiLink javaScriptMember		Keyword
-HiLink javaScriptDeprecated		Exception 
-HiLink javaScriptReserved		Keyword
-HiLink javaScriptDebug		Debug
-HiLink javaScriptConstant		Label
-
-delcommand HiLink
+hi def link javaScriptComment		Comment
+hi def link javaScriptLineComment		Comment
+hi def link javaScriptCommentTodo		Todo
+hi def link javaScriptSpecial		Special
+hi def link javaScriptStringS		String
+hi def link javaScriptStringD		String
+hi def link javaScriptCharacter		Character
+hi def link javaScriptSpecialCharacter	javaScriptSpecial
+hi def link javaScriptNumber		javaScriptValue
+hi def link javaScriptConditional		Conditional
+hi def link javaScriptRepeat		Repeat
+hi def link javaScriptBranch		Conditional
+hi def link javaScriptOperator		Operator
+hi def link javaScriptType			Type
+hi def link javaScriptStatement		Statement
+hi def link javaScriptFunction		Function
+hi def link javaScriptBraces		Function
+hi def link javaScriptError		Error
+hi def link javaScrParenError		javaScriptError
+hi def link javaScriptNull			Keyword
+hi def link javaScriptBoolean		Boolean
+hi def link javaScriptRegexpString		String
+
+hi def link javaScriptIdentifier		Identifier
+hi def link javaScriptLabel		Label
+hi def link javaScriptException		Exception
+hi def link javaScriptMessage		Keyword
+hi def link javaScriptGlobal		Keyword
+hi def link javaScriptMember		Keyword
+hi def link javaScriptDeprecated		Exception 
+hi def link javaScriptReserved		Keyword
+hi def link javaScriptDebug		Debug
+hi def link javaScriptConstant		Label
+
 
 let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
diff --git a/runtime/syntax/jess.vim b/runtime/syntax/jess.vim
index ad625ac73f..67d3715a30 100644
--- a/runtime/syntax/jess.vim
+++ b/runtime/syntax/jess.vim
@@ -119,27 +119,25 @@ syn sync lines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink jessAtomNmbr	jessNumber
-HiLink jessAtomMark	jessMark
-
-HiLink jessAtom		Identifier
-HiLink jessAtomBarSymbol	Special
-HiLink jessBarSymbol	Special
-HiLink jessComment	Comment
-HiLink jessConcat	Statement
-HiLink jessDeclaration	Statement
-HiLink jessFunc		Statement
-HiLink jessKey		Type
-HiLink jessMark		Delimiter
-HiLink jessNumber	Number
-HiLink jessParenError	Error
-HiLink jessSpecial	Type
-HiLink jessString	String
-HiLink jessVar		Identifier
-
-delcommand HiLink
+
+hi def link jessAtomNmbr	jessNumber
+hi def link jessAtomMark	jessMark
+
+hi def link jessAtom		Identifier
+hi def link jessAtomBarSymbol	Special
+hi def link jessBarSymbol	Special
+hi def link jessComment	Comment
+hi def link jessConcat	Statement
+hi def link jessDeclaration	Statement
+hi def link jessFunc		Statement
+hi def link jessKey		Type
+hi def link jessMark		Delimiter
+hi def link jessNumber	Number
+hi def link jessParenError	Error
+hi def link jessSpecial	Type
+hi def link jessString	String
+hi def link jessVar		Identifier
+
 
 let b:current_syntax = "jess"
 
diff --git a/runtime/syntax/jgraph.vim b/runtime/syntax/jgraph.vim
index 43fc4275de..a29a21a73b 100644
--- a/runtime/syntax/jgraph.vim
+++ b/runtime/syntax/jgraph.vim
@@ -34,14 +34,12 @@ syn match  jgraphNumber		 "\-\=\.\d\+\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jgraphComment	Comment
-HiLink jgraphCmd	Identifier
-HiLink jgraphType	Type
-HiLink jgraphNumber	Number
+hi def link jgraphComment	Comment
+hi def link jgraphCmd	Identifier
+hi def link jgraphType	Type
+hi def link jgraphNumber	Number
 
-delcommand HiLink
 
 
 let b:current_syntax = "jgraph"
diff --git a/runtime/syntax/jproperties.vim b/runtime/syntax/jproperties.vim
index bde160b24d..628c03097f 100644
--- a/runtime/syntax/jproperties.vim
+++ b/runtime/syntax/jproperties.vim
@@ -118,19 +118,17 @@ syn keyword jpropertiesTodo		TODO FIXME XXX contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink jpropertiesComment	Comment
-HiLink jpropertiesTodo		Todo
-HiLink jpropertiesIdentifier	Identifier
-HiLink jpropertiesString	String
-HiLink jpropertiesExtendString	String
-HiLink jpropertiesCharacter	Character
-HiLink jpropertiesSpecial	Special
-HiLink jpropertiesSpecialChar	SpecialChar
-HiLink jpropertiesError	Error
-
-delcommand HiLink
+
+hi def link jpropertiesComment	Comment
+hi def link jpropertiesTodo		Todo
+hi def link jpropertiesIdentifier	Identifier
+hi def link jpropertiesString	String
+hi def link jpropertiesExtendString	String
+hi def link jpropertiesCharacter	Character
+hi def link jpropertiesSpecial	Special
+hi def link jpropertiesSpecialChar	SpecialChar
+hi def link jpropertiesError	Error
+
 
 let b:current_syntax = "jproperties"
 
diff --git a/runtime/syntax/json.vim b/runtime/syntax/json.vim
index 34c26d37d8..d80af84312 100644
--- a/runtime/syntax/json.vim
+++ b/runtime/syntax/json.vim
@@ -93,30 +93,28 @@ syn region  jsonFold matchgroup=jsonBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ tr
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink jsonPadding         Operator
-HiLink jsonString          String
-HiLink jsonTest          Label
-HiLink jsonEscape          Special
-HiLink jsonNumber          Number
-HiLink jsonBraces          Delimiter
-HiLink jsonNull            Function
-HiLink jsonBoolean         Boolean
-HiLink jsonKeyword         Label
+hi def link jsonPadding         Operator
+hi def link jsonString          String
+hi def link jsonTest          Label
+hi def link jsonEscape          Special
+hi def link jsonNumber          Number
+hi def link jsonBraces          Delimiter
+hi def link jsonNull            Function
+hi def link jsonBoolean         Boolean
+hi def link jsonKeyword         Label
 
 if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
-HiLink jsonNumError        Error
-HiLink jsonCommentError    Error
-HiLink jsonSemicolonError  Error
-HiLink jsonTrailingCommaError     Error
-HiLink jsonMissingCommaError      Error
-HiLink jsonStringSQError        	Error
-HiLink jsonNoQuotesError        	Error
-HiLink jsonTripleQuotesError     	Error
+hi def link jsonNumError        Error
+hi def link jsonCommentError    Error
+hi def link jsonSemicolonError  Error
+hi def link jsonTrailingCommaError     Error
+hi def link jsonMissingCommaError      Error
+hi def link jsonStringSQError        	Error
+hi def link jsonNoQuotesError        	Error
+hi def link jsonTripleQuotesError     	Error
 endif
-HiLink jsonQuote           Quote
-HiLink jsonNoise           Noise
-delcommand HiLink
+hi def link jsonQuote           Quote
+hi def link jsonNoise           Noise
 
 let b:current_syntax = "json"
 if main_syntax == 'json'
diff --git a/runtime/syntax/jsp.vim b/runtime/syntax/jsp.vim
index 812a81465b..1c3cc35a31 100644
--- a/runtime/syntax/jsp.vim
+++ b/runtime/syntax/jsp.vim
@@ -46,20 +46,18 @@ syn region htmlTag start=+<[^/%]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,h
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 " java.vim has redefined htmlComment highlighting
-HiLink htmlComment	 Comment
-HiLink htmlCommentPart Comment
+hi def link htmlComment	 Comment
+hi def link htmlCommentPart Comment
 " Be consistent with html highlight settings
-HiLink jspComment	 htmlComment
-HiLink jspTag		 htmlTag
-HiLink jspDirective	 jspTag
-HiLink jspDirName	 htmlTagName
-HiLink jspDirArg	 htmlArg
-HiLink jspCommand	 jspTag
-HiLink jspCommandName  htmlTagName
-HiLink jspCommandArg	 htmlArg
-delcommand HiLink
+hi def link jspComment	 htmlComment
+hi def link jspTag		 htmlTag
+hi def link jspDirective	 jspTag
+hi def link jspDirName	 htmlTagName
+hi def link jspDirArg	 htmlArg
+hi def link jspCommand	 jspTag
+hi def link jspCommandName  htmlTagName
+hi def link jspCommandArg	 htmlArg
 
 if main_syntax == 'jsp'
   unlet main_syntax
diff --git a/runtime/syntax/kix.vim b/runtime/syntax/kix.vim
index cbc837c4d1..8efe02baee 100644
--- a/runtime/syntax/kix.vim
+++ b/runtime/syntax/kix.vim
@@ -129,43 +129,41 @@ syn match   kixExpression	"<\|>\|<=\|>=\|<>"
 
 " Default highlighting.
 " Set default highlight only if it doesn't already have a value.
-command -nargs=+ HiLink hi def link <args>
-
-HiLink kixDoubleString		String
-HiLink kixSingleString		String
-HiLink kixStatement		Statement
-HiLink kixRepeat		Repeat
-HiLink kixComment		Comment
-HiLink kixBuiltin		Function
-HiLink kixLocalVar		Special
-HiLink kixMacro			Special
-HiLink kixEnvVar		Special
-HiLink kixLabel			Type
-HiLink kixFunction		Function
-HiLink kixInteger		Number
-HiLink kixHex			Number
-HiLink kixFloat			Number
-HiLink kixOperator		Operator
-HiLink kixExpression		Operator
-
-HiLink kixParenCloseError	Error
-HiLink kixBrackCloseError	Error
-HiLink kixStringError		Error
-
-HiLink kixWhileError		Error
-HiLink kixWhileOK		Conditional
-HiLink kixDoError		Error
-HiLink kixDoOK			Conditional
-HiLink kixIfError		Error
-HiLink kixIfOK			Conditional
-HiLink kixSelectError		Error
-HiLink kixSelectOK		Conditional
-HiLink kixForNextError		Error
-HiLink kixForNextOK		Conditional
-HiLink kixForEachError		Error
-HiLink kixForEachOK		Conditional
-
-delcommand HiLink
+
+hi def link kixDoubleString		String
+hi def link kixSingleString		String
+hi def link kixStatement		Statement
+hi def link kixRepeat		Repeat
+hi def link kixComment		Comment
+hi def link kixBuiltin		Function
+hi def link kixLocalVar		Special
+hi def link kixMacro			Special
+hi def link kixEnvVar		Special
+hi def link kixLabel			Type
+hi def link kixFunction		Function
+hi def link kixInteger		Number
+hi def link kixHex			Number
+hi def link kixFloat			Number
+hi def link kixOperator		Operator
+hi def link kixExpression		Operator
+
+hi def link kixParenCloseError	Error
+hi def link kixBrackCloseError	Error
+hi def link kixStringError		Error
+
+hi def link kixWhileError		Error
+hi def link kixWhileOK		Conditional
+hi def link kixDoError		Error
+hi def link kixDoOK			Conditional
+hi def link kixIfError		Error
+hi def link kixIfOK			Conditional
+hi def link kixSelectError		Error
+hi def link kixSelectOK		Conditional
+hi def link kixForNextError		Error
+hi def link kixForNextOK		Conditional
+hi def link kixForEachError		Error
+hi def link kixForEachOK		Conditional
+
 
 let b:current_syntax = "kix"
 
diff --git a/runtime/syntax/kscript.vim b/runtime/syntax/kscript.vim
index e06b49d880..e6776208d4 100644
--- a/runtime/syntax/kscript.vim
+++ b/runtime/syntax/kscript.vim
@@ -35,24 +35,22 @@ syn region	kscriptString		start=+'''+  end=+'''+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink kscriptConditional		Conditional
-HiLink kscriptRepeat			Repeat
-HiLink kscriptExceptions		Statement
-HiLink kscriptFunction		Function
-HiLink kscriptConst			Constant
-HiLink kscriptStatement		Statement
-HiLink kscriptLabel			Label
-HiLink kscriptStorageClass		StorageClass
-HiLink kscriptType			Type
-HiLink kscriptTodo			Todo
-HiLink kscriptComment		Comment
-HiLink kscriptString			String
-HiLink kscriptPreCondit		PreCondit
-HiLink kscriptHardCoded		Statement
-
-delcommand HiLink
+
+hi def link kscriptConditional		Conditional
+hi def link kscriptRepeat			Repeat
+hi def link kscriptExceptions		Statement
+hi def link kscriptFunction		Function
+hi def link kscriptConst			Constant
+hi def link kscriptStatement		Statement
+hi def link kscriptLabel			Label
+hi def link kscriptStorageClass		StorageClass
+hi def link kscriptType			Type
+hi def link kscriptTodo			Todo
+hi def link kscriptComment		Comment
+hi def link kscriptString			String
+hi def link kscriptPreCondit		PreCondit
+hi def link kscriptHardCoded		Statement
+
 
 let b:current_syntax = "kscript"
 
diff --git a/runtime/syntax/kwt.vim b/runtime/syntax/kwt.vim
index b711663c46..ecda5bb985 100644
--- a/runtime/syntax/kwt.vim
+++ b/runtime/syntax/kwt.vim
@@ -52,18 +52,16 @@ syn region kwtRewBody		transparent keepend extend fold start="->\s*<" start="^\s
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink kwtStatement	cppStatement
-HiLink kwtDecl	cppStatement
-HiLink kwtCast	cppStatement
-HiLink kwtSep	Delimiter
-HiLink kwtViews	Label
-HiLink kwtPhylum	Type
-HiLink kwtOption	PreProc
-"HiLink cText	Comment
-
-delcommand HiLink
+
+hi def link kwtStatement	cppStatement
+hi def link kwtDecl	cppStatement
+hi def link kwtCast	cppStatement
+hi def link kwtSep	Delimiter
+hi def link kwtViews	Label
+hi def link kwtPhylum	Type
+hi def link kwtOption	PreProc
+"hi def link cText	Comment
+
 
 syn sync lines=300
 
diff --git a/runtime/syntax/lace.vim b/runtime/syntax/lace.vim
index dbdaf8bec8..9a83851f2b 100644
--- a/runtime/syntax/lace.vim
+++ b/runtime/syntax/lace.vim
@@ -83,41 +83,39 @@ syn sync lines=40
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink laceTopStruct			PreProc
+hi def link laceTopStruct			PreProc
 
-HiLink laceOptionClause		Statement
-HiLink laceOptionMark			Constant
-HiLink laceClusterProp		Label
-HiLink laceAdaptClassName		Label
-HiLink laceExternal			Statement
-HiLink laceCluster			ModeMsg
+hi def link laceOptionClause		Statement
+hi def link laceOptionMark			Constant
+hi def link laceClusterProp		Label
+hi def link laceAdaptClassName		Label
+hi def link laceExternal			Statement
+hi def link laceCluster			ModeMsg
 
-HiLink laceEscape				Special
+hi def link laceEscape				Special
 
-HiLink laceBool				Boolean
-HiLink laceString				String
-HiLink laceCharacter			Character
-HiLink laceClassName			Type
-HiLink laceNumber				Number
+hi def link laceBool				Boolean
+hi def link laceString				String
+hi def link laceCharacter			Character
+hi def link laceClassName			Type
+hi def link laceNumber				Number
 
-HiLink laceOperator			Special
-HiLink laceArray				Special
-HiLink laceExport				Special
-HiLink laceCreation			Special
-HiLink laceBrackets			Special
-HiLink laceConstraint			Special
+hi def link laceOperator			Special
+hi def link laceArray				Special
+hi def link laceExport				Special
+hi def link laceCreation			Special
+hi def link laceBrackets			Special
+hi def link laceConstraint			Special
 
-HiLink laceComment			Comment
+hi def link laceComment			Comment
 
-HiLink laceError				Error
-HiLink laceStringError		Error
-HiLink laceParenError			Error
-HiLink laceBracketError		Error
-HiLink laceTodo				Todo
+hi def link laceError				Error
+hi def link laceStringError		Error
+hi def link laceParenError			Error
+hi def link laceBracketError		Error
+hi def link laceTodo				Todo
 
-delcommand HiLink
 
 let b:current_syntax = "lace"
 
diff --git a/runtime/syntax/latte.vim b/runtime/syntax/latte.vim
index f95c7b5c73..e30ae42e38 100644
--- a/runtime/syntax/latte.vim
+++ b/runtime/syntax/latte.vim
@@ -64,20 +64,18 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink latteSyntax		Statement
-HiLink latteVar			Function
+hi def link latteSyntax		Statement
+hi def link latteVar			Function
 
-HiLink latteString		String
-HiLink latteQuote			String
+hi def link latteString		String
+hi def link latteQuote			String
 
-HiLink latteDelimiter		Delimiter
-HiLink latteOperator		Operator
+hi def link latteDelimiter		Delimiter
+hi def link latteOperator		Operator
 
-HiLink latteComment		Comment
-HiLink latteError			Error
+hi def link latteComment		Comment
+hi def link latteError			Error
 
-delcommand HiLink
 
 let b:current_syntax = "latte"
diff --git a/runtime/syntax/ldif.vim b/runtime/syntax/ldif.vim
index 704a590ec5..576e4c023d 100644
--- a/runtime/syntax/ldif.vim
+++ b/runtime/syntax/ldif.vim
@@ -20,16 +20,14 @@ syn region ldifFileValue   matchgroup=ldifPunctuation start=/:< / end=/\_$/ skip
 
 syn region ldifComment start=/^#/ end=/\_$/ skip=/\n /
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ldifAttribute		Type
-HiLink ldifOption		Identifier
-HiLink ldifPunctuation	Normal
-HiLink ldifStringValue	String
-HiLink ldifBase64Value	Special
-HiLink ldifFileValue		Special
-HiLink ldifComment		Comment
+hi def link ldifAttribute		Type
+hi def link ldifOption		Identifier
+hi def link ldifPunctuation	Normal
+hi def link ldifStringValue	String
+hi def link ldifBase64Value	Special
+hi def link ldifFileValue		Special
+hi def link ldifComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "ldif"
diff --git a/runtime/syntax/lex.vim b/runtime/syntax/lex.vim
index 83eb212f2f..560aa44be3 100644
--- a/runtime/syntax/lex.vim
+++ b/runtime/syntax/lex.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Lex
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Nov 14, 2012
-" Version:	14
-" URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+" Last Change:	Aug 31, 2016
+" Version:	16
+" URL:	http://mysite.verizon.net/astronaut/vim/index.html#SYNTAX_LEX
 "
 " Option:
 "   lex_uses_cpp : if this variable exists, then C++ is loaded rather than C
@@ -119,22 +119,24 @@ syn sync match lexSyncPat	groupthere lexPatBlock	"^<$"
 syn sync match lexSyncPat	groupthere lexPatBlock	"^%%$"
 
 " The default highlighting.
-hi def link lexAbbrvComment	lexPatComment
-hi def link lexAbbrvRegExp	Macro
-hi def link lexAbbrv	SpecialChar
-hi def link lexBrace	lexPat
-hi def link lexCFunctions	Function
-hi def link lexCstruct	cStructure
-hi def link lexMorePat	SpecialChar
-hi def link lexOptions	PreProc
-hi def link lexPatComment	Comment
-hi def link lexPat		Function
-hi def link lexPatString	Function
-hi def link lexPatTag	Special
-hi def link lexPatTagZone	lexPatTag
-hi def link lexSep		Delimiter
-hi def link lexSlashQuote	lexPat
-hi def link lexStartState	Statement
+if !exists("skip_lex_syntax_inits")
+ hi def link lexAbbrvComment	lexPatComment
+ hi def link lexAbbrvRegExp	Macro
+ hi def link lexAbbrv	SpecialChar
+ hi def link lexBrace	lexPat
+ hi def link lexCFunctions	Function
+ hi def link lexCstruct	cStructure
+ hi def link lexMorePat	SpecialChar
+ hi def link lexOptions	PreProc
+ hi def link lexPatComment	Comment
+ hi def link lexPat		Function
+ hi def link lexPatString	Function
+ hi def link lexPatTag	Special
+ hi def link lexPatTagZone	lexPatTag
+ hi def link lexSep		Delimiter
+ hi def link lexSlashQuote	lexPat
+ hi def link lexStartState	Statement
+endif
 
 let b:current_syntax = "lex"
 
diff --git a/runtime/syntax/lhaskell.vim b/runtime/syntax/lhaskell.vim
index 78207812f0..0a8a076ff4 100644
--- a/runtime/syntax/lhaskell.vim
+++ b/runtime/syntax/lhaskell.vim
@@ -104,14 +104,12 @@ syntax region beginCodeCode  matchgroup=texDelimiter start="{" end="}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lhsBirdTrack Comment
+hi def link lhsBirdTrack Comment
 
-HiLink beginCodeBegin	      texCmdName
-HiLink beginCodeCode	      texSection
+hi def link beginCodeBegin	      texCmdName
+hi def link beginCodeCode	      texSection
 
-delcommand HiLink
 
 " Restore cursor to original position, as it may have been disturbed
 " by the searches in our guessing code
diff --git a/runtime/syntax/lifelines.vim b/runtime/syntax/lifelines.vim
index 041c50963d..ff4692888e 100644
--- a/runtime/syntax/lifelines.vim
+++ b/runtime/syntax/lifelines.vim
@@ -122,34 +122,32 @@ syn match	lifelinesErrInParen	contained "[{}]"
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
-
-HiLink lifelinesConditional	Conditional
-HiLink lifelinesArithm	Operator
-HiLink lifelinesLogical	Conditional
-HiLink lifelinesInclude	Include
-HiLink lifelinesComment	Comment
-HiLink lifelinesStatement	Statement
-HiLink lifelinesUser		Statement
-HiLink lifelinesFunct		Statement
-HiLink lifelinesTable		Statement
-HiLink lifelinesGedcom	Statement
-HiLink lifelinesList		Statement
-HiLink lifelinesRepeat	Repeat
-HiLink lifelinesFam		Statement
-HiLink lifelinesIndi		Statement
-HiLink lifelinesProc		Statement
-HiLink lifelinesDef		Statement
-HiLink lifelinesString	String
-HiLink lifelinesSpecial	Special
-HiLink lifelinesNumber	Number
-HiLink lifelinesParenError	Error
-HiLink lifelinesErrInParen	Error
-HiLink lifelinesError		Error
-HiLink lifelinesTodo		Todo
-HiLink lifelinesDecl		PreProc
-
-delcommand HiLink
+
+hi def link lifelinesConditional	Conditional
+hi def link lifelinesArithm	Operator
+hi def link lifelinesLogical	Conditional
+hi def link lifelinesInclude	Include
+hi def link lifelinesComment	Comment
+hi def link lifelinesStatement	Statement
+hi def link lifelinesUser		Statement
+hi def link lifelinesFunct		Statement
+hi def link lifelinesTable		Statement
+hi def link lifelinesGedcom	Statement
+hi def link lifelinesList		Statement
+hi def link lifelinesRepeat	Repeat
+hi def link lifelinesFam		Statement
+hi def link lifelinesIndi		Statement
+hi def link lifelinesProc		Statement
+hi def link lifelinesDef		Statement
+hi def link lifelinesString	String
+hi def link lifelinesSpecial	Special
+hi def link lifelinesNumber	Number
+hi def link lifelinesParenError	Error
+hi def link lifelinesErrInParen	Error
+hi def link lifelinesError		Error
+hi def link lifelinesTodo		Todo
+hi def link lifelinesDecl		PreProc
+
 
 let b:current_syntax = "lifelines"
 
diff --git a/runtime/syntax/lilo.vim b/runtime/syntax/lilo.vim
index f58e34061c..a87dafb734 100644
--- a/runtime/syntax/lilo.vim
+++ b/runtime/syntax/lilo.vim
@@ -119,58 +119,56 @@ syn match liloDecNumberPListComment "#.*$" contained nextgroup=liloDecNumberPLis
 syn match liloAnythingComment "#.*$" contained nextgroup=liloAnything,liloAnythingComment,liloError skipwhite skipempty
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
-
-HiLink liloEqPath             liloEquals
-HiLink liloEqWord             liloEquals
-HiLink liloEqVga              liloEquals
-HiLink liloEqDecNumber        liloEquals
-HiLink liloEqHexNumber        liloEquals
-HiLink liloEqNumber           liloEquals
-HiLink liloEqString           liloEquals
-HiLink liloEqAnything         liloEquals
-HiLink liloEquals             Special
-
-HiLink liloError              Error
-
-HiLink liloEqPathComment      liloComment
-HiLink liloEqVgaComment       liloComment
-HiLink liloEqDecNumberComment liloComment
-HiLink liloEqHexNumberComment liloComment
-HiLink liloEqStringComment    liloComment
-HiLink liloEqAnythingComment  liloComment
-HiLink liloPathComment        liloComment
-HiLink liloVgaComment         liloComment
-HiLink liloDecNumberComment   liloComment
-HiLink liloHexNumberComment   liloComment
-HiLink liloNumberComment      liloComment
-HiLink liloStringComment      liloComment
-HiLink liloAnythingComment    liloComment
-HiLink liloComment            Comment
-
-HiLink liloDiskOpt            liloOption
-HiLink liloKernelOpt          liloOption
-HiLink liloImageOpt           liloOption
-HiLink liloOption             Keyword
-
-HiLink liloDecNumber          liloNumber
-HiLink liloHexNumber          liloNumber
-HiLink liloDecNumberP         liloNumber
-HiLink liloNumber             Number
-HiLink liloString             String
-HiLink liloPath               Constant
-
-HiLink liloSpecial            Special
-HiLink liloLabel              Title
-HiLink liloDecNumberList      Special
-HiLink liloDecNumberPList     Special
-HiLink liloAnything           Normal
-HiLink liloEnviron            Identifier
-HiLink liloVgaKeyword         Identifier
-HiLink liloImage              Type
-HiLink liloChRules            Preproc
-HiLink liloDisk               Preproc
-
-delcommand HiLink
+
+hi def link liloEqPath             liloEquals
+hi def link liloEqWord             liloEquals
+hi def link liloEqVga              liloEquals
+hi def link liloEqDecNumber        liloEquals
+hi def link liloEqHexNumber        liloEquals
+hi def link liloEqNumber           liloEquals
+hi def link liloEqString           liloEquals
+hi def link liloEqAnything         liloEquals
+hi def link liloEquals             Special
+
+hi def link liloError              Error
+
+hi def link liloEqPathComment      liloComment
+hi def link liloEqVgaComment       liloComment
+hi def link liloEqDecNumberComment liloComment
+hi def link liloEqHexNumberComment liloComment
+hi def link liloEqStringComment    liloComment
+hi def link liloEqAnythingComment  liloComment
+hi def link liloPathComment        liloComment
+hi def link liloVgaComment         liloComment
+hi def link liloDecNumberComment   liloComment
+hi def link liloHexNumberComment   liloComment
+hi def link liloNumberComment      liloComment
+hi def link liloStringComment      liloComment
+hi def link liloAnythingComment    liloComment
+hi def link liloComment            Comment
+
+hi def link liloDiskOpt            liloOption
+hi def link liloKernelOpt          liloOption
+hi def link liloImageOpt           liloOption
+hi def link liloOption             Keyword
+
+hi def link liloDecNumber          liloNumber
+hi def link liloHexNumber          liloNumber
+hi def link liloDecNumberP         liloNumber
+hi def link liloNumber             Number
+hi def link liloString             String
+hi def link liloPath               Constant
+
+hi def link liloSpecial            Special
+hi def link liloLabel              Title
+hi def link liloDecNumberList      Special
+hi def link liloDecNumberPList     Special
+hi def link liloAnything           Normal
+hi def link liloEnviron            Identifier
+hi def link liloVgaKeyword         Identifier
+hi def link liloImage              Type
+hi def link liloChRules            Preproc
+hi def link liloDisk               Preproc
+
 
 let b:current_syntax = "lilo"
diff --git a/runtime/syntax/lisp.vim b/runtime/syntax/lisp.vim
index f555070032..b02eb09d0a 100644
--- a/runtime/syntax/lisp.vim
+++ b/runtime/syntax/lisp.vim
@@ -2,7 +2,7 @@
 " Language:    Lisp
 " Maintainer:  Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
 " Last Change: May 02, 2016
-" Version:     25
+" Version:     26
 " URL:	       http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP
 "
 "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec
@@ -561,57 +561,56 @@ syn sync lines=100
 
 " ---------------------------------------------------------------------
 " Define Highlighting: {{{1
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_lisp_syntax_inits")
 
-HiLink lispCommentRegion	lispComment
-HiLink lispAtomNmbr		lispNumber
-HiLink lispAtomMark		lispMark
-HiLink lispInStringString	lispString
+  hi def link lispCommentRegion	lispComment
+  hi def link lispAtomNmbr		lispNumber
+  hi def link lispAtomMark		lispMark
+  hi def link lispInStringString	lispString
 
-HiLink lispAtom		Identifier
-HiLink lispAtomBarSymbol	Special
-HiLink lispBarSymbol		Special
-HiLink lispComment		Comment
-HiLink lispConcat		Statement
-HiLink lispDecl		Statement
-HiLink lispFunc		Statement
-HiLink lispKey		Type
-HiLink lispMark		Delimiter
-HiLink lispNumber		Number
-HiLink lispParenError		Error
-HiLink lispEscapeSpecial	Type
-HiLink lispString		String
-HiLink lispTodo		Todo
-HiLink lispVar		Statement
+  hi def link lispAtom		Identifier
+  hi def link lispAtomBarSymbol	Special
+  hi def link lispBarSymbol		Special
+  hi def link lispComment		Comment
+  hi def link lispConcat		Statement
+  hi def link lispDecl		Statement
+  hi def link lispFunc		Statement
+  hi def link lispKey		Type
+  hi def link lispMark		Delimiter
+  hi def link lispNumber		Number
+  hi def link lispParenError		Error
+  hi def link lispEscapeSpecial	Type
+  hi def link lispString		String
+  hi def link lispTodo		Todo
+  hi def link lispVar		Statement
 
-if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
- if &bg == "dark"
-  hi def hlLevel0 ctermfg=red         guifg=red1
-  hi def hlLevel1 ctermfg=yellow      guifg=orange1
-  hi def hlLevel2 ctermfg=green       guifg=yellow1
-  hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
-  hi def hlLevel4 ctermfg=magenta     guifg=green1
-  hi def hlLevel5 ctermfg=red         guifg=springgreen1
-  hi def hlLevel6 ctermfg=yellow      guifg=cyan1
-  hi def hlLevel7 ctermfg=green       guifg=slateblue1
-  hi def hlLevel8 ctermfg=cyan        guifg=magenta1
-  hi def hlLevel9 ctermfg=magenta     guifg=purple1
- else
-  hi def hlLevel0 ctermfg=red         guifg=red3
-  hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
-  hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
-  hi def hlLevel3 ctermfg=blue        guifg=yellow3
-  hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
-  hi def hlLevel5 ctermfg=red         guifg=green4
-  hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
-  hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
-  hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
-  hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
- endif
-endif
+  if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
+   if &bg == "dark"
+    hi def hlLevel0 ctermfg=red         guifg=red1
+    hi def hlLevel1 ctermfg=yellow      guifg=orange1
+    hi def hlLevel2 ctermfg=green       guifg=yellow1
+    hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
+    hi def hlLevel4 ctermfg=magenta     guifg=green1
+    hi def hlLevel5 ctermfg=red         guifg=springgreen1
+    hi def hlLevel6 ctermfg=yellow      guifg=cyan1
+    hi def hlLevel7 ctermfg=green       guifg=slateblue1
+    hi def hlLevel8 ctermfg=cyan        guifg=magenta1
+    hi def hlLevel9 ctermfg=magenta     guifg=purple1
+   else
+    hi def hlLevel0 ctermfg=red         guifg=red3
+    hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
+    hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
+    hi def hlLevel3 ctermfg=blue        guifg=yellow3
+    hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
+    hi def hlLevel5 ctermfg=red         guifg=green4
+    hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
+    hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
+    hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
+    hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
+   endif
+  endif
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "lisp"
 
diff --git a/runtime/syntax/lite.vim b/runtime/syntax/lite.vim
index 1a76e6c7f5..a8d26892d4 100644
--- a/runtime/syntax/lite.vim
+++ b/runtime/syntax/lite.vim
@@ -136,30 +136,28 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink liteComment		Comment
-HiLink liteString		String
-HiLink liteNumber		Number
-HiLink liteFloat		Float
-HiLink liteIdentifier	Identifier
-HiLink liteGlobalIdentifier	Identifier
-HiLink liteIntVar		Identifier
-HiLink liteFunctions		Function
-HiLink liteRepeat		Repeat
-HiLink liteConditional	Conditional
-HiLink liteStatement		Statement
-HiLink liteType		Type
-HiLink liteInclude		Include
-HiLink liteDefine		Define
-HiLink liteSpecialChar	SpecialChar
-HiLink liteParentError	liteError
-HiLink liteError		Error
-HiLink liteTodo		Todo
-HiLink liteOperator		Operator
-HiLink liteRelation		Operator
-
-delcommand HiLink
+
+hi def link liteComment		Comment
+hi def link liteString		String
+hi def link liteNumber		Number
+hi def link liteFloat		Float
+hi def link liteIdentifier	Identifier
+hi def link liteGlobalIdentifier	Identifier
+hi def link liteIntVar		Identifier
+hi def link liteFunctions		Function
+hi def link liteRepeat		Repeat
+hi def link liteConditional	Conditional
+hi def link liteStatement		Statement
+hi def link liteType		Type
+hi def link liteInclude		Include
+hi def link liteDefine		Define
+hi def link liteSpecialChar	SpecialChar
+hi def link liteParentError	liteError
+hi def link liteError		Error
+hi def link liteTodo		Todo
+hi def link liteOperator		Operator
+hi def link liteRelation		Operator
+
 
 let b:current_syntax = "lite"
 
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
index e4decf2ef9..532f83d3bf 100644
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -387,48 +387,46 @@ syn sync ccomment logtalkBlockComment maxlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	logtalkBlockComment	Comment
-HiLink	logtalkLineComment	Comment
+hi def link logtalkBlockComment	Comment
+hi def link logtalkLineComment	Comment
 
-HiLink	logtalkOpenEntityDir	Normal
-HiLink	logtalkOpenEntityDirTag	PreProc
+hi def link logtalkOpenEntityDir	Normal
+hi def link logtalkOpenEntityDirTag	PreProc
 
-HiLink	logtalkIfContainer	PreProc
-HiLink	logtalkIf		PreProc
-HiLink	logtalkElseIf		PreProc
-HiLink	logtalkElse		PreProc
+hi def link logtalkIfContainer	PreProc
+hi def link logtalkIf		PreProc
+hi def link logtalkElseIf		PreProc
+hi def link logtalkElse		PreProc
 
-HiLink	logtalkEntity		Normal
+hi def link logtalkEntity		Normal
 
-HiLink	logtalkEntityRel	Normal
-HiLink	logtalkEntityRelTag	PreProc
+hi def link logtalkEntityRel	Normal
+hi def link logtalkEntityRelTag	PreProc
 
-HiLink	logtalkCloseEntityDir	PreProc
+hi def link logtalkCloseEntityDir	PreProc
 
-HiLink	logtalkDir		Normal
-HiLink	logtalkDirTag		PreProc
+hi def link logtalkDir		Normal
+hi def link logtalkDirTag		PreProc
 
-HiLink	logtalkAtom		String
-HiLink	logtalkString		String
-HiLink	logtalkEscapeSequence	SpecialChar
+hi def link logtalkAtom		String
+hi def link logtalkString		String
+hi def link logtalkEscapeSequence	SpecialChar
 
-HiLink	logtalkNumber		Number
+hi def link logtalkNumber		Number
 
-HiLink	logtalkKeyword		Keyword
+hi def link logtalkKeyword		Keyword
 
-HiLink	logtalkBuiltIn		Keyword
-HiLink	logtalkBuiltInMethod	Keyword
+hi def link logtalkBuiltIn		Keyword
+hi def link logtalkBuiltInMethod	Keyword
 
-HiLink	logtalkOperator		Operator
+hi def link logtalkOperator		Operator
 
-HiLink	logtalkExtCall		Normal
-HiLink	logtalkExtCallTag	Operator
+hi def link logtalkExtCall		Normal
+hi def link logtalkExtCallTag	Operator
 
-HiLink	logtalkVariable		Identifier
+hi def link logtalkVariable		Identifier
 
-delcommand HiLink
 
 
 let b:current_syntax = "logtalk"
diff --git a/runtime/syntax/lotos.vim b/runtime/syntax/lotos.vim
index e617bdb086..8262e1d9ef 100644
--- a/runtime/syntax/lotos.vim
+++ b/runtime/syntax/lotos.vim
@@ -54,17 +54,15 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lotosStatement		Statement
-HiLink lotosProcess		Label
-HiLink lotosOperator		Operator
-HiLink lotosSort		Function
-HiLink lotosType		Type
-HiLink lotosComment		Comment
-HiLink lotosDelimiter		String
+hi def link lotosStatement		Statement
+hi def link lotosProcess		Label
+hi def link lotosOperator		Operator
+hi def link lotosSort		Function
+hi def link lotosType		Type
+hi def link lotosComment		Comment
+hi def link lotosDelimiter		String
 
-delcommand HiLink
 
 let b:current_syntax = "lotos"
 
diff --git a/runtime/syntax/lout.vim b/runtime/syntax/lout.vim
index e7a1e15627..30c87fce51 100644
--- a/runtime/syntax/lout.vim
+++ b/runtime/syntax/lout.vim
@@ -100,35 +100,32 @@ syn region loutHeadings matchgroup=loutHeads start='@\(\(Title\)\|\(Caption\)\)\
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overrriden later.
-HiLink loutTodo Todo
-HiLink loutDefine Define
-HiLink loutEOmlDef Define
-HiLink loutFunction Function
-HiLink loutBraceError Error
-HiLink loutNULL Special
-HiLink loutComment Comment
-HiLink loutSpecial Special
-HiLink loutSymbols Character
-HiLink loutInclude Include
-HiLink loutKeyword Keyword
-HiLink loutTag Tag
-HiLink loutMath Number
-
-" HiLink Not really needed here, but I think it is more consistent.
-HiLink loutMBraces loutMath
+hi def link loutTodo Todo
+hi def link loutDefine Define
+hi def link loutEOmlDef Define
+hi def link loutFunction Function
+hi def link loutBraceError Error
+hi def link loutNULL Special
+hi def link loutComment Comment
+hi def link loutSpecial Special
+hi def link loutSymbols Character
+hi def link loutInclude Include
+hi def link loutKeyword Keyword
+hi def link loutTag Tag
+hi def link loutMath Number
+
+hi def link loutMBraces loutMath
 hi loutItalic term=italic cterm=italic gui=italic
-HiLink loutIBraces loutItalic
+hi def link loutIBraces loutItalic
 hi loutBold term=bold cterm=bold gui=bold
-HiLink loutBBraces loutBold
+hi def link loutBBraces loutBold
 hi loutBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
-HiLink loutBIBraces loutBoldItalic
+hi def link loutBIBraces loutBoldItalic
 hi loutHeadings term=bold cterm=bold guifg=indianred
-HiLink loutHeads loutHeadings
+hi def link loutHeads loutHeadings
 
-delcommand HiLink
 
 let b:current_syntax = "lout"
 
diff --git a/runtime/syntax/lpc.vim b/runtime/syntax/lpc.vim
index 45aba92159..7d85fce8e2 100644
--- a/runtime/syntax/lpc.vim
+++ b/runtime/syntax/lpc.vim
@@ -2,7 +2,7 @@
 " Language:	LPC
 " Maintainer:	Shizhu Pan <poet@mudbuilder.net>
 " URL:		http://poet.tomud.com/pub/lpc.vim.bz2
-" Last Change:	2011 Dec 10 by Thilo Six
+" Last Change:	2016 Aug 31
 " Comments:	If you are using Vim 6.2 or later, see :h lpc.vim for
 "		file type recognizing, if not, you had to use modeline.
 
@@ -358,85 +358,83 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lpcModifier		lpcStorageClass
+hi def link lpcModifier		lpcStorageClass
 
-HiLink lpcQuotedFmt		lpcFormat
-HiLink lpcFormat		lpcSpecial
-HiLink lpcCppString		lpcString	" Cpp means
+hi def link lpcQuotedFmt		lpcFormat
+hi def link lpcFormat		lpcSpecial
+hi def link lpcCppString		lpcString	" Cpp means
 					      " C Pre-Processor
-HiLink lpcCommentL		lpcComment
-HiLink lpcCommentStart	lpcComment
-HiLink lpcUserLabel		lpcLabel
-HiLink lpcSpecialCharacter	lpcSpecial
-HiLink lpcOctal		lpcPreProc
-HiLink lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
+hi def link lpcCommentL		lpcComment
+hi def link lpcCommentStart	lpcComment
+hi def link lpcUserLabel		lpcLabel
+hi def link lpcSpecialCharacter	lpcSpecial
+hi def link lpcOctal		lpcPreProc
+hi def link lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
 					  " as decimals, programmers should
 					  " be aware of that.
-HiLink lpcEfunError		lpcError
-HiLink lpcKeywdError		lpcError
-HiLink lpcOctalError		lpcError
-HiLink lpcParenError		lpcError
-HiLink lpcErrInParen		lpcError
-HiLink lpcErrInBracket	lpcError
-HiLink lpcCommentError	lpcError
-HiLink lpcCommentStartError	lpcError
-HiLink lpcSpaceError		lpcError
-HiLink lpcSpecialError	lpcError
-HiLink lpcErrFunc		lpcError
+hi def link lpcEfunError		lpcError
+hi def link lpcKeywdError		lpcError
+hi def link lpcOctalError		lpcError
+hi def link lpcParenError		lpcError
+hi def link lpcErrInParen		lpcError
+hi def link lpcErrInBracket	lpcError
+hi def link lpcCommentError	lpcError
+hi def link lpcCommentStartError	lpcError
+hi def link lpcSpaceError		lpcError
+hi def link lpcSpecialError	lpcError
+hi def link lpcErrFunc		lpcError
 
 if exists("lpc_pre_v22")
-    HiLink lpcOldEfuns	lpc_efuns
-    HiLink lpcNewEfuns	lpcError
+    hi def link lpcOldEfuns	lpc_efuns
+    hi def link lpcNewEfuns	lpcError
 else
-    HiLink lpcOldEfuns	lpcReserved
-    HiLink lpcNewEfuns	lpc_efuns
+    hi def link lpcOldEfuns	lpcReserved
+    hi def link lpcNewEfuns	lpc_efuns
 endif
-HiLink lpc_efuns		lpcFunction
+hi def link lpc_efuns		lpcFunction
 
-HiLink lpcReserved		lpcPreProc
-HiLink lpcTextString		lpcString   " This should be preprocessors, but
-HiLink lpcArrayString		lpcPreProc  " let's make some difference
+hi def link lpcReserved		lpcPreProc
+hi def link lpcTextString		lpcString   " This should be preprocessors, but
+hi def link lpcArrayString		lpcPreProc  " let's make some difference
 					  " between text and array
 
-HiLink lpcIncluded		lpcString
-HiLink lpcCommentString	lpcString
-HiLink lpcComment2String	lpcString
-HiLink lpcCommentSkip		lpcComment
-HiLink lpcCommentFunc		lpcComment
+hi def link lpcIncluded		lpcString
+hi def link lpcCommentString	lpcString
+hi def link lpcComment2String	lpcString
+hi def link lpcCommentSkip		lpcComment
+hi def link lpcCommentFunc		lpcComment
 
-HiLink lpcCppSkip		lpcCppOut
-HiLink lpcCppOut2		lpcCppOut
-HiLink lpcCppOut		lpcComment
+hi def link lpcCppSkip		lpcCppOut
+hi def link lpcCppOut2		lpcCppOut
+hi def link lpcCppOut		lpcComment
 
 " Standard type below
-HiLink lpcApplies		Special
-HiLink lpcCharacter		Character
-HiLink lpcComment		Comment
-HiLink lpcConditional		Conditional
-HiLink lpcConstant		Constant
-HiLink lpcDefine		Macro
-HiLink lpcError		Error
-HiLink lpcFloat		Float
-HiLink lpcFunction		Function
-HiLink lpcIdentifier		Identifier
-HiLink lpcInclude		Include
-HiLink lpcLabel		Label
-HiLink lpcNumber		Number
-HiLink lpcOperator		Operator
-HiLink lpcPreCondit		PreCondit
-HiLink lpcPreProc		PreProc
-HiLink lpcRepeat		Repeat
-HiLink lpcStatement		Statement
-HiLink lpcStorageClass	StorageClass
-HiLink lpcString		String
-HiLink lpcStructure		Structure
-HiLink lpcSpecial		LineNr
-HiLink lpcTodo		Todo
-HiLink lpcType		Type
-
-delcommand HiLink
+hi def link lpcApplies		Special
+hi def link lpcCharacter		Character
+hi def link lpcComment		Comment
+hi def link lpcConditional		Conditional
+hi def link lpcConstant		Constant
+hi def link lpcDefine		Macro
+hi def link lpcError		Error
+hi def link lpcFloat		Float
+hi def link lpcFunction		Function
+hi def link lpcIdentifier		Identifier
+hi def link lpcInclude		Include
+hi def link lpcLabel		Label
+hi def link lpcNumber		Number
+hi def link lpcOperator		Operator
+hi def link lpcPreCondit		PreCondit
+hi def link lpcPreProc		PreProc
+hi def link lpcRepeat		Repeat
+hi def link lpcStatement		Statement
+hi def link lpcStorageClass	StorageClass
+hi def link lpcString		String
+hi def link lpcStructure		Structure
+hi def link lpcSpecial		LineNr
+hi def link lpcTodo		Todo
+hi def link lpcType		Type
+
 
 " Nodule: This is the end nodule. {{{1
 
diff --git a/runtime/syntax/lprolog.vim b/runtime/syntax/lprolog.vim
index 1256758049..85c3537fed 100644
--- a/runtime/syntax/lprolog.vim
+++ b/runtime/syntax/lprolog.vim
@@ -94,32 +94,30 @@ syn sync maxlines=500
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lprologComment     Comment
-HiLink lprologTodo	    Todo
+hi def link lprologComment     Comment
+hi def link lprologTodo	    Todo
 
-HiLink lprologKeyword     Keyword
-HiLink lprologSpecial     Special
-HiLink lprologOperator    Operator
-HiLink lprologIdentifier  Normal
+hi def link lprologKeyword     Keyword
+hi def link lprologSpecial     Special
+hi def link lprologOperator    Operator
+hi def link lprologIdentifier  Normal
 
-HiLink lprologInteger     Number
-HiLink lprologReal	    Number
-HiLink lprologString	    String
+hi def link lprologInteger     Number
+hi def link lprologReal	    Number
+hi def link lprologString	    String
 
-HiLink lprologCommentErr  Error
-HiLink lprologBrackErr    Error
-HiLink lprologParenErr    Error
+hi def link lprologCommentErr  Error
+hi def link lprologBrackErr    Error
+hi def link lprologParenErr    Error
 
-HiLink lprologModuleName  Special
-HiLink lprologTypeName    Identifier
+hi def link lprologModuleName  Special
+hi def link lprologTypeName    Identifier
 
-HiLink lprologVariable    Keyword
-HiLink lprologAtom	    Normal
-HiLink lprologClause	    Type
+hi def link lprologVariable    Keyword
+hi def link lprologAtom	    Normal
+hi def link lprologClause	    Type
 
-delcommand HiLink
 
 let b:current_syntax = "lprolog"
 
diff --git a/runtime/syntax/lscript.vim b/runtime/syntax/lscript.vim
index 2dbd33ddba..3c4a0fffda 100644
--- a/runtime/syntax/lscript.vim
+++ b/runtime/syntax/lscript.vim
@@ -177,25 +177,23 @@ syn match   lscriptTypeSpecifier	"[a-zA-Z0-9][\$%&!#]"ms=s+1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi lscriptNotesType	term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold
 
-HiLink lscriptNotesConst	lscriptNotesType
-HiLink lscriptLineNumber	Comment
-HiLink lscriptDatatype	Type
-HiLink lscriptNumber		Number
-HiLink lscriptError		Error
-HiLink lscriptStatement	Statement
-HiLink lscriptString		String
-HiLink lscriptComment		Comment
-HiLink lscriptTodo		Todo
-HiLink lscriptFunction	Identifier
-HiLink lscriptMethods		PreProc
-HiLink lscriptEvents		Special
-HiLink lscriptTypeSpecifier	Type
-
-delcommand HiLink
+hi def link lscriptNotesConst	lscriptNotesType
+hi def link lscriptLineNumber	Comment
+hi def link lscriptDatatype	Type
+hi def link lscriptNumber		Number
+hi def link lscriptError		Error
+hi def link lscriptStatement	Statement
+hi def link lscriptString		String
+hi def link lscriptComment		Comment
+hi def link lscriptTodo		Todo
+hi def link lscriptFunction	Identifier
+hi def link lscriptMethods		PreProc
+hi def link lscriptEvents		Special
+hi def link lscriptTypeSpecifier	Type
+
 
 let b:current_syntax = "lscript"
 
diff --git a/runtime/syntax/lua.vim b/runtime/syntax/lua.vim
index 5ef771bb75..f313c14e7a 100644
--- a/runtime/syntax/lua.vim
+++ b/runtime/syntax/lua.vim
@@ -323,31 +323,29 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink luaStatement		Statement
-HiLink luaRepeat		Repeat
-HiLink luaFor			Repeat
-HiLink luaString		String
-HiLink luaString2		String
-HiLink luaNumber		Number
-HiLink luaOperator		Operator
-HiLink luaIn			Operator
-HiLink luaConstant		Constant
-HiLink luaCond		Conditional
-HiLink luaElse		Conditional
-HiLink luaFunction		Function
-HiLink luaComment		Comment
-HiLink luaTodo		Todo
-HiLink luaTable		Structure
-HiLink luaError		Error
-HiLink luaParenError		Error
-HiLink luaBraceError		Error
-HiLink luaSpecial		SpecialChar
-HiLink luaFunc		Identifier
-HiLink luaLabel		Label
+hi def link luaStatement		Statement
+hi def link luaRepeat		Repeat
+hi def link luaFor			Repeat
+hi def link luaString		String
+hi def link luaString2		String
+hi def link luaNumber		Number
+hi def link luaOperator		Operator
+hi def link luaIn			Operator
+hi def link luaConstant		Constant
+hi def link luaCond		Conditional
+hi def link luaElse		Conditional
+hi def link luaFunction		Function
+hi def link luaComment		Comment
+hi def link luaTodo		Todo
+hi def link luaTable		Structure
+hi def link luaError		Error
+hi def link luaParenError		Error
+hi def link luaBraceError		Error
+hi def link luaSpecial		SpecialChar
+hi def link luaFunc		Identifier
+hi def link luaLabel		Label
 
-delcommand HiLink
 
 let b:current_syntax = "lua"
 
diff --git a/runtime/syntax/m4.vim b/runtime/syntax/m4.vim
index 8325405261..6f229ea1ab 100644
--- a/runtime/syntax/m4.vim
+++ b/runtime/syntax/m4.vim
@@ -37,21 +37,19 @@ syn cluster m4Top     contains=m4Comment,m4Constants,m4Special,m4Variable,m4Stri
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink m4Delimiter Delimiter
-HiLink m4Comment   Comment
-HiLink m4Function  Function
-HiLink m4Keyword   Keyword
-HiLink m4Special   Special
-HiLink m4String    String
-HiLink m4Statement Statement
-HiLink m4Preproc   PreProc
-HiLink m4Type      Type
-HiLink m4Special   Special
-HiLink m4Variable  Special
-HiLink m4Constants Constant
-HiLink m4Builtin   Statement
-delcommand HiLink
+hi def link m4Delimiter Delimiter
+hi def link m4Comment   Comment
+hi def link m4Function  Function
+hi def link m4Keyword   Keyword
+hi def link m4Special   Special
+hi def link m4String    String
+hi def link m4Statement Statement
+hi def link m4Preproc   PreProc
+hi def link m4Type      Type
+hi def link m4Special   Special
+hi def link m4Variable  Special
+hi def link m4Constants Constant
+hi def link m4Builtin   Statement
 
 let b:current_syntax = "m4"
 
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index f022a4e9ac..7072bab988 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -99,31 +99,29 @@ syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Z
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink makeNextLine		makeSpecial
-HiLink makeCmdNextLine	makeSpecial
-HiLink makeSpecTarget		Statement
+hi def link makeNextLine		makeSpecial
+hi def link makeCmdNextLine	makeSpecial
+hi def link makeSpecTarget		Statement
 if !exists("make_no_commands")
-HiLink makeCommands		Number
+hi def link makeCommands		Number
 endif
-HiLink makeImplicit		Function
-HiLink makeTarget		Function
-HiLink makeInclude		Include
-HiLink makePreCondit		PreCondit
-HiLink makeStatement		Statement
-HiLink makeIdent		Identifier
-HiLink makeSpecial		Special
-HiLink makeComment		Comment
-HiLink makeDString		String
-HiLink makeSString		String
-HiLink makeBString		Function
-HiLink makeError		Error
-HiLink makeTodo		Todo
-HiLink makeDefine		Define
-HiLink makeCommandError	Error
-HiLink makeConfig		PreCondit
-delcommand HiLink
+hi def link makeImplicit		Function
+hi def link makeTarget		Function
+hi def link makeInclude		Include
+hi def link makePreCondit		PreCondit
+hi def link makeStatement		Statement
+hi def link makeIdent		Identifier
+hi def link makeSpecial		Special
+hi def link makeComment		Comment
+hi def link makeDString		String
+hi def link makeSString		String
+hi def link makeBString		Function
+hi def link makeError		Error
+hi def link makeTodo		Todo
+hi def link makeDefine		Define
+hi def link makeCommandError	Error
+hi def link makeConfig		PreCondit
 
 let b:current_syntax = "make"
 
diff --git a/runtime/syntax/maple.vim b/runtime/syntax/maple.vim
index ad94053b39..1261ff5a47 100644
--- a/runtime/syntax/maple.vim
+++ b/runtime/syntax/maple.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Maple V (based on release 4)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	May 02, 2016
-" Version:	13
+" Last Change:	Aug 31, 2016
+" Version:	15
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_MAPLE
 "
 " Package Function Selection: {{{1
@@ -549,73 +549,73 @@ endif
 
 " Highlighting: Define the default highlighting. {{{1
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-" Maple->Maple Links {{{2
-HiLink mvBraceError	mvError
-HiLink mvCurlyError	mvError
-HiLink mvDebug		mvTodo
-HiLink mvParenError	mvError
-HiLink mvPkg_DEtools	mvPkgFunc
-HiLink mvPkg_Galois	mvPkgFunc
-HiLink mvPkg_GaussInt	mvPkgFunc
-HiLink mvPkg_LREtools	mvPkgFunc
-HiLink mvPkg_combinat	mvPkgFunc
-HiLink mvPkg_combstruct	mvPkgFunc
-HiLink mvPkg_difforms	mvPkgFunc
-HiLink mvPkg_finance	mvPkgFunc
-HiLink mvPkg_genfunc	mvPkgFunc
-HiLink mvPkg_geometry	mvPkgFunc
-HiLink mvPkg_grobner	mvPkgFunc
-HiLink mvPkg_group	mvPkgFunc
-HiLink mvPkg_inttrans	mvPkgFunc
-HiLink mvPkg_liesymm	mvPkgFunc
-HiLink mvPkg_linalg	mvPkgFunc
-HiLink mvPkg_logic	mvPkgFunc
-HiLink mvPkg_networks	mvPkgFunc
-HiLink mvPkg_numapprox	mvPkgFunc
-HiLink mvPkg_numtheory	mvPkgFunc
-HiLink mvPkg_orthopoly	mvPkgFunc
-HiLink mvPkg_padic	mvPkgFunc
-HiLink mvPkg_plots	mvPkgFunc
-HiLink mvPkg_plottools	mvPkgFunc
-HiLink mvPkg_powseries	mvPkgFunc
-HiLink mvPkg_process	mvPkgFunc
-HiLink mvPkg_simplex	mvPkgFunc
-HiLink mvPkg_stats	mvPkgFunc
-HiLink mvPkg_student	mvPkgFunc
-HiLink mvPkg_sumtools	mvPkgFunc
-HiLink mvPkg_tensor	mvPkgFunc
-HiLink mvPkg_totorder	mvPkgFunc
-HiLink mvRange		mvOper
-HiLink mvSemiError	mvError
-HiLink mvDelim		Delimiter
-
-" Maple->Standard Links {{{2
-HiLink mvAssign		Delimiter
-HiLink mvBool		Boolean
-HiLink mvComma		Delimiter
-HiLink mvComment		Comment
-HiLink mvCond		Conditional
-HiLink mvConstant		Number
-HiLink mvDelayEval	Label
-HiLink mvDcolon		Delimiter
-HiLink mvError		Error
-HiLink mvLibrary		Statement
-HiLink mvNumber		Number
-HiLink mvOper		Operator
-HiLink mvAssign		Delimiter
-HiLink mvPackage		Type
-HiLink mvPkgFunc		Function
-HiLink mvPktOption	Special
-HiLink mvRepeat		Repeat
-HiLink mvSpecial		Special
-HiLink mvStatement	Statement
-HiLink mvName		String
-HiLink mvString		String
-HiLink mvTodo		Todo
-
-delcommand HiLink
+if !exists("skip_maplev_syntax_inits")
+
+  " Maple->Maple Links {{{2
+  hi def link mvBraceError	mvError
+  hi def link mvCurlyError	mvError
+  hi def link mvDebug		mvTodo
+  hi def link mvParenError	mvError
+  hi def link mvPkg_DEtools	mvPkgFunc
+  hi def link mvPkg_Galois	mvPkgFunc
+  hi def link mvPkg_GaussInt	mvPkgFunc
+  hi def link mvPkg_LREtools	mvPkgFunc
+  hi def link mvPkg_combinat	mvPkgFunc
+  hi def link mvPkg_combstruct	mvPkgFunc
+  hi def link mvPkg_difforms	mvPkgFunc
+  hi def link mvPkg_finance	mvPkgFunc
+  hi def link mvPkg_genfunc	mvPkgFunc
+  hi def link mvPkg_geometry	mvPkgFunc
+  hi def link mvPkg_grobner	mvPkgFunc
+  hi def link mvPkg_group	mvPkgFunc
+  hi def link mvPkg_inttrans	mvPkgFunc
+  hi def link mvPkg_liesymm	mvPkgFunc
+  hi def link mvPkg_linalg	mvPkgFunc
+  hi def link mvPkg_logic	mvPkgFunc
+  hi def link mvPkg_networks	mvPkgFunc
+  hi def link mvPkg_numapprox	mvPkgFunc
+  hi def link mvPkg_numtheory	mvPkgFunc
+  hi def link mvPkg_orthopoly	mvPkgFunc
+  hi def link mvPkg_padic	mvPkgFunc
+  hi def link mvPkg_plots	mvPkgFunc
+  hi def link mvPkg_plottools	mvPkgFunc
+  hi def link mvPkg_powseries	mvPkgFunc
+  hi def link mvPkg_process	mvPkgFunc
+  hi def link mvPkg_simplex	mvPkgFunc
+  hi def link mvPkg_stats	mvPkgFunc
+  hi def link mvPkg_student	mvPkgFunc
+  hi def link mvPkg_sumtools	mvPkgFunc
+  hi def link mvPkg_tensor	mvPkgFunc
+  hi def link mvPkg_totorder	mvPkgFunc
+  hi def link mvRange		mvOper
+  hi def link mvSemiError	mvError
+  hi def link mvDelim		Delimiter
+
+  " Maple->Standard Links {{{2
+  hi def link mvAssign		Delimiter
+  hi def link mvBool		Boolean
+  hi def link mvComma		Delimiter
+  hi def link mvComment		Comment
+  hi def link mvCond		Conditional
+  hi def link mvConstant		Number
+  hi def link mvDelayEval	Label
+  hi def link mvDcolon		Delimiter
+  hi def link mvError		Error
+  hi def link mvLibrary		Statement
+  hi def link mvNumber		Number
+  hi def link mvOper		Operator
+  hi def link mvAssign		Delimiter
+  hi def link mvPackage		Type
+  hi def link mvPkgFunc		Function
+  hi def link mvPktOption	Special
+  hi def link mvRepeat		Repeat
+  hi def link mvSpecial		Special
+  hi def link mvStatement	Statement
+  hi def link mvName		String
+  hi def link mvString		String
+  hi def link mvTodo		Todo
+
+endif
 
 " Current Syntax: {{{1
 let b:current_syntax = "maple"
diff --git a/runtime/syntax/master.vim b/runtime/syntax/master.vim
index 14440ee13d..f89c5b2f1c 100644
--- a/runtime/syntax/master.vim
+++ b/runtime/syntax/master.vim
@@ -26,13 +26,11 @@ syn match   masterComment	"\$.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink masterKeyword Keyword
-HiLink masterComment Comment
-HiLink masterString  String
+hi def link masterKeyword Keyword
+hi def link masterComment Comment
+hi def link masterString  String
 
-delcommand HiLink
 
 let b:current_syntax = "master"
 
diff --git a/runtime/syntax/matlab.vim b/runtime/syntax/matlab.vim
index 9cc2be877c..92ffbbc1ed 100644
--- a/runtime/syntax/matlab.vim
+++ b/runtime/syntax/matlab.vim
@@ -74,40 +74,38 @@ syn match matlabError	"-\=\<\d\+\.\d\+[eEdD][-+]\=\d\+\.\([^*/\\^]\)"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink matlabTransposeOperator	matlabOperator
-HiLink matlabOperator			Operator
-HiLink matlabLineContinuation		Special
-HiLink matlabLabel			Label
-HiLink matlabConditional		Conditional
-HiLink matlabExceptions		Conditional
-HiLink matlabRepeat			Repeat
-HiLink matlabTodo			Todo
-HiLink matlabString			String
-HiLink matlabDelimiter		Identifier
-HiLink matlabTransposeOther		Identifier
-HiLink matlabNumber			Number
-HiLink matlabFloat			Float
-HiLink matlabFunction			Function
-HiLink matlabError			Error
-HiLink matlabImplicit			matlabStatement
-HiLink matlabStatement		Statement
-HiLink matlabOO			Statement
-HiLink matlabSemicolon		SpecialChar
-HiLink matlabComment			Comment
-HiLink matlabMultilineComment		Comment
-HiLink matlabScope			Type
-
-HiLink matlabArithmeticOperator	matlabOperator
-HiLink matlabRelationalOperator	matlabOperator
-HiLink matlabLogicalOperator		matlabOperator
+
+hi def link matlabTransposeOperator	matlabOperator
+hi def link matlabOperator			Operator
+hi def link matlabLineContinuation		Special
+hi def link matlabLabel			Label
+hi def link matlabConditional		Conditional
+hi def link matlabExceptions		Conditional
+hi def link matlabRepeat			Repeat
+hi def link matlabTodo			Todo
+hi def link matlabString			String
+hi def link matlabDelimiter		Identifier
+hi def link matlabTransposeOther		Identifier
+hi def link matlabNumber			Number
+hi def link matlabFloat			Float
+hi def link matlabFunction			Function
+hi def link matlabError			Error
+hi def link matlabImplicit			matlabStatement
+hi def link matlabStatement		Statement
+hi def link matlabOO			Statement
+hi def link matlabSemicolon		SpecialChar
+hi def link matlabComment			Comment
+hi def link matlabMultilineComment		Comment
+hi def link matlabScope			Type
+
+hi def link matlabArithmeticOperator	matlabOperator
+hi def link matlabRelationalOperator	matlabOperator
+hi def link matlabLogicalOperator		matlabOperator
 
 "optional highlighting
-"HiLink matlabIdentifier		Identifier
-"HiLink matlabTab			Error
+"hi def link matlabIdentifier		Identifier
+"hi def link matlabTab			Error
 
-delcommand HiLink
 
 let b:current_syntax = "matlab"
 
diff --git a/runtime/syntax/maxima.vim b/runtime/syntax/maxima.vim
index be13b0ef25..46e1e4ff84 100644
--- a/runtime/syntax/maxima.vim
+++ b/runtime/syntax/maxima.vim
@@ -232,32 +232,30 @@ syn sync match maximaSyncComment	groupthere NONE "*/"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink maximaBraceError	maximaError
-HiLink maximaCmd	maximaStatement
-HiLink maximaCurlyError	maximaError
-HiLink maximaFuncCmd	maximaStatement
-HiLink maximaParenError	maximaError
+hi def link maximaBraceError	maximaError
+hi def link maximaCmd	maximaStatement
+hi def link maximaCurlyError	maximaError
+hi def link maximaFuncCmd	maximaStatement
+hi def link maximaParenError	maximaError
 
 " The default methods for highlighting.  Can be overridden later
-HiLink maximaCharacter	Character
-HiLink maximaComma	Function
-HiLink maximaCommentBlock	Comment
-HiLink maximaConditional	Conditional
-HiLink maximaError	Error
-HiLink maximaFunc	Delimiter
-HiLink maximaOp                 Delimiter
-HiLink maximaLabel	PreProc
-HiLink maximaNumber	Number
-HiLink maximaFloat	Float
-HiLink maximaRepeat	Repeat
-HiLink maximaSpecial	Type
-HiLink maximaSpecialChar	SpecialChar
-HiLink maximaStatement	Statement
-HiLink maximaString	String
-HiLink maximaTodo	Todo
+hi def link maximaCharacter	Character
+hi def link maximaComma	Function
+hi def link maximaCommentBlock	Comment
+hi def link maximaConditional	Conditional
+hi def link maximaError	Error
+hi def link maximaFunc	Delimiter
+hi def link maximaOp                 Delimiter
+hi def link maximaLabel	PreProc
+hi def link maximaNumber	Number
+hi def link maximaFloat	Float
+hi def link maximaRepeat	Repeat
+hi def link maximaSpecial	Type
+hi def link maximaSpecialChar	SpecialChar
+hi def link maximaStatement	Statement
+hi def link maximaString	String
+hi def link maximaTodo	Todo
 
-delcommand HiLink
 
 let b:current_syntax = "maxima"
diff --git a/runtime/syntax/mel.vim b/runtime/syntax/mel.vim
index 3d89f72a57..ea6e75fa22 100644
--- a/runtime/syntax/mel.vim
+++ b/runtime/syntax/mel.vim
@@ -75,36 +75,34 @@ exec "sy sync ccomment melComment minlines=" . mel_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink melBoolean	Boolean
-HiLink melFunction	Function
-HiLink melIdentifier	Identifier
-HiLink melStatement	Statement
-HiLink melConditional Conditional
-HiLink melRepeat	Repeat
-HiLink melLabel	Label
-HiLink melOperator	Operator
-HiLink melKeyword	Keyword
-HiLink melException	Exception
-HiLink melInclude	Include
-HiLink melType	Type
-HiLink melStorageClass StorageClass
-HiLink melDebug	Debug
-HiLink melTodo	Todo
-HiLink melCharSpecial SpecialChar
-HiLink melString	String
-HiLink melInteger	Number
-HiLink melFloat	Float
-HiLink melMatrixVector Float
-HiLink melComment	Comment
-HiLink melError	Error
-HiLink melSpaceError	melError
-HiLink melCharError	melError
-HiLink melParenError	melError
-HiLink melInParen	melError
-HiLink melCommentError melError
-
-delcommand HiLink
+
+hi def link melBoolean	Boolean
+hi def link melFunction	Function
+hi def link melIdentifier	Identifier
+hi def link melStatement	Statement
+hi def link melConditional Conditional
+hi def link melRepeat	Repeat
+hi def link melLabel	Label
+hi def link melOperator	Operator
+hi def link melKeyword	Keyword
+hi def link melException	Exception
+hi def link melInclude	Include
+hi def link melType	Type
+hi def link melStorageClass StorageClass
+hi def link melDebug	Debug
+hi def link melTodo	Todo
+hi def link melCharSpecial SpecialChar
+hi def link melString	String
+hi def link melInteger	Number
+hi def link melFloat	Float
+hi def link melMatrixVector Float
+hi def link melComment	Comment
+hi def link melError	Error
+hi def link melSpaceError	melError
+hi def link melCharError	melError
+hi def link melParenError	melError
+hi def link melInParen	melError
+hi def link melCommentError melError
+
 
 let b:current_syntax = "mel"
diff --git a/runtime/syntax/mf.vim b/runtime/syntax/mf.vim
index e277c2d6c0..5f600e2ebe 100644
--- a/runtime/syntax/mf.vim
+++ b/runtime/syntax/mf.vim
@@ -155,31 +155,29 @@ syn sync maxlines=50
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink mfBoolExp	Statement
-HiLink mfNumExp	Statement
-HiLink mfInternal	Identifier
-HiLink mfPairExp	Statement
-HiLink mfPathExp	Statement
-HiLink mfPenExp	Statement
-HiLink mfPicExp	Statement
-HiLink mfStringExp	Statement
-HiLink mfCommand	Statement
-HiLink mfType	Type
-HiLink mfStatement	Statement
-HiLink mfDefinition	Statement
-HiLink mfCondition	Conditional
-HiLink mfPrimitive	Statement
-HiLink mfMacro	Macro
-HiLink mfCoord	Identifier
-HiLink mfPoint	Identifier
-HiLink mfNumeric	Number
-HiLink mfLength	Number
-HiLink mfComment	Comment
-HiLink mfString	String
-
-delcommand HiLink
+
+hi def link mfBoolExp	Statement
+hi def link mfNumExp	Statement
+hi def link mfInternal	Identifier
+hi def link mfPairExp	Statement
+hi def link mfPathExp	Statement
+hi def link mfPenExp	Statement
+hi def link mfPicExp	Statement
+hi def link mfStringExp	Statement
+hi def link mfCommand	Statement
+hi def link mfType	Type
+hi def link mfStatement	Statement
+hi def link mfDefinition	Statement
+hi def link mfCondition	Conditional
+hi def link mfPrimitive	Statement
+hi def link mfMacro	Macro
+hi def link mfCoord	Identifier
+hi def link mfPoint	Identifier
+hi def link mfNumeric	Number
+hi def link mfLength	Number
+hi def link mfComment	Comment
+hi def link mfString	String
+
 
 let b:current_syntax = "mf"
 
diff --git a/runtime/syntax/mgl.vim b/runtime/syntax/mgl.vim
index 4fd718e05b..f7bc617f5a 100644
--- a/runtime/syntax/mgl.vim
+++ b/runtime/syntax/mgl.vim
@@ -84,34 +84,32 @@ syn keyword mglPredefined	exception
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink mglBoolean		Boolean
-HiLink mglComment		Comment
-HiLink mglConditional		Conditional
-HiLink mglConstant		Constant
-HiLink mglException		Exception
-HiLink mglFunction		Function
-HiLink mglLabel		Label
-HiLink mglMatrixDelimiter	Identifier
-HiLink mglNumber		Number
-HiLink mglHexNumber		Number
-HiLink mglCharacter		Number
-HiLink mglIpAddr		Number
-HiLink mglOperator		Operator
-HiLink mglPredefined		mglFunction
-HiLink mglPreProc		PreProc
-HiLink mglRepeat		Repeat
-HiLink mglStatement		Statement
-HiLink mglString		String
-HiLink mglStringEscape	Special
-HiLink mglStringEscapeGPC	Special
-HiLink mglStringError		Error
-HiLink mglStruct		mglStatement
-HiLink mglSymbolOperator	mglOperator
-HiLink mglType		Type
-
-delcommand HiLink
+
+hi def link mglBoolean		Boolean
+hi def link mglComment		Comment
+hi def link mglConditional		Conditional
+hi def link mglConstant		Constant
+hi def link mglException		Exception
+hi def link mglFunction		Function
+hi def link mglLabel		Label
+hi def link mglMatrixDelimiter	Identifier
+hi def link mglNumber		Number
+hi def link mglHexNumber		Number
+hi def link mglCharacter		Number
+hi def link mglIpAddr		Number
+hi def link mglOperator		Operator
+hi def link mglPredefined		mglFunction
+hi def link mglPreProc		PreProc
+hi def link mglRepeat		Repeat
+hi def link mglStatement		Statement
+hi def link mglString		String
+hi def link mglStringEscape	Special
+hi def link mglStringEscapeGPC	Special
+hi def link mglStringError		Error
+hi def link mglStruct		mglStatement
+hi def link mglSymbolOperator	mglOperator
+hi def link mglType		Type
+
 
 
 let b:current_syntax = "mgl"
diff --git a/runtime/syntax/mgp.vim b/runtime/syntax/mgp.vim
index a5c6186c43..7227804550 100644
--- a/runtime/syntax/mgp.vim
+++ b/runtime/syntax/mgp.vim
@@ -46,26 +46,24 @@ syn match mgpNoDefault +^%nodefault$+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mgpLineSkip	Special
+hi def link mgpLineSkip	Special
 
-HiLink mgpHash	mgpComment
-HiLink mgpPercent	mgpComment
-HiLink mgpComment	Comment
+hi def link mgpHash	mgpComment
+hi def link mgpPercent	mgpComment
+hi def link mgpComment	Comment
 
-HiLink mgpCommand	Identifier
+hi def link mgpCommand	Identifier
 
-HiLink mgpLine	Type
+hi def link mgpLine	Type
 
-HiLink mgpFile	String
-HiLink mgpSize	Number
-HiLink mgpValue	Number
+hi def link mgpFile	String
+hi def link mgpSize	Number
+hi def link mgpValue	Number
 
-HiLink mgpPage	mgpDefine
-HiLink mgpNoDefault	mgpDefine
-HiLink mgpDefine	Define
+hi def link mgpPage	mgpDefine
+hi def link mgpNoDefault	mgpDefine
+hi def link mgpDefine	Define
 
-delcommand HiLink
 
 let b:current_syntax = "mgp"
diff --git a/runtime/syntax/mma.vim b/runtime/syntax/mma.vim
index 9bdb7019b7..0683adc573 100644
--- a/runtime/syntax/mma.vim
+++ b/runtime/syntax/mma.vim
@@ -282,7 +282,6 @@ syntax sync fromstart
 "set foldnestmax=1
 "set foldminlines=15
 
-command -nargs=+ HiLink hi def link <args>
 
 " NOTE - the following links are not guaranteed to
 " look good under all colorschemes.  You might need to
@@ -290,32 +289,31 @@ command -nargs=+ HiLink hi def link <args>
 " look good in yours
 
 
-HiLink mmaComment           Comment
-HiLink mmaCommentStar       Comment
-HiLink mmaFunctionComment   Comment
-HiLink mmaLooseQuote        Comment
-HiLink mmaGenericFunction   Function
-HiLink mmaVariable          Identifier
-"    HiLink mmaSymbol            Identifier
-HiLink mmaOperator          Operator
-HiLink mmaPatternOp         Operator
-HiLink mmaPureFunction      Operator
-HiLink mmaString            String
-HiLink mmaCommentString     String
-HiLink mmaUnicode           String
-HiLink mmaMessage           Type
-HiLink mmaNumber            Type
-HiLink mmaPattern           Type
-HiLink mmaError             Error
-HiLink mmaFixme             Error
-HiLink mmaPatternError      Error
-HiLink mmaTodo              Todo
-HiLink mmaemPHAsis          Special
-HiLink mmaFunctionTitle     Special
-HiLink mmaMessageType       Special
-HiLink mmaItem              Preproc
-
-delcommand HiLink
+hi def link mmaComment           Comment
+hi def link mmaCommentStar       Comment
+hi def link mmaFunctionComment   Comment
+hi def link mmaLooseQuote        Comment
+hi def link mmaGenericFunction   Function
+hi def link mmaVariable          Identifier
+"    hi def link mmaSymbol            Identifier
+hi def link mmaOperator          Operator
+hi def link mmaPatternOp         Operator
+hi def link mmaPureFunction      Operator
+hi def link mmaString            String
+hi def link mmaCommentString     String
+hi def link mmaUnicode           String
+hi def link mmaMessage           Type
+hi def link mmaNumber            Type
+hi def link mmaPattern           Type
+hi def link mmaError             Error
+hi def link mmaFixme             Error
+hi def link mmaPatternError      Error
+hi def link mmaTodo              Todo
+hi def link mmaemPHAsis          Special
+hi def link mmaFunctionTitle     Special
+hi def link mmaMessageType       Special
+hi def link mmaItem              Preproc
+
 
 let b:current_syntax = "mma"
 
diff --git a/runtime/syntax/mmix.vim b/runtime/syntax/mmix.vim
index 724bdd35e4..39e209336e 100644
--- a/runtime/syntax/mmix.vim
+++ b/runtime/syntax/mmix.vim
@@ -119,35 +119,33 @@ syn keyword mmixRegister	rBB rTT rWW rXX rYY rZZ
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink mmixAt		Type
-HiLink mmixPseudo	Type
-HiLink mmixRegister	Special
-HiLink mmixSegments	Type
+hi def link mmixAt		Type
+hi def link mmixPseudo	Type
+hi def link mmixRegister	Special
+hi def link mmixSegments	Type
 
-HiLink mmixLabel	Special
-HiLink mmixComment	Comment
-HiLink mmixOpcode	Keyword
+hi def link mmixLabel	Special
+hi def link mmixComment	Comment
+hi def link mmixOpcode	Keyword
 
-HiLink hexNumber	Number
-HiLink decNumber	Number
-HiLink octNumber	Number
+hi def link hexNumber	Number
+hi def link decNumber	Number
+hi def link octNumber	Number
 
-HiLink mmixString	String
-HiLink mmixChar	String
+hi def link mmixString	String
+hi def link mmixChar	String
 
-HiLink mmixType	Type
-HiLink mmixIdentifier	Normal
-HiLink mmixSpecialComment Comment
+hi def link mmixType	Type
+hi def link mmixIdentifier	Normal
+hi def link mmixSpecialComment Comment
 
 " My default color overrides:
 " hi mmixSpecialComment ctermfg=red
 "hi mmixLabel ctermfg=lightcyan
 " hi mmixType ctermbg=black ctermfg=brown
 
-delcommand HiLink
 
 let b:current_syntax = "mmix"
 
diff --git a/runtime/syntax/modsim3.vim b/runtime/syntax/modsim3.vim
index ba1963b695..ce35033402 100644
--- a/runtime/syntax/modsim3.vim
+++ b/runtime/syntax/modsim3.vim
@@ -76,22 +76,20 @@ syn match modsim3Literal "'[^']'\|''''"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink modsim3Keyword	Statement
-HiLink modsim3Block		Statement
-HiLink modsim3Comment1	Comment
-HiLink modsim3Comment2	Comment
-HiLink modsim3String		String
-HiLink modsim3Literal	Character
-HiLink modsim3Include	Statement
-HiLink modsim3Type		Type
-HiLink modsim3ParenError	Error
-HiLink modsim3Builtin	Function
-HiLink modsim3BuiltinNoParen	Function
-
-delcommand HiLink
+hi def link modsim3Keyword	Statement
+hi def link modsim3Block		Statement
+hi def link modsim3Comment1	Comment
+hi def link modsim3Comment2	Comment
+hi def link modsim3String		String
+hi def link modsim3Literal	Character
+hi def link modsim3Include	Statement
+hi def link modsim3Type		Type
+hi def link modsim3ParenError	Error
+hi def link modsim3Builtin	Function
+hi def link modsim3BuiltinNoParen	Function
+
 
 let b:current_syntax = "modsim3"
 
diff --git a/runtime/syntax/modula2.vim b/runtime/syntax/modula2.vim
index 9873201cda..4a14cf1f6f 100644
--- a/runtime/syntax/modula2.vim
+++ b/runtime/syntax/modula2.vim
@@ -52,23 +52,21 @@ syn region modula2Set start="{" end="}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink modula2Ident		Identifier
-HiLink modula2StdConst	Boolean
-HiLink modula2Type		Identifier
-HiLink modula2StdFunc		Identifier
-HiLink modula2Header		Type
-HiLink modula2Keyword		Statement
-HiLink modula2AttKeyword	PreProc
-HiLink modula2Comment		Comment
+hi def link modula2Ident		Identifier
+hi def link modula2StdConst	Boolean
+hi def link modula2Type		Identifier
+hi def link modula2StdFunc		Identifier
+hi def link modula2Header		Type
+hi def link modula2Keyword		Statement
+hi def link modula2AttKeyword	PreProc
+hi def link modula2Comment		Comment
 " The following is just a matter of taste (you want to try this instead):
 " hi modula2Comment term=bold ctermfg=DarkBlue guifg=Blue gui=bold
-HiLink modula2Todo		Todo
-HiLink modula2String		String
-HiLink modula2Set		String
+hi def link modula2Todo		Todo
+hi def link modula2String		String
+hi def link modula2Set		String
 
-delcommand HiLink
 
 let b:current_syntax = "modula2"
 
diff --git a/runtime/syntax/modula3.vim b/runtime/syntax/modula3.vim
index 5f00efb76b..d9b89ca7ce 100644
--- a/runtime/syntax/modula3.vim
+++ b/runtime/syntax/modula3.vim
@@ -44,15 +44,13 @@ syn region modula3String start=+'+ end=+'+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink modula3Keyword	Statement
-HiLink modula3Block		PreProc
-HiLink modula3Comment	Comment
-HiLink modula3String		String
+hi def link modula3Keyword	Statement
+hi def link modula3Block		PreProc
+hi def link modula3Comment	Comment
+hi def link modula3String		String
 
-delcommand HiLink
 
 let b:current_syntax = "modula3"
 
diff --git a/runtime/syntax/monk.vim b/runtime/syntax/monk.vim
index 851560a3a9..3af810173a 100644
--- a/runtime/syntax/monk.vim
+++ b/runtime/syntax/monk.vim
@@ -195,23 +195,21 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink monkSyntax		Statement
-HiLink monkFunc		Function
+hi def link monkSyntax		Statement
+hi def link monkFunc		Function
 
-HiLink monkString		String
-HiLink monkChar		Character
-HiLink monkNumber		Number
-HiLink monkBoolean		Boolean
+hi def link monkString		String
+hi def link monkChar		Character
+hi def link monkNumber		Number
+hi def link monkBoolean		Boolean
 
-HiLink monkDelimiter	Delimiter
-HiLink monkConstant	Constant
+hi def link monkDelimiter	Delimiter
+hi def link monkConstant	Constant
 
-HiLink monkComment		Comment
-HiLink monkError		Error
+hi def link monkComment		Comment
+hi def link monkError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "monk"
 
diff --git a/runtime/syntax/mp.vim b/runtime/syntax/mp.vim
index 480db2a1b1..3966b69a03 100644
--- a/runtime/syntax/mp.vim
+++ b/runtime/syntax/mp.vim
@@ -102,15 +102,13 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mpTeXinsert	String
-HiLink mpTeXbegin	Statement
-HiLink mpTeXend	Statement
-HiLink mpInternal	mfInternal
-HiLink mpMacro	Macro
+hi def link mpTeXinsert	String
+hi def link mpTeXbegin	Statement
+hi def link mpTeXend	Statement
+hi def link mpInternal	mfInternal
+hi def link mpMacro	Macro
 
-delcommand HiLink
 
 let b:current_syntax = "mp"
 
diff --git a/runtime/syntax/msidl.vim b/runtime/syntax/msidl.vim
index 3bf5940a81..57eaecaa4f 100644
--- a/runtime/syntax/msidl.vim
+++ b/runtime/syntax/msidl.vim
@@ -54,30 +54,28 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink msidlInclude		Include
-HiLink msidlPreProc		PreProc
-HiLink msidlPreCondit		PreCondit
-HiLink msidlDefine		Macro
-HiLink msidlIncluded		String
-HiLink msidlString		String
-HiLink msidlComment		Comment
-HiLink msidlTodo		Todo
-HiLink msidlSpecial		SpecialChar
-HiLink msidlLiteral		Number
-HiLink msidlUUID		Number
-
-HiLink msidlImport		Include
-HiLink msidlEnum		StorageClass
-HiLink msidlStruct		Structure
-HiLink msidlTypedef		Typedef
-HiLink msidlAttribute		StorageClass
-
-HiLink msidlStandardType	Type
-HiLink msidlSafeArray		Type
-
-delcommand HiLink
+
+hi def link msidlInclude		Include
+hi def link msidlPreProc		PreProc
+hi def link msidlPreCondit		PreCondit
+hi def link msidlDefine		Macro
+hi def link msidlIncluded		String
+hi def link msidlString		String
+hi def link msidlComment		Comment
+hi def link msidlTodo		Todo
+hi def link msidlSpecial		SpecialChar
+hi def link msidlLiteral		Number
+hi def link msidlUUID		Number
+
+hi def link msidlImport		Include
+hi def link msidlEnum		StorageClass
+hi def link msidlStruct		Structure
+hi def link msidlTypedef		Typedef
+hi def link msidlAttribute		StorageClass
+
+hi def link msidlStandardType	Type
+hi def link msidlSafeArray		Type
+
 
 let b:current_syntax = "msidl"
 
diff --git a/runtime/syntax/msql.vim b/runtime/syntax/msql.vim
index 6195786260..60e75a7ef6 100644
--- a/runtime/syntax/msql.vim
+++ b/runtime/syntax/msql.vim
@@ -51,30 +51,28 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink msqlComment		Comment
-HiLink msqlString		String
-HiLink msqlNumber		Number
-HiLink msqlFloat		Float
-HiLink msqlIdentifier	Identifier
-HiLink msqlGlobalIdentifier	Identifier
-HiLink msqlIntVar		Identifier
-HiLink msqlEnvVar		Identifier
-HiLink msqlFunctions		Function
-HiLink msqlRepeat		Repeat
-HiLink msqlConditional	Conditional
-HiLink msqlStatement		Statement
-HiLink msqlType		Type
-HiLink msqlInclude		Include
-HiLink msqlDefine		Define
-HiLink msqlSpecialChar	SpecialChar
-HiLink msqlParentError	Error
-HiLink msqlTodo		Todo
-HiLink msqlOperator		Operator
-HiLink msqlRelation		Operator
-
-delcommand HiLink
+
+hi def link msqlComment		Comment
+hi def link msqlString		String
+hi def link msqlNumber		Number
+hi def link msqlFloat		Float
+hi def link msqlIdentifier	Identifier
+hi def link msqlGlobalIdentifier	Identifier
+hi def link msqlIntVar		Identifier
+hi def link msqlEnvVar		Identifier
+hi def link msqlFunctions		Function
+hi def link msqlRepeat		Repeat
+hi def link msqlConditional	Conditional
+hi def link msqlStatement		Statement
+hi def link msqlType		Type
+hi def link msqlInclude		Include
+hi def link msqlDefine		Define
+hi def link msqlSpecialChar	SpecialChar
+hi def link msqlParentError	Error
+hi def link msqlTodo		Todo
+hi def link msqlOperator		Operator
+hi def link msqlRelation		Operator
+
 
 let b:current_syntax = "msql"
 
diff --git a/runtime/syntax/mupad.vim b/runtime/syntax/mupad.vim
index 7f981f0b7a..55ea9c4e43 100644
--- a/runtime/syntax/mupad.vim
+++ b/runtime/syntax/mupad.vim
@@ -265,21 +265,19 @@ syn keyword mupadIdentifier	Tubular
 " graphics  meta-documentation Attributes
 syn keyword mupadIdentifier	objectGroupsListed
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mupadComment		Comment
-HiLink mupadString		String
-HiLink mupadOperator		Operator
-HiLink mupadSpecial		Special
-HiLink mupadStatement		Statement
-HiLink mupadUnderlined	Underlined
-HiLink mupadConditional	Conditional
-HiLink mupadRepeat		Repeat
-HiLink mupadFunction		Function
-HiLink mupadType		Type
-HiLink mupadDefine		Define
-HiLink mupadIdentifier	Identifier
+hi def link mupadComment		Comment
+hi def link mupadString		String
+hi def link mupadOperator		Operator
+hi def link mupadSpecial		Special
+hi def link mupadStatement		Statement
+hi def link mupadUnderlined	Underlined
+hi def link mupadConditional	Conditional
+hi def link mupadRepeat		Repeat
+hi def link mupadFunction		Function
+hi def link mupadType		Type
+hi def link mupadDefine		Define
+hi def link mupadIdentifier	Identifier
 
-delcommand HiLink
 
 " TODO  More comprehensive listing.
diff --git a/runtime/syntax/mush.vim b/runtime/syntax/mush.vim
index cf95d2a9e9..efaae50ae3 100644
--- a/runtime/syntax/mush.vim
+++ b/runtime/syntax/mush.vim
@@ -182,35 +182,33 @@ syntax keyword mushAttribute use va vb vc vd ve vf vg vh vi vj vk vl vm vn
 syntax keyword mushAttribute vo vp vq vr vs vt vu vv vw vx vy vz
 
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink mushAttribute  Constant
-HiLink mushCommand    Function
-HiLink mushNumber     Number
-HiLink mushSetting    PreProc
-HiLink mushFunction   Statement
-HiLink mushVariable   Identifier
-HiLink mushSpecial    Special
-HiLink mushTodo       Todo
-HiLink mushFlag       Special
-HiLink mushIdentifier Identifier
-HiLink mushDefine     Macro
-HiLink mushPreProc    PreProc
-HiLink mushPreProcGroup PreProc 
-HiLink mushPreCondit PreCondit
-HiLink mushIncluded cString
-HiLink  mushInclude Include
+hi def link mushAttribute  Constant
+hi def link mushCommand    Function
+hi def link mushNumber     Number
+hi def link mushSetting    PreProc
+hi def link mushFunction   Statement
+hi def link mushVariable   Identifier
+hi def link mushSpecial    Special
+hi def link mushTodo       Todo
+hi def link mushFlag       Special
+hi def link mushIdentifier Identifier
+hi def link mushDefine     Macro
+hi def link mushPreProc    PreProc
+hi def link mushPreProcGroup PreProc 
+hi def link mushPreCondit PreCondit
+hi def link mushIncluded cString
+hi def link mushInclude Include
 
 
 
 " Comments
-HiLink mushCommentStart mushComment
-HiLink mushComment    Comment
-HiLink mushCommentString mushString
+hi def link mushCommentStart mushComment
+hi def link mushComment    Comment
+hi def link mushCommentString mushString
 
 
-delcommand HiLink
 
 let b:current_syntax = "mush"
 
diff --git a/runtime/syntax/muttrc.vim b/runtime/syntax/muttrc.vim
index 4e073b887e..e4395fdf59 100644
--- a/runtime/syntax/muttrc.vim
+++ b/runtime/syntax/muttrc.vim
@@ -630,151 +630,149 @@ syn match   muttrcMonoLine	"^\s*mono\s\+\S\+"	skipwhite nextgroup=muttrcMonoAttr
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink muttrcComment		Comment
-HiLink muttrcEscape		SpecialChar
-HiLink muttrcRXChars		SpecialChar
-HiLink muttrcString		String
-HiLink muttrcRXString		String
-HiLink muttrcRXString2	String
-HiLink muttrcSpecial		Special
-HiLink muttrcHooks		Type
-HiLink muttrcGroupFlag	Type
-HiLink muttrcGroupDef		Macro
-HiLink muttrcAddrDef		muttrcGroupFlag
-HiLink muttrcRXDef		muttrcGroupFlag
-HiLink muttrcRXPat		String
-HiLink muttrcAliasGroupName	Macro
-HiLink muttrcAliasKey	        Identifier
-HiLink muttrcUnAliasKey	Identifier
-HiLink muttrcAliasEncEmail	Identifier
-HiLink muttrcAliasParens	Type
-HiLink muttrcSetNumAssignment	Number
-HiLink muttrcSetBoolAssignment	Boolean
-HiLink muttrcSetQuadAssignment	Boolean
-HiLink muttrcSetStrAssignment	String
-HiLink muttrcEmail		Special
-HiLink muttrcVariableInner	Special
-HiLink muttrcEscapedVariable	String
-HiLink muttrcHeader		Type
-HiLink muttrcKeySpecial	SpecialChar
-HiLink muttrcKey		Type
-HiLink muttrcKeyName		SpecialChar
-HiLink muttrcVarBool		Identifier
-HiLink muttrcVarQuad		Identifier
-HiLink muttrcVarNum		Identifier
-HiLink muttrcVarStr		Identifier
-HiLink muttrcMenu		Identifier
-HiLink muttrcCommand		Keyword
-HiLink muttrcMacroDescr	String
-HiLink muttrcAction		Macro
-HiLink muttrcBadAction	Error
-HiLink muttrcBindFunction	Error
-HiLink muttrcBindMenuList	Error
-HiLink muttrcFunction		Macro
-HiLink muttrcGroupKeyword	muttrcCommand
-HiLink muttrcGroupLine	Error
-HiLink muttrcSubscribeKeyword	muttrcCommand
-HiLink muttrcSubscribeLine	Error
-HiLink muttrcListsKeyword	muttrcCommand
-HiLink muttrcListsLine	Error
-HiLink muttrcAlternateKeyword	muttrcCommand
-HiLink muttrcAlternatesLine	Error
-HiLink muttrcAttachmentsLine	muttrcCommand
-HiLink muttrcAttachmentsFlag	Type
-HiLink muttrcAttachmentsMimeType	String
-HiLink muttrcColorLine	Error
-HiLink muttrcColorContext	Error
-HiLink muttrcColorContextI	Identifier
-HiLink muttrcColorContextH	Identifier
-HiLink muttrcColorKeyword	muttrcCommand
-HiLink muttrcColorKeywordI	muttrcColorKeyword
-HiLink muttrcColorKeywordH	muttrcColorKeyword
-HiLink muttrcColorField	Identifier
-HiLink muttrcColor		Type
-HiLink muttrcColorFG		Error
-HiLink muttrcColorFGI		Error
-HiLink muttrcColorFGH		Error
-HiLink muttrcColorBG		Error
-HiLink muttrcColorBGI		Error
-HiLink muttrcColorBGH		Error
-HiLink muttrcMonoAttrib	muttrcColor
-HiLink muttrcMono		muttrcCommand
-HiLink muttrcSimplePat	Identifier
-HiLink muttrcSimplePatString	Macro
-HiLink muttrcSimplePatMetas	Special
-HiLink muttrcPattern		Error
-HiLink muttrcUnColorLine	Error
-HiLink muttrcUnColorKeyword	muttrcCommand
-HiLink muttrcUnColorIndex	Identifier
-HiLink muttrcShellString	muttrcEscape
-HiLink muttrcRXHooks		muttrcCommand
-HiLink muttrcRXHookNot	Type
-HiLink muttrcPatHooks		muttrcCommand
-HiLink muttrcPatHookNot	Type
-HiLink muttrcFormatConditionals2 Type
-HiLink muttrcIndexFormatStr	muttrcString
-HiLink muttrcIndexFormatEscapes muttrcEscape
-HiLink muttrcIndexFormatConditionals muttrcFormatConditionals2
-HiLink muttrcAliasFormatStr	muttrcString
-HiLink muttrcAliasFormatEscapes muttrcEscape
-HiLink muttrcAttachFormatStr	muttrcString
-HiLink muttrcAttachFormatEscapes muttrcEscape
-HiLink muttrcAttachFormatConditionals muttrcFormatConditionals2
-HiLink muttrcComposeFormatStr	muttrcString
-HiLink muttrcComposeFormatEscapes muttrcEscape
-HiLink muttrcFolderFormatStr	muttrcString
-HiLink muttrcFolderFormatEscapes muttrcEscape
-HiLink muttrcFolderFormatConditionals muttrcFormatConditionals2
-HiLink muttrcMixFormatStr	muttrcString
-HiLink muttrcMixFormatEscapes muttrcEscape
-HiLink muttrcMixFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPFormatStr	muttrcString
-HiLink muttrcPGPFormatEscapes muttrcEscape
-HiLink muttrcPGPFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPCmdFormatStr	muttrcString
-HiLink muttrcPGPCmdFormatEscapes muttrcEscape
-HiLink muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
-HiLink muttrcStatusFormatStr	muttrcString
-HiLink muttrcStatusFormatEscapes muttrcEscape
-HiLink muttrcStatusFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPGetKeysFormatStr	muttrcString
-HiLink muttrcPGPGetKeysFormatEscapes muttrcEscape
-HiLink muttrcSmimeFormatStr	muttrcString
-HiLink muttrcSmimeFormatEscapes muttrcEscape
-HiLink muttrcSmimeFormatConditionals muttrcFormatConditionals2
-HiLink muttrcTimeEscapes	muttrcEscape
-HiLink muttrcPGPTimeEscapes	muttrcEscape
-HiLink muttrcStrftimeEscapes	Type
-HiLink muttrcStrftimeFormatStr muttrcString
-HiLink muttrcFormatErrors Error
-
-HiLink muttrcBindFunctionNL	SpecialChar
-HiLink muttrcBindKeyNL	SpecialChar
-HiLink muttrcBindMenuListNL	SpecialChar
-HiLink muttrcMacroDescrNL	SpecialChar
-HiLink muttrcMacroBodyNL	SpecialChar
-HiLink muttrcMacroKeyNL	SpecialChar
-HiLink muttrcMacroMenuListNL	SpecialChar
-HiLink muttrcColorMatchCountNL SpecialChar
-HiLink muttrcColorNL		SpecialChar
-HiLink muttrcColorRXNL	SpecialChar
-HiLink muttrcColorBGNL	SpecialChar
-HiLink muttrcColorFGNL	SpecialChar
-HiLink muttrcAliasNameNL	SpecialChar
-HiLink muttrcAliasENNL	SpecialChar
-HiLink muttrcAliasNL		SpecialChar
-HiLink muttrcUnAliasNL	SpecialChar
-HiLink muttrcAliasGroupDefNL	SpecialChar
-HiLink muttrcAliasEncEmailNL	SpecialChar
-HiLink muttrcPatternNL	SpecialChar
-HiLink muttrcUnColorPatNL	SpecialChar
-HiLink muttrcUnColorAPNL	SpecialChar
-HiLink muttrcUnColorIndexNL	SpecialChar
-HiLink muttrcStringNL		SpecialChar
-
-delcommand HiLink
+
+hi def link muttrcComment		Comment
+hi def link muttrcEscape		SpecialChar
+hi def link muttrcRXChars		SpecialChar
+hi def link muttrcString		String
+hi def link muttrcRXString		String
+hi def link muttrcRXString2	String
+hi def link muttrcSpecial		Special
+hi def link muttrcHooks		Type
+hi def link muttrcGroupFlag	Type
+hi def link muttrcGroupDef		Macro
+hi def link muttrcAddrDef		muttrcGroupFlag
+hi def link muttrcRXDef		muttrcGroupFlag
+hi def link muttrcRXPat		String
+hi def link muttrcAliasGroupName	Macro
+hi def link muttrcAliasKey	        Identifier
+hi def link muttrcUnAliasKey	Identifier
+hi def link muttrcAliasEncEmail	Identifier
+hi def link muttrcAliasParens	Type
+hi def link muttrcSetNumAssignment	Number
+hi def link muttrcSetBoolAssignment	Boolean
+hi def link muttrcSetQuadAssignment	Boolean
+hi def link muttrcSetStrAssignment	String
+hi def link muttrcEmail		Special
+hi def link muttrcVariableInner	Special
+hi def link muttrcEscapedVariable	String
+hi def link muttrcHeader		Type
+hi def link muttrcKeySpecial	SpecialChar
+hi def link muttrcKey		Type
+hi def link muttrcKeyName		SpecialChar
+hi def link muttrcVarBool		Identifier
+hi def link muttrcVarQuad		Identifier
+hi def link muttrcVarNum		Identifier
+hi def link muttrcVarStr		Identifier
+hi def link muttrcMenu		Identifier
+hi def link muttrcCommand		Keyword
+hi def link muttrcMacroDescr	String
+hi def link muttrcAction		Macro
+hi def link muttrcBadAction	Error
+hi def link muttrcBindFunction	Error
+hi def link muttrcBindMenuList	Error
+hi def link muttrcFunction		Macro
+hi def link muttrcGroupKeyword	muttrcCommand
+hi def link muttrcGroupLine	Error
+hi def link muttrcSubscribeKeyword	muttrcCommand
+hi def link muttrcSubscribeLine	Error
+hi def link muttrcListsKeyword	muttrcCommand
+hi def link muttrcListsLine	Error
+hi def link muttrcAlternateKeyword	muttrcCommand
+hi def link muttrcAlternatesLine	Error
+hi def link muttrcAttachmentsLine	muttrcCommand
+hi def link muttrcAttachmentsFlag	Type
+hi def link muttrcAttachmentsMimeType	String
+hi def link muttrcColorLine	Error
+hi def link muttrcColorContext	Error
+hi def link muttrcColorContextI	Identifier
+hi def link muttrcColorContextH	Identifier
+hi def link muttrcColorKeyword	muttrcCommand
+hi def link muttrcColorKeywordI	muttrcColorKeyword
+hi def link muttrcColorKeywordH	muttrcColorKeyword
+hi def link muttrcColorField	Identifier
+hi def link muttrcColor		Type
+hi def link muttrcColorFG		Error
+hi def link muttrcColorFGI		Error
+hi def link muttrcColorFGH		Error
+hi def link muttrcColorBG		Error
+hi def link muttrcColorBGI		Error
+hi def link muttrcColorBGH		Error
+hi def link muttrcMonoAttrib	muttrcColor
+hi def link muttrcMono		muttrcCommand
+hi def link muttrcSimplePat	Identifier
+hi def link muttrcSimplePatString	Macro
+hi def link muttrcSimplePatMetas	Special
+hi def link muttrcPattern		Error
+hi def link muttrcUnColorLine	Error
+hi def link muttrcUnColorKeyword	muttrcCommand
+hi def link muttrcUnColorIndex	Identifier
+hi def link muttrcShellString	muttrcEscape
+hi def link muttrcRXHooks		muttrcCommand
+hi def link muttrcRXHookNot	Type
+hi def link muttrcPatHooks		muttrcCommand
+hi def link muttrcPatHookNot	Type
+hi def link muttrcFormatConditionals2 Type
+hi def link muttrcIndexFormatStr	muttrcString
+hi def link muttrcIndexFormatEscapes muttrcEscape
+hi def link muttrcIndexFormatConditionals muttrcFormatConditionals2
+hi def link muttrcAliasFormatStr	muttrcString
+hi def link muttrcAliasFormatEscapes muttrcEscape
+hi def link muttrcAttachFormatStr	muttrcString
+hi def link muttrcAttachFormatEscapes muttrcEscape
+hi def link muttrcAttachFormatConditionals muttrcFormatConditionals2
+hi def link muttrcComposeFormatStr	muttrcString
+hi def link muttrcComposeFormatEscapes muttrcEscape
+hi def link muttrcFolderFormatStr	muttrcString
+hi def link muttrcFolderFormatEscapes muttrcEscape
+hi def link muttrcFolderFormatConditionals muttrcFormatConditionals2
+hi def link muttrcMixFormatStr	muttrcString
+hi def link muttrcMixFormatEscapes muttrcEscape
+hi def link muttrcMixFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPFormatStr	muttrcString
+hi def link muttrcPGPFormatEscapes muttrcEscape
+hi def link muttrcPGPFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPCmdFormatStr	muttrcString
+hi def link muttrcPGPCmdFormatEscapes muttrcEscape
+hi def link muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
+hi def link muttrcStatusFormatStr	muttrcString
+hi def link muttrcStatusFormatEscapes muttrcEscape
+hi def link muttrcStatusFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPGetKeysFormatStr	muttrcString
+hi def link muttrcPGPGetKeysFormatEscapes muttrcEscape
+hi def link muttrcSmimeFormatStr	muttrcString
+hi def link muttrcSmimeFormatEscapes muttrcEscape
+hi def link muttrcSmimeFormatConditionals muttrcFormatConditionals2
+hi def link muttrcTimeEscapes	muttrcEscape
+hi def link muttrcPGPTimeEscapes	muttrcEscape
+hi def link muttrcStrftimeEscapes	Type
+hi def link muttrcStrftimeFormatStr muttrcString
+hi def link muttrcFormatErrors Error
+
+hi def link muttrcBindFunctionNL	SpecialChar
+hi def link muttrcBindKeyNL	SpecialChar
+hi def link muttrcBindMenuListNL	SpecialChar
+hi def link muttrcMacroDescrNL	SpecialChar
+hi def link muttrcMacroBodyNL	SpecialChar
+hi def link muttrcMacroKeyNL	SpecialChar
+hi def link muttrcMacroMenuListNL	SpecialChar
+hi def link muttrcColorMatchCountNL SpecialChar
+hi def link muttrcColorNL		SpecialChar
+hi def link muttrcColorRXNL	SpecialChar
+hi def link muttrcColorBGNL	SpecialChar
+hi def link muttrcColorFGNL	SpecialChar
+hi def link muttrcAliasNameNL	SpecialChar
+hi def link muttrcAliasENNL	SpecialChar
+hi def link muttrcAliasNL		SpecialChar
+hi def link muttrcUnAliasNL	SpecialChar
+hi def link muttrcAliasGroupDefNL	SpecialChar
+hi def link muttrcAliasEncEmailNL	SpecialChar
+hi def link muttrcPatternNL	SpecialChar
+hi def link muttrcUnColorPatNL	SpecialChar
+hi def link muttrcUnColorAPNL	SpecialChar
+hi def link muttrcUnColorIndexNL	SpecialChar
+hi def link muttrcStringNL		SpecialChar
+
 
 let b:current_syntax = "muttrc"
 
diff --git a/runtime/syntax/mysql.vim b/runtime/syntax/mysql.vim
index 8d0361c220..8bd7b6459a 100644
--- a/runtime/syntax/mysql.vim
+++ b/runtime/syntax/mysql.vim
@@ -271,20 +271,18 @@ syn region mysqlFunction         start="yearweek(" end=")" contains=ALL
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mysqlKeyword            Statement
-HiLink mysqlSpecial            Special
-HiLink mysqlString             String
-HiLink mysqlNumber             Number
-HiLink mysqlVariable           Identifier
-HiLink mysqlComment            Comment
-HiLink mysqlType               Type
-HiLink mysqlOperator           Statement
-HiLink mysqlFlow               Statement
-HiLink mysqlFunction           Function
+hi def link mysqlKeyword            Statement
+hi def link mysqlSpecial            Special
+hi def link mysqlString             String
+hi def link mysqlNumber             Number
+hi def link mysqlVariable           Identifier
+hi def link mysqlComment            Comment
+hi def link mysqlType               Type
+hi def link mysqlOperator           Statement
+hi def link mysqlFlow               Statement
+hi def link mysqlFunction           Function
 
-delcommand HiLink
 
 let b:current_syntax = "mysql"
 
diff --git a/runtime/syntax/named.vim b/runtime/syntax/named.vim
index 6d6cbd484d..a5757d5eb9 100644
--- a/runtime/syntax/named.vim
+++ b/runtime/syntax/named.vim
@@ -189,39 +189,37 @@ syn match	namedParenError	+}\([^;]\|$\)+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink namedComment	Comment
-HiLink namedInclude	Include
-HiLink namedKeyword	Keyword
-HiLink namedIntKeyword	Keyword
-HiLink namedIdentifier	Identifier
-HiLink namedIntIdent	Identifier
-
-HiLink namedString	String
-HiLink namedBool	Type
-HiLink namedNotBool	Error
-HiLink namedNumber	Number
-HiLink namedNotNumber	Error
-
-HiLink namedOption	namedKeyword
-HiLink namedLogOption	namedKeyword
-HiLink namedCNOption	namedKeyword
-HiLink namedQSKeywords	Type
-HiLink namedCNKeywords	Type
-HiLink namedLogCategory	Type
-HiLink namedIPaddr	Number
-HiLink namedDomain	Identifier
-HiLink namedZoneOpt	namedKeyword
-HiLink namedZoneType	Type
-HiLink namedParenError	Error
-HiLink namedEParenError	Error
-HiLink namedIllegalDom	Error
-HiLink namedIPerror	Error
-HiLink namedSpareDot	Error
-HiLink namedError	Error
-
-delcommand HiLink
+
+hi def link namedComment	Comment
+hi def link namedInclude	Include
+hi def link namedKeyword	Keyword
+hi def link namedIntKeyword	Keyword
+hi def link namedIdentifier	Identifier
+hi def link namedIntIdent	Identifier
+
+hi def link namedString	String
+hi def link namedBool	Type
+hi def link namedNotBool	Error
+hi def link namedNumber	Number
+hi def link namedNotNumber	Error
+
+hi def link namedOption	namedKeyword
+hi def link namedLogOption	namedKeyword
+hi def link namedCNOption	namedKeyword
+hi def link namedQSKeywords	Type
+hi def link namedCNKeywords	Type
+hi def link namedLogCategory	Type
+hi def link namedIPaddr	Number
+hi def link namedDomain	Identifier
+hi def link namedZoneOpt	namedKeyword
+hi def link namedZoneType	Type
+hi def link namedParenError	Error
+hi def link namedEParenError	Error
+hi def link namedIllegalDom	Error
+hi def link namedIPerror	Error
+hi def link namedSpareDot	Error
+hi def link namedError	Error
+
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim
index 0f81ceb5a9..d6485080ee 100644
--- a/runtime/syntax/nasm.vim
+++ b/runtime/syntax/nasm.vim
@@ -422,87 +422,85 @@ syn sync match	nasmSync	grouphere NONE	       "^\s*%endmacro\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Sub Links:
-HiLink nasmInMacDirective	nasmDirective
-HiLink nasmInMacLabel		nasmLocalLabel
-HiLink nasmInMacLblWarn	nasmLabelWarn
-HiLink nasmInMacMacro		nasmMacro
-HiLink nasmInMacParam		nasmMacro
-HiLink nasmInMacParamNum	nasmDecNumber
-HiLink nasmInMacPreCondit	nasmPreCondit
-HiLink nasmInMacPreProc	nasmPreProc
-HiLink nasmInPreCondit	nasmPreCondit
-HiLink nasmInStructure	nasmStructure
-HiLink nasmStructureLabel	nasmStructure
+hi def link nasmInMacDirective	nasmDirective
+hi def link nasmInMacLabel		nasmLocalLabel
+hi def link nasmInMacLblWarn	nasmLabelWarn
+hi def link nasmInMacMacro		nasmMacro
+hi def link nasmInMacParam		nasmMacro
+hi def link nasmInMacParamNum	nasmDecNumber
+hi def link nasmInMacPreCondit	nasmPreCondit
+hi def link nasmInMacPreProc	nasmPreProc
+hi def link nasmInPreCondit	nasmPreCondit
+hi def link nasmInStructure	nasmStructure
+hi def link nasmStructureLabel	nasmStructure
 
 " Comment Group:
-HiLink nasmComment		Comment
-HiLink nasmSpecialComment	SpecialComment
-HiLink nasmInCommentTodo	Todo
+hi def link nasmComment		Comment
+hi def link nasmSpecialComment	SpecialComment
+hi def link nasmInCommentTodo	Todo
 
 " Constant Group:
-HiLink nasmString		String
-HiLink nasmStringError	Error
-HiLink nasmBinNumber		Number
-HiLink nasmOctNumber		Number
-HiLink nasmDecNumber		Number
-HiLink nasmHexNumber		Number
-HiLink nasmFltNumber		Float
-HiLink nasmNumberError	Error
+hi def link nasmString		String
+hi def link nasmStringError	Error
+hi def link nasmBinNumber		Number
+hi def link nasmOctNumber		Number
+hi def link nasmDecNumber		Number
+hi def link nasmHexNumber		Number
+hi def link nasmFltNumber		Float
+hi def link nasmNumberError	Error
 
 " Identifier Group:
-HiLink nasmLabel		Identifier
-HiLink nasmLocalLabel		Identifier
-HiLink nasmSpecialLabel	Special
-HiLink nasmLabelError		Error
-HiLink nasmLabelWarn		Todo
+hi def link nasmLabel		Identifier
+hi def link nasmLocalLabel		Identifier
+hi def link nasmSpecialLabel	Special
+hi def link nasmLabelError		Error
+hi def link nasmLabelWarn		Todo
 
 " PreProc Group:
-HiLink nasmPreProc		PreProc
-HiLink nasmDefine		Define
-HiLink nasmInclude		Include
-HiLink nasmMacro		Macro
-HiLink nasmPreCondit		PreCondit
-HiLink nasmPreProcError	Error
-HiLink nasmPreProcWarn	Todo
+hi def link nasmPreProc		PreProc
+hi def link nasmDefine		Define
+hi def link nasmInclude		Include
+hi def link nasmMacro		Macro
+hi def link nasmPreCondit		PreCondit
+hi def link nasmPreProcError	Error
+hi def link nasmPreProcWarn	Todo
 
 " Type Group:
-HiLink nasmType		Type
-HiLink nasmStorage		StorageClass
-HiLink nasmStructure		Structure
-HiLink nasmTypeError		Error
+hi def link nasmType		Type
+hi def link nasmStorage		StorageClass
+hi def link nasmStructure		Structure
+hi def link nasmTypeError		Error
 
 " Directive Group:
-HiLink nasmConstant		Constant
-HiLink nasmInstrModifier	Operator
-HiLink nasmRepeat		Repeat
-HiLink nasmDirective		Keyword
-HiLink nasmStdDirective	Operator
-HiLink nasmFmtDirective	Keyword
+hi def link nasmConstant		Constant
+hi def link nasmInstrModifier	Operator
+hi def link nasmRepeat		Repeat
+hi def link nasmDirective		Keyword
+hi def link nasmStdDirective	Operator
+hi def link nasmFmtDirective	Keyword
 
 " Register Group:
-HiLink nasmCtrlRegister	Special
-HiLink nasmDebugRegister	Debug
-HiLink nasmTestRegister	Special
-HiLink nasmRegisterError	Error
-HiLink nasmMemRefError	Error
+hi def link nasmCtrlRegister	Special
+hi def link nasmDebugRegister	Debug
+hi def link nasmTestRegister	Special
+hi def link nasmRegisterError	Error
+hi def link nasmMemRefError	Error
 
 " Instruction Group:
-HiLink nasmStdInstruction	Statement
-HiLink nasmSysInstruction	Statement
-HiLink nasmDbgInstruction	Debug
-HiLink nasmFpuInstruction	Statement
-HiLink nasmMmxInstruction	Statement
-HiLink nasmSseInstruction	Statement
-HiLink nasmNowInstruction	Statement
-HiLink nasmAmdInstruction	Special
-HiLink nasmCrxInstruction	Special
-HiLink nasmUndInstruction	Todo
-HiLink nasmInstructnError	Error
-
-delcommand HiLink
+hi def link nasmStdInstruction	Statement
+hi def link nasmSysInstruction	Statement
+hi def link nasmDbgInstruction	Debug
+hi def link nasmFpuInstruction	Statement
+hi def link nasmMmxInstruction	Statement
+hi def link nasmSseInstruction	Statement
+hi def link nasmNowInstruction	Statement
+hi def link nasmAmdInstruction	Special
+hi def link nasmCrxInstruction	Special
+hi def link nasmUndInstruction	Todo
+hi def link nasmInstructnError	Error
+
 
 let b:current_syntax = "nasm"
 
diff --git a/runtime/syntax/nastran.vim b/runtime/syntax/nastran.vim
index 34ad1bf378..239fd6e49d 100644
--- a/runtime/syntax/nastran.vim
+++ b/runtime/syntax/nastran.vim
@@ -153,30 +153,28 @@ syn region nastranBulkData start=+ *[Bb][Uu][Ll][Kk] *$+ end=+^ [Ee][Nn][Dd] *[D
 syn keyword nastranUtilCard ECHOON ECHOOFF INCLUDE PARAM
 
 
-command -nargs=+ HiLink hi link <args>
 " The default methods for highlighting.  Can be overridden later
-HiLink nastranDmapexecmod	     Statement
-HiLink nastranDmapType	     Type
-HiLink nastranDmapPreCondit	     Error
-HiLink nastranDmapUtilmod	     PreProc
-HiLink nastranDmapMatmod	     nastranDmapUtilmod
-HiLink nastranDmapString	     String
-HiLink nastranDmapNumber	     Constant
-HiLink nastranDmapFloat	     nastranDmapNumber
-HiLink nastranDmapInitTab	     nastranDmapNumber
-HiLink nastranDmapTab		     nastranDmapNumber
-HiLink nastranDmapLogical	     nastranDmapExecmod
-HiLink nastranDmapImplicit	     Identifier
-HiLink nastranDmapComment	     Comment
-HiLink nastranDmapRepeat	     nastranDmapexecmod
-HiLink nastranNastranCard	     nastranDmapPreCondit
-HiLink nastranECSCard		     nastranDmapUtilmod
-HiLink nastranFMSCard		     nastranNastranCard
-HiLink nastranCC		     nastranDmapexecmod
-HiLink nastranDelimiter	     Special
-HiLink nastranBulkData	     nastranDmapType
-HiLink nastranUtilCard	     nastranDmapexecmod
-delcommand HiLink
+hi def link nastranDmapexecmod	     Statement
+hi def link nastranDmapType	     Type
+hi def link nastranDmapPreCondit	     Error
+hi def link nastranDmapUtilmod	     PreProc
+hi def link nastranDmapMatmod	     nastranDmapUtilmod
+hi def link nastranDmapString	     String
+hi def link nastranDmapNumber	     Constant
+hi def link nastranDmapFloat	     nastranDmapNumber
+hi def link nastranDmapInitTab	     nastranDmapNumber
+hi def link nastranDmapTab		     nastranDmapNumber
+hi def link nastranDmapLogical	     nastranDmapExecmod
+hi def link nastranDmapImplicit	     Identifier
+hi def link nastranDmapComment	     Comment
+hi def link nastranDmapRepeat	     nastranDmapexecmod
+hi def link nastranNastranCard	     nastranDmapPreCondit
+hi def link nastranECSCard		     nastranDmapUtilmod
+hi def link nastranFMSCard		     nastranNastranCard
+hi def link nastranCC		     nastranDmapexecmod
+hi def link nastranDelimiter	     Special
+hi def link nastranBulkData	     nastranDmapType
+hi def link nastranUtilCard	     nastranDmapexecmod
 
 let b:current_syntax = "nastran"
 
diff --git a/runtime/syntax/natural.vim b/runtime/syntax/natural.vim
index c94231d9f2..be529f2d85 100644
--- a/runtime/syntax/natural.vim
+++ b/runtime/syntax/natural.vim
@@ -148,59 +148,50 @@ if v:version >= 600
 endif
 
 
-if v:version >= 508 || !exists("did_natural_syntax_inits")
-  if v:version < 508
-    let did_natural_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  " The default methods for highlighting.  Can be overridden later
-
-  " Constants
-  HiLink naturalFormat		Constant
-  HiLink naturalAttribute	Constant
-  HiLink naturalNumber		Number
-  HiLink naturalString		String
-  HiLink naturalBoolean		Boolean
-
-  " All kinds of keywords
-  HiLink naturalConditional	Conditional
-  HiLink naturalRepeat		Repeat
-  HiLink naturalLoop		Repeat
-  HiLink naturalFlow		Keyword
-  HiLink naturalError		Keyword
-  HiLink naturalKeyword		Keyword
-  HiLink naturalOperator	Operator
-  HiLink naturalParGui		Operator
-
-  " Labels
-  HiLink naturalLabel		Label
-  HiLink naturalRefLabel	Label
-
-  " Comments
-  HiLink naturalPComment	Comment
-  HiLink naturalComment		Comment
-  HiLink naturalTodo		Todo
-  HiLink naturalCommentMark	PreProc
-
-  HiLink naturalInclude		Include
-  HiLink naturalSysVar		Identifier
-  HiLink naturalLineNo		LineNr
-  HiLink naturalLineRef		Error
-  HiLink naturalSpecial		Special
-  HiLink naturalComKey		Todo
-
-  " illegal things
-  HiLink naturalRMKeyword	Error
-  HiLink naturalLegalIdent	Error
-
-  HiLink naturalType		Type
-  HiLink naturalFunction	Function
-  HiLink naturalObjName		PreProc
-
-  delcommand HiLink
-endif
+" The default methods for highlighting.  Can be overridden later
+
+" Constants
+hi def link naturalFormat		Constant
+hi def link naturalAttribute	Constant
+hi def link naturalNumber		Number
+hi def link naturalString		String
+hi def link naturalBoolean		Boolean
+
+" All kinds of keywords
+hi def link naturalConditional	Conditional
+hi def link naturalRepeat		Repeat
+hi def link naturalLoop		Repeat
+hi def link naturalFlow		Keyword
+hi def link naturalError		Keyword
+hi def link naturalKeyword		Keyword
+hi def link naturalOperator	Operator
+hi def link naturalParGui		Operator
+
+" Labels
+hi def link naturalLabel		Label
+hi def link naturalRefLabel	Label
+
+" Comments
+hi def link naturalPComment	Comment
+hi def link naturalComment		Comment
+hi def link naturalTodo		Todo
+hi def link naturalCommentMark	PreProc
+
+hi def link naturalInclude		Include
+hi def link naturalSysVar		Identifier
+hi def link naturalLineNo		LineNr
+hi def link naturalLineRef		Error
+hi def link naturalSpecial		Special
+hi def link naturalComKey		Todo
+
+" illegal things
+hi def link naturalRMKeyword	Error
+hi def link naturalLegalIdent	Error
+
+hi def link naturalType		Type
+hi def link naturalFunction	Function
+hi def link naturalObjName		PreProc
+
 
 let b:current_syntax = "natural"
 
diff --git a/runtime/syntax/ncf.vim b/runtime/syntax/ncf.vim
index b458e630f2..0027fd4ef8 100644
--- a/runtime/syntax/ncf.vim
+++ b/runtime/syntax/ncf.vim
@@ -215,35 +215,33 @@ if exists("ncf_highlight_unknowns")
     syn match Error "[^ \t]*" contains=ALL
 endif
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink ncfCommands		Statement
-HiLink ncfSetCommands	ncfCommands
-HiLink ncfLogins		ncfCommands
-HiLink ncfString		String
-HiLink ncfContString	ncfString
-HiLink ncfComment		Comment
-HiLink ncfImplicit		Type
-HiLink ncfBoolean		Boolean
-HiLink ncfScript		Identifier
-HiLink ncfNumber		Number
-HiLink ncfIPAddr		ncfNumber
-HiLink ncfHexNumber		ncfNumber
-HiLink ncfTime		ncfNumber
-HiLink ncfDSTTime		ncfNumber
-HiLink ncfPath		Constant
-HiLink ncfServerName	Special
-HiLink ncfIPXNet		ncfServerName
-HiLink ncfTimeTypes		Constant
-HiLink ncfSetCommandsNum	   ncfSetCommands
-HiLink ncfSetCommandsBool	   ncfSetCommands
-HiLink ncfSetCommandsStr	   ncfSetCommands
-HiLink ncfSetCommandsTime	   ncfSetCommands
-HiLink ncfSetCommandsTimeDate  ncfSetCommands
-HiLink ncfSetCommandsBindCon   ncfSetCommands
-
-delcommand HiLink
+hi def link ncfCommands		Statement
+hi def link ncfSetCommands	ncfCommands
+hi def link ncfLogins		ncfCommands
+hi def link ncfString		String
+hi def link ncfContString	ncfString
+hi def link ncfComment		Comment
+hi def link ncfImplicit		Type
+hi def link ncfBoolean		Boolean
+hi def link ncfScript		Identifier
+hi def link ncfNumber		Number
+hi def link ncfIPAddr		ncfNumber
+hi def link ncfHexNumber		ncfNumber
+hi def link ncfTime		ncfNumber
+hi def link ncfDSTTime		ncfNumber
+hi def link ncfPath		Constant
+hi def link ncfServerName	Special
+hi def link ncfIPXNet		ncfServerName
+hi def link ncfTimeTypes		Constant
+hi def link ncfSetCommandsNum	   ncfSetCommands
+hi def link ncfSetCommandsBool	   ncfSetCommands
+hi def link ncfSetCommandsStr	   ncfSetCommands
+hi def link ncfSetCommandsTime	   ncfSetCommands
+hi def link ncfSetCommandsTimeDate  ncfSetCommands
+hi def link ncfSetCommandsBindCon   ncfSetCommands
+
 
 
 let b:current_syntax = "ncf"
diff --git a/runtime/syntax/nqc.vim b/runtime/syntax/nqc.vim
index 9105705241..d09c106f98 100644
--- a/runtime/syntax/nqc.vim
+++ b/runtime/syntax/nqc.vim
@@ -324,43 +324,41 @@ exec "syn sync ccomment nqcComment minlines=" . nqc_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink nqcLabel		Label
-HiLink nqcConditional		Conditional
-HiLink nqcRepeat		Repeat
-HiLink nqcCharacter		Character
-HiLink nqcNumber		Number
-HiLink nqcFloat		Float
-HiLink nqcFunction		Function
-HiLink nqcParenError		nqcError
-HiLink nqcErrInParen		nqcError
-HiLink nqcErrInBracket	nqcError
-HiLink nqcCommentL		nqcComment
-HiLink nqcCommentStart	nqcComment
-HiLink nqcCommentError	nqcError
-HiLink nqcCommentStartError	nqcError
-HiLink nqcSpaceError		nqcError
-HiLink nqcStorageClass	StorageClass
-HiLink nqcInclude		Include
-HiLink nqcPreProc		PreProc
-HiLink nqcDefine		Macro
-HiLink nqcIncluded		String
-HiLink nqcError		Error
-HiLink nqcStatement		Statement
-HiLink nqcEvents		Statement
-HiLink nqcPreCondit		PreCondit
-HiLink nqcType		Type
-HiLink nqcConstant		Constant
-HiLink nqcCommentSkip		nqcComment
-HiLink nqcComment		Comment
-HiLink nqcTodo		Todo
-HiLink nqcCppSkip		nqcCppOut
-HiLink nqcCppOut2		nqcCppOut
-HiLink nqcCppOut		Comment
-
-delcommand HiLink
+hi def link nqcLabel		Label
+hi def link nqcConditional		Conditional
+hi def link nqcRepeat		Repeat
+hi def link nqcCharacter		Character
+hi def link nqcNumber		Number
+hi def link nqcFloat		Float
+hi def link nqcFunction		Function
+hi def link nqcParenError		nqcError
+hi def link nqcErrInParen		nqcError
+hi def link nqcErrInBracket	nqcError
+hi def link nqcCommentL		nqcComment
+hi def link nqcCommentStart	nqcComment
+hi def link nqcCommentError	nqcError
+hi def link nqcCommentStartError	nqcError
+hi def link nqcSpaceError		nqcError
+hi def link nqcStorageClass	StorageClass
+hi def link nqcInclude		Include
+hi def link nqcPreProc		PreProc
+hi def link nqcDefine		Macro
+hi def link nqcIncluded		String
+hi def link nqcError		Error
+hi def link nqcStatement		Statement
+hi def link nqcEvents		Statement
+hi def link nqcPreCondit		PreCondit
+hi def link nqcType		Type
+hi def link nqcConstant		Constant
+hi def link nqcCommentSkip		nqcComment
+hi def link nqcComment		Comment
+hi def link nqcTodo		Todo
+hi def link nqcCppSkip		nqcCppOut
+hi def link nqcCppOut2		nqcCppOut
+hi def link nqcCppOut		Comment
+
 
 let b:current_syntax = "nqc"
 
diff --git a/runtime/syntax/nroff.vim b/runtime/syntax/nroff.vim
index 2619d02c44..3a8cf95856 100644
--- a/runtime/syntax/nroff.vim
+++ b/runtime/syntax/nroff.vim
@@ -196,53 +196,51 @@ syn keyword nroffTodo TODO XXX FIXME contained
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 "
-command -nargs=+ HiLink hi def link <args>
-
-HiLink nroffEscChar nroffSpecialChar
-HiLink nroffEscCharAr nroffSpecialChar
-HiLink nroffSpecialChar SpecialChar
-HiLink nroffSpace Delimiter
-
-HiLink nroffEscRegArg2 nroffEscRegArg
-HiLink nroffEscRegArg nroffIdent
-
-HiLink nroffEscArg2 nroffEscArg
-HiLink nroffEscPar nroffEscape
-
-HiLink nroffEscRegPar nroffEscape
-HiLink nroffEscArg nroffEscape
-HiLink nroffSize nroffEscape
-HiLink nroffEscape Preproc
-
-HiLink nroffIgnore Comment
-HiLink nroffComment Comment
-HiLink nroffTodo Todo
-
-HiLink nroffReqLeader nroffRequest
-HiLink nroffReqName nroffRequest
-HiLink nroffRequest Statement
-HiLink nroffCond PreCondit
-HiLink nroffDefIdent nroffIdent
-HiLink nroffIdent Identifier
-
-HiLink nroffEquation PreProc
-HiLink nroffTable PreProc
-HiLink nroffPicture PreProc
-HiLink nroffRefer PreProc
-HiLink nroffGrap PreProc
-HiLink nroffGremlin PreProc
-
-HiLink nroffNumber Number
-HiLink nroffBadChar nroffError
-HiLink nroffSpaceError nroffError
-HiLink nroffError Error
-
-HiLink nroffPreserve String
-HiLink nroffString String
-HiLink nroffDefinition String
-HiLink nroffDefSpecial Special
-
-delcommand HiLink
+
+hi def link nroffEscChar nroffSpecialChar
+hi def link nroffEscCharAr nroffSpecialChar
+hi def link nroffSpecialChar SpecialChar
+hi def link nroffSpace Delimiter
+
+hi def link nroffEscRegArg2 nroffEscRegArg
+hi def link nroffEscRegArg nroffIdent
+
+hi def link nroffEscArg2 nroffEscArg
+hi def link nroffEscPar nroffEscape
+
+hi def link nroffEscRegPar nroffEscape
+hi def link nroffEscArg nroffEscape
+hi def link nroffSize nroffEscape
+hi def link nroffEscape Preproc
+
+hi def link nroffIgnore Comment
+hi def link nroffComment Comment
+hi def link nroffTodo Todo
+
+hi def link nroffReqLeader nroffRequest
+hi def link nroffReqName nroffRequest
+hi def link nroffRequest Statement
+hi def link nroffCond PreCondit
+hi def link nroffDefIdent nroffIdent
+hi def link nroffIdent Identifier
+
+hi def link nroffEquation PreProc
+hi def link nroffTable PreProc
+hi def link nroffPicture PreProc
+hi def link nroffRefer PreProc
+hi def link nroffGrap PreProc
+hi def link nroffGremlin PreProc
+
+hi def link nroffNumber Number
+hi def link nroffBadChar nroffError
+hi def link nroffSpaceError nroffError
+hi def link nroffError Error
+
+hi def link nroffPreserve String
+hi def link nroffString String
+hi def link nroffDefinition String
+hi def link nroffDefSpecial Special
+
 
 let b:current_syntax = "nroff"
 
diff --git a/runtime/syntax/nsis.vim b/runtime/syntax/nsis.vim
index 8f3aa2507a..3a343dd430 100644
--- a/runtime/syntax/nsis.vim
+++ b/runtime/syntax/nsis.vim
@@ -222,37 +222,35 @@ syn keyword nsisError		UninstallExeName
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink nsisInstruction		Function
-HiLink nsisComment			Comment
-HiLink nsisLocalLabel			Label
-HiLink nsisGlobalLabel		Label
-HiLink nsisStatement			Statement
-HiLink nsisString			String
-HiLink nsisBoolean			Boolean
-HiLink nsisAttribOptions		Constant
-HiLink nsisExecShell			Constant
-HiLink nsisFileAttrib			Constant
-HiLink nsisMessageBox			Constant
-HiLink nsisRegistry			Identifier
-HiLink nsisNumber			Number
-HiLink nsisError			Error
-HiLink nsisUserVar			Identifier
-HiLink nsisSysVar			Identifier
-HiLink nsisAttribute			Type
-HiLink nsisCompiler			Type
-HiLink nsisTodo			Todo
-HiLink nsisCallback			Operator
+
+hi def link nsisInstruction		Function
+hi def link nsisComment			Comment
+hi def link nsisLocalLabel			Label
+hi def link nsisGlobalLabel		Label
+hi def link nsisStatement			Statement
+hi def link nsisString			String
+hi def link nsisBoolean			Boolean
+hi def link nsisAttribOptions		Constant
+hi def link nsisExecShell			Constant
+hi def link nsisFileAttrib			Constant
+hi def link nsisMessageBox			Constant
+hi def link nsisRegistry			Identifier
+hi def link nsisNumber			Number
+hi def link nsisError			Error
+hi def link nsisUserVar			Identifier
+hi def link nsisSysVar			Identifier
+hi def link nsisAttribute			Type
+hi def link nsisCompiler			Type
+hi def link nsisTodo			Todo
+hi def link nsisCallback			Operator
 " preprocessor commands
-HiLink nsisPreprocSubst		PreProc
-HiLink nsisDefine			Define
-HiLink nsisMacro			Macro
-HiLink nsisPreCondit			PreCondit
-HiLink nsisInclude			Include
-HiLink nsisSystem			PreProc
-
-delcommand HiLink
+hi def link nsisPreprocSubst		PreProc
+hi def link nsisDefine			Define
+hi def link nsisMacro			Macro
+hi def link nsisPreCondit			PreCondit
+hi def link nsisInclude			Include
+hi def link nsisSystem			PreProc
+
 
 let b:current_syntax = "nsis"
 
diff --git a/runtime/syntax/obj.vim b/runtime/syntax/obj.vim
index f2cd8a47a9..df4dbca5d7 100644
--- a/runtime/syntax/obj.vim
+++ b/runtime/syntax/obj.vim
@@ -60,25 +60,23 @@ syn match       objIndex        "\d\+\/\d*\/\d*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink objError           Error
-HiLink objComment         Comment
-HiLink objInclude         PreProc
-HiLink objFloat           Float
-HiLink objInt             Number
-HiLink objGroup           Structure
-HiLink objIndex           Constant
-HiLink objMaterial        Label
+hi def link objError           Error
+hi def link objComment         Comment
+hi def link objInclude         PreProc
+hi def link objFloat           Float
+hi def link objInt             Number
+hi def link objGroup           Structure
+hi def link objIndex           Constant
+hi def link objMaterial        Label
 
-HiLink objVertex          Keyword
-HiLink objNormale         Keyword
-HiLink objVertice         Keyword
-HiLink objFace            Keyword
-HiLink objKeywords        Keyword
+hi def link objVertex          Keyword
+hi def link objNormale         Keyword
+hi def link objVertice         Keyword
+hi def link objFace            Keyword
+hi def link objKeywords        Keyword
 
 
-delcommand HiLink
 
 let b:current_syntax = "obj"
 
diff --git a/runtime/syntax/ocaml.vim b/runtime/syntax/ocaml.vim
index 1884c31823..68c1feddae 100644
--- a/runtime/syntax/ocaml.vim
+++ b/runtime/syntax/ocaml.vim
@@ -251,69 +251,67 @@ syn sync match ocamlSigSync     groupthere ocamlSig     "\<end\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ocamlBraceErr	   Error
-HiLink ocamlBrackErr	   Error
-HiLink ocamlParenErr	   Error
-HiLink ocamlArrErr	   Error
+hi def link ocamlBraceErr	   Error
+hi def link ocamlBrackErr	   Error
+hi def link ocamlParenErr	   Error
+hi def link ocamlArrErr	   Error
 
-HiLink ocamlCommentErr   Error
+hi def link ocamlCommentErr   Error
 
-HiLink ocamlCountErr	   Error
-HiLink ocamlDoErr	   Error
-HiLink ocamlDoneErr	   Error
-HiLink ocamlEndErr	   Error
-HiLink ocamlThenErr	   Error
+hi def link ocamlCountErr	   Error
+hi def link ocamlDoErr	   Error
+hi def link ocamlDoneErr	   Error
+hi def link ocamlEndErr	   Error
+hi def link ocamlThenErr	   Error
 
-HiLink ocamlCharErr	   Error
+hi def link ocamlCharErr	   Error
 
-HiLink ocamlErr	   Error
+hi def link ocamlErr	   Error
 
-HiLink ocamlComment	   Comment
+hi def link ocamlComment	   Comment
 
-HiLink ocamlModPath	   Include
-HiLink ocamlObject	   Include
-HiLink ocamlModule	   Include
-HiLink ocamlModParam1    Include
-HiLink ocamlModType	   Include
-HiLink ocamlMPRestr3	   Include
-HiLink ocamlFullMod	   Include
-HiLink ocamlModTypeRestr Include
-HiLink ocamlWith	   Include
-HiLink ocamlMTDef	   Include
+hi def link ocamlModPath	   Include
+hi def link ocamlObject	   Include
+hi def link ocamlModule	   Include
+hi def link ocamlModParam1    Include
+hi def link ocamlModType	   Include
+hi def link ocamlMPRestr3	   Include
+hi def link ocamlFullMod	   Include
+hi def link ocamlModTypeRestr Include
+hi def link ocamlWith	   Include
+hi def link ocamlMTDef	   Include
 
-HiLink ocamlScript	   Include
+hi def link ocamlScript	   Include
 
-HiLink ocamlConstructor  Constant
+hi def link ocamlConstructor  Constant
 
-HiLink ocamlVal          Keyword
-HiLink ocamlModPreRHS    Keyword
-HiLink ocamlMPRestr2	   Keyword
-HiLink ocamlKeyword	   Keyword
-HiLink ocamlMethod	   Include
-HiLink ocamlFunDef	   Keyword
-HiLink ocamlRefAssign    Keyword
-HiLink ocamlKeyChar	   Keyword
-HiLink ocamlAnyVar	   Keyword
-HiLink ocamlTopStop	   Keyword
-HiLink ocamlOperator	   Keyword
+hi def link ocamlVal          Keyword
+hi def link ocamlModPreRHS    Keyword
+hi def link ocamlMPRestr2	   Keyword
+hi def link ocamlKeyword	   Keyword
+hi def link ocamlMethod	   Include
+hi def link ocamlFunDef	   Keyword
+hi def link ocamlRefAssign    Keyword
+hi def link ocamlKeyChar	   Keyword
+hi def link ocamlAnyVar	   Keyword
+hi def link ocamlTopStop	   Keyword
+hi def link ocamlOperator	   Keyword
 
-HiLink ocamlBoolean	   Boolean
-HiLink ocamlCharacter    Character
-HiLink ocamlNumber	   Number
-HiLink ocamlFloat	   Float
-HiLink ocamlString	   String
+hi def link ocamlBoolean	   Boolean
+hi def link ocamlCharacter    Character
+hi def link ocamlNumber	   Number
+hi def link ocamlFloat	   Float
+hi def link ocamlString	   String
 
-HiLink ocamlLabel	   Identifier
+hi def link ocamlLabel	   Identifier
 
-HiLink ocamlType	   Type
+hi def link ocamlType	   Type
 
-HiLink ocamlTodo	   Todo
+hi def link ocamlTodo	   Todo
 
-HiLink ocamlEncl	   Keyword
+hi def link ocamlEncl	   Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "ocaml"
 
diff --git a/runtime/syntax/occam.vim b/runtime/syntax/occam.vim
index bab84f2e18..01d139bd09 100644
--- a/runtime/syntax/occam.vim
+++ b/runtime/syntax/occam.vim
@@ -85,34 +85,32 @@ syn match occamCDString		/<\|>\|=\|(\|)/ contained
 
 syn region occamCDirective	start=/#\(USE\|INCLUDE\|PRAGMA\|DEFINE\|UNDEFINE\|UNDEF\|IF\|ELIF\|ELSE\|ENDIF\|WARNING\|ERROR\|RELAX\)\>/ end=/$/ contains=occamString,occamComment,occamCDString
 
-command -nargs=+ HiLink hi def link <args>
-
-HiLink occamType Type
-HiLink occamKeyword Keyword
-HiLink occamComment Comment
-HiLink occamCommentTitle PreProc
-HiLink occamTodo Todo
-HiLink occamNote Todo
-HiLink occamString String
-HiLink occamCharString String
-HiLink occamNumber Number
-HiLink occamCDirective PreProc
-HiLink occamCDString String
-HiLink occamPPIdentifier PreProc
-HiLink occamBoolean Boolean
-HiLink occamSpecialChar SpecialChar
-HiLink occamChar Character
-HiLink occamStructure Structure
-HiLink occamIdentifier Identifier
-HiLink occamConstant Constant
-HiLink occamOperator Operator
-HiLink occamFunction Ignore
-HiLink occamRepeat Repeat
-HiLink occamConditional Conditional
-HiLink occamBrackets Type
-HiLink occamParantheses Delimiter
-
-delcommand HiLink
+
+hi def link occamType Type
+hi def link occamKeyword Keyword
+hi def link occamComment Comment
+hi def link occamCommentTitle PreProc
+hi def link occamTodo Todo
+hi def link occamNote Todo
+hi def link occamString String
+hi def link occamCharString String
+hi def link occamNumber Number
+hi def link occamCDirective PreProc
+hi def link occamCDString String
+hi def link occamPPIdentifier PreProc
+hi def link occamBoolean Boolean
+hi def link occamSpecialChar SpecialChar
+hi def link occamChar Character
+hi def link occamStructure Structure
+hi def link occamIdentifier Identifier
+hi def link occamConstant Constant
+hi def link occamOperator Operator
+hi def link occamFunction Ignore
+hi def link occamRepeat Repeat
+hi def link occamConditional Conditional
+hi def link occamBrackets Type
+hi def link occamParantheses Delimiter
+
 
 let b:current_syntax = "occam"
 
diff --git a/runtime/syntax/omnimark.vim b/runtime/syntax/omnimark.vim
index 9887352a68..6294945ffb 100644
--- a/runtime/syntax/omnimark.vim
+++ b/runtime/syntax/omnimark.vim
@@ -90,17 +90,15 @@ syn sync minlines=2000
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink omnimarkCommands		Statement
-HiLink omnimarkKeywords		Identifier
-HiLink omnimarkString		String
-HiLink omnimarkPatterns		Macro
-"  HiLink omnimarkNumber			Number
-HiLink omnimarkComment		Comment
-HiLink omnimarkEscape		Special
+hi def link omnimarkCommands		Statement
+hi def link omnimarkKeywords		Identifier
+hi def link omnimarkString		String
+hi def link omnimarkPatterns		Macro
+"  hi def link omnimarkNumber			Number
+hi def link omnimarkComment		Comment
+hi def link omnimarkEscape		Special
 
-delcommand HiLink
 
 let b:current_syntax = "omnimark"
 
diff --git a/runtime/syntax/openroad.vim b/runtime/syntax/openroad.vim
index 6d2affca9b..e09f233647 100644
--- a/runtime/syntax/openroad.vim
+++ b/runtime/syntax/openroad.vim
@@ -233,22 +233,20 @@ endif
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 "
-command -nargs=+ HiLink hi def link <args>
-
-HiLink openroadKeyword	Statement
-HiLink openroadNumber	Number
-HiLink openroadString	String
-HiLink openroadComment	Comment
-HiLink openroadOperator	Operator
-HiLink openroadType		Type
-HiLink openroadFunc		Special
-HiLink openroadClass	Type
-HiLink openroadEvent	Statement
-HiLink openroadConst	Constant
-HiLink openroadVar		Identifier
-HiLink openroadIdent	Identifier
-HiLink openroadTodo		Todo
-
-delcommand HiLink
+
+hi def link openroadKeyword	Statement
+hi def link openroadNumber	Number
+hi def link openroadString	String
+hi def link openroadComment	Comment
+hi def link openroadOperator	Operator
+hi def link openroadType		Type
+hi def link openroadFunc		Special
+hi def link openroadClass	Type
+hi def link openroadEvent	Statement
+hi def link openroadConst	Constant
+hi def link openroadVar		Identifier
+hi def link openroadIdent	Identifier
+hi def link openroadTodo		Todo
+
 
 let b:current_syntax = "openroad"
diff --git a/runtime/syntax/opl.vim b/runtime/syntax/opl.vim
index 8959cf6d6f..8b66a5b345 100644
--- a/runtime/syntax/opl.vim
+++ b/runtime/syntax/opl.vim
@@ -73,16 +73,14 @@ syn match   OPLMathsOperator    "-\|=\|[:<>+\*^/\\]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink OPLStatement		Statement
-HiLink OPLNumber		Number
-HiLink OPLString		String
-HiLink OPLComment		Comment
-HiLink OPLMathsOperator	Conditional
-"  HiLink OPLError		Error
+hi def link OPLStatement		Statement
+hi def link OPLNumber		Number
+hi def link OPLString		String
+hi def link OPLComment		Comment
+hi def link OPLMathsOperator	Conditional
+"  hi def link OPLError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "opl"
 
diff --git a/runtime/syntax/ora.vim b/runtime/syntax/ora.vim
index e84299a53b..99034793f2 100644
--- a/runtime/syntax/ora.vim
+++ b/runtime/syntax/ora.vim
@@ -436,25 +436,23 @@ syn cluster oraAll add=oraValue,oraModifier,oraString,oraSpecial,oraComment
 " highlighting
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink oraKeyword	  Statement		"usual keywords
-HiLink oraKeywordGroup  Type			"keywords which group other keywords
-HiLink oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
-HiLink oraKeywordObs	  Todo			"obsolete keywords
-HiLink oraKeywordUnd	  PreProc		"undocumented keywords
-HiLink oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
-HiLink oraValue	  Identifier		"values, like true or false
-HiLink oraModifier	  oraValue		"modifies values
-HiLink oraString	  String		"strings
+hi def link oraKeyword	  Statement		"usual keywords
+hi def link oraKeywordGroup  Type			"keywords which group other keywords
+hi def link oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
+hi def link oraKeywordObs	  Todo			"obsolete keywords
+hi def link oraKeywordUnd	  PreProc		"undocumented keywords
+hi def link oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
+hi def link oraValue	  Identifier		"values, like true or false
+hi def link oraModifier	  oraValue		"modifies values
+hi def link oraString	  String		"strings
 
-HiLink oraSpecial	  Special		"special characters
-HiLink oraError	  Error			"errors
-HiLink oraParenError	  oraError		"errors caused by mismatching parantheses
+hi def link oraSpecial	  Special		"special characters
+hi def link oraError	  Error			"errors
+hi def link oraParenError	  oraError		"errors caused by mismatching parantheses
 
-HiLink oraComment	  Comment		"comments
+hi def link oraComment	  Comment		"comments
 
-delcommand HiLink
 
 
 let b:current_syntax = "ora"
diff --git a/runtime/syntax/pascal.vim b/runtime/syntax/pascal.vim
index 4a290f059d..2a58ee43f6 100644
--- a/runtime/syntax/pascal.vim
+++ b/runtime/syntax/pascal.vim
@@ -318,43 +318,41 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink pascalAcces		pascalStatement
-HiLink pascalBoolean		Boolean
-HiLink pascalComment		Comment
-HiLink pascalConditional	Conditional
-HiLink pascalConstant		Constant
-HiLink pascalDelimiter	Identifier
-HiLink pascalDirective	pascalStatement
-HiLink pascalException	Exception
-HiLink pascalFloat		Float
-HiLink pascalFunction		Function
-HiLink pascalLabel		Label
-HiLink pascalMatrixDelimiter	Identifier
-HiLink pascalModifier		Type
-HiLink pascalNumber		Number
-HiLink pascalOperator		Operator
-HiLink pascalPredefined	pascalStatement
-HiLink pascalPreProc		PreProc
-HiLink pascalRepeat		Repeat
-HiLink pascalSpaceError	Error
-HiLink pascalStatement	Statement
-HiLink pascalString		String
-HiLink pascalStringEscape	Special
-HiLink pascalStringEscapeGPC	Special
-HiLink pascalStringError	Error
-HiLink pascalStruct		pascalStatement
-HiLink pascalSymbolOperator	pascalOperator
-HiLink pascalTodo		Todo
-HiLink pascalType		Type
-HiLink pascalUnclassified	pascalStatement
-"  HiLink pascalAsm		Assembler
-HiLink pascalError		Error
-HiLink pascalAsmKey		pascalStatement
-HiLink pascalShowTab		Error
-
-delcommand HiLink
+
+hi def link pascalAcces		pascalStatement
+hi def link pascalBoolean		Boolean
+hi def link pascalComment		Comment
+hi def link pascalConditional	Conditional
+hi def link pascalConstant		Constant
+hi def link pascalDelimiter	Identifier
+hi def link pascalDirective	pascalStatement
+hi def link pascalException	Exception
+hi def link pascalFloat		Float
+hi def link pascalFunction		Function
+hi def link pascalLabel		Label
+hi def link pascalMatrixDelimiter	Identifier
+hi def link pascalModifier		Type
+hi def link pascalNumber		Number
+hi def link pascalOperator		Operator
+hi def link pascalPredefined	pascalStatement
+hi def link pascalPreProc		PreProc
+hi def link pascalRepeat		Repeat
+hi def link pascalSpaceError	Error
+hi def link pascalStatement	Statement
+hi def link pascalString		String
+hi def link pascalStringEscape	Special
+hi def link pascalStringEscapeGPC	Special
+hi def link pascalStringError	Error
+hi def link pascalStruct		pascalStatement
+hi def link pascalSymbolOperator	pascalOperator
+hi def link pascalTodo		Todo
+hi def link pascalType		Type
+hi def link pascalUnclassified	pascalStatement
+"  hi def link pascalAsm		Assembler
+hi def link pascalError		Error
+hi def link pascalAsmKey		pascalStatement
+hi def link pascalShowTab		Error
+
 
 
 let b:current_syntax = "pascal"
diff --git a/runtime/syntax/pcap.vim b/runtime/syntax/pcap.vim
index 7c97738520..e0eed633c1 100644
--- a/runtime/syntax/pcap.vim
+++ b/runtime/syntax/pcap.vim
@@ -37,13 +37,11 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pcapBad WarningMsg
-HiLink pcapBadword WarningMsg
-HiLink pcapComment Comment
+hi def link pcapBad WarningMsg
+hi def link pcapBadword WarningMsg
+hi def link pcapComment Comment
 
-delcommand HiLink
 
 let b:current_syntax = "pcap"
 
diff --git a/runtime/syntax/pccts.vim b/runtime/syntax/pccts.vim
index 5ddc570bbe..780035798b 100644
--- a/runtime/syntax/pccts.vim
+++ b/runtime/syntax/pccts.vim
@@ -66,25 +66,23 @@ syn sync match pcctsSyncRule grouphere pcctsRule "\<[a-z][A-Za-z0-9_]*\>\(\s*\[[
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink pcctsDelim		Special
-HiLink pcctsTokenName		Identifier
-HiLink pcctsRuleName		Statement
-HiLink pcctsLabelHack		Label
-HiLink pcctsDirective		PreProc
-HiLink pcctsString		String
-HiLink pcctsComment		Comment
-HiLink pcctsClass		Statement
-HiLink pcctsClassName		Identifier
-HiLink pcctsException		Statement
-HiLink pcctsExceptionHandler	Keyword
-HiLink pcctsExceptionRuleRef	pcctsDelim
-HiLink pcctsExceptionID	Identifier
-HiLink pcctsRuleRef		Identifier
-HiLink pcctsSpecialChar	SpecialChar
-
-delcommand HiLink
+
+hi def link pcctsDelim		Special
+hi def link pcctsTokenName		Identifier
+hi def link pcctsRuleName		Statement
+hi def link pcctsLabelHack		Label
+hi def link pcctsDirective		PreProc
+hi def link pcctsString		String
+hi def link pcctsComment		Comment
+hi def link pcctsClass		Statement
+hi def link pcctsClassName		Identifier
+hi def link pcctsException		Statement
+hi def link pcctsExceptionHandler	Keyword
+hi def link pcctsExceptionRuleRef	pcctsDelim
+hi def link pcctsExceptionID	Identifier
+hi def link pcctsRuleRef		Identifier
+hi def link pcctsSpecialChar	SpecialChar
+
 
 let b:current_syntax = "pccts"
 
diff --git a/runtime/syntax/perl.vim b/runtime/syntax/perl.vim
index c09373a5cd..6ab6cd83a2 100644
--- a/runtime/syntax/perl.vim
+++ b/runtime/syntax/perl.vim
@@ -435,121 +435,119 @@ else
   syn sync minlines=0
 endif
 
-command -nargs=+ HiLink hi def link <args>
 
 " NOTE: If you're linking new highlight groups to perlString, please also put
 "       them into b:match_skip in ftplugin/perl.vim.
 
 " The default highlighting.
-HiLink perlSharpBang		PreProc
-HiLink perlControl		PreProc
-HiLink perlInclude		Include
-HiLink perlSpecial		Special
-HiLink perlString		String
-HiLink perlCharacter		Character
-HiLink perlNumber		Number
-HiLink perlFloat		Float
-HiLink perlType			Type
-HiLink perlIdentifier		Identifier
-HiLink perlLabel		Label
-HiLink perlStatement		Statement
-HiLink perlConditional		Conditional
-HiLink perlRepeat		Repeat
-HiLink perlOperator		Operator
-HiLink perlFunction		Keyword
-HiLink perlSubName		Function
-HiLink perlSubPrototype		Type
-HiLink perlSubAttributes	PreProc
-HiLink perlSubAttributesCont	perlSubAttributes
-HiLink perlComment		Comment
-HiLink perlTodo			Todo
+hi def link perlSharpBang		PreProc
+hi def link perlControl		PreProc
+hi def link perlInclude		Include
+hi def link perlSpecial		Special
+hi def link perlString		String
+hi def link perlCharacter		Character
+hi def link perlNumber		Number
+hi def link perlFloat		Float
+hi def link perlType			Type
+hi def link perlIdentifier		Identifier
+hi def link perlLabel		Label
+hi def link perlStatement		Statement
+hi def link perlConditional		Conditional
+hi def link perlRepeat		Repeat
+hi def link perlOperator		Operator
+hi def link perlFunction		Keyword
+hi def link perlSubName		Function
+hi def link perlSubPrototype		Type
+hi def link perlSubAttributes	PreProc
+hi def link perlSubAttributesCont	perlSubAttributes
+hi def link perlComment		Comment
+hi def link perlTodo			Todo
 if exists("perl_string_as_statement")
-  HiLink perlStringStartEnd	perlStatement
+  hi def link perlStringStartEnd	perlStatement
 else
-  HiLink perlStringStartEnd	perlString
+  hi def link perlStringStartEnd	perlString
 endif
-HiLink perlVStringV		perlStringStartEnd
-HiLink perlList			perlStatement
-HiLink perlMisc			perlStatement
-HiLink perlVarPlain		perlIdentifier
-HiLink perlVarPlain2		perlIdentifier
-HiLink perlArrow		perlIdentifier
-HiLink perlFiledescRead		perlIdentifier
-HiLink perlFiledescStatement	perlIdentifier
-HiLink perlVarSimpleMember	perlIdentifier
-HiLink perlVarSimpleMemberName 	perlString
-HiLink perlVarNotInMatches	perlIdentifier
-HiLink perlVarSlash		perlIdentifier
-HiLink perlQQ			perlString
-HiLink perlHereDoc		perlString
-HiLink perlStringUnexpanded	perlString
-HiLink perlSubstitutionSQ	perlString
-HiLink perlSubstitutionGQQ	perlString
-HiLink perlTranslationGQ	perlString
-HiLink perlMatch		perlString
-HiLink perlMatchStartEnd	perlStatement
-HiLink perlFormatName		perlIdentifier
-HiLink perlFormatField		perlString
-HiLink perlPackageDecl		perlType
-HiLink perlStorageClass		perlType
-HiLink perlPackageRef		perlType
-HiLink perlStatementPackage	perlStatement
-HiLink perlStatementStorage	perlStatement
-HiLink perlStatementControl	perlStatement
-HiLink perlStatementScalar	perlStatement
-HiLink perlStatementRegexp	perlStatement
-HiLink perlStatementNumeric	perlStatement
-HiLink perlStatementList	perlStatement
-HiLink perlStatementHash	perlStatement
-HiLink perlStatementIOfunc	perlStatement
-HiLink perlStatementFiledesc	perlStatement
-HiLink perlStatementVector	perlStatement
-HiLink perlStatementFiles	perlStatement
-HiLink perlStatementFlow	perlStatement
-HiLink perlStatementInclude	perlStatement
-HiLink perlStatementProc	perlStatement
-HiLink perlStatementSocket	perlStatement
-HiLink perlStatementIPC		perlStatement
-HiLink perlStatementNetwork	perlStatement
-HiLink perlStatementPword	perlStatement
-HiLink perlStatementTime	perlStatement
-HiLink perlStatementMisc	perlStatement
-HiLink perlStatementIndirObj	perlStatement
-HiLink perlFunctionName		perlIdentifier
-HiLink perlMethod		perlIdentifier
-HiLink perlFunctionPRef		perlType
-HiLink perlPOD			perlComment
-HiLink perlShellCommand		perlString
-HiLink perlSpecialAscii		perlSpecial
-HiLink perlSpecialDollar	perlSpecial
-HiLink perlSpecialString	perlSpecial
-HiLink perlSpecialStringU	perlSpecial
-HiLink perlSpecialMatch		perlSpecial
-HiLink perlDATA			perlComment
+hi def link perlVStringV		perlStringStartEnd
+hi def link perlList			perlStatement
+hi def link perlMisc			perlStatement
+hi def link perlVarPlain		perlIdentifier
+hi def link perlVarPlain2		perlIdentifier
+hi def link perlArrow		perlIdentifier
+hi def link perlFiledescRead		perlIdentifier
+hi def link perlFiledescStatement	perlIdentifier
+hi def link perlVarSimpleMember	perlIdentifier
+hi def link perlVarSimpleMemberName 	perlString
+hi def link perlVarNotInMatches	perlIdentifier
+hi def link perlVarSlash		perlIdentifier
+hi def link perlQQ			perlString
+hi def link perlHereDoc		perlString
+hi def link perlStringUnexpanded	perlString
+hi def link perlSubstitutionSQ	perlString
+hi def link perlSubstitutionGQQ	perlString
+hi def link perlTranslationGQ	perlString
+hi def link perlMatch		perlString
+hi def link perlMatchStartEnd	perlStatement
+hi def link perlFormatName		perlIdentifier
+hi def link perlFormatField		perlString
+hi def link perlPackageDecl		perlType
+hi def link perlStorageClass		perlType
+hi def link perlPackageRef		perlType
+hi def link perlStatementPackage	perlStatement
+hi def link perlStatementStorage	perlStatement
+hi def link perlStatementControl	perlStatement
+hi def link perlStatementScalar	perlStatement
+hi def link perlStatementRegexp	perlStatement
+hi def link perlStatementNumeric	perlStatement
+hi def link perlStatementList	perlStatement
+hi def link perlStatementHash	perlStatement
+hi def link perlStatementIOfunc	perlStatement
+hi def link perlStatementFiledesc	perlStatement
+hi def link perlStatementVector	perlStatement
+hi def link perlStatementFiles	perlStatement
+hi def link perlStatementFlow	perlStatement
+hi def link perlStatementInclude	perlStatement
+hi def link perlStatementProc	perlStatement
+hi def link perlStatementSocket	perlStatement
+hi def link perlStatementIPC		perlStatement
+hi def link perlStatementNetwork	perlStatement
+hi def link perlStatementPword	perlStatement
+hi def link perlStatementTime	perlStatement
+hi def link perlStatementMisc	perlStatement
+hi def link perlStatementIndirObj	perlStatement
+hi def link perlFunctionName		perlIdentifier
+hi def link perlMethod		perlIdentifier
+hi def link perlFunctionPRef		perlType
+hi def link perlPOD			perlComment
+hi def link perlShellCommand		perlString
+hi def link perlSpecialAscii		perlSpecial
+hi def link perlSpecialDollar	perlSpecial
+hi def link perlSpecialString	perlSpecial
+hi def link perlSpecialStringU	perlSpecial
+hi def link perlSpecialMatch		perlSpecial
+hi def link perlDATA			perlComment
 
 " NOTE: Due to a bug in Vim (or more likely, a misunderstanding on my part),
 "       I had to remove the transparent property from the following regions
 "       in order to get them to highlight correctly.  Feel free to remove
 "       these and reinstate the transparent property if you know how.
-HiLink perlParensSQ		perlString
-HiLink perlBracketsSQ		perlString
-HiLink perlBracesSQ		perlString
-HiLink perlAnglesSQ		perlString
+hi def link perlParensSQ		perlString
+hi def link perlBracketsSQ		perlString
+hi def link perlBracesSQ		perlString
+hi def link perlAnglesSQ		perlString
 
-HiLink perlParensDQ		perlString
-HiLink perlBracketsDQ		perlString
-HiLink perlBracesDQ		perlString
-HiLink perlAnglesDQ		perlString
+hi def link perlParensDQ		perlString
+hi def link perlBracketsDQ		perlString
+hi def link perlBracesDQ		perlString
+hi def link perlAnglesDQ		perlString
 
-HiLink perlSpecialStringU2	perlString
+hi def link perlSpecialStringU2	perlString
 
 " Possible errors
-HiLink perlNotEmptyLine		Error
-HiLink perlElseIfError		Error
-HiLink perlSubPrototypeError	Error
-HiLink perlSubError		Error
+hi def link perlNotEmptyLine		Error
+hi def link perlElseIfError		Error
+hi def link perlSubPrototypeError	Error
+hi def link perlSubError		Error
 
-delcommand HiLink
 
 " Syncing to speed up processing
 "
diff --git a/runtime/syntax/perl6.vim b/runtime/syntax/perl6.vim
index f40a040a45..3bcd9ff0e9 100644
--- a/runtime/syntax/perl6.vim
+++ b/runtime/syntax/perl6.vim
@@ -2061,167 +2061,165 @@ syn region p6PodFormatFrench
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink p6EscOctOld       p6Error
-HiLink p6PackageTwigil   p6Twigil
-HiLink p6StringAngle     p6String
-HiLink p6StringFrench    p6String
-HiLink p6StringAngles    p6String
-HiLink p6StringSQ        p6String
-HiLink p6StringDQ        p6String
-HiLink p6StringQ         p6String
-HiLink p6RxStringSQ      p6String
-HiLink p6RxStringDQ      p6String
-HiLink p6Substitution    p6String
-HiLink p6Transliteration p6String
-HiLink p6StringAuto      p6String
-HiLink p6StringP5Auto    p6String
-HiLink p6Key             p6String
-HiLink p6Match           p6String
-HiLink p6RegexBlock      p6String
-HiLink p6RxP5CharClass   p6String
-HiLink p6RxP5QuoteMeta   p6String
-HiLink p6RxCharClass     p6String
-HiLink p6RxQuoteWords    p6String
-HiLink p6ReduceOp        p6Operator
-HiLink p6ReverseCrossOp  p6Operator
-HiLink p6HyperOp         p6Operator
-HiLink p6QuoteQ          p6Operator
-HiLink p6RxRange         p6StringSpecial
-HiLink p6RxAnchor        p6StringSpecial
-HiLink p6RxP5Anchor      p6StringSpecial
-HiLink p6CodePoint       p6StringSpecial
-HiLink p6RxMeta          p6StringSpecial
-HiLink p6RxP5Range       p6StringSpecial
-HiLink p6RxP5CPId        p6StringSpecial
-HiLink p6RxP5Posix       p6StringSpecial
-HiLink p6RxP5Mod         p6StringSpecial
-HiLink p6RxP5HexSeq      p6StringSpecial
-HiLink p6RxP5OctSeq      p6StringSpecial
-HiLink p6RxP5WriteRefId  p6StringSpecial
-HiLink p6HexSequence     p6StringSpecial
-HiLink p6OctSequence     p6StringSpecial
-HiLink p6RxP5Named       p6StringSpecial
-HiLink p6RxP5PropId      p6StringSpecial
-HiLink p6RxP5Quantifier  p6StringSpecial
-HiLink p6RxP5CountId     p6StringSpecial
-HiLink p6RxP5Verb        p6StringSpecial
-HiLink p6Escape          p6StringSpecial2
-HiLink p6EscNull         p6StringSpecial2
-HiLink p6EscHash         p6StringSpecial2
-HiLink p6EscQQ           p6StringSpecial2
-HiLink p6EscQuote        p6StringSpecial2
-HiLink p6EscDoubleQuote  p6StringSpecial2
-HiLink p6EscBackTick     p6StringSpecial2
-HiLink p6EscForwardSlash p6StringSpecial2
-HiLink p6EscVerticalBar  p6StringSpecial2
-HiLink p6EscExclamation  p6StringSpecial2
-HiLink p6EscDollar       p6StringSpecial2
-HiLink p6EscOpenCurly    p6StringSpecial2
-HiLink p6EscCloseCurly   p6StringSpecial2
-HiLink p6EscCloseBracket p6StringSpecial2
-HiLink p6EscCloseAngle   p6StringSpecial2
-HiLink p6EscCloseFrench  p6StringSpecial2
-HiLink p6EscBackSlash    p6StringSpecial2
-HiLink p6RxEscape        p6StringSpecial2
-HiLink p6RxCapture       p6StringSpecial2
-HiLink p6RxAlternation   p6StringSpecial2
-HiLink p6RxP5            p6StringSpecial2
-HiLink p6RxP5ReadRef     p6StringSpecial2
-HiLink p6RxP5Oct         p6StringSpecial2
-HiLink p6RxP5Hex         p6StringSpecial2
-HiLink p6RxP5EscMeta     p6StringSpecial2
-HiLink p6RxP5Meta        p6StringSpecial2
-HiLink p6RxP5Escape      p6StringSpecial2
-HiLink p6RxP5CodePoint   p6StringSpecial2
-HiLink p6RxP5WriteRef    p6StringSpecial2
-HiLink p6RxP5Prop        p6StringSpecial2
-
-HiLink p6Property       Tag
-HiLink p6Attention      Todo
-HiLink p6Type           Type
-HiLink p6Error          Error
-HiLink p6BlockLabel     Label
-HiLink p6Float          Float
-HiLink p6Normal         Normal
-HiLink p6Package        Normal
-HiLink p6PackageScope   Normal
-HiLink p6Number         Number
-HiLink p6VersionNum     Number
-HiLink p6String         String
-HiLink p6Repeat         Repeat
-HiLink p6Keyword        Keyword
-HiLink p6Pragma         Keyword
-HiLink p6Module         Keyword
-HiLink p6DeclareRoutine Keyword
-HiLink p6VarStorage     Special
-HiLink p6FlowControl    Special
-HiLink p6NumberBase     Special
-HiLink p6Twigil         Special
-HiLink p6StringSpecial2 Special
-HiLink p6VersionDot     Special
-HiLink p6Comment        Comment
-HiLink p6Include        Include
-HiLink p6Shebang        PreProc
-HiLink p6ClosureTrait   PreProc
-HiLink p6Routine        Function
-HiLink p6Operator       Operator
-HiLink p6Version        Operator
-HiLink p6Context        Operator
-HiLink p6Quote          Delimiter
-HiLink p6TypeConstraint PreCondit
-HiLink p6Exception      Exception
-HiLink p6Placeholder    Identifier
-HiLink p6Variable       Identifier
-HiLink p6VarSlash       Identifier
-HiLink p6VarNum         Identifier
-HiLink p6VarExclam      Identifier
-HiLink p6VarMatch       Identifier
-HiLink p6VarName        Identifier
-HiLink p6MatchVar       Identifier
-HiLink p6RxP5ReadRefId  Identifier
-HiLink p6RxP5ModDef     Identifier
-HiLink p6RxP5ModName    Identifier
-HiLink p6Conditional    Conditional
-HiLink p6StringSpecial  SpecialChar
-
-HiLink p6PodAbbr         p6Pod
-HiLink p6PodAbbrEOF      p6Pod
-HiLink p6PodAbbrNoCode   p6Pod
-HiLink p6PodAbbrCode     p6PodCode
-HiLink p6PodPara         p6Pod
-HiLink p6PodParaEOF      p6Pod
-HiLink p6PodParaNoCode   p6Pod
-HiLink p6PodParaCode     p6PodCode
-HiLink p6PodDelim        p6Pod
-HiLink p6PodDelimEOF     p6Pod
-HiLink p6PodDelimNoCode  p6Pod
-HiLink p6PodDelimCode    p6PodCode
-HiLink p6PodImplicitCode p6PodCode
-HiLink p6PodExtraConfig  p6PodPrefix
-HiLink p6PodVerticalBar  p6PodFormatCode
-HiLink p6PodColon        p6PodFormatCode
-HiLink p6PodSemicolon    p6PodFormatCode
-HiLink p6PodComma        p6PodFormatCode
-HiLink p6PodFormatOne    p6PodFormat
-HiLink p6PodFormatTwo    p6PodFormat
-HiLink p6PodFormatThree  p6PodFormat
-HiLink p6PodFormatFrench p6PodFormat
-
-HiLink p6PodType           Type
-HiLink p6PodConfigOption   String
-HiLink p6PodCode           PreProc
-HiLink p6Pod               Comment
-HiLink p6PodComment        Comment
-HiLink p6PodAutoQuote      Operator
-HiLink p6PodConfigOperator Operator
-HiLink p6PodPrefix         Statement
-HiLink p6PodName           Identifier
-HiLink p6PodFormatCode     SpecialChar
-HiLink p6PodFormat         SpecialComment
-
-delcommand HiLink
+
+hi def link p6EscOctOld       p6Error
+hi def link p6PackageTwigil   p6Twigil
+hi def link p6StringAngle     p6String
+hi def link p6StringFrench    p6String
+hi def link p6StringAngles    p6String
+hi def link p6StringSQ        p6String
+hi def link p6StringDQ        p6String
+hi def link p6StringQ         p6String
+hi def link p6RxStringSQ      p6String
+hi def link p6RxStringDQ      p6String
+hi def link p6Substitution    p6String
+hi def link p6Transliteration p6String
+hi def link p6StringAuto      p6String
+hi def link p6StringP5Auto    p6String
+hi def link p6Key             p6String
+hi def link p6Match           p6String
+hi def link p6RegexBlock      p6String
+hi def link p6RxP5CharClass   p6String
+hi def link p6RxP5QuoteMeta   p6String
+hi def link p6RxCharClass     p6String
+hi def link p6RxQuoteWords    p6String
+hi def link p6ReduceOp        p6Operator
+hi def link p6ReverseCrossOp  p6Operator
+hi def link p6HyperOp         p6Operator
+hi def link p6QuoteQ          p6Operator
+hi def link p6RxRange         p6StringSpecial
+hi def link p6RxAnchor        p6StringSpecial
+hi def link p6RxP5Anchor      p6StringSpecial
+hi def link p6CodePoint       p6StringSpecial
+hi def link p6RxMeta          p6StringSpecial
+hi def link p6RxP5Range       p6StringSpecial
+hi def link p6RxP5CPId        p6StringSpecial
+hi def link p6RxP5Posix       p6StringSpecial
+hi def link p6RxP5Mod         p6StringSpecial
+hi def link p6RxP5HexSeq      p6StringSpecial
+hi def link p6RxP5OctSeq      p6StringSpecial
+hi def link p6RxP5WriteRefId  p6StringSpecial
+hi def link p6HexSequence     p6StringSpecial
+hi def link p6OctSequence     p6StringSpecial
+hi def link p6RxP5Named       p6StringSpecial
+hi def link p6RxP5PropId      p6StringSpecial
+hi def link p6RxP5Quantifier  p6StringSpecial
+hi def link p6RxP5CountId     p6StringSpecial
+hi def link p6RxP5Verb        p6StringSpecial
+hi def link p6Escape          p6StringSpecial2
+hi def link p6EscNull         p6StringSpecial2
+hi def link p6EscHash         p6StringSpecial2
+hi def link p6EscQQ           p6StringSpecial2
+hi def link p6EscQuote        p6StringSpecial2
+hi def link p6EscDoubleQuote  p6StringSpecial2
+hi def link p6EscBackTick     p6StringSpecial2
+hi def link p6EscForwardSlash p6StringSpecial2
+hi def link p6EscVerticalBar  p6StringSpecial2
+hi def link p6EscExclamation  p6StringSpecial2
+hi def link p6EscDollar       p6StringSpecial2
+hi def link p6EscOpenCurly    p6StringSpecial2
+hi def link p6EscCloseCurly   p6StringSpecial2
+hi def link p6EscCloseBracket p6StringSpecial2
+hi def link p6EscCloseAngle   p6StringSpecial2
+hi def link p6EscCloseFrench  p6StringSpecial2
+hi def link p6EscBackSlash    p6StringSpecial2
+hi def link p6RxEscape        p6StringSpecial2
+hi def link p6RxCapture       p6StringSpecial2
+hi def link p6RxAlternation   p6StringSpecial2
+hi def link p6RxP5            p6StringSpecial2
+hi def link p6RxP5ReadRef     p6StringSpecial2
+hi def link p6RxP5Oct         p6StringSpecial2
+hi def link p6RxP5Hex         p6StringSpecial2
+hi def link p6RxP5EscMeta     p6StringSpecial2
+hi def link p6RxP5Meta        p6StringSpecial2
+hi def link p6RxP5Escape      p6StringSpecial2
+hi def link p6RxP5CodePoint   p6StringSpecial2
+hi def link p6RxP5WriteRef    p6StringSpecial2
+hi def link p6RxP5Prop        p6StringSpecial2
+
+hi def link p6Property       Tag
+hi def link p6Attention      Todo
+hi def link p6Type           Type
+hi def link p6Error          Error
+hi def link p6BlockLabel     Label
+hi def link p6Float          Float
+hi def link p6Normal         Normal
+hi def link p6Package        Normal
+hi def link p6PackageScope   Normal
+hi def link p6Number         Number
+hi def link p6VersionNum     Number
+hi def link p6String         String
+hi def link p6Repeat         Repeat
+hi def link p6Keyword        Keyword
+hi def link p6Pragma         Keyword
+hi def link p6Module         Keyword
+hi def link p6DeclareRoutine Keyword
+hi def link p6VarStorage     Special
+hi def link p6FlowControl    Special
+hi def link p6NumberBase     Special
+hi def link p6Twigil         Special
+hi def link p6StringSpecial2 Special
+hi def link p6VersionDot     Special
+hi def link p6Comment        Comment
+hi def link p6Include        Include
+hi def link p6Shebang        PreProc
+hi def link p6ClosureTrait   PreProc
+hi def link p6Routine        Function
+hi def link p6Operator       Operator
+hi def link p6Version        Operator
+hi def link p6Context        Operator
+hi def link p6Quote          Delimiter
+hi def link p6TypeConstraint PreCondit
+hi def link p6Exception      Exception
+hi def link p6Placeholder    Identifier
+hi def link p6Variable       Identifier
+hi def link p6VarSlash       Identifier
+hi def link p6VarNum         Identifier
+hi def link p6VarExclam      Identifier
+hi def link p6VarMatch       Identifier
+hi def link p6VarName        Identifier
+hi def link p6MatchVar       Identifier
+hi def link p6RxP5ReadRefId  Identifier
+hi def link p6RxP5ModDef     Identifier
+hi def link p6RxP5ModName    Identifier
+hi def link p6Conditional    Conditional
+hi def link p6StringSpecial  SpecialChar
+
+hi def link p6PodAbbr         p6Pod
+hi def link p6PodAbbrEOF      p6Pod
+hi def link p6PodAbbrNoCode   p6Pod
+hi def link p6PodAbbrCode     p6PodCode
+hi def link p6PodPara         p6Pod
+hi def link p6PodParaEOF      p6Pod
+hi def link p6PodParaNoCode   p6Pod
+hi def link p6PodParaCode     p6PodCode
+hi def link p6PodDelim        p6Pod
+hi def link p6PodDelimEOF     p6Pod
+hi def link p6PodDelimNoCode  p6Pod
+hi def link p6PodDelimCode    p6PodCode
+hi def link p6PodImplicitCode p6PodCode
+hi def link p6PodExtraConfig  p6PodPrefix
+hi def link p6PodVerticalBar  p6PodFormatCode
+hi def link p6PodColon        p6PodFormatCode
+hi def link p6PodSemicolon    p6PodFormatCode
+hi def link p6PodComma        p6PodFormatCode
+hi def link p6PodFormatOne    p6PodFormat
+hi def link p6PodFormatTwo    p6PodFormat
+hi def link p6PodFormatThree  p6PodFormat
+hi def link p6PodFormatFrench p6PodFormat
+
+hi def link p6PodType           Type
+hi def link p6PodConfigOption   String
+hi def link p6PodCode           PreProc
+hi def link p6Pod               Comment
+hi def link p6PodComment        Comment
+hi def link p6PodAutoQuote      Operator
+hi def link p6PodConfigOperator Operator
+hi def link p6PodPrefix         Statement
+hi def link p6PodName           Identifier
+hi def link p6PodFormatCode     SpecialChar
+hi def link p6PodFormat         SpecialComment
+
 
 " Syncing to speed up processing
 "syn sync match p6SyncPod groupthere p6PodAbbrRegion     "^=\K\k*\>"
diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim
index 794aa5dc23..af58da70ef 100644
--- a/runtime/syntax/pfmain.vim
+++ b/runtime/syntax/pfmain.vim
@@ -1811,26 +1811,24 @@ syntax match pfmainSpecial	"\<smtpd\>"
 syntax match pfmainSpecial	"\<trace\>"
 syntax match pfmainSpecial	"\<verify\>"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pfmainConf	Statement
-HiLink pfmainRef	PreProc
-HiLink pfmainWord	identifier
+hi def link pfmainConf	Statement
+hi def link pfmainRef	PreProc
+hi def link pfmainWord	identifier
 
-HiLink pfmainDict	Type
-HiLink pfmainQueueDir	Constant
-HiLink pfmainTransport	Constant
-HiLink pfmainLock	Constant
-HiLink pfmainAnswer	Constant
+hi def link pfmainDict	Type
+hi def link pfmainQueueDir	Constant
+hi def link pfmainTransport	Constant
+hi def link pfmainLock	Constant
+hi def link pfmainAnswer	Constant
 
-HiLink pfmainComment	Comment
-HiLink pfmainNumber	Number
-HiLink pfmainTime	Number
-HiLink pfmainIP		Number
-HiLink pfmainVariable	Error
-HiLink pfmainSpecial	Special
+hi def link pfmainComment	Comment
+hi def link pfmainNumber	Number
+hi def link pfmainTime	Number
+hi def link pfmainIP		Number
+hi def link pfmainVariable	Error
+hi def link pfmainSpecial	Special
 
-delcommand HiLink
 
 let b:current_syntax = "pfmain"
 
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index a1b658e17a..efb355ec83 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -598,53 +598,52 @@ syntax match  phpDocTodo  "@\(todo\|fixme\|xxx\)\(\s\+\)\?" containedin=phpComme
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink   phpConstant  Constant
-HiLink   phpCoreConstant  Constant
-HiLink   phpComment Comment
-HiLink   phpDocTags PreProc
-HiLink   phpDocCustomTags Type
-HiLink   phpException Exception
-HiLink   phpBoolean Boolean
-HiLink   phpStorageClass  StorageClass
-HiLink   phpSCKeyword StorageClass
-HiLink   phpFCKeyword Define
-HiLink   phpStructure Structure
-HiLink   phpStringSingle  String
-HiLink   phpStringDouble  String
-HiLink   phpBacktick  String
-HiLink   phpNumber  Number
-HiLink   phpFloat Float
-HiLink   phpMethods Function
-HiLink   phpFunctions Function
-HiLink   phpBaselib Function
-HiLink   phpRepeat  Repeat
-HiLink   phpConditional Conditional
-HiLink   phpLabel Label
-HiLink   phpStatement Statement
-HiLink   phpKeyword Statement
-HiLink   phpType  Type
-HiLink   phpInclude Include
-HiLink   phpDefine  Define
-HiLink   phpBackslashSequences SpecialChar
-HiLink   phpBackslashDoubleQuote SpecialChar
-HiLink   phpBackslashSingleQuote SpecialChar
-HiLink   phpParent  Delimiter
-HiLink   phpBrackets  Delimiter
-HiLink   phpIdentifierConst Delimiter
-HiLink   phpParentError Error
-HiLink   phpOctalError  Error
-HiLink   phpInterpSimpleError Error
-HiLink   phpInterpBogusDollarCurley Error
-HiLink   phpInterpDollarCurly1 Error
-HiLink   phpInterpDollarCurly2 Error
-HiLink   phpInterpSimpleBracketsInner String
-HiLink   phpInterpSimpleCurly Delimiter
-HiLink   phpInterpVarname Identifier
-HiLink   phpTodo  Todo
-HiLink   phpDocTodo Todo
-HiLink   phpMemberSelector  Structure
+
+hi def link phpConstant  Constant
+hi def link phpCoreConstant  Constant
+hi def link phpComment Comment
+hi def link phpDocTags PreProc
+hi def link phpDocCustomTags Type
+hi def link phpException Exception
+hi def link phpBoolean Boolean
+hi def link phpStorageClass  StorageClass
+hi def link phpSCKeyword StorageClass
+hi def link phpFCKeyword Define
+hi def link phpStructure Structure
+hi def link phpStringSingle  String
+hi def link phpStringDouble  String
+hi def link phpBacktick  String
+hi def link phpNumber  Number
+hi def link phpFloat Float
+hi def link phpMethods Function
+hi def link phpFunctions Function
+hi def link phpBaselib Function
+hi def link phpRepeat  Repeat
+hi def link phpConditional Conditional
+hi def link phpLabel Label
+hi def link phpStatement Statement
+hi def link phpKeyword Statement
+hi def link phpType  Type
+hi def link phpInclude Include
+hi def link phpDefine  Define
+hi def link phpBackslashSequences SpecialChar
+hi def link phpBackslashDoubleQuote SpecialChar
+hi def link phpBackslashSingleQuote SpecialChar
+hi def link phpParent  Delimiter
+hi def link phpBrackets  Delimiter
+hi def link phpIdentifierConst Delimiter
+hi def link phpParentError Error
+hi def link phpOctalError  Error
+hi def link phpInterpSimpleError Error
+hi def link phpInterpBogusDollarCurley Error
+hi def link phpInterpDollarCurly1 Error
+hi def link phpInterpDollarCurly2 Error
+hi def link phpInterpSimpleBracketsInner String
+hi def link phpInterpSimpleCurly Delimiter
+hi def link phpInterpVarname Identifier
+hi def link phpTodo  Todo
+hi def link phpDocTodo Todo
+hi def link phpMemberSelector  Structure
 if exists("php_oldStyle")
 hi  phpIntVar guifg=Red ctermfg=DarkRed
 hi  phpEnvVar guifg=Red ctermfg=DarkRed
@@ -654,16 +653,15 @@ hi  phpRelation guifg=SeaGreen ctermfg=DarkGreen
 hi  phpIdentifier guifg=DarkGray ctermfg=Brown
 hi  phpIdentifierSimply guifg=DarkGray ctermfg=Brown
 else
-HiLink   phpIntVar Identifier
-HiLink   phpEnvVar Identifier
-HiLink   phpOperator Operator
-HiLink   phpVarSelector  Operator
-HiLink   phpRelation Operator
-HiLink   phpIdentifier Identifier
-HiLink   phpIdentifierSimply Identifier
+hi def link phpIntVar Identifier
+hi def link phpEnvVar Identifier
+hi def link phpOperator Operator
+hi def link phpVarSelector  Operator
+hi def link phpRelation Operator
+hi def link phpIdentifier Identifier
+hi def link phpIdentifierSimply Identifier
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "php"
 
diff --git a/runtime/syntax/pic.vim b/runtime/syntax/pic.vim
index b98984ed3d..bcb01f4dbd 100644
--- a/runtime/syntax/pic.vim
+++ b/runtime/syntax/pic.vim
@@ -89,27 +89,25 @@ syn match picDirective   "#\=DEFINE"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink picTodo		Todo
-HiLink picComment		Comment
-HiLink picDirective		Statement
-HiLink picLabel		Label
-HiLink picString		String
+hi def link picTodo		Todo
+hi def link picComment		Comment
+hi def link picDirective		Statement
+hi def link picLabel		Label
+hi def link picString		String
 
-"HiLink picOpcode		Keyword
-"HiLink picRegister		Structure
-"HiLink picRegisterPart	Special
+"hi def link picOpcode		Keyword
+"hi def link picRegister		Structure
+"hi def link picRegisterPart	Special
 
-HiLink picASCII		String
-HiLink picBinary		Number
-HiLink picDecimal		Number
-HiLink picHexadecimal		Number
-HiLink picOctal		Number
+hi def link picASCII		String
+hi def link picBinary		Number
+hi def link picDecimal		Number
+hi def link picHexadecimal		Number
+hi def link picOctal		Number
 
-HiLink picIdentifier		Identifier
+hi def link picIdentifier		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "pic"
 
diff --git a/runtime/syntax/pike.vim b/runtime/syntax/pike.vim
index dcf32113c5..ccd122c46c 100644
--- a/runtime/syntax/pike.vim
+++ b/runtime/syntax/pike.vim
@@ -102,42 +102,40 @@ syn sync ccomment pikeComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink pikeLabel		Label
-HiLink pikeUserLabel		Label
-HiLink pikeConditional	Conditional
-HiLink pikeRepeat		Repeat
-HiLink pikeCharacter		Character
-HiLink pikeSpecialCharacter pikeSpecial
-HiLink pikeNumber		Number
-HiLink pikeFloat		Float
-HiLink pikeOctalError		pikeError
-HiLink pikeParenError		pikeError
-HiLink pikeInParen		pikeError
-HiLink pikeCommentError	pikeError
-HiLink pikeOperator		Operator
-HiLink pikeInclude		Include
-HiLink pikePreProc		PreProc
-HiLink pikeDefine		Macro
-HiLink pikeIncluded		pikeString
-HiLink pikeError		Error
-HiLink pikeStatement		Statement
-HiLink pikePreCondit		PreCondit
-HiLink pikeType		Type
-HiLink pikeCommentError	pikeError
-HiLink pikeCommentString	pikeString
-HiLink pikeComment2String	pikeString
-HiLink pikeCommentSkip	pikeComment
-HiLink pikeString		String
-HiLink pikeComment		Comment
-HiLink pikeSpecial		SpecialChar
-HiLink pikeTodo		Todo
-HiLink pikeException		pikeStatement
-HiLink pikeCompoundType	Constant
-"HiLink pikeIdentifier	Identifier
-
-delcommand HiLink
+
+hi def link pikeLabel		Label
+hi def link pikeUserLabel		Label
+hi def link pikeConditional	Conditional
+hi def link pikeRepeat		Repeat
+hi def link pikeCharacter		Character
+hi def link pikeSpecialCharacter pikeSpecial
+hi def link pikeNumber		Number
+hi def link pikeFloat		Float
+hi def link pikeOctalError		pikeError
+hi def link pikeParenError		pikeError
+hi def link pikeInParen		pikeError
+hi def link pikeCommentError	pikeError
+hi def link pikeOperator		Operator
+hi def link pikeInclude		Include
+hi def link pikePreProc		PreProc
+hi def link pikeDefine		Macro
+hi def link pikeIncluded		pikeString
+hi def link pikeError		Error
+hi def link pikeStatement		Statement
+hi def link pikePreCondit		PreCondit
+hi def link pikeType		Type
+hi def link pikeCommentError	pikeError
+hi def link pikeCommentString	pikeString
+hi def link pikeComment2String	pikeString
+hi def link pikeCommentSkip	pikeComment
+hi def link pikeString		String
+hi def link pikeComment		Comment
+hi def link pikeSpecial		SpecialChar
+hi def link pikeTodo		Todo
+hi def link pikeException		pikeStatement
+hi def link pikeCompoundType	Constant
+"hi def link pikeIdentifier	Identifier
+
 
 let b:current_syntax = "pike"
 
diff --git a/runtime/syntax/pilrc.vim b/runtime/syntax/pilrc.vim
index c1d3288b05..f0e5f9bbc7 100644
--- a/runtime/syntax/pilrc.vim
+++ b/runtime/syntax/pilrc.vim
@@ -117,22 +117,20 @@ syn region pilrcInclude start="public class" end="}"
 
 syn sync ccomment pilrcComment
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting
-HiLink pilrcKeyword		Statement
-HiLink pilrcType		Type
-HiLink pilrcError		Error
-HiLink pilrcCountry		SpecialChar
-HiLink pilrcLanguage		SpecialChar
-HiLink pilrcString		SpecialChar
-HiLink pilrcNumber		Number
-HiLink pilrcComment		Comment
-HiLink pilrcConstant		Constant
-HiLink pilrcFunction		Function
-HiLink pilrcInclude		SpecialChar
-HiLink pilrcIdentifier		Number
-
-delcommand HiLink
+hi def link pilrcKeyword		Statement
+hi def link pilrcType		Type
+hi def link pilrcError		Error
+hi def link pilrcCountry		SpecialChar
+hi def link pilrcLanguage		SpecialChar
+hi def link pilrcString		SpecialChar
+hi def link pilrcNumber		Number
+hi def link pilrcComment		Comment
+hi def link pilrcConstant		Constant
+hi def link pilrcFunction		Function
+hi def link pilrcInclude		SpecialChar
+hi def link pilrcIdentifier		Number
+
 
 let b:current_syntax = "pilrc"
diff --git a/runtime/syntax/pine.vim b/runtime/syntax/pine.vim
index e41dd87007..aadf50be15 100644
--- a/runtime/syntax/pine.vim
+++ b/runtime/syntax/pine.vim
@@ -345,12 +345,10 @@ syn match  pineComment  "^#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pineConfig	Type
-HiLink pineComment	Comment
-HiLink pineOption	Macro
-delcommand HiLink
+hi def link pineConfig	Type
+hi def link pineComment	Comment
+hi def link pineOption	Macro
 
 let b:current_syntax = "pine"
 
diff --git a/runtime/syntax/pli.vim b/runtime/syntax/pli.vim
index 9c74f9b0f8..a274cc40bf 100644
--- a/runtime/syntax/pli.vim
+++ b/runtime/syntax/pli.vim
@@ -222,47 +222,45 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when and item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pl1Attribute       Macro
-HiLink pl1BlockError      Error
-HiLink pl1BooleanLiteral  Boolean
-HiLink pl1CharLiteral     Character
-HiLink pl1Comment         Comment
-HiLink pl1CommentL        Comment
-HiLink pl1Conditional     Conditional
-HiLink pl1Error           Error
-HiLink pl1ErrInBracket    Error
-HiLink pl1ErrInBlock      Error
-HiLink pl1ErrInParen      Error
-HiLink pl1Exception       Function
-HiLink pl1FloatLiteral    Float
-HiLink pl1Function        Function
-HiLink pl1Garbage         Error
-HiLink pl1HostIdentifier  Label
-HiLink pl1Identifier      Normal
-HiLink pl1IntLiteral      Number
-HiLink pl1Operator        Operator
-HiLink pl1Paren           Normal
-HiLink pl1ParenError      Error
-HiLink pl1SpaceError      Error
-HiLink pl1Pseudo          PreProc
-HiLink pl1PreProc         PreProc
-HiLink pl1PreProcSym      PreProc
-HiLink pl1Keyword         Keyword
-HiLink pl1Other           Keyword
-HiLink pl1Repeat          Repeat
-HiLink pl1Statement       Keyword
-HiLink pl1Storage         StorageClass
-HiLink pl1StringError     Error
-HiLink pl1StringLiteral   String
-HiLink pl1CommentString   String
-HiLink pl1Comment2String  String
-HiLink pl1Symbol          Normal
-HiLink pl1Trigger         Function
-HiLink pl1TypeAttribute   StorageClass
-HiLink pl1Todo            Todo
+hi def link pl1Attribute       Macro
+hi def link pl1BlockError      Error
+hi def link pl1BooleanLiteral  Boolean
+hi def link pl1CharLiteral     Character
+hi def link pl1Comment         Comment
+hi def link pl1CommentL        Comment
+hi def link pl1Conditional     Conditional
+hi def link pl1Error           Error
+hi def link pl1ErrInBracket    Error
+hi def link pl1ErrInBlock      Error
+hi def link pl1ErrInParen      Error
+hi def link pl1Exception       Function
+hi def link pl1FloatLiteral    Float
+hi def link pl1Function        Function
+hi def link pl1Garbage         Error
+hi def link pl1HostIdentifier  Label
+hi def link pl1Identifier      Normal
+hi def link pl1IntLiteral      Number
+hi def link pl1Operator        Operator
+hi def link pl1Paren           Normal
+hi def link pl1ParenError      Error
+hi def link pl1SpaceError      Error
+hi def link pl1Pseudo          PreProc
+hi def link pl1PreProc         PreProc
+hi def link pl1PreProcSym      PreProc
+hi def link pl1Keyword         Keyword
+hi def link pl1Other           Keyword
+hi def link pl1Repeat          Repeat
+hi def link pl1Statement       Keyword
+hi def link pl1Storage         StorageClass
+hi def link pl1StringError     Error
+hi def link pl1StringLiteral   String
+hi def link pl1CommentString   String
+hi def link pl1Comment2String  String
+hi def link pl1Symbol          Normal
+hi def link pl1Trigger         Function
+hi def link pl1TypeAttribute   StorageClass
+hi def link pl1Todo            Todo
 
-delcommand HiLink
 
 let b:current_syntax = "pl1"
diff --git a/runtime/syntax/plm.vim b/runtime/syntax/plm.vim
index de806b3335..c6618adacb 100644
--- a/runtime/syntax/plm.vim
+++ b/runtime/syntax/plm.vim
@@ -101,34 +101,32 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-"  HiLink plmLabel			Label
-"  HiLink plmConditional		Conditional
-"  HiLink plmRepeat			Repeat
-HiLink plmTodo			Todo
-HiLink plmNumber			Number
-HiLink plmOperator			Operator
-HiLink plmDelimiter			Operator
-"HiLink plmShowTab			Error
-"HiLink plmShowTabc			Error
-HiLink plmIdentifier			Identifier
-HiLink plmBuiltIn			Statement
-HiLink plm286BuiltIn			Statement
-HiLink plm386BuiltIn			Statement
-HiLink plm386w16BuiltIn		Statement
-HiLink plmReserved			Statement
-HiLink plm386Reserved			Statement
-HiLink plmPreProc			PreProc
-HiLink plmCommentError		plmError
-HiLink plmCommentString		plmString
-HiLink plmComment2String		plmString
-HiLink plmCommentSkip			plmComment
-HiLink plmString			String
-HiLink plmComment			Comment
-
-delcommand HiLink
+"  hi def link plmLabel			Label
+"  hi def link plmConditional		Conditional
+"  hi def link plmRepeat			Repeat
+hi def link plmTodo			Todo
+hi def link plmNumber			Number
+hi def link plmOperator			Operator
+hi def link plmDelimiter			Operator
+"hi def link plmShowTab			Error
+"hi def link plmShowTabc			Error
+hi def link plmIdentifier			Identifier
+hi def link plmBuiltIn			Statement
+hi def link plm286BuiltIn			Statement
+hi def link plm386BuiltIn			Statement
+hi def link plm386w16BuiltIn		Statement
+hi def link plmReserved			Statement
+hi def link plm386Reserved			Statement
+hi def link plmPreProc			PreProc
+hi def link plmCommentError		plmError
+hi def link plmCommentString		plmString
+hi def link plmComment2String		plmString
+hi def link plmCommentSkip			plmComment
+hi def link plmString			String
+hi def link plmComment			Comment
+
 
 let b:current_syntax = "plm"
 
diff --git a/runtime/syntax/plsql.vim b/runtime/syntax/plsql.vim
index 173c22f761..1868c9cb16 100644
--- a/runtime/syntax/plsql.vim
+++ b/runtime/syntax/plsql.vim
@@ -221,45 +221,43 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink plsqlAttribute		Macro
-HiLink plsqlBlockError	Error
-HiLink plsqlBooleanLiteral	Boolean
-HiLink plsqlCharLiteral	Character
-HiLink plsqlComment		Comment
-HiLink plsqlCommentL		Comment
-HiLink plsqlConditional	Conditional
-HiLink plsqlError		Error
-HiLink plsqlErrInBracket	Error
-HiLink plsqlErrInBlock	Error
-HiLink plsqlErrInParen	Error
-HiLink plsqlException		Function
-HiLink plsqlFloatLiteral	Float
-HiLink plsqlFunction		Function
-HiLink plsqlGarbage		Error
-HiLink plsqlHostIdentifier	Label
-HiLink plsqlIdentifier	Normal
-HiLink plsqlIntLiteral	Number
-HiLink plsqlOperator		Operator
-HiLink plsqlParen		Normal
-HiLink plsqlParenError	Error
-HiLink plsqlSpaceError	Error
-HiLink plsqlPseudo		PreProc
-HiLink plsqlKeyword		Keyword
-HiLink plsqlRepeat		Repeat
-HiLink plsqlStorage		StorageClass
-HiLink plsqlSQLKeyword	Function
-HiLink plsqlStringError	Error
-HiLink plsqlStringLiteral	String
-HiLink plsqlCommentString	String
-HiLink plsqlComment2String	String
-HiLink plsqlSymbol		Normal
-HiLink plsqlTrigger		Function
-HiLink plsqlTypeAttribute	StorageClass
-HiLink plsqlTodo		Todo
+hi def link plsqlAttribute		Macro
+hi def link plsqlBlockError	Error
+hi def link plsqlBooleanLiteral	Boolean
+hi def link plsqlCharLiteral	Character
+hi def link plsqlComment		Comment
+hi def link plsqlCommentL		Comment
+hi def link plsqlConditional	Conditional
+hi def link plsqlError		Error
+hi def link plsqlErrInBracket	Error
+hi def link plsqlErrInBlock	Error
+hi def link plsqlErrInParen	Error
+hi def link plsqlException		Function
+hi def link plsqlFloatLiteral	Float
+hi def link plsqlFunction		Function
+hi def link plsqlGarbage		Error
+hi def link plsqlHostIdentifier	Label
+hi def link plsqlIdentifier	Normal
+hi def link plsqlIntLiteral	Number
+hi def link plsqlOperator		Operator
+hi def link plsqlParen		Normal
+hi def link plsqlParenError	Error
+hi def link plsqlSpaceError	Error
+hi def link plsqlPseudo		PreProc
+hi def link plsqlKeyword		Keyword
+hi def link plsqlRepeat		Repeat
+hi def link plsqlStorage		StorageClass
+hi def link plsqlSQLKeyword	Function
+hi def link plsqlStringError	Error
+hi def link plsqlStringLiteral	String
+hi def link plsqlCommentString	String
+hi def link plsqlComment2String	String
+hi def link plsqlSymbol		Normal
+hi def link plsqlTrigger		Function
+hi def link plsqlTypeAttribute	StorageClass
+hi def link plsqlTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "plsql"
 
diff --git a/runtime/syntax/po.vim b/runtime/syntax/po.vim
index f98813c62a..15d09b18bd 100644
--- a/runtime/syntax/po.vim
+++ b/runtime/syntax/po.vim
@@ -80,52 +80,50 @@ syn match poVariable contained "%\d"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink poCommentSources    PreProc
-HiLink poComment	     Comment
-HiLink poCommentAutomatic  Comment
-HiLink poCommentTranslator Comment
-HiLink poCommentFlags      Special
-HiLink poCommentDiff       Comment
-HiLink poCopyrightUnset    Todo
-HiLink poFlagFuzzy         Todo
-HiLink poDiffOld           Todo
-HiLink poDiffNew          Special
-HiLink poObsolete         Comment
-
-HiLink poStatementMsgid   Statement
-HiLink poStatementMsgstr  Statement
-HiLink poStatementMsgidplural  Statement
-HiLink poStatementMsgCTxt Statement
-HiLink poPluralCaseN      Constant
-
-HiLink poStringCTxt	    Comment
-HiLink poStringID	    String
-HiLink poStringSTR	    String
-HiLink poCommentKDE       Comment
-HiLink poCommentKDEError  Error
-HiLink poPluralKDE        Comment
-HiLink poPluralKDEError   Error
-HiLink poHeaderItem       Identifier
-HiLink poHeaderUndefined  Todo
-HiLink poKDEdesktopFile   Identifier
-
-HiLink poHtml              Identifier
-HiLink poHtmlNot           String
-HiLink poHtmlTranslatables String
-HiLink poLineBreak         String
-
-HiLink poFormat	    poSpecial
-HiLink poSpecial	    Special
-HiLink poAcceleratorId    Special
-HiLink poAcceleratorStr   Special
-HiLink poVariable         Special
-
-HiLink poMsguniqError        Special
-HiLink poMsguniqErrorMarkers Comment
-
-delcommand HiLink
+
+hi def link poCommentSources    PreProc
+hi def link poComment	     Comment
+hi def link poCommentAutomatic  Comment
+hi def link poCommentTranslator Comment
+hi def link poCommentFlags      Special
+hi def link poCommentDiff       Comment
+hi def link poCopyrightUnset    Todo
+hi def link poFlagFuzzy         Todo
+hi def link poDiffOld           Todo
+hi def link poDiffNew          Special
+hi def link poObsolete         Comment
+
+hi def link poStatementMsgid   Statement
+hi def link poStatementMsgstr  Statement
+hi def link poStatementMsgidplural  Statement
+hi def link poStatementMsgCTxt Statement
+hi def link poPluralCaseN      Constant
+
+hi def link poStringCTxt	    Comment
+hi def link poStringID	    String
+hi def link poStringSTR	    String
+hi def link poCommentKDE       Comment
+hi def link poCommentKDEError  Error
+hi def link poPluralKDE        Comment
+hi def link poPluralKDEError   Error
+hi def link poHeaderItem       Identifier
+hi def link poHeaderUndefined  Todo
+hi def link poKDEdesktopFile   Identifier
+
+hi def link poHtml              Identifier
+hi def link poHtmlNot           String
+hi def link poHtmlTranslatables String
+hi def link poLineBreak         String
+
+hi def link poFormat	    poSpecial
+hi def link poSpecial	    Special
+hi def link poAcceleratorId    Special
+hi def link poAcceleratorStr   Special
+hi def link poVariable         Special
+
+hi def link poMsguniqError        Special
+hi def link poMsguniqErrorMarkers Comment
+
 
 let b:current_syntax = "po"
 
diff --git a/runtime/syntax/pod.vim b/runtime/syntax/pod.vim
index c545141275..7c65a8433f 100644
--- a/runtime/syntax/pod.vim
+++ b/runtime/syntax/pod.vim
@@ -65,19 +65,17 @@ syn match  podEscape2	"\d\+>"me=e-1 contained contains=@NoSpell
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink podCommand		Statement
-HiLink podCmdText		String
-HiLink podOverIndent		Number
-HiLink podForKeywd		Identifier
-HiLink podFormat		Identifier
-HiLink podVerbatimLine	PreProc
-HiLink podSpecial		Identifier
-HiLink podEscape		String
-HiLink podEscape2		Number
-
-delcommand HiLink
+
+hi def link podCommand		Statement
+hi def link podCmdText		String
+hi def link podOverIndent		Number
+hi def link podForKeywd		Identifier
+hi def link podFormat		Identifier
+hi def link podVerbatimLine	PreProc
+hi def link podSpecial		Identifier
+hi def link podEscape		String
+hi def link podEscape2		Number
+
 
 if exists("perl_pod_spellcheck_headings")
   " Spell-check headings
diff --git a/runtime/syntax/postscr.vim b/runtime/syntax/postscr.vim
index 33cc6ec128..d5dc9a22d6 100644
--- a/runtime/syntax/postscr.vim
+++ b/runtime/syntax/postscr.vim
@@ -724,58 +724,56 @@ endif " GhostScript highlighting
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink postscrComment         Comment
-
-HiLink postscrConstant        Constant
-HiLink postscrString          String
-HiLink postscrASCIIString     postscrString
-HiLink postscrHexString       postscrString
-HiLink postscrASCII85String   postscrString
-HiLink postscrNumber          Number
-HiLink postscrInteger         postscrNumber
-HiLink postscrHex             postscrNumber
-HiLink postscrRadix           postscrNumber
-HiLink postscrFloat           Float
-HiLink postscrBoolean         Boolean
-
-HiLink postscrIdentifier      Identifier
-HiLink postscrProcedure       Function
-
-HiLink postscrName            Statement
-HiLink postscrConditional     Conditional
-HiLink postscrRepeat          Repeat
-HiLink postscrL2Repeat        postscrRepeat
-HiLink postscrOperator        Operator
-HiLink postscrL1Operator      postscrOperator
-HiLink postscrL2Operator      postscrOperator
-HiLink postscrL3Operator      postscrOperator
-HiLink postscrMathOperator    postscrOperator
-HiLink postscrLogicalOperator postscrOperator
-HiLink postscrBinaryOperator  postscrOperator
-
-HiLink postscrDSCComment      SpecialComment
-HiLink postscrSpecialChar     SpecialChar
-
-HiLink postscrTodo            Todo
-
-HiLink postscrError           Error
-HiLink postscrSpecialCharError postscrError
-HiLink postscrASCII85CharError postscrError
-HiLink postscrHexCharError    postscrError
-HiLink postscrASCIIStringError postscrError
-HiLink postscrIdentifierError postscrError
+
+hi def link postscrComment         Comment
+
+hi def link postscrConstant        Constant
+hi def link postscrString          String
+hi def link postscrASCIIString     postscrString
+hi def link postscrHexString       postscrString
+hi def link postscrASCII85String   postscrString
+hi def link postscrNumber          Number
+hi def link postscrInteger         postscrNumber
+hi def link postscrHex             postscrNumber
+hi def link postscrRadix           postscrNumber
+hi def link postscrFloat           Float
+hi def link postscrBoolean         Boolean
+
+hi def link postscrIdentifier      Identifier
+hi def link postscrProcedure       Function
+
+hi def link postscrName            Statement
+hi def link postscrConditional     Conditional
+hi def link postscrRepeat          Repeat
+hi def link postscrL2Repeat        postscrRepeat
+hi def link postscrOperator        Operator
+hi def link postscrL1Operator      postscrOperator
+hi def link postscrL2Operator      postscrOperator
+hi def link postscrL3Operator      postscrOperator
+hi def link postscrMathOperator    postscrOperator
+hi def link postscrLogicalOperator postscrOperator
+hi def link postscrBinaryOperator  postscrOperator
+
+hi def link postscrDSCComment      SpecialComment
+hi def link postscrSpecialChar     SpecialChar
+
+hi def link postscrTodo            Todo
+
+hi def link postscrError           Error
+hi def link postscrSpecialCharError postscrError
+hi def link postscrASCII85CharError postscrError
+hi def link postscrHexCharError    postscrError
+hi def link postscrASCIIStringError postscrError
+hi def link postscrIdentifierError postscrError
 
 if exists("postscr_ghostscript")
-HiLink postscrGSOperator      postscrOperator
-HiLink postscrGSMathOperator  postscrMathOperator
+hi def link postscrGSOperator      postscrOperator
+hi def link postscrGSMathOperator  postscrMathOperator
 else
-HiLink postscrGSOperator      postscrError
-HiLink postscrGSMathOperator  postscrError
+hi def link postscrGSOperator      postscrError
+hi def link postscrGSMathOperator  postscrError
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "postscr"
 
diff --git a/runtime/syntax/ppd.vim b/runtime/syntax/ppd.vim
index 31d3841e33..da67e1f39f 100644
--- a/runtime/syntax/ppd.vim
+++ b/runtime/syntax/ppd.vim
@@ -19,18 +19,16 @@ syn match	ppdContraints	"^*UIConstraints:"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
-HiLink ppdComment		Comment
-HiLink ppdDefine		Statement
-HiLink ppdUI			Function
-HiLink ppdUIGroup		Function
-HiLink ppdDef			String
-HiLink ppdGUIText		Type
-HiLink ppdContraints		Special
+hi def link ppdComment		Comment
+hi def link ppdDefine		Statement
+hi def link ppdUI			Function
+hi def link ppdUIGroup		Function
+hi def link ppdDef			String
+hi def link ppdGUIText		Type
+hi def link ppdContraints		Special
 
-delcommand HiLink
 
 let b:current_syntax = "ppd"
 
diff --git a/runtime/syntax/ppwiz.vim b/runtime/syntax/ppwiz.vim
index 599bf0b89f..514f8f36cc 100644
--- a/runtime/syntax/ppwiz.vim
+++ b/runtime/syntax/ppwiz.vim
@@ -61,24 +61,22 @@ syn cluster ppwizArgVal add=ppwizString,ppwizInteger
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ppwizSpecial  Special
-HiLink ppwizEqual    ppwizSpecial
-HiLink ppwizOperator ppwizSpecial
-HiLink ppwizComment  Comment
-HiLink ppwizDef      PreProc
-HiLink ppwizMacro    Statement
-HiLink ppwizArg      Identifier
-HiLink ppwizStdVar   Identifier
-HiLink ppwizRexxVar  Identifier
-HiLink ppwizString   Constant
-HiLink ppwizInteger  Constant
-HiLink ppwizCont     ppwizSpecial
-HiLink ppwizError    Error
-HiLink ppwizHTML     Type
+hi def link ppwizSpecial  Special
+hi def link ppwizEqual    ppwizSpecial
+hi def link ppwizOperator ppwizSpecial
+hi def link ppwizComment  Comment
+hi def link ppwizDef      PreProc
+hi def link ppwizMacro    Statement
+hi def link ppwizArg      Identifier
+hi def link ppwizStdVar   Identifier
+hi def link ppwizRexxVar  Identifier
+hi def link ppwizString   Constant
+hi def link ppwizInteger  Constant
+hi def link ppwizCont     ppwizSpecial
+hi def link ppwizError    Error
+hi def link ppwizHTML     Type
 
-delcommand HiLink
 
 let b:current_syntax = "ppwiz"
 
diff --git a/runtime/syntax/prescribe.vim b/runtime/syntax/prescribe.vim
index 05f9162e4c..cd5ddbeedd 100644
--- a/runtime/syntax/prescribe.vim
+++ b/runtime/syntax/prescribe.vim
@@ -42,16 +42,14 @@ syn region  prescribeComment	start=+CMNT+ end=+;+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink prescribeSpecial		PreProc
-HiLink prescribeStatement		Statement
-HiLink prescribeNumber		Number
-HiLink prescribeCSETArg		String
-HiLink prescribeFRPOArg		String
-HiLink prescribeComment		Comment
+hi def link prescribeSpecial		PreProc
+hi def link prescribeStatement		Statement
+hi def link prescribeNumber		Number
+hi def link prescribeCSETArg		String
+hi def link prescribeFRPOArg		String
+hi def link prescribeComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "prescribe"
 
diff --git a/runtime/syntax/procmail.vim b/runtime/syntax/procmail.vim
index 9202dbf29a..93f50fe9ef 100644
--- a/runtime/syntax/procmail.vim
+++ b/runtime/syntax/procmail.vim
@@ -31,25 +31,23 @@ syn region procmailRecipe start=+^\s*:.*$+ end=+^\s*\($\|}\)+me=e-1 contains=pro
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink procmailComment Comment
-HiLink procmailTodo    Todo
+hi def link procmailComment Comment
+hi def link procmailTodo    Todo
 
-HiLink procmailRecipe   Statement
-"HiLink procmailCondition   Statement
+hi def link procmailRecipe   Statement
+"hi def link procmailCondition   Statement
 
-HiLink procmailActionFolder	procmailAction
-HiLink procmailActionVariable procmailAction
-HiLink procmailActionForward	procmailAction
-HiLink procmailActionPipe	procmailAction
-HiLink procmailAction		Function
-HiLink procmailVar		Identifier
-HiLink procmailVarDecl	Identifier
+hi def link procmailActionFolder	procmailAction
+hi def link procmailActionVariable procmailAction
+hi def link procmailActionForward	procmailAction
+hi def link procmailActionPipe	procmailAction
+hi def link procmailAction		Function
+hi def link procmailVar		Identifier
+hi def link procmailVarDecl	Identifier
 
-HiLink procmailString String
+hi def link procmailString String
 
-delcommand HiLink
 
 let b:current_syntax = "procmail"
 
diff --git a/runtime/syntax/progress.vim b/runtime/syntax/progress.vim
index 9ff506960e..5e7cfef299 100644
--- a/runtime/syntax/progress.vim
+++ b/runtime/syntax/progress.vim
@@ -276,35 +276,33 @@ syn sync lines=800
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink ProgressByte		Number
-HiLink ProgressCase		Repeat
-HiLink ProgressComment		Comment
-HiLink ProgressConditional	Conditional
-HiLink ProgressDebug		Debug
-HiLink ProgressDo		Repeat
-HiLink ProgressEndError		Error
-HiLink ProgressFor		Repeat
-HiLink ProgressFunction		Procedure
-HiLink ProgressIdentifier	Identifier
-HiLink ProgressInclude		Include
-HiLink ProgressMatrixDelimiter	Identifier
-HiLink ProgressNumber		Number
-HiLink ProgressOperator		Operator
-HiLink ProgressPreProc		PreProc
-HiLink ProgressProcedure	Procedure
-HiLink ProgressQuote		Delimiter
-HiLink ProgressRepeat		Repeat
-HiLink ProgressReserved		Statement
-HiLink ProgressSpaceError	Error
-HiLink ProgressString		String
-HiLink ProgressTodo		Todo
-HiLink ProgressType		Statement
-HiLink ProgressShowTab		Error
+hi def link ProgressByte		Number
+hi def link ProgressCase		Repeat
+hi def link ProgressComment		Comment
+hi def link ProgressConditional	Conditional
+hi def link ProgressDebug		Debug
+hi def link ProgressDo		Repeat
+hi def link ProgressEndError		Error
+hi def link ProgressFor		Repeat
+hi def link ProgressFunction		Procedure
+hi def link ProgressIdentifier	Identifier
+hi def link ProgressInclude		Include
+hi def link ProgressMatrixDelimiter	Identifier
+hi def link ProgressNumber		Number
+hi def link ProgressOperator		Operator
+hi def link ProgressPreProc		PreProc
+hi def link ProgressProcedure	Procedure
+hi def link ProgressQuote		Delimiter
+hi def link ProgressRepeat		Repeat
+hi def link ProgressReserved		Statement
+hi def link ProgressSpaceError	Error
+hi def link ProgressString		String
+hi def link ProgressTodo		Todo
+hi def link ProgressType		Statement
+hi def link ProgressShowTab		Error
 
-delcommand HiLink
 
 let b:current_syntax = "progress"
 
diff --git a/runtime/syntax/prolog.vim b/runtime/syntax/prolog.vim
index 2131308b80..f8fb966b66 100644
--- a/runtime/syntax/prolog.vim
+++ b/runtime/syntax/prolog.vim
@@ -77,36 +77,34 @@ syn sync maxlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink prologComment          Comment
-HiLink prologCComment         Comment
-HiLink prologCharCode         Special
+hi def link prologComment          Comment
+hi def link prologCComment         Comment
+hi def link prologCharCode         Special
 
 if exists ("prolog_highlighting_clean")
 
-HiLink prologKeyword        Statement
-HiLink prologClauseHead     Statement
-HiLink prologClause Normal
+hi def link prologKeyword        Statement
+hi def link prologClauseHead     Statement
+hi def link prologClause Normal
 
 else
 
-HiLink prologKeyword        Keyword
-HiLink prologClauseHead     Constant
-HiLink prologClause Normal
-HiLink prologQuestion       PreProc
-HiLink prologSpecialCharacter Special
-HiLink prologNumber         Number
-HiLink prologAsIs           Normal
-HiLink prologCommentError   Error
-HiLink prologAtom           String
-HiLink prologString         String
-HiLink prologOperator       Operator
+hi def link prologKeyword        Keyword
+hi def link prologClauseHead     Constant
+hi def link prologClause Normal
+hi def link prologQuestion       PreProc
+hi def link prologSpecialCharacter Special
+hi def link prologNumber         Number
+hi def link prologAsIs           Normal
+hi def link prologCommentError   Error
+hi def link prologAtom           String
+hi def link prologString         String
+hi def link prologOperator       Operator
 
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "prolog"
 
diff --git a/runtime/syntax/psf.vim b/runtime/syntax/psf.vim
index e059ff9f4d..0971fe96bf 100644
--- a/runtime/syntax/psf.vim
+++ b/runtime/syntax/psf.vim
@@ -72,18 +72,16 @@ syn match  psfComment "#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink psfObject       Statement
-HiLink psfAttrib       Type
-HiLink psfQuotString   String
-HiLink psfObjTag       Identifier
-HiLink psfAttAbbrev    PreProc
-HiLink psfObjTags      Identifier
+hi def link psfObject       Statement
+hi def link psfAttrib       Type
+hi def link psfQuotString   String
+hi def link psfObjTag       Identifier
+hi def link psfAttAbbrev    PreProc
+hi def link psfObjTags      Identifier
 
-HiLink psfComment      Comment
+hi def link psfComment      Comment
 
-delcommand HiLink
 
 " Long descriptions and copyrights confuse the syntax highlighting, so
 " force vim to backup at least 100 lines before the top visible line
diff --git a/runtime/syntax/ptcap.vim b/runtime/syntax/ptcap.vim
index 6d3c460d39..1ebeb5227b 100644
--- a/runtime/syntax/ptcap.vim
+++ b/runtime/syntax/ptcap.vim
@@ -70,27 +70,25 @@ syn region ptcapField	    start=":" skip="[^\\]\(\\\\\)*\\$" end="[^\\]\(\\\\\)*
 syn region ptcapString	    matchgroup=ptcapOperator start="=" skip="[^\\]\(\\\\\)*\\:" matchgroup=ptcapDelimiter end=":"me=e-1 matchgroup=NONE end="[^\\]\(\\\\\)*[^\\]$" end="^$" contains=ptcapEscapedChar,ptcapLineCont keepend contained
 syn region ptcapComment	    start="^\s*#" end="$" contains=ptcapLeadBlank
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ptcapComment		Comment
-HiLink ptcapDelimiter	Delimiter
+hi def link ptcapComment		Comment
+hi def link ptcapDelimiter	Delimiter
 " The highlighting of "ptcapEntry" should always be overridden by
 " its contents, so I use Todo highlighting to indicate that there
 " is work to be done with the syntax file if you can see it :-)
-HiLink ptcapEntry		Todo
-HiLink ptcapError		Error
-HiLink ptcapEscapedChar	SpecialChar
-HiLink ptcapField		Type
-HiLink ptcapLeadBlank	NONE
-HiLink ptcapLineCont	Special
-HiLink ptcapNames		Label
-HiLink ptcapNumber		NONE
-HiLink ptcapNumberError	Error
-HiLink ptcapOperator	Operator
-HiLink ptcapSpecialCap	Type
-HiLink ptcapString		NONE
-
-delcommand HiLink
+hi def link ptcapEntry		Todo
+hi def link ptcapError		Error
+hi def link ptcapEscapedChar	SpecialChar
+hi def link ptcapField		Type
+hi def link ptcapLeadBlank	NONE
+hi def link ptcapLineCont	Special
+hi def link ptcapNames		Label
+hi def link ptcapNumber		NONE
+hi def link ptcapNumberError	Error
+hi def link ptcapOperator	Operator
+hi def link ptcapSpecialCap	Type
+hi def link ptcapString		NONE
+
 
 let b:current_syntax = "ptcap"
 
diff --git a/runtime/syntax/purifylog.vim b/runtime/syntax/purifylog.vim
index b56ca6ae1d..2143d9fe28 100644
--- a/runtime/syntax/purifylog.vim
+++ b/runtime/syntax/purifylog.vim
@@ -55,53 +55,51 @@ syn match purifyLogZPW "^ZPW:.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink purifyLogFIU purifyLogInformational
-HiLink purifyLogMAF purifyLogInformational
-HiLink purifyLogMIU purifyLogInformational
-HiLink purifyLogSIG purifyLogInformational
-HiLink purifyLogWPF purifyLogInformational
-HiLink purifyLogWPM purifyLogInformational
-HiLink purifyLogWPN purifyLogInformational
-HiLink purifyLogWPR purifyLogInformational
-HiLink purifyLogWPW purifyLogInformational
-HiLink purifyLogWPX purifyLogInformational
+hi def link purifyLogFIU purifyLogInformational
+hi def link purifyLogMAF purifyLogInformational
+hi def link purifyLogMIU purifyLogInformational
+hi def link purifyLogSIG purifyLogInformational
+hi def link purifyLogWPF purifyLogInformational
+hi def link purifyLogWPM purifyLogInformational
+hi def link purifyLogWPN purifyLogInformational
+hi def link purifyLogWPR purifyLogInformational
+hi def link purifyLogWPW purifyLogInformational
+hi def link purifyLogWPX purifyLogInformational
 
-HiLink purifyLogABR purifyLogWarning
-HiLink purifyLogBSR purifyLogWarning
-HiLink purifyLogBSW purifyLogWarning
-HiLink purifyLogFMR purifyLogWarning
-HiLink purifyLogMLK purifyLogWarning
-HiLink purifyLogMSE purifyLogWarning
-HiLink purifyLogPAR purifyLogWarning
-HiLink purifyLogPLK purifyLogWarning
-HiLink purifyLogSBR purifyLogWarning
-HiLink purifyLogSOF purifyLogWarning
-HiLink purifyLogUMC purifyLogWarning
-HiLink purifyLogUMR purifyLogWarning
+hi def link purifyLogABR purifyLogWarning
+hi def link purifyLogBSR purifyLogWarning
+hi def link purifyLogBSW purifyLogWarning
+hi def link purifyLogFMR purifyLogWarning
+hi def link purifyLogMLK purifyLogWarning
+hi def link purifyLogMSE purifyLogWarning
+hi def link purifyLogPAR purifyLogWarning
+hi def link purifyLogPLK purifyLogWarning
+hi def link purifyLogSBR purifyLogWarning
+hi def link purifyLogSOF purifyLogWarning
+hi def link purifyLogUMC purifyLogWarning
+hi def link purifyLogUMR purifyLogWarning
 
-HiLink purifyLogABW purifyLogCorrupting
-HiLink purifyLogBRK purifyLogCorrupting
-HiLink purifyLogFMW purifyLogCorrupting
-HiLink purifyLogFNH purifyLogCorrupting
-HiLink purifyLogFUM purifyLogCorrupting
-HiLink purifyLogMRE purifyLogCorrupting
-HiLink purifyLogSBW purifyLogCorrupting
+hi def link purifyLogABW purifyLogCorrupting
+hi def link purifyLogBRK purifyLogCorrupting
+hi def link purifyLogFMW purifyLogCorrupting
+hi def link purifyLogFNH purifyLogCorrupting
+hi def link purifyLogFUM purifyLogCorrupting
+hi def link purifyLogMRE purifyLogCorrupting
+hi def link purifyLogSBW purifyLogCorrupting
 
-HiLink purifyLogCOR purifyLogFatal
-HiLink purifyLogNPR purifyLogFatal
-HiLink purifyLogNPW purifyLogFatal
-HiLink purifyLogZPR purifyLogFatal
-HiLink purifyLogZPW purifyLogFatal
+hi def link purifyLogCOR purifyLogFatal
+hi def link purifyLogNPR purifyLogFatal
+hi def link purifyLogNPW purifyLogFatal
+hi def link purifyLogZPR purifyLogFatal
+hi def link purifyLogZPW purifyLogFatal
 
-HiLink purifyLogHeader		Comment
-HiLink purifyLogInformational	PreProc
-HiLink purifyLogWarning		Type
-HiLink purifyLogCorrupting	Error
-HiLink purifyLogFatal		Error
+hi def link purifyLogHeader		Comment
+hi def link purifyLogInformational	PreProc
+hi def link purifyLogWarning		Type
+hi def link purifyLogCorrupting	Error
+hi def link purifyLogFatal		Error
 
-delcommand HiLink
 
 let b:current_syntax = "purifylog"
 
diff --git a/runtime/syntax/pyrex.vim b/runtime/syntax/pyrex.vim
index cd743df889..b860658975 100644
--- a/runtime/syntax/pyrex.vim
+++ b/runtime/syntax/pyrex.vim
@@ -37,17 +37,15 @@ syn match   pythonInclude     "from"
 syn match   pyrexForFrom        "\(for[^:]*\)\@<=from"
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
-HiLink pyrexStatement		Statement
-HiLink pyrexType		Type
-HiLink pyrexStructure		Structure
-HiLink pyrexInclude		PreCondit
-HiLink pyrexAccess		pyrexStatement
+hi def link pyrexStatement		Statement
+hi def link pyrexType		Type
+hi def link pyrexStructure		Structure
+hi def link pyrexInclude		PreCondit
+hi def link pyrexAccess		pyrexStatement
 if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
-HiLink pyrexBuiltin	Function
+hi def link pyrexBuiltin	Function
 endif
-HiLink pyrexForFrom		Statement
+hi def link pyrexForFrom		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "pyrex"
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index e44721b7fa..38bea3eefe 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -289,44 +289,42 @@ endif
 " Sync at the beginning of class, function, or method definition.
 syn sync match pythonSync grouphere NONE "^\s*\%(def\|class\)\s\+\h\w*\s*("
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlight links.  Can be overridden later.
-HiLink pythonStatement	Statement
-HiLink pythonConditional	Conditional
-HiLink pythonRepeat		Repeat
-HiLink pythonOperator		Operator
-HiLink pythonException	Exception
-HiLink pythonInclude		Include
-HiLink pythonAsync		Statement
-HiLink pythonDecorator	Define
-HiLink pythonDecoratorName	Function
-HiLink pythonFunction		Function
-HiLink pythonComment		Comment
-HiLink pythonTodo		Todo
-HiLink pythonString		String
-HiLink pythonRawString	String
-HiLink pythonQuotes		String
-HiLink pythonTripleQuotes	pythonQuotes
-HiLink pythonEscape		Special
+hi def link pythonStatement	Statement
+hi def link pythonConditional	Conditional
+hi def link pythonRepeat		Repeat
+hi def link pythonOperator		Operator
+hi def link pythonException	Exception
+hi def link pythonInclude		Include
+hi def link pythonAsync		Statement
+hi def link pythonDecorator	Define
+hi def link pythonDecoratorName	Function
+hi def link pythonFunction		Function
+hi def link pythonComment		Comment
+hi def link pythonTodo		Todo
+hi def link pythonString		String
+hi def link pythonRawString	String
+hi def link pythonQuotes		String
+hi def link pythonTripleQuotes	pythonQuotes
+hi def link pythonEscape		Special
 if !exists("python_no_number_highlight")
-  HiLink pythonNumber		Number
+  hi def link pythonNumber		Number
 endif
 if !exists("python_no_builtin_highlight")
-  HiLink pythonBuiltin	Function
+  hi def link pythonBuiltin	Function
 endif
 if !exists("python_no_exception_highlight")
-  HiLink pythonExceptions	Structure
+  hi def link pythonExceptions	Structure
 endif
 if exists("python_space_error_highlight")
-  HiLink pythonSpaceError	Error
+  hi def link pythonSpaceError	Error
 endif
 if !exists("python_no_doctest_highlight")
-  HiLink pythonDoctest	Special
-  HiLink pythonDoctestValue	Define
+  hi def link pythonDoctest	Special
+  hi def link pythonDoctestValue	Define
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "python"
 
diff --git a/runtime/syntax/radiance.vim b/runtime/syntax/radiance.vim
index 134792ac11..c49e339a28 100644
--- a/runtime/syntax/radiance.vim
+++ b/runtime/syntax/radiance.vim
@@ -124,20 +124,18 @@ syn match radianceComment "#.*$" contains=radianceTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink radianceKeyword	Keyword
-HiLink radianceExtraType	Type
-HiLink radianceSurfType	Type
-HiLink radianceLightType	Type
-HiLink radianceMatType	Type
-HiLink radiancePatType	Type
-HiLink radianceTexType	Type
-HiLink radianceMixType	Type
-HiLink radianceComment	Comment
-HiLink radianceCommand	Function
-HiLink radianceID		String
-HiLink radianceTodo		Todo
-delcommand HiLink
+hi def link radianceKeyword	Keyword
+hi def link radianceExtraType	Type
+hi def link radianceSurfType	Type
+hi def link radianceLightType	Type
+hi def link radianceMatType	Type
+hi def link radiancePatType	Type
+hi def link radianceTexType	Type
+hi def link radianceMixType	Type
+hi def link radianceComment	Comment
+hi def link radianceCommand	Function
+hi def link radianceID		String
+hi def link radianceTodo		Todo
 
 let b:current_syntax = "radiance"
 
diff --git a/runtime/syntax/ratpoison.vim b/runtime/syntax/ratpoison.vim
index 30cf369803..af8676c43d 100644
--- a/runtime/syntax/ratpoison.vim
+++ b/runtime/syntax/ratpoison.vim
@@ -245,24 +245,22 @@ syn match   ratpoisonVoidCommand	"^\s*\zswindows\ze\s*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ratpoisonBooleanArg	Boolean
-HiLink ratpoisonCommandArg	Keyword
-HiLink ratpoisonComment	Comment
-HiLink ratpoisonDefCommand	Identifier
-HiLink ratpoisonGravityArg	Constant
-HiLink ratpoisonKeySeqArg	Special
-HiLink ratpoisonNumberArg	Number
-HiLink ratpoisonSetArg	Keyword
-HiLink ratpoisonStringCommand	Identifier
-HiLink ratpoisonTodo		Todo
-HiLink ratpoisonVoidCommand	Identifier
-HiLink ratpoisonWinFmtArg	Special
-HiLink ratpoisonWinNameArg	Constant
-HiLink ratpoisonWinListArg	Constant
+hi def link ratpoisonBooleanArg	Boolean
+hi def link ratpoisonCommandArg	Keyword
+hi def link ratpoisonComment	Comment
+hi def link ratpoisonDefCommand	Identifier
+hi def link ratpoisonGravityArg	Constant
+hi def link ratpoisonKeySeqArg	Special
+hi def link ratpoisonNumberArg	Number
+hi def link ratpoisonSetArg	Keyword
+hi def link ratpoisonStringCommand	Identifier
+hi def link ratpoisonTodo		Todo
+hi def link ratpoisonVoidCommand	Identifier
+hi def link ratpoisonWinFmtArg	Special
+hi def link ratpoisonWinNameArg	Constant
+hi def link ratpoisonWinListArg	Constant
 
-delcommand HiLink
 
 let b:current_syntax = "ratpoison"
 
diff --git a/runtime/syntax/rc.vim b/runtime/syntax/rc.vim
index 13900b339a..4c6856bc83 100644
--- a/runtime/syntax/rc.vim
+++ b/runtime/syntax/rc.vim
@@ -146,33 +146,32 @@ syn sync ccomment rcComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink rcCharacter	Character
-HiLink rcSpecialCharacter rcSpecial
-HiLink rcNumber	Number
-HiLink rcFloat	Float
-HiLink rcOctalError	rcError
-HiLink rcParenError	rcError
-HiLink rcInParen	rcError
-HiLink rcCommentError	rcError
-HiLink rcInclude	Include
-HiLink rcPreProc	PreProc
-HiLink rcDefine	Macro
-HiLink rcIncluded	rcString
-HiLink rcError	Error
-HiLink rcPreCondit	PreCondit
-HiLink rcCommentString rcString
-HiLink rcComment2String rcString
-HiLink rcCommentSkip	rcComment
-HiLink rcString	String
-HiLink rcComment	Comment
-HiLink rcSpecial	SpecialChar
-HiLink rcTodo	Todo
-
-HiLink rcAttribute	rcCommonAttribute
-HiLink rcStdId	rcStatement
-HiLink rcStatement	Statement
+
+hi def link rcCharacter	Character
+hi def link rcSpecialCharacter rcSpecial
+hi def link rcNumber	Number
+hi def link rcFloat	Float
+hi def link rcOctalError	rcError
+hi def link rcParenError	rcError
+hi def link rcInParen	rcError
+hi def link rcCommentError	rcError
+hi def link rcInclude	Include
+hi def link rcPreProc	PreProc
+hi def link rcDefine	Macro
+hi def link rcIncluded	rcString
+hi def link rcError	Error
+hi def link rcPreCondit	PreCondit
+hi def link rcCommentString rcString
+hi def link rcComment2String rcString
+hi def link rcCommentSkip	rcComment
+hi def link rcString	String
+hi def link rcComment	Comment
+hi def link rcSpecial	SpecialChar
+hi def link rcTodo	Todo
+
+hi def link rcAttribute	rcCommonAttribute
+hi def link rcStdId	rcStatement
+hi def link rcStatement	Statement
 
 " Default color overrides
 hi def rcLanguage	term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow
@@ -183,9 +182,8 @@ hi def rcParam	ctermfg=DarkGreen guifg=DarkGreen
 hi def rcStatement	ctermfg=DarkGreen guifg=DarkGreen
 hi def rcCommonAttribute	ctermfg=Brown guifg=Brown
 
-"HiLink rcIdentifier	Identifier
+"hi def link rcIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "rc"
 
diff --git a/runtime/syntax/rcs.vim b/runtime/syntax/rcs.vim
index 5fa66c49b0..5a34802ada 100644
--- a/runtime/syntax/rcs.vim
+++ b/runtime/syntax/rcs.vim
@@ -50,16 +50,14 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rcsKeyword     Keyword
-HiLink rcsNumber      Identifier
-HiLink rcsString      String
-HiLink rcsTextStr     String
-HiLink rcsSpecial     Special
-HiLink rcsDiffLines   Special
-HiLink rcsEOFError    Error
+hi def link rcsKeyword     Keyword
+hi def link rcsNumber      Identifier
+hi def link rcsString      String
+hi def link rcsTextStr     String
+hi def link rcsSpecial     Special
+hi def link rcsDiffLines   Special
+hi def link rcsEOFError    Error
 
-delcommand HiLink
 
 let b:current_syntax = "rcs"
diff --git a/runtime/syntax/rcslog.vim b/runtime/syntax/rcslog.vim
index 8451852993..18f4593c77 100644
--- a/runtime/syntax/rcslog.vim
+++ b/runtime/syntax/rcslog.vim
@@ -14,13 +14,11 @@ syn match rcslogDate		"^date: .*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rcslogFile		Type
-HiLink rcslogRevision	Constant
-HiLink rcslogDate		Identifier
+hi def link rcslogFile		Type
+hi def link rcslogRevision	Constant
+hi def link rcslogDate		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "rcslog"
 
diff --git a/runtime/syntax/rebol.vim b/runtime/syntax/rebol.vim
index 9c367b01b7..a5d50c4ab1 100644
--- a/runtime/syntax/rebol.vim
+++ b/runtime/syntax/rebol.vim
@@ -139,56 +139,54 @@ syn keyword     rebolConstant   none
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink rebolTodo     Todo
-
-HiLink rebolStatement Statement
-HiLink rebolLabel	Label
-HiLink rebolConditional Conditional
-HiLink rebolRepeat	Repeat
-
-HiLink rebolOperator	Operator
-HiLink rebolLogicOperator rebolOperator
-HiLink rebolLogicFunction rebolLogicOperator
-HiLink rebolMathOperator rebolOperator
-HiLink rebolMathFunction rebolMathOperator
-HiLink rebolBinaryOperator rebolOperator
-HiLink rebolBinaryFunction rebolBinaryOperator
-
-HiLink rebolType     Type
-HiLink rebolTypeFunction rebolOperator
-
-HiLink rebolWord     Identifier
-HiLink rebolWordPath rebolWord
-HiLink rebolFunction	Function
-
-HiLink rebolCharacter Character
-HiLink rebolSpecialCharacter SpecialChar
-HiLink rebolString	String
-
-HiLink rebolNumber   Number
-HiLink rebolInteger  rebolNumber
-HiLink rebolDecimal  rebolNumber
-HiLink rebolTime     rebolNumber
-HiLink rebolDate     rebolNumber
-HiLink rebolMoney    rebolNumber
-HiLink rebolBinary   rebolNumber
-HiLink rebolEmail    rebolString
-HiLink rebolFile     rebolString
-HiLink rebolURL      rebolString
-HiLink rebolIssue    rebolNumber
-HiLink rebolTuple    rebolNumber
-HiLink rebolFloat    Float
-HiLink rebolBoolean  Boolean
-
-HiLink rebolConstant Constant
-
-HiLink rebolComment	Comment
-
-HiLink rebolError	Error
-
-delcommand HiLink
+
+hi def link rebolTodo     Todo
+
+hi def link rebolStatement Statement
+hi def link rebolLabel	Label
+hi def link rebolConditional Conditional
+hi def link rebolRepeat	Repeat
+
+hi def link rebolOperator	Operator
+hi def link rebolLogicOperator rebolOperator
+hi def link rebolLogicFunction rebolLogicOperator
+hi def link rebolMathOperator rebolOperator
+hi def link rebolMathFunction rebolMathOperator
+hi def link rebolBinaryOperator rebolOperator
+hi def link rebolBinaryFunction rebolBinaryOperator
+
+hi def link rebolType     Type
+hi def link rebolTypeFunction rebolOperator
+
+hi def link rebolWord     Identifier
+hi def link rebolWordPath rebolWord
+hi def link rebolFunction	Function
+
+hi def link rebolCharacter Character
+hi def link rebolSpecialCharacter SpecialChar
+hi def link rebolString	String
+
+hi def link rebolNumber   Number
+hi def link rebolInteger  rebolNumber
+hi def link rebolDecimal  rebolNumber
+hi def link rebolTime     rebolNumber
+hi def link rebolDate     rebolNumber
+hi def link rebolMoney    rebolNumber
+hi def link rebolBinary   rebolNumber
+hi def link rebolEmail    rebolString
+hi def link rebolFile     rebolString
+hi def link rebolURL      rebolString
+hi def link rebolIssue    rebolNumber
+hi def link rebolTuple    rebolNumber
+hi def link rebolFloat    Float
+hi def link rebolBoolean  Boolean
+
+hi def link rebolConstant Constant
+
+hi def link rebolComment	Comment
+
+hi def link rebolError	Error
+
 
 if exists("my_rebol_file")
   if file_readable(expand(my_rebol_file))
diff --git a/runtime/syntax/registry.vim b/runtime/syntax/registry.vim
index 652b609f09..67b5e49bcb 100644
--- a/runtime/syntax/registry.vim
+++ b/runtime/syntax/registry.vim
@@ -82,22 +82,20 @@ syn match registryHex		"^\s*\([0-9a-fA-F]\{2},\)\{0,999}\([0-9a-fA-F]\{2}\|\\\)$
 " Dword (32 bits)
 syn match registryDword		"dword:[0-9a-fA-F]\{8}$" contains=registrySpecial
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink registryComment	Comment
-HiLink registryHead		Constant
-HiLink registryHKEY		Constant
-HiLink registryPath		Special
-HiLink registryRemove	PreProc
-HiLink registryGUID		Identifier
-HiLink registrySpecial	Special
-HiLink registrySubKey	Type
-HiLink registryString	String
-HiLink registryHex		Number
-HiLink registryDword		Number
-
-delcommand HiLink
+hi def link registryComment	Comment
+hi def link registryHead		Constant
+hi def link registryHKEY		Constant
+hi def link registryPath		Special
+hi def link registryRemove	PreProc
+hi def link registryGUID		Identifier
+hi def link registrySpecial	Special
+hi def link registrySubKey	Type
+hi def link registryString	String
+hi def link registryHex		Number
+hi def link registryDword		Number
+
 
 
 let b:current_syntax = "registry"
diff --git a/runtime/syntax/remind.vim b/runtime/syntax/remind.vim
index 8e4e554343..9e7ff22e14 100644
--- a/runtime/syntax/remind.vim
+++ b/runtime/syntax/remind.vim
@@ -47,28 +47,26 @@ syn match remindDates		"'[0-9]\{4}[/-][0-9]\{1,2}[/-][0-9]\{1,2}\(@[0-9]\{1,2}[:
 syn match remindWarning		display excludenl "\S\s\+$"ms=s+1
 
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink remindCommands		Function
-HiLink remindExpiry		Repeat
-HiLink remindTag		Label
-HiLink remindTimed		Statement
-HiLink remindMove		Statement
-HiLink remindSpecial		Include
-HiLink remindRun		Function
-HiLink remindConditional	Conditional
-HiLink remindComment		Comment
-HiLink remindTimes		String
-HiLink remindString		String
-HiLink remindDebug		Debug
-HiLink remindVar		Identifier
-HiLink remindSubst		Constant
-HiLink remindAdvanceNumber	Number
-HiLink remindDateSeparators	Comment
-HiLink remindDates		String
-HiLink remindWarning		Error
+hi def link remindCommands		Function
+hi def link remindExpiry		Repeat
+hi def link remindTag		Label
+hi def link remindTimed		Statement
+hi def link remindMove		Statement
+hi def link remindSpecial		Include
+hi def link remindRun		Function
+hi def link remindConditional	Conditional
+hi def link remindComment		Comment
+hi def link remindTimes		String
+hi def link remindString		String
+hi def link remindDebug		Debug
+hi def link remindVar		Identifier
+hi def link remindSubst		Constant
+hi def link remindAdvanceNumber	Number
+hi def link remindDateSeparators	Comment
+hi def link remindDates		String
+hi def link remindWarning		Error
 
-delcommand HiLink
 
 let b:current_syntax = "remind"
 
diff --git a/runtime/syntax/resolv.vim b/runtime/syntax/resolv.vim
index 1744e66f82..a879116a5f 100644
--- a/runtime/syntax/resolv.vim
+++ b/runtime/syntax/resolv.vim
@@ -49,31 +49,29 @@ syn match resolvOption /\<\%(ndots\|timeout\|attempts\):\d\+\>/ contained contai
 " Additional errors
 syn match resolvError /^search .\{257,}/
 
-command! -nargs=+ HiLink hi def link <args>
-
-HiLink resolvIP Number
-HiLink resolvIPNetmask Number
-HiLink resolvHostname String
-HiLink resolvOption String
-
-HiLink resolvIPNameserver Number
-HiLink resolvHostnameSearch String
-HiLink resolvIPNetmaskSortList Number
-
-HiLink resolvNameServer Identifier
-HiLink resolvLwserver Identifier
-HiLink resolvDomain Identifier
-HiLink resolvSearch Identifier
-HiLink resolvSortList Identifier
-HiLink resolvOptions Identifier
-
-HiLink resolvComment Comment
-HiLink resolvOperator Operator
-HiLink resolvError Error
-HiLink resolvIPError Error
-HiLink resolvIPSpecial Special
-
-delcommand HiLink
+
+hi def link resolvIP Number
+hi def link resolvIPNetmask Number
+hi def link resolvHostname String
+hi def link resolvOption String
+
+hi def link resolvIPNameserver Number
+hi def link resolvHostnameSearch String
+hi def link resolvIPNetmaskSortList Number
+
+hi def link resolvNameServer Identifier
+hi def link resolvLwserver Identifier
+hi def link resolvDomain Identifier
+hi def link resolvSearch Identifier
+hi def link resolvSortList Identifier
+hi def link resolvOptions Identifier
+
+hi def link resolvComment Comment
+hi def link resolvOperator Operator
+hi def link resolvError Error
+hi def link resolvIPError Error
+hi def link resolvIPSpecial Special
+
 
 let b:current_syntax = "resolv"
 
diff --git a/runtime/syntax/rexx.vim b/runtime/syntax/rexx.vim
index b22af93c18..360fc8ff9f 100644
--- a/runtime/syntax/rexx.vim
+++ b/runtime/syntax/rexx.vim
@@ -242,78 +242,76 @@ exec "syn sync fromstart"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " make binary and hex strings stand out
 hi rexxStringConstant term=bold,underline ctermfg=5 cterm=bold guifg=darkMagenta gui=bold
 
-HiLink rexxLabel2		Function
-HiLink doLoopSelectLabelRegion	rexxKeyword
-HiLink endIterateLeaveLabelRegion	rexxKeyword
-HiLink rexxLoopKeywords	rexxKeyword " Todo
-
-HiLink rexxNumber		Normal "DiffChange
-"  HiLink rexxIdentifier		DiffChange
-
-HiLink rexxRegularCallSignal	Statement
-HiLink rexxExceptionHandling	Statement
-
-HiLink rexxLabel		Function
-HiLink rexxCharacter		Character
-HiLink rexxParenError		rexxError
-HiLink rexxInParen		rexxError
-HiLink rexxCommentError	rexxError
-HiLink rexxError		Error
-HiLink rexxKeyword		Statement
-HiLink rexxKeywordStatements	Statement
-
-HiLink rexxFunction		Function
-HiLink rexxString		String
-HiLink rexxComment		Comment
-HiLink rexxTodo		Todo
-HiLink rexxSpecialVariable	Special
-HiLink rexxConditional	rexxKeyword
-
-HiLink rexxOperator		Operator
-HiLink rexxMessageOperator	rexxOperator
-HiLink rexxLineComment	Comment
-
-HiLink rexxLineContinue	WildMenu
-
-HiLink rexxDirective		rexxKeyword
-HiLink rexxClassDirective	Type
-HiLink rexxMethodDirective	rexxFunction
-HiLink rexxAttributeDirective	rexxFunction
-HiLink rexxRequiresDirective	Include
-HiLink rexxRoutineDirective	rexxFunction
+hi def link rexxLabel2		Function
+hi def link doLoopSelectLabelRegion	rexxKeyword
+hi def link endIterateLeaveLabelRegion	rexxKeyword
+hi def link rexxLoopKeywords	rexxKeyword " Todo
+
+hi def link rexxNumber		Normal "DiffChange
+"  hi def link rexxIdentifier		DiffChange
+
+hi def link rexxRegularCallSignal	Statement
+hi def link rexxExceptionHandling	Statement
+
+hi def link rexxLabel		Function
+hi def link rexxCharacter		Character
+hi def link rexxParenError		rexxError
+hi def link rexxInParen		rexxError
+hi def link rexxCommentError	rexxError
+hi def link rexxError		Error
+hi def link rexxKeyword		Statement
+hi def link rexxKeywordStatements	Statement
+
+hi def link rexxFunction		Function
+hi def link rexxString		String
+hi def link rexxComment		Comment
+hi def link rexxTodo		Todo
+hi def link rexxSpecialVariable	Special
+hi def link rexxConditional	rexxKeyword
+
+hi def link rexxOperator		Operator
+hi def link rexxMessageOperator	rexxOperator
+hi def link rexxLineComment	Comment
+
+hi def link rexxLineContinue	WildMenu
+
+hi def link rexxDirective		rexxKeyword
+hi def link rexxClassDirective	Type
+hi def link rexxMethodDirective	rexxFunction
+hi def link rexxAttributeDirective	rexxFunction
+hi def link rexxRequiresDirective	Include
+hi def link rexxRoutineDirective	rexxFunction
 
 " rgf, 2012-09-09
-HiLink rexxOptionsDirective	rexxFunction
-HiLink rexxOptionsDirective2  rexxOptionsDirective
-HiLink rexxOptionsDirective3  Normal " rexxOptionsDirective
+hi def link rexxOptionsDirective	rexxFunction
+hi def link rexxOptionsDirective2  rexxOptionsDirective
+hi def link rexxOptionsDirective3  Normal " rexxOptionsDirective
 
-HiLink rexxConstantDirective	rexxFunction
+hi def link rexxConstantDirective	rexxFunction
 
-HiLink rexxConst		Constant
-HiLink rexxTypeSpecifier	Type
-HiLink rexxBuiltinClass	rexxTypeSpecifier
+hi def link rexxConst		Constant
+hi def link rexxTypeSpecifier	Type
+hi def link rexxBuiltinClass	rexxTypeSpecifier
 
-HiLink rexxEnvironmentSymbol  rexxConst
-HiLink rexxMessage		rexxFunction
+hi def link rexxEnvironmentSymbol  rexxConst
+hi def link rexxMessage		rexxFunction
 
-HiLink rexxParse              rexxKeyword
-HiLink rexxParse2             rexxParse
+hi def link rexxParse              rexxKeyword
+hi def link rexxParse2             rexxParse
 
-HiLink rexxGuard              rexxKeyword
-HiLink rexxTrace              rexxKeyword
+hi def link rexxGuard              rexxKeyword
+hi def link rexxTrace              rexxKeyword
 
-HiLink rexxRaise              rexxKeyword
-HiLink rexxRaise2             rexxRaise
+hi def link rexxRaise              rexxKeyword
+hi def link rexxRaise2             rexxRaise
 
-HiLink rexxForward            rexxKeyword
-HiLink rexxForward2           rexxForward
+hi def link rexxForward            rexxKeyword
+hi def link rexxForward2           rexxForward
 
-delcommand HiLink
 
 let b:current_syntax = "rexx"
 
diff --git a/runtime/syntax/rib.vim b/runtime/syntax/rib.vim
index 3d2235ffcb..0ee607122f 100644
--- a/runtime/syntax/rib.vim
+++ b/runtime/syntax/rib.vim
@@ -44,19 +44,17 @@ syn match	ribFloat	  display contained "[-]\=\.\d\+\(e[-+]\=\d\+\)\=\>"
 syn match	ribFloat	  display contained "[-]\=\d\+e[-+]\d\+\>"
 syn case match
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ribStructure		Structure
-HiLink ribCommand		Statement
+hi def link ribStructure		Structure
+hi def link ribCommand		Statement
 
-HiLink ribStructureComment	SpecialComment
-HiLink ribLineComment		Comment
+hi def link ribStructureComment	SpecialComment
+hi def link ribLineComment		Comment
 
-HiLink ribString		String
-HiLink ribNumber		Number
-HiLink ribFloat		Float
+hi def link ribString		String
+hi def link ribNumber		Number
+hi def link ribFloat		Float
 
-delcommand HiLink
 
 
 let b:current_syntax = "rib"
diff --git a/runtime/syntax/robots.vim b/runtime/syntax/robots.vim
index 23be8d2280..396bf52b25 100644
--- a/runtime/syntax/robots.vim
+++ b/runtime/syntax/robots.vim
@@ -38,19 +38,17 @@ syn match  robotsUrl		"http[s]\=://\S*"
 syn match  robotsMail		"\S*@\S*"
 syn region robotsString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+
 
-command -nargs=+ HiLink hi def link <args>
-
-HiLink robotsComment		Comment
-HiLink robotsAgent		Type
-HiLink robotsDisallow		Statement
-HiLink robotsLine		Special
-HiLink robotsStar		Operator
-HiLink robotsDelimiter	Delimiter
-HiLink robotsUrl		String
-HiLink robotsMail		String
-HiLink robotsString		String
-
-delcommand HiLink
+
+hi def link robotsComment		Comment
+hi def link robotsAgent		Type
+hi def link robotsDisallow		Statement
+hi def link robotsLine		Special
+hi def link robotsStar		Operator
+hi def link robotsDelimiter	Delimiter
+hi def link robotsUrl		String
+hi def link robotsMail		String
+hi def link robotsString		String
+
 
 
 let b:current_syntax = "robots"
diff --git a/runtime/syntax/rpcgen.vim b/runtime/syntax/rpcgen.vim
index ee4cc3fdab..08183d43a4 100644
--- a/runtime/syntax/rpcgen.vim
+++ b/runtime/syntax/rpcgen.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	rpcgen
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Jan 13, 2015
-" Version:	10
+" Last Change:	Aug 31, 2016
+" Version:	12
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_RPCGEN
 
 if exists("b:current_syntax")
@@ -24,23 +24,22 @@ syn match   rpcProgNmbrErr contained	"=\s*0x[^23]\x*"ms=s+1
 syn match   rpcPassThru			"^\s*%.*$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_rpcgen_syntax_inits")
 
-HiLink rpcProgName	rpcName
-HiLink rpcProgram	rpcStatement
-HiLink rpcVersName	rpcName
-HiLink rpcVersion	rpcStatement
+  hi def link rpcProgName	rpcName
+  hi def link rpcProgram	rpcStatement
+  hi def link rpcVersName	rpcName
+  hi def link rpcVersion	rpcStatement
 
-HiLink rpcDecl	cType
-HiLink rpcPassThru	cComment
+  hi def link rpcDecl	cType
+  hi def link rpcPassThru	cComment
 
-HiLink rpcName	Special
-HiLink rpcProcNmbr	Delimiter
-HiLink rpcProgNmbrErr	Error
-HiLink rpcStatement	Statement
+  hi def link rpcName	Special
+  hi def link rpcProcNmbr	Delimiter
+  hi def link rpcProgNmbrErr	Error
+  hi def link rpcStatement	Statement
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "rpcgen"
 
diff --git a/runtime/syntax/rpl.vim b/runtime/syntax/rpl.vim
index d2bffbaaae..f339f7ae6e 100644
--- a/runtime/syntax/rpl.vim
+++ b/runtime/syntax/rpl.vim
@@ -415,68 +415,66 @@ syntax match rplTab "\t"  transparent
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink highlight default link <args>
 
 " The default highlighting.
 
-HiLink rplControl		Statement
-HiLink rplStatement		Statement
-HiLink rplAlgConditional	Conditional
-HiLink rplConditional		Repeat
-HiLink rplConditionalError	Error
-HiLink rplRepeat		Repeat
-HiLink rplCycle		Repeat
-HiLink rplUntil		Repeat
-HiLink rplIntrinsic		Special
-HiLink rplStorage		StorageClass
-HiLink rplStorageExpr		StorageClass
-HiLink rplStorageError	Error
-HiLink rplReadWrite		rplIntrinsic
-
-HiLink rplOperator		Operator
-
-HiLink rplList		Special
-HiLink rplArray		Special
-HiLink rplConstant		Identifier
-HiLink rplExpr		Type
-
-HiLink rplString		String
-HiLink rplStringGuilles	String
-HiLink rplStringAntislash	String
-
-HiLink rplBinary		Boolean
-HiLink rplOctal		Boolean
-HiLink rplDecimal		Boolean
-HiLink rplHexadecimal		Boolean
-HiLink rplInteger		Number
-HiLink rplFloat		Float
-HiLink rplComplex		Float
-HiLink rplBoolean		Identifier
-
-HiLink rplObsolete		Todo
-
-HiLink rplPreCondit		PreCondit
-HiLink rplInclude		Include
-HiLink rplIncluded		rplString
-HiLink rplInclude		Include
-HiLink rplExecPath		Include
-HiLink rplPreProc		PreProc
-HiLink rplComment		Comment
-HiLink rplCommentLine		Comment
-HiLink rplCommentString	Comment
-HiLink rplSubDelimitor	rplStorage
-HiLink rplCommentError	Error
-HiLink rplParenError		Error
-HiLink rplSubError		Error
-HiLink rplArrayError		Error
-HiLink rplListError		Error
-HiLink rplTab			Error
-HiLink rplBinaryError		Error
-HiLink rplOctalError		Error
-HiLink rplDecimalError	Error
-HiLink rplHexadecimalError	Error
-
-delcommand HiLink
+hi def link rplControl		Statement
+hi def link rplStatement		Statement
+hi def link rplAlgConditional	Conditional
+hi def link rplConditional		Repeat
+hi def link rplConditionalError	Error
+hi def link rplRepeat		Repeat
+hi def link rplCycle		Repeat
+hi def link rplUntil		Repeat
+hi def link rplIntrinsic		Special
+hi def link rplStorage		StorageClass
+hi def link rplStorageExpr		StorageClass
+hi def link rplStorageError	Error
+hi def link rplReadWrite		rplIntrinsic
+
+hi def link rplOperator		Operator
+
+hi def link rplList		Special
+hi def link rplArray		Special
+hi def link rplConstant		Identifier
+hi def link rplExpr		Type
+
+hi def link rplString		String
+hi def link rplStringGuilles	String
+hi def link rplStringAntislash	String
+
+hi def link rplBinary		Boolean
+hi def link rplOctal		Boolean
+hi def link rplDecimal		Boolean
+hi def link rplHexadecimal		Boolean
+hi def link rplInteger		Number
+hi def link rplFloat		Float
+hi def link rplComplex		Float
+hi def link rplBoolean		Identifier
+
+hi def link rplObsolete		Todo
+
+hi def link rplPreCondit		PreCondit
+hi def link rplInclude		Include
+hi def link rplIncluded		rplString
+hi def link rplInclude		Include
+hi def link rplExecPath		Include
+hi def link rplPreProc		PreProc
+hi def link rplComment		Comment
+hi def link rplCommentLine		Comment
+hi def link rplCommentString	Comment
+hi def link rplSubDelimitor	rplStorage
+hi def link rplCommentError	Error
+hi def link rplParenError		Error
+hi def link rplSubError		Error
+hi def link rplArrayError		Error
+hi def link rplListError		Error
+hi def link rplTab			Error
+hi def link rplBinaryError		Error
+hi def link rplOctalError		Error
+hi def link rplDecimalError	Error
+hi def link rplHexadecimalError	Error
+
 
 let b:current_syntax = "rpl"
 
diff --git a/runtime/syntax/rtf.vim b/runtime/syntax/rtf.vim
index 0c63e8d523..c856f9ffcf 100644
--- a/runtime/syntax/rtf.vim
+++ b/runtime/syntax/rtf.vim
@@ -50,26 +50,24 @@ syn match rtfFootNote "[#$K+]{\\footnote.*}" contains=rtfControlWord,rtfNewContr
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
-HiLink rtfControlWord		Statement
-HiLink rtfNewControlWord	Special
-HiLink rtfControlSymbol	Constant
-HiLink rtfCharacter		Character
-HiLink rtfUnicodeCharacter	SpecialChar
-HiLink rtfFootNote		Comment
+hi def link rtfControlWord		Statement
+hi def link rtfNewControlWord	Special
+hi def link rtfControlSymbol	Constant
+hi def link rtfCharacter		Character
+hi def link rtfUnicodeCharacter	SpecialChar
+hi def link rtfFootNote		Comment
 
 " Define colors for the syntax file
 hi rtfRed	      term=underline cterm=underline ctermfg=DarkRed gui=underline guifg=DarkRed
 hi rtfGreen	      term=underline cterm=underline ctermfg=DarkGreen gui=underline guifg=DarkGreen
 hi rtfBlue	      term=underline cterm=underline ctermfg=DarkBlue gui=underline guifg=DarkBlue
 
-HiLink rtfRed	rtfRed
-HiLink rtfGreen	rtfGreen
-HiLink rtfBlue	rtfBlue
+hi def link rtfRed	rtfRed
+hi def link rtfGreen	rtfGreen
+hi def link rtfBlue	rtfBlue
 
-delcommand HiLink
 
 
 let b:current_syntax = "rtf"
diff --git a/runtime/syntax/samba.vim b/runtime/syntax/samba.vim
index ddd35a8e3d..5b866cc6d9 100644
--- a/runtime/syntax/samba.vim
+++ b/runtime/syntax/samba.vim
@@ -105,15 +105,13 @@ syn keyword sambaKeyword contained store unknown unwriteable
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink sambaParameter Normal
-HiLink sambaKeyword   Type
-HiLink sambaSection   Statement
-HiLink sambaMacro     PreProc
-HiLink sambaComment   Comment
-HiLink sambaContinue  Operator
-HiLink sambaBoolean   Constant
-delcommand HiLink
+hi def link sambaParameter Normal
+hi def link sambaKeyword   Type
+hi def link sambaSection   Statement
+hi def link sambaMacro     PreProc
+hi def link sambaComment   Comment
+hi def link sambaContinue  Operator
+hi def link sambaBoolean   Constant
 
 let b:current_syntax = "samba"
 
diff --git a/runtime/syntax/sas.vim b/runtime/syntax/sas.vim
index a99501103d..90d411dc8b 100644
--- a/runtime/syntax/sas.vim
+++ b/runtime/syntax/sas.vim
@@ -41,7 +41,7 @@ syn region sasComment start=";\s*\*"hs=s+1 end=";" contains=sasTodo
 " Comments with * starting after a semicolon (Paulo Tanimoto)
 syn region sasComment start="^\s*\*" end=";" contains=sasTodo
 
-" This line defines macro variables in code.  HiLink at end of file
+" This line defines macro variables in code.  "hi def link" at end of file
 " defines the color scheme. Begin region with ampersand and end with
 " any non-word character offset by -1; put ampersand in the skip list
 " just in case it is used to concatenate macro variable values.
@@ -213,7 +213,6 @@ syn keyword sasUnderscore	_ALL_ _AUTOMATIC_ _CHARACTER_ _INFILE_ _N_ _NAME_ _NUL
 "  Define the default highlighting.
 "  Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
 
 " Default sas enhanced editor color syntax
 hi sComment	term=bold cterm=NONE ctermfg=Green ctermbg=Black gui=NONE guifg=DarkGreen guibg=White
@@ -240,25 +239,24 @@ hi lNote	term=NONE cterm=NONE ctermfg=Cyan ctermbg=Black gui=none guifg=Blue gui
 
 " Special hilighting for the SAS proc section
 
-HiLink	sasComment	sComment
-HiLink	sasConditional	sKeyword
-HiLink	sasStep		sSection
-HiLink	sasFunction	sKeyword
-HiLink	sasMacro	mKeyword
-HiLink	sasMacroVar	NonText
-HiLink	sasNumber	sNumber
-HiLink	sasStatement	sKeyword
-HiLink	sasString	sString
-HiLink	sasProc		sProc
+hi def link sasComment	sComment
+hi def link sasConditional	sKeyword
+hi def link sasStep		sSection
+hi def link sasFunction	sKeyword
+hi def link sasMacro	mKeyword
+hi def link sasMacroVar	NonText
+hi def link sasNumber	sNumber
+hi def link sasStatement	sKeyword
+hi def link sasString	sString
+hi def link sasProc		sProc
 " (Bob Heckel)
-HiLink	sasTodo		Todo
-HiLink	sasErrMsg	lError
-HiLink	sasWarnMsg	lWarning
-HiLink	sasLogMsg	lNote
-HiLink	sasCards	sCard
+hi def link sasTodo		Todo
+hi def link sasErrMsg	lError
+hi def link sasWarnMsg	lWarning
+hi def link sasLogMsg	lNote
+hi def link sasCards	sCard
 " (Bob Heckel)
-HiLink	sasUnderscore	PreProc
-delcommand HiLink
+hi def link sasUnderscore	PreProc
 
 " Syncronize from beginning to keep large blocks from losing
 " syntax coloring while moving through code.
diff --git a/runtime/syntax/sather.vim b/runtime/syntax/sather.vim
index bc35ba2dcf..baa3a825d8 100644
--- a/runtime/syntax/sather.vim
+++ b/runtime/syntax/sather.vim
@@ -59,35 +59,33 @@ syn sync ccomment satherComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink satherBranch		satherStatement
-HiLink satherLabel		satherStatement
-HiLink satherConditional	satherStatement
-HiLink satherSynchronize	satherStatement
-HiLink satherRepeat		satherStatement
-HiLink satherExceptions	satherStatement
-HiLink satherStorageClass	satherDeclarative
-HiLink satherMethodDecl	satherDeclarative
-HiLink satherClassDecl	satherDeclarative
-HiLink satherScopeDecl	satherDeclarative
-HiLink satherBoolValue	satherValue
-HiLink satherSpecial		satherValue
-HiLink satherString		satherValue
-HiLink satherCharacter	satherValue
-HiLink satherSpecialCharacter satherValue
-HiLink satherNumber		satherValue
-HiLink satherStatement	Statement
-HiLink satherOperator		Statement
-HiLink satherComment		Comment
-HiLink satherType		Type
-HiLink satherValue		String
-HiLink satherString		String
-HiLink satherSpecial		String
-HiLink satherCharacter	String
-HiLink satherDeclarative	Type
-HiLink satherExternal		PreCondit
-delcommand HiLink
+hi def link satherBranch		satherStatement
+hi def link satherLabel		satherStatement
+hi def link satherConditional	satherStatement
+hi def link satherSynchronize	satherStatement
+hi def link satherRepeat		satherStatement
+hi def link satherExceptions	satherStatement
+hi def link satherStorageClass	satherDeclarative
+hi def link satherMethodDecl	satherDeclarative
+hi def link satherClassDecl	satherDeclarative
+hi def link satherScopeDecl	satherDeclarative
+hi def link satherBoolValue	satherValue
+hi def link satherSpecial		satherValue
+hi def link satherString		satherValue
+hi def link satherCharacter	satherValue
+hi def link satherSpecialCharacter satherValue
+hi def link satherNumber		satherValue
+hi def link satherStatement	Statement
+hi def link satherOperator		Statement
+hi def link satherComment		Comment
+hi def link satherType		Type
+hi def link satherValue		String
+hi def link satherString		String
+hi def link satherSpecial		String
+hi def link satherCharacter	String
+hi def link satherDeclarative	Type
+hi def link satherExternal		PreCondit
 
 let b:current_syntax = "sather"
 
diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim
index ac50ead6ce..af9a659e07 100644
--- a/runtime/syntax/scheme.vim
+++ b/runtime/syntax/scheme.vim
@@ -300,29 +300,27 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink schemeSyntax		Statement
-HiLink schemeFunc		Function
+hi def link schemeSyntax		Statement
+hi def link schemeFunc		Function
 
-HiLink schemeString		String
-HiLink schemeCharacter	Character
-HiLink schemeNumber		Number
-HiLink schemeBoolean		Boolean
+hi def link schemeString		String
+hi def link schemeCharacter	Character
+hi def link schemeNumber		Number
+hi def link schemeBoolean		Boolean
 
-HiLink schemeDelimiter	Delimiter
-HiLink schemeConstant		Constant
+hi def link schemeDelimiter	Delimiter
+hi def link schemeConstant		Constant
 
-HiLink schemeComment		Comment
-HiLink schemeMultilineComment	Comment
-HiLink schemeError		Error
+hi def link schemeComment		Comment
+hi def link schemeMultilineComment	Comment
+hi def link schemeError		Error
 
-HiLink schemeExtSyntax	Type
-HiLink schemeExtFunc		PreProc
+hi def link schemeExtSyntax	Type
+hi def link schemeExtFunc		PreProc
 
-HiLink schemeLang		PreProc
+hi def link schemeLang		PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "scheme"
 
diff --git a/runtime/syntax/scilab.vim b/runtime/syntax/scilab.vim
index bee4007f57..03e123b058 100644
--- a/runtime/syntax/scilab.vim
+++ b/runtime/syntax/scilab.vim
@@ -64,40 +64,38 @@ syn match scilabOverload			"%[A-Za-z0-9?!_#$]\+_[A-Za-z0-9?!_#$]\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink	scilabStatement				Statement
-HiLink	scilabFunction				Keyword
-HiLink	scilabPredicate				Keyword
-HiLink	scilabKeyword				Keyword
-HiLink	scilabDebug					Debug
-HiLink	scilabRepeat				Repeat
-HiLink	scilabConditional			Conditional
-HiLink	scilabMultiplex				Conditional
-
-HiLink	scilabConstant				Constant
-HiLink	scilabBoolean				Boolean
-
-HiLink	scilabDelimiter				Delimiter
-HiLink	scilabMlistAccess			Delimiter
-HiLink	scilabComparison			Operator
-HiLink	scilabLogical				Operator
-HiLink	scilabAssignment			Operator
-HiLink	scilabArithmetic			Operator
-HiLink	scilabRange					Operator
-HiLink	scilabLineContinuation		Underlined
-HiLink	scilabTransposition			Operator
-
-HiLink	scilabTodo					Todo
-HiLink	scilabComment				Comment
-
-HiLink	scilabNumber				Number
-HiLink	scilabString				String
-
-HiLink	scilabIdentifier			Identifier
-HiLink	scilabOverload				Special
-
-delcommand HiLink
+
+hi def link scilabStatement				Statement
+hi def link scilabFunction				Keyword
+hi def link scilabPredicate				Keyword
+hi def link scilabKeyword				Keyword
+hi def link scilabDebug					Debug
+hi def link scilabRepeat				Repeat
+hi def link scilabConditional			Conditional
+hi def link scilabMultiplex				Conditional
+
+hi def link scilabConstant				Constant
+hi def link scilabBoolean				Boolean
+
+hi def link scilabDelimiter				Delimiter
+hi def link scilabMlistAccess			Delimiter
+hi def link scilabComparison			Operator
+hi def link scilabLogical				Operator
+hi def link scilabAssignment			Operator
+hi def link scilabArithmetic			Operator
+hi def link scilabRange					Operator
+hi def link scilabLineContinuation		Underlined
+hi def link scilabTransposition			Operator
+
+hi def link scilabTodo					Todo
+hi def link scilabComment				Comment
+
+hi def link scilabNumber				Number
+hi def link scilabString				String
+
+hi def link scilabIdentifier			Identifier
+hi def link scilabOverload				Special
+
 
 let b:current_syntax = "scilab"
 
diff --git a/runtime/syntax/sd.vim b/runtime/syntax/sd.vim
index 015c1f0890..b497ba5eaa 100644
--- a/runtime/syntax/sd.vim
+++ b/runtime/syntax/sd.vim
@@ -50,22 +50,20 @@ syn keyword sdSpecial TRUE FALSE NULL
 syn keyword sdDelimiter STREAM STREAM_END
 syn match sdError /^search .\{257,}/
 
-command! -nargs=+ HiLink hi def link <args>
 
-HiLink sdIP Number
-HiLink sdHostname Type
-HiLink sdEncoding Identifier
-HiLink sdCoding Identifier
-HiLink sdSource Identifier
-HiLink sdComment Comment
-HiLink sdIPError Error
-HiLink sdError Error
-HiLink sdStatement Statement
-HiLink sdIPSpecial Special
-HiLink sdSpecial Special
-HiLink sdDelimiter Delimiter
+hi def link sdIP Number
+hi def link sdHostname Type
+hi def link sdEncoding Identifier
+hi def link sdCoding Identifier
+hi def link sdSource Identifier
+hi def link sdComment Comment
+hi def link sdIPError Error
+hi def link sdError Error
+hi def link sdStatement Statement
+hi def link sdIPSpecial Special
+hi def link sdSpecial Special
+hi def link sdDelimiter Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "sd"
 
diff --git a/runtime/syntax/sdl.vim b/runtime/syntax/sdl.vim
index 51086dad1f..7df38d1955 100644
--- a/runtime/syntax/sdl.vim
+++ b/runtime/syntax/sdl.vim
@@ -127,27 +127,25 @@ syn sync ccomment sdlComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 command -nargs=+ Hi     hi def <args>
 
-HiLink  sdlException	Label
-HiLink  sdlConditional	sdlStatement
-HiLink  sdlVirtual		sdlStatement
-HiLink  sdlExported		sdlFlag
-HiLink  sdlCommentError	sdlError
-HiLink  sdlOperator		Operator
-HiLink  sdlStructure	sdlType
+hi def link sdlException	Label
+hi def link sdlConditional	sdlStatement
+hi def link sdlVirtual		sdlStatement
+hi def link sdlExported		sdlFlag
+hi def link sdlCommentError	sdlError
+hi def link sdlOperator		Operator
+hi def link sdlStructure	sdlType
 Hi	    sdlStatement	term=bold ctermfg=4 guifg=Blue
 Hi	    sdlFlag		term=bold ctermfg=4 guifg=Blue gui=italic
 Hi	    sdlNewState		term=italic ctermfg=2 guifg=Magenta gui=underline
 Hi	    sdlInput		term=bold guifg=Red
-HiLink  sdlType		Type
-HiLink  sdlString		String
-HiLink  sdlComment		Comment
-HiLink  sdlSpecial		Special
-HiLink  sdlError		Error
+hi def link sdlType		Type
+hi def link sdlString		String
+hi def link sdlComment		Comment
+hi def link sdlSpecial		Special
+hi def link sdlError		Error
 
-delcommand HiLink
 delcommand Hi
 
 let b:current_syntax = "sdl"
diff --git a/runtime/syntax/sgmldecl.vim b/runtime/syntax/sgmldecl.vim
index 1bf1b49e34..6c1cde15ae 100644
--- a/runtime/syntax/sgmldecl.vim
+++ b/runtime/syntax/sgmldecl.vim
@@ -50,21 +50,19 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink	sgmldeclDeclKeys	Keyword
-HiLink	sgmldeclTypes		Type
-HiLink	sgmldeclConst		Constant
-HiLink	sgmldeclNConst		Constant
-HiLink	sgmldeclString		String
-HiLink	sgmldeclDeclBlock	Normal
-HiLink	sgmldeclBool		Boolean
-HiLink	sgmldeclSpecial		Special
-HiLink	sgmldeclComment		Comment
-HiLink	sgmldeclStatem		Statement
-HiLink	sgmldeclVariables	Type
-
-delcommand HiLink
+
+hi def link sgmldeclDeclKeys	Keyword
+hi def link sgmldeclTypes		Type
+hi def link sgmldeclConst		Constant
+hi def link sgmldeclNConst		Constant
+hi def link sgmldeclString		String
+hi def link sgmldeclDeclBlock	Normal
+hi def link sgmldeclBool		Boolean
+hi def link sgmldeclSpecial		Special
+hi def link sgmldeclComment		Comment
+hi def link sgmldeclStatem		Statement
+hi def link sgmldeclVariables	Type
+
 
 let b:current_syntax = "sgmldecl"
 
diff --git a/runtime/syntax/sgmllnx.vim b/runtime/syntax/sgmllnx.vim
index 7fd633d404..ccd78f494a 100644
--- a/runtime/syntax/sgmllnx.vim
+++ b/runtime/syntax/sgmllnx.vim
@@ -34,22 +34,20 @@ syn region sgmllnxDocType start=+<!doctype+ end=+>+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink sgmllnxTag2	    Function
-HiLink sgmllnxTagN2	    Function
-HiLink sgmllnxTag	    Special
-HiLink sgmllnxEndTag	    Special
-HiLink sgmllnxParen	    Special
-HiLink sgmllnxEntity	    Type
-HiLink sgmllnxDocEnt	    Type
-HiLink sgmllnxTagName	    Statement
-HiLink sgmllnxComment	    Comment
-HiLink sgmllnxSpecial	    Special
-HiLink sgmllnxDocType	    PreProc
-HiLink sgmllnxTagError    Error
-
-delcommand HiLink
+
+hi def link sgmllnxTag2	    Function
+hi def link sgmllnxTagN2	    Function
+hi def link sgmllnxTag	    Special
+hi def link sgmllnxEndTag	    Special
+hi def link sgmllnxParen	    Special
+hi def link sgmllnxEntity	    Type
+hi def link sgmllnxDocEnt	    Type
+hi def link sgmllnxTagName	    Statement
+hi def link sgmllnxComment	    Comment
+hi def link sgmllnxSpecial	    Special
+hi def link sgmllnxDocType	    PreProc
+hi def link sgmllnxTagError    Error
+
 
 let b:current_syntax = "sgmllnx"
 
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 31c7b0534c..18da779764 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,13 +2,13 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Aug 26, 2016
+" Last Change:		Aug 31, 2016
 " Version:		162
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
 
-" quit when a syntax file was already loaded
+" quit when a syntax file was already loaded {{{1
 if exists("b:current_syntax")
   finish
 endif
@@ -145,7 +145,7 @@ syn cluster shHereBeginList	contains=@shCommandSubList
 syn cluster shHereList	contains=shBeginHere,shHerePayload
 syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
 syn cluster shIdList	contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shHereString,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
-syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo,shParen
+syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
 syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr,shTouch
 syn cluster shPPSRightList	contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
 syn cluster shSubShList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
@@ -497,7 +497,7 @@ syn match  shDerefString	contained	"\\["']"	nextgroup=shDerefPattern
 if exists("b:is_bash")
  " bash : ${parameter:offset}
  " bash : ${parameter:offset:length}
- syn region shDerefOff	contained	start=':\ze[^-=?+]'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
+ syn region shDerefOff	contained	start=':'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn region shDerefOff	contained	start=':\s-'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn match  shDerefLen	contained	":[^}]\+"	contains=shDeref,shDerefSimple
 
@@ -573,132 +573,134 @@ syn sync match shWhileSync	grouphere	shRepeat	"\<while\>"
 
 " Default Highlighting: {{{1
 " =====================
-hi def link shArithRegion	shShellVariables
-hi def link shAstQuote	shDoubleQuote
-hi def link shAtExpr	shSetList
-hi def link shBeginHere	shRedir
-hi def link shCaseBar	shConditional
-hi def link shCaseCommandSub	shCommandSub
-hi def link shCaseDoubleQuote	shDoubleQuote
-hi def link shCaseIn	shConditional
-hi def link shQuote	shOperator
-hi def link shCaseSingleQuote	shSingleQuote
-hi def link shCaseStart	shConditional
-hi def link shCmdSubRegion	shShellVariables
-hi def link shColon	shComment
-hi def link shDerefOp	shOperator
-hi def link shDerefPOL	shDerefOp
-hi def link shDerefPPS	shDerefOp
-hi def link shDerefPSR	shDerefOp
-hi def link shDeref	shShellVariables
-hi def link shDerefDelim	shOperator
-hi def link shDerefSimple	shDeref
-hi def link shDerefSpecial	shDeref
-hi def link shDerefString	shDoubleQuote
-hi def link shDerefVar	shDeref
-hi def link shDoubleQuote	shString
-hi def link shEcho	shString
-hi def link shEchoDelim	shOperator
-hi def link shEchoQuote	shString
-hi def link shForPP	shLoop
-hi def link shFunction	Function
-hi def link shEmbeddedEcho	shString
-hi def link shEscape	shCommandSub
-hi def link shExDoubleQuote	shDoubleQuote
-hi def link shExSingleQuote	shSingleQuote
-hi def link shHereDoc	shString
-hi def link shHereString	shRedir
-hi def link shHerePayload	shHereDoc
-hi def link shLoop	shStatement
-hi def link shSpecialNxt	shSpecial
-hi def link shNoQuote	shDoubleQuote
-hi def link shOption	shCommandSub
-hi def link shPattern	shString
-hi def link shParen	shArithmetic
-hi def link shPosnParm	shShellVariables
-hi def link shQuickComment	shComment
-hi def link shRange	shOperator
-hi def link shRedir	shOperator
-hi def link shSetListDelim	shOperator
-hi def link shSetOption	shOption
-hi def link shSingleQuote	shString
-hi def link shSource	shOperator
-hi def link shStringSpecial	shSpecial
-hi def link shSubShRegion	shOperator
-hi def link shTestOpr	shConditional
-hi def link shTestPattern	shString
-hi def link shTestDoubleQuote	shString
-hi def link shTestSingleQuote	shString
-hi def link shTouchCmd	shStatement
-hi def link shVariable	shSetList
-hi def link shWrapLineOperator	shOperator
+if !exists("skip_sh_syntax_inits")
+ hi def link shArithRegion	shShellVariables
+ hi def link shAstQuote	shDoubleQuote
+ hi def link shAtExpr	shSetList
+ hi def link shBeginHere	shRedir
+ hi def link shCaseBar	shConditional
+ hi def link shCaseCommandSub	shCommandSub
+ hi def link shCaseDoubleQuote	shDoubleQuote
+ hi def link shCaseIn	shConditional
+ hi def link shQuote	shOperator
+ hi def link shCaseSingleQuote	shSingleQuote
+ hi def link shCaseStart	shConditional
+ hi def link shCmdSubRegion	shShellVariables
+ hi def link shColon	shComment
+ hi def link shDerefOp	shOperator
+ hi def link shDerefPOL	shDerefOp
+ hi def link shDerefPPS	shDerefOp
+ hi def link shDerefPSR	shDerefOp
+ hi def link shDeref	shShellVariables
+ hi def link shDerefDelim	shOperator
+ hi def link shDerefSimple	shDeref
+ hi def link shDerefSpecial	shDeref
+ hi def link shDerefString	shDoubleQuote
+ hi def link shDerefVar	shDeref
+ hi def link shDoubleQuote	shString
+ hi def link shEcho	shString
+ hi def link shEchoDelim	shOperator
+ hi def link shEchoQuote	shString
+ hi def link shForPP	shLoop
+ hi def link shFunction	Function
+ hi def link shEmbeddedEcho	shString
+ hi def link shEscape	shCommandSub
+ hi def link shExDoubleQuote	shDoubleQuote
+ hi def link shExSingleQuote	shSingleQuote
+ hi def link shHereDoc	shString
+ hi def link shHereString	shRedir
+ hi def link shHerePayload	shHereDoc
+ hi def link shLoop	shStatement
+ hi def link shSpecialNxt	shSpecial
+ hi def link shNoQuote	shDoubleQuote
+ hi def link shOption	shCommandSub
+ hi def link shPattern	shString
+ hi def link shParen	shArithmetic
+ hi def link shPosnParm	shShellVariables
+ hi def link shQuickComment	shComment
+ hi def link shRange	shOperator
+ hi def link shRedir	shOperator
+ hi def link shSetListDelim	shOperator
+ hi def link shSetOption	shOption
+ hi def link shSingleQuote	shString
+ hi def link shSource	shOperator
+ hi def link shStringSpecial	shSpecial
+ hi def link shSubShRegion	shOperator
+ hi def link shTestOpr	shConditional
+ hi def link shTestPattern	shString
+ hi def link shTestDoubleQuote	shString
+ hi def link shTestSingleQuote	shString
+ hi def link shTouchCmd	shStatement
+ hi def link shVariable	shSetList
+ hi def link shWrapLineOperator	shOperator
 
-if exists("b:is_bash")
-  hi def link bashAdminStatement	shStatement
-  hi def link bashSpecialVariables	shShellVariables
-  hi def link bashStatement		shStatement
-  hi def link shCharClass		shSpecial
-  hi def link shDerefOff		shDerefOp
-  hi def link shDerefLen		shDerefOff
-endif
-if exists("b:is_kornshell")
-  hi def link kshSpecialVariables	shShellVariables
-  hi def link kshStatement		shStatement
-endif
-
-if !exists("g:sh_no_error")
- hi def link shCaseError		Error
- hi def link shCondError		Error
- hi def link shCurlyError		Error
- hi def link shDerefOpError		Error
- hi def link shDerefWordError		Error
- hi def link shDoError		Error
- hi def link shEsacError		Error
- hi def link shIfError		Error
- hi def link shInError		Error
- hi def link shParenError		Error
- hi def link shTestError		Error
+ if exists("b:is_bash")
+   hi def link bashAdminStatement	shStatement
+   hi def link bashSpecialVariables	shShellVariables
+   hi def link bashStatement		shStatement
+   hi def link shCharClass		shSpecial
+   hi def link shDerefOff		shDerefOp
+   hi def link shDerefLen		shDerefOff
+ endif
  if exists("b:is_kornshell")
-   hi def link shDTestError		Error
+   hi def link kshSpecialVariables	shShellVariables
+   hi def link kshStatement		shStatement
+ endif
+
+ if !exists("g:sh_no_error")
+  hi def link shCaseError		Error
+  hi def link shCondError		Error
+  hi def link shCurlyError		Error
+  hi def link shDerefOpError		Error
+  hi def link shDerefWordError		Error
+  hi def link shDoError		Error
+  hi def link shEsacError		Error
+  hi def link shIfError		Error
+  hi def link shInError		Error
+  hi def link shParenError		Error
+  hi def link shTestError		Error
+  if exists("b:is_kornshell")
+    hi def link shDTestError		Error
+  endif
  endif
-endif
 
-hi def link shArithmetic		Special
-hi def link shCharClass		Identifier
-hi def link shSnglCase		Statement
-hi def link shCommandSub		Special
-hi def link shComment		Comment
-hi def link shConditional		Conditional
-hi def link shCtrlSeq		Special
-hi def link shExprRegion		Delimiter
-hi def link shFunctionKey		Function
-hi def link shFunctionName		Function
-hi def link shNumber		Number
-hi def link shOperator		Operator
-hi def link shRepeat		Repeat
-hi def link shSet		Statement
-hi def link shSetList		Identifier
-hi def link shShellVariables		PreProc
-hi def link shSpecial		Special
-hi def link shStatement		Statement
-hi def link shString		String
-hi def link shTodo		Todo
-hi def link shAlias		Identifier
-hi def link shHereDoc01		shRedir
-hi def link shHereDoc02		shRedir
-hi def link shHereDoc03		shRedir
-hi def link shHereDoc04		shRedir
-hi def link shHereDoc05		shRedir
-hi def link shHereDoc06		shRedir
-hi def link shHereDoc07		shRedir
-hi def link shHereDoc08		shRedir
-hi def link shHereDoc09		shRedir
-hi def link shHereDoc10		shRedir
-hi def link shHereDoc11		shRedir
-hi def link shHereDoc12		shRedir
-hi def link shHereDoc13		shRedir
-hi def link shHereDoc14		shRedir
-hi def link shHereDoc15		shRedir
+ hi def link shArithmetic		Special
+ hi def link shCharClass		Identifier
+ hi def link shSnglCase		Statement
+ hi def link shCommandSub		Special
+ hi def link shComment		Comment
+ hi def link shConditional		Conditional
+ hi def link shCtrlSeq		Special
+ hi def link shExprRegion		Delimiter
+ hi def link shFunctionKey		Function
+ hi def link shFunctionName		Function
+ hi def link shNumber		Number
+ hi def link shOperator		Operator
+ hi def link shRepeat		Repeat
+ hi def link shSet		Statement
+ hi def link shSetList		Identifier
+ hi def link shShellVariables		PreProc
+ hi def link shSpecial		Special
+ hi def link shStatement		Statement
+ hi def link shString		String
+ hi def link shTodo		Todo
+ hi def link shAlias		Identifier
+ hi def link shHereDoc01		shRedir
+ hi def link shHereDoc02		shRedir
+ hi def link shHereDoc03		shRedir
+ hi def link shHereDoc04		shRedir
+ hi def link shHereDoc05		shRedir
+ hi def link shHereDoc06		shRedir
+ hi def link shHereDoc07		shRedir
+ hi def link shHereDoc08		shRedir
+ hi def link shHereDoc09		shRedir
+ hi def link shHereDoc10		shRedir
+ hi def link shHereDoc11		shRedir
+ hi def link shHereDoc12		shRedir
+ hi def link shHereDoc13		shRedir
+ hi def link shHereDoc14		shRedir
+ hi def link shHereDoc15		shRedir
+endif
 
 " Delete shell folding commands {{{1
 " =============================
diff --git a/runtime/syntax/sicad.vim b/runtime/syntax/sicad.vim
index 04f870d04e..20eb14cba1 100644
--- a/runtime/syntax/sicad.vim
+++ b/runtime/syntax/sicad.vim
@@ -359,33 +359,31 @@ syn keyword sicadStatement zparp zparpn zwinkp zwinkpn
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sicadLabel PreProc
-HiLink sicadLabel1 sicadLabel
-HiLink sicadLabel2 sicadLabel
-HiLink sicadConditional Conditional
-HiLink sicadBoolean Boolean
-HiLink sicadNumber Number
-HiLink sicadFloat Float
-HiLink sicadOperator Operator
-HiLink sicadStatement Statement
-HiLink sicadParameter sicadStatement
-HiLink sicadGoto sicadStatement
-HiLink sicadLineCont sicadStatement
-HiLink sicadString String
-HiLink sicadComment Comment
-HiLink sicadSpecial Special
-HiLink sicadIdentifier Type
-"  HiLink sicadIdentifier Identifier
-HiLink sicadError Error
-HiLink sicadParenError sicadError
-HiLink sicadApostropheError sicadError
-HiLink sicadStringError sicadError
-HiLink sicadCommentError sicadError
-"  HiLink sqlStatement Special  " modified highlight group in sql.vim
+hi def link sicadLabel PreProc
+hi def link sicadLabel1 sicadLabel
+hi def link sicadLabel2 sicadLabel
+hi def link sicadConditional Conditional
+hi def link sicadBoolean Boolean
+hi def link sicadNumber Number
+hi def link sicadFloat Float
+hi def link sicadOperator Operator
+hi def link sicadStatement Statement
+hi def link sicadParameter sicadStatement
+hi def link sicadGoto sicadStatement
+hi def link sicadLineCont sicadStatement
+hi def link sicadString String
+hi def link sicadComment Comment
+hi def link sicadSpecial Special
+hi def link sicadIdentifier Type
+"  hi def link sicadIdentifier Identifier
+hi def link sicadError Error
+hi def link sicadParenError sicadError
+hi def link sicadApostropheError sicadError
+hi def link sicadStringError sicadError
+hi def link sicadCommentError sicadError
+"  hi def link sqlStatement Special  " modified highlight group in sql.vim
 
-delcommand HiLink
 
 let b:current_syntax = "sicad"
 
diff --git a/runtime/syntax/simula.vim b/runtime/syntax/simula.vim
index eb3f8a1e85..82f66d049e 100644
--- a/runtime/syntax/simula.vim
+++ b/runtime/syntax/simula.vim
@@ -55,35 +55,33 @@ syn match	simulaReal		"-\=\<\d\+\(\.\d\+\)\=\(&&\=[+-]\=\d\+\)\=\>"
 " Real starting with a `.', optional exponent
 syn match	simulaReal		"-\=\.\d\+\(&&\=[+-]\=\d\+\)\=\>"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink simulaAssigned		Identifier
-HiLink simulaBoolean		Boolean
-HiLink simulaCharacter		Character
-HiLink simulaCharError		Error
-HiLink simulaComment		Comment
-HiLink simulaCompound		Statement
-HiLink simulaConditional		Conditional
-HiLink simulaConstant		Constant
-HiLink simulaFunction		Function
-HiLink simulaNumber			Number
-HiLink simulaOperator		Operator
-HiLink simulaReal			Float
-HiLink simulaReferenceType		Type
-HiLink simulaRepeat			Repeat
-HiLink simulaReserved		Error
-HiLink simulaSemicolon		Statement
-HiLink simulaSpecial		Special
-HiLink simulaSpecialChar		SpecialChar
-HiLink simulaSpecialCharErr		Error
-HiLink simulaStatement		Statement
-HiLink simulaStorageClass		StorageClass
-HiLink simulaString			String
-HiLink simulaStructure		Structure
-HiLink simulaTodo			Todo
-HiLink simulaType			Type
+hi def link simulaAssigned		Identifier
+hi def link simulaBoolean		Boolean
+hi def link simulaCharacter		Character
+hi def link simulaCharError		Error
+hi def link simulaComment		Comment
+hi def link simulaCompound		Statement
+hi def link simulaConditional		Conditional
+hi def link simulaConstant		Constant
+hi def link simulaFunction		Function
+hi def link simulaNumber			Number
+hi def link simulaOperator		Operator
+hi def link simulaReal			Float
+hi def link simulaReferenceType		Type
+hi def link simulaRepeat			Repeat
+hi def link simulaReserved		Error
+hi def link simulaSemicolon		Statement
+hi def link simulaSpecial		Special
+hi def link simulaSpecialChar		SpecialChar
+hi def link simulaSpecialCharErr		Error
+hi def link simulaStatement		Statement
+hi def link simulaStorageClass		StorageClass
+hi def link simulaString			String
+hi def link simulaStructure		Structure
+hi def link simulaTodo			Todo
+hi def link simulaType			Type
 
-delcommand HiLink
 
 let b:current_syntax = "simula"
 " vim: sts=4 sw=4 ts=8
diff --git a/runtime/syntax/sinda.vim b/runtime/syntax/sinda.vim
index ef0929e07a..a6e5b45fcd 100644
--- a/runtime/syntax/sinda.vim
+++ b/runtime/syntax/sinda.vim
@@ -100,30 +100,28 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sindaMacro		Macro
-HiLink sindaOptions		Special
-HiLink sindaRoutine		Type
-HiLink sindaControl		Special
-HiLink sindaSubRoutine	Function
-HiLink sindaIdentifier	Identifier
+hi def link sindaMacro		Macro
+hi def link sindaOptions		Special
+hi def link sindaRoutine		Type
+hi def link sindaControl		Special
+hi def link sindaSubRoutine	Function
+hi def link sindaIdentifier	Identifier
 
-HiLink sindaFortran		PreProc
-HiLink sindaMotran		PreProc
+hi def link sindaFortran		PreProc
+hi def link sindaMotran		PreProc
 
-HiLink sindaComment		Comment
-HiLink sindaHeader		Typedef
-HiLink sindaIncludeFile	Type
-HiLink sindaInteger		Number
-HiLink sindaFloat		Float
-HiLink sindaScientific	Float
+hi def link sindaComment		Comment
+hi def link sindaHeader		Typedef
+hi def link sindaIncludeFile	Type
+hi def link sindaInteger		Number
+hi def link sindaFloat		Float
+hi def link sindaScientific	Float
 
-HiLink sindaEndData		Macro
+hi def link sindaEndData		Macro
 
-HiLink sindaTodo		Todo
+hi def link sindaTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "sinda"
diff --git a/runtime/syntax/sindacmp.vim b/runtime/syntax/sindacmp.vim
index 28c3cdc0ea..88373eb285 100644
--- a/runtime/syntax/sindacmp.vim
+++ b/runtime/syntax/sindacmp.vim
@@ -43,19 +43,17 @@ syn match  sindacmpFloat       "-\=\<[0-9]*\.[0-9]*"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sindacmpTitle		     Type
-HiLink sindacmpUnit		     PreProc
+hi def link sindacmpTitle		     Type
+hi def link sindacmpUnit		     PreProc
 
-HiLink sindacmpLabel		     Statement
+hi def link sindacmpLabel		     Statement
 
-HiLink sindacmpHeader		     sindaHeader
+hi def link sindacmpHeader		     sindaHeader
 
-HiLink sindacmpInteger	     Number
-HiLink sindacmpFloat		     Special
+hi def link sindacmpInteger	     Number
+hi def link sindacmpFloat		     Special
 
-delcommand HiLink
 
 
 let b:current_syntax = "sindacmp"
diff --git a/runtime/syntax/sindaout.vim b/runtime/syntax/sindaout.vim
index b4fb177f06..c362f19467 100644
--- a/runtime/syntax/sindaout.vim
+++ b/runtime/syntax/sindaout.vim
@@ -60,24 +60,22 @@ syn match sindaoutError		"<<< Error >>>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi sindaHeaderDelim  ctermfg=Black ctermbg=Green	       guifg=Black guibg=Green
 
-HiLink sindaoutPos		     Statement
-HiLink sindaoutNeg		     PreProc
-HiLink sindaoutTitle		     Type
-HiLink sindaoutFile		     sindaIncludeFile
-HiLink sindaoutInteger	     sindaInteger
+hi def link sindaoutPos		     Statement
+hi def link sindaoutNeg		     PreProc
+hi def link sindaoutTitle		     Type
+hi def link sindaoutFile		     sindaIncludeFile
+hi def link sindaoutInteger	     sindaInteger
 
-HiLink sindaoutSectionDelim	      Delimiter
-HiLink sindaoutSectionTitle	     Exception
-HiLink sindaoutHeaderDelim	     SpecialComment
-HiLink sindaoutLabel		     Identifier
+hi def link sindaoutSectionDelim	      Delimiter
+hi def link sindaoutSectionTitle	     Exception
+hi def link sindaoutHeaderDelim	     SpecialComment
+hi def link sindaoutLabel		     Identifier
 
-HiLink sindaoutError		     Error
+hi def link sindaoutError		     Error
 
-delcommand HiLink
 
 
 let b:current_syntax = "sindaout"
diff --git a/runtime/syntax/skill.vim b/runtime/syntax/skill.vim
index f32d5ee3ed..47afffc0a9 100644
--- a/runtime/syntax/skill.vim
+++ b/runtime/syntax/skill.vim
@@ -523,28 +523,26 @@ syn sync ccomment skillComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink skillcdfFunctions	Function
-HiLink skillgeFunctions		Function
-HiLink skillhiFunctions		Function
-HiLink skillleFunctions		Function
-HiLink skilldbefFunctions	Function
-HiLink skillddFunctions		Function
-HiLink skillpcFunctions		Function
-HiLink skilltechFunctions	Function
-HiLink skillConstants		Constant
-HiLink skillFunction		Function
-HiLink skillKeywords		Statement
-HiLink skillConditional		Conditional
-HiLink skillRepeat			Repeat
-HiLink skillString			String
-HiLink skillTodo			Todo
-HiLink skillNote			Todo
-HiLink skillComment			Comment
-HiLink skillCommentError	Error
+hi def link skillcdfFunctions	Function
+hi def link skillgeFunctions		Function
+hi def link skillhiFunctions		Function
+hi def link skillleFunctions		Function
+hi def link skilldbefFunctions	Function
+hi def link skillddFunctions		Function
+hi def link skillpcFunctions		Function
+hi def link skilltechFunctions	Function
+hi def link skillConstants		Constant
+hi def link skillFunction		Function
+hi def link skillKeywords		Statement
+hi def link skillConditional		Conditional
+hi def link skillRepeat			Repeat
+hi def link skillString			String
+hi def link skillTodo			Todo
+hi def link skillNote			Todo
+hi def link skillComment			Comment
+hi def link skillCommentError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "skill"
 
diff --git a/runtime/syntax/sl.vim b/runtime/syntax/sl.vim
index a40d43ea6a..1f6c847353 100644
--- a/runtime/syntax/sl.vim
+++ b/runtime/syntax/sl.vim
@@ -73,36 +73,34 @@ syn sync ccomment slComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slLabel	Label
-HiLink slUserLabel	Label
-HiLink slConditional	Conditional
-HiLink slRepeat	Repeat
-HiLink slCharacter	Character
-HiLink slSpecialCharacter slSpecial
-HiLink slNumber	Number
-HiLink slFloat	Float
-HiLink slParenError	slError
-HiLink slInParen	slError
-HiLink slCommentError	slError
-HiLink slOperator	Operator
-HiLink slStorageClass	StorageClass
-HiLink slError	Error
-HiLink slStatement	Statement
-HiLink slType		Type
-HiLink slCommentError	slError
-HiLink slCommentString slString
-HiLink slComment2String slString
-HiLink slCommentSkip	slComment
-HiLink slString	String
-HiLink slComment	Comment
-HiLink slSpecial	SpecialChar
-HiLink slTodo	Todo
-HiLink slVariable	Identifier
-"HiLink slIdentifier	Identifier
+hi def link slLabel	Label
+hi def link slUserLabel	Label
+hi def link slConditional	Conditional
+hi def link slRepeat	Repeat
+hi def link slCharacter	Character
+hi def link slSpecialCharacter slSpecial
+hi def link slNumber	Number
+hi def link slFloat	Float
+hi def link slParenError	slError
+hi def link slInParen	slError
+hi def link slCommentError	slError
+hi def link slOperator	Operator
+hi def link slStorageClass	StorageClass
+hi def link slError	Error
+hi def link slStatement	Statement
+hi def link slType		Type
+hi def link slCommentError	slError
+hi def link slCommentString slString
+hi def link slComment2String slString
+hi def link slCommentSkip	slComment
+hi def link slString	String
+hi def link slComment	Comment
+hi def link slSpecial	SpecialChar
+hi def link slTodo	Todo
+hi def link slVariable	Identifier
+"hi def link slIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "sl"
 
diff --git a/runtime/syntax/slang.vim b/runtime/syntax/slang.vim
index 938e8d5c51..53ede4dc5a 100644
--- a/runtime/syntax/slang.vim
+++ b/runtime/syntax/slang.vim
@@ -53,38 +53,36 @@ syn region slangPreCondit start="^\s*#\s*\(ifdef\>\|ifndef\>\|iftrue\>\|ifnfalse
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slangDefinition	Type
-HiLink slangBlock		slangDefinition
-HiLink slangLabel		Label
-HiLink slangConditional	Conditional
-HiLink slangRepeat		Repeat
-HiLink slangCharacter	Character
-HiLink slangFloat		Float
-HiLink slangImaginary	Float
-HiLink slangDecimal		slangNumber
-HiLink slangOctal		slangNumber
-HiLink slangHex		slangNumber
-HiLink slangNumber		Number
-HiLink slangParenError	Error
-HiLink slangOctalError	Error
-HiLink slangOperator		Operator
-HiLink slangStructure	Structure
-HiLink slangInclude		Include
-HiLink slangPreCondit	PreCondit
-HiLink slangError		Error
-HiLink slangStatement	Statement
-HiLink slangType		Type
-HiLink slangString		String
-HiLink slangConstant		Constant
-HiLink slangRangeArray	slangConstant
-HiLink slangComment		Comment
-HiLink slangSpecial		SpecialChar
-HiLink slangTodo		Todo
-HiLink slangDelim		Delimiter
+hi def link slangDefinition	Type
+hi def link slangBlock		slangDefinition
+hi def link slangLabel		Label
+hi def link slangConditional	Conditional
+hi def link slangRepeat		Repeat
+hi def link slangCharacter	Character
+hi def link slangFloat		Float
+hi def link slangImaginary	Float
+hi def link slangDecimal		slangNumber
+hi def link slangOctal		slangNumber
+hi def link slangHex		slangNumber
+hi def link slangNumber		Number
+hi def link slangParenError	Error
+hi def link slangOctalError	Error
+hi def link slangOperator		Operator
+hi def link slangStructure	Structure
+hi def link slangInclude		Include
+hi def link slangPreCondit	PreCondit
+hi def link slangError		Error
+hi def link slangStatement	Statement
+hi def link slangType		Type
+hi def link slangString		String
+hi def link slangConstant		Constant
+hi def link slangRangeArray	slangConstant
+hi def link slangComment		Comment
+hi def link slangSpecial		SpecialChar
+hi def link slangTodo		Todo
+hi def link slangDelim		Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "slang"
 
diff --git a/runtime/syntax/slice.vim b/runtime/syntax/slice.vim
index 202aee7599..3a57ece913 100644
--- a/runtime/syntax/slice.vim
+++ b/runtime/syntax/slice.vim
@@ -56,24 +56,22 @@ syn sync ccomment sliceComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sliceComment	Comment
-HiLink sliceConstruct	Keyword
-HiLink sliceType	Type
-HiLink sliceString	String
-HiLink sliceIncluded	String
-HiLink sliceQualifier	Keyword
-HiLink sliceInclude	Include
-HiLink sliceGuard	PreProc
-HiLink sliceBoolean	Boolean
-HiLink sliceFloat	Number
-HiLink sliceNumber	Number
-HiLink sliceOctal	Number
-HiLink sliceOctalZero	Special
-HiLink sliceNumberError Special
+hi def link sliceComment	Comment
+hi def link sliceConstruct	Keyword
+hi def link sliceType	Type
+hi def link sliceString	String
+hi def link sliceIncluded	String
+hi def link sliceQualifier	Keyword
+hi def link sliceInclude	Include
+hi def link sliceGuard	PreProc
+hi def link sliceBoolean	Boolean
+hi def link sliceFloat	Number
+hi def link sliceNumber	Number
+hi def link sliceOctal	Number
+hi def link sliceOctalZero	Special
+hi def link sliceNumberError Special
 
-delcommand HiLink
 
 let b:current_syntax = "slice"
 
diff --git a/runtime/syntax/slrnrc.vim b/runtime/syntax/slrnrc.vim
index a55439a20a..cf0734ae85 100644
--- a/runtime/syntax/slrnrc.vim
+++ b/runtime/syntax/slrnrc.vim
@@ -148,35 +148,33 @@ syn match   slrnrcUnsetkey	'^\s*unsetkey\s\+\("\)\=\(article\|group\|readline\)\
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink slrnrcTodo		Todo
-HiLink slrnrcSpaceError	Error
-HiLink slrnrcNumber		Number
-HiLink slrnrcSpecKey		SpecialChar
-HiLink slrnrcKey		String
-HiLink slrnrcSpecChar		SpecialChar
-HiLink slrnrcString		String
-HiLink slrnSlangPreCondit	Special
-HiLink slrnrcComment		Comment
-HiLink slrnrcVarInt		Identifier
-HiLink slrnrcVarStr		Identifier
-HiLink slrnrcCmd		slrnrcSet
-HiLink slrnrcSet		Operator
-HiLink slrnrcColor		Keyword
-HiLink slrnrcColorObj		Identifier
-HiLink slrnrcColorVal		String
-HiLink slrnrcMono		Keyword
-HiLink slrnrcMonoObj		Identifier
-HiLink slrnrcMonoVal		String
-HiLink slrnrcFunArt		Macro
-HiLink slrnrcFunGroup		Macro
-HiLink slrnrcFunRead		Macro
-HiLink slrnrcSetkeyObj	Identifier
-HiLink slrnrcSetkey		Keyword
-HiLink slrnrcUnsetkey		slrnrcSetkey
-
-delcommand HiLink
+
+hi def link slrnrcTodo		Todo
+hi def link slrnrcSpaceError	Error
+hi def link slrnrcNumber		Number
+hi def link slrnrcSpecKey		SpecialChar
+hi def link slrnrcKey		String
+hi def link slrnrcSpecChar		SpecialChar
+hi def link slrnrcString		String
+hi def link slrnSlangPreCondit	Special
+hi def link slrnrcComment		Comment
+hi def link slrnrcVarInt		Identifier
+hi def link slrnrcVarStr		Identifier
+hi def link slrnrcCmd		slrnrcSet
+hi def link slrnrcSet		Operator
+hi def link slrnrcColor		Keyword
+hi def link slrnrcColorObj		Identifier
+hi def link slrnrcColorVal		String
+hi def link slrnrcMono		Keyword
+hi def link slrnrcMonoObj		Identifier
+hi def link slrnrcMonoVal		String
+hi def link slrnrcFunArt		Macro
+hi def link slrnrcFunGroup		Macro
+hi def link slrnrcFunRead		Macro
+hi def link slrnrcSetkeyObj	Identifier
+hi def link slrnrcSetkey		Keyword
+hi def link slrnrcUnsetkey		slrnrcSetkey
+
 
 let b:current_syntax = "slrnrc"
 
diff --git a/runtime/syntax/slrnsc.vim b/runtime/syntax/slrnsc.vim
index a5dfa55e54..9f51cad380 100644
--- a/runtime/syntax/slrnsc.vim
+++ b/runtime/syntax/slrnsc.vim
@@ -45,25 +45,23 @@ syn match slrnScoreLine		"^\s*Score::\=\s\+=\=[-+]\=\d\+\s*\(%.*\)\=$" skipempty
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slrnscComment		Comment
-HiLink slrnscSectionCom	slrnscComment
-HiLink slrnscGroup		String
-HiLink slrnscNumber		Number
-HiLink slrnscDate		Special
-HiLink slrnscDelim		Delimiter
-HiLink slrnscComma		SpecialChar
-HiLink slrnscOper		SpecialChar
-HiLink slrnscEsc		String
-HiLink slrnscSectionStd	Type
-HiLink slrnscSectionNot	Delimiter
-HiLink slrnscItem		Statement
-HiLink slrnscScore		Keyword
-HiLink slrnscScoreIdent	Identifier
-HiLink slrnscInclude		Keyword
+hi def link slrnscComment		Comment
+hi def link slrnscSectionCom	slrnscComment
+hi def link slrnscGroup		String
+hi def link slrnscNumber		Number
+hi def link slrnscDate		Special
+hi def link slrnscDelim		Delimiter
+hi def link slrnscComma		SpecialChar
+hi def link slrnscOper		SpecialChar
+hi def link slrnscEsc		String
+hi def link slrnscSectionStd	Type
+hi def link slrnscSectionNot	Delimiter
+hi def link slrnscItem		Statement
+hi def link slrnscScore		Keyword
+hi def link slrnscScoreIdent	Identifier
+hi def link slrnscInclude		Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "slrnsc"
 
diff --git a/runtime/syntax/sm.vim b/runtime/syntax/sm.vim
index 33a67724f1..cb01d44bb6 100644
--- a/runtime/syntax/sm.vim
+++ b/runtime/syntax/sm.vim
@@ -57,27 +57,25 @@ syn region smClause	matchgroup=Delimiter start="\$?." matchgroup=Delimiter end="
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink smClause	Special
-HiLink smClauseError	Error
-HiLink smComment	Comment
-HiLink smDefine	Statement
-HiLink smElse		Delimiter
-HiLink smHeader	Statement
-HiLink smHeaderSep	String
-HiLink smMesg		Special
-HiLink smPrecedence	Number
-HiLink smRewrite	Statement
-HiLink smRewriteComment	Comment
-HiLink smRewriteLhsToken	String
-HiLink smRewriteLhsUser	Statement
-HiLink smRewriteRhsToken	String
-HiLink smRuleset	Preproc
-HiLink smTrusted	Special
-HiLink smVar		String
-
-delcommand HiLink
+
+hi def link smClause	Special
+hi def link smClauseError	Error
+hi def link smComment	Comment
+hi def link smDefine	Statement
+hi def link smElse		Delimiter
+hi def link smHeader	Statement
+hi def link smHeaderSep	String
+hi def link smMesg		Special
+hi def link smPrecedence	Number
+hi def link smRewrite	Statement
+hi def link smRewriteComment	Comment
+hi def link smRewriteLhsToken	String
+hi def link smRewriteLhsUser	Statement
+hi def link smRewriteRhsToken	String
+hi def link smRuleset	Preproc
+hi def link smTrusted	Special
+hi def link smVar		String
+
 
 let b:current_syntax = "sm"
 
diff --git a/runtime/syntax/smarty.vim b/runtime/syntax/smarty.vim
index ab8e85dced..a39c290abe 100644
--- a/runtime/syntax/smarty.vim
+++ b/runtime/syntax/smarty.vim
@@ -56,18 +56,16 @@ syn region  htmlString   contained start=+'+ end=+'+ contains=htmlSpecialChar,ja
   syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc,smartyZone
 
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smartyTagName Identifier
-HiLink smartyProperty Constant
+hi def link smartyTagName Identifier
+hi def link smartyProperty Constant
 " if you want the text inside the braces to be colored, then
 " remove the comment in from of the next statement
-"HiLink smartyZone Include
-HiLink smartyInFunc Function
-HiLink smartyBlock Constant
-HiLink smartyDot SpecialChar
-HiLink smartyModifier Function
-delcommand HiLink
+"hi def link smartyZone Include
+hi def link smartyInFunc Function
+hi def link smartyBlock Constant
+hi def link smartyDot SpecialChar
+hi def link smartyModifier Function
 
 let b:current_syntax = "smarty"
 
diff --git a/runtime/syntax/smil.vim b/runtime/syntax/smil.vim
index 84826323cf..4cf6e84710 100644
--- a/runtime/syntax/smil.vim
+++ b/runtime/syntax/smil.vim
@@ -113,29 +113,27 @@ syn region smilComment		      start=+<!DOCTYPE+ keepend end=+>+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink smilTag			Function
-HiLink smilEndTag			Identifier
-HiLink smilArg			Type
-HiLink smilTagName			smilStatement
-HiLink smilSpecialTagName		Exception
-HiLink smilValue			Value
-HiLink smilSpecialChar		Special
-
-HiLink smilSpecial			Special
-HiLink smilSpecialChar		Special
-HiLink smilString			String
-HiLink smilStatement			Statement
-HiLink smilComment			Comment
-HiLink smilCommentPart		Comment
-HiLink smilPreProc			PreProc
-HiLink smilValue			String
-HiLink smilCommentError		smilError
-HiLink smilTagError			smilError
-HiLink smilError			Error
-
-delcommand HiLink
+
+hi def link smilTag			Function
+hi def link smilEndTag			Identifier
+hi def link smilArg			Type
+hi def link smilTagName			smilStatement
+hi def link smilSpecialTagName		Exception
+hi def link smilValue			Value
+hi def link smilSpecialChar		Special
+
+hi def link smilSpecial			Special
+hi def link smilSpecialChar		Special
+hi def link smilString			String
+hi def link smilStatement			Statement
+hi def link smilComment			Comment
+hi def link smilCommentPart		Comment
+hi def link smilPreProc			PreProc
+hi def link smilValue			String
+hi def link smilCommentError		smilError
+hi def link smilTagError			smilError
+hi def link smilError			Error
+
 
 let b:current_syntax = "smil"
 
diff --git a/runtime/syntax/smith.vim b/runtime/syntax/smith.vim
index 82429691c1..b045d3b963 100644
--- a/runtime/syntax/smith.vim
+++ b/runtime/syntax/smith.vim
@@ -26,15 +26,13 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smithRegister	Identifier
-HiLink smithKeyword	Keyword
-HiLink smithComment Comment
-HiLink smithString String
-HiLink smithNumber	Number
+hi def link smithRegister	Identifier
+hi def link smithKeyword	Keyword
+hi def link smithComment Comment
+hi def link smithString String
+hi def link smithNumber	Number
 
-delcommand HiLink
 
 let b:current_syntax = "smith"
 
diff --git a/runtime/syntax/sml.vim b/runtime/syntax/sml.vim
index 01d494d2be..fa4524f93d 100644
--- a/runtime/syntax/sml.vim
+++ b/runtime/syntax/sml.vim
@@ -166,53 +166,51 @@ syn sync match smlSigSync     groupthere smlSig     "\<end\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink smlBraceErr	 Error
-HiLink smlBrackErr	 Error
-HiLink smlParenErr	 Error
-
-HiLink smlCommentErr	 Error
-
-HiLink smlEndErr	 Error
-HiLink smlThenErr	 Error
-
-HiLink smlCharErr	 Error
-
-HiLink smlComment	 Comment
-
-HiLink smlModPath	 Include
-HiLink smlModule	 Include
-HiLink smlModParam1	 Include
-HiLink smlModType	 Include
-HiLink smlMPRestr3	 Include
-HiLink smlFullMod	 Include
-HiLink smlModTypeRestr Include
-HiLink smlWith	 Include
-HiLink smlMTDef	 Include
-
-HiLink smlConstructor  Constant
-
-HiLink smlModPreRHS	 Keyword
-HiLink smlMPRestr2	 Keyword
-HiLink smlKeyword	 Keyword
-HiLink smlFunDef	 Keyword
-HiLink smlRefAssign	 Keyword
-HiLink smlKeyChar	 Keyword
-HiLink smlAnyVar	 Keyword
-HiLink smlTopStop	 Keyword
-HiLink smlOperator	 Keyword
-
-HiLink smlBoolean	 Boolean
-HiLink smlCharacter	 Character
-HiLink smlNumber	 Number
-HiLink smlReal	 Float
-HiLink smlString	 String
-HiLink smlType	 Type
-HiLink smlTodo	 Todo
-HiLink smlEncl	 Keyword
-
-delcommand HiLink
+
+hi def link smlBraceErr	 Error
+hi def link smlBrackErr	 Error
+hi def link smlParenErr	 Error
+
+hi def link smlCommentErr	 Error
+
+hi def link smlEndErr	 Error
+hi def link smlThenErr	 Error
+
+hi def link smlCharErr	 Error
+
+hi def link smlComment	 Comment
+
+hi def link smlModPath	 Include
+hi def link smlModule	 Include
+hi def link smlModParam1	 Include
+hi def link smlModType	 Include
+hi def link smlMPRestr3	 Include
+hi def link smlFullMod	 Include
+hi def link smlModTypeRestr Include
+hi def link smlWith	 Include
+hi def link smlMTDef	 Include
+
+hi def link smlConstructor  Constant
+
+hi def link smlModPreRHS	 Keyword
+hi def link smlMPRestr2	 Keyword
+hi def link smlKeyword	 Keyword
+hi def link smlFunDef	 Keyword
+hi def link smlRefAssign	 Keyword
+hi def link smlKeyChar	 Keyword
+hi def link smlAnyVar	 Keyword
+hi def link smlTopStop	 Keyword
+hi def link smlOperator	 Keyword
+
+hi def link smlBoolean	 Boolean
+hi def link smlCharacter	 Character
+hi def link smlNumber	 Number
+hi def link smlReal	 Float
+hi def link smlString	 String
+hi def link smlType	 Type
+hi def link smlTodo	 Todo
+hi def link smlEncl	 Keyword
+
 
 let b:current_syntax = "sml"
 
diff --git a/runtime/syntax/snnsnet.vim b/runtime/syntax/snnsnet.vim
index c73891e2b8..9dc9e06e78 100644
--- a/runtime/syntax/snnsnet.vim
+++ b/runtime/syntax/snnsnet.vim
@@ -53,16 +53,14 @@ syn match	snnsnetNumbers	"\d" contained
 syn match	snnsnetComment	"#.*$" contains=snnsnetTodo
 syn keyword	snnsnetTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnsnetType		Type
-HiLink snnsnetComment		Comment
-HiLink snnsnetNumbers		Number
-HiLink snnsnetSection		Statement
-HiLink snnsnetTitle		Label
-HiLink snnsnetTodo		Todo
+hi def link snnsnetType		Type
+hi def link snnsnetComment		Comment
+hi def link snnsnetNumbers		Number
+hi def link snnsnetSection		Statement
+hi def link snnsnetTitle		Label
+hi def link snnsnetTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "snnsnet"
 
diff --git a/runtime/syntax/snnspat.vim b/runtime/syntax/snnspat.vim
index ffc4caea71..cb6e9c5bd1 100644
--- a/runtime/syntax/snnspat.vim
+++ b/runtime/syntax/snnspat.vim
@@ -43,19 +43,17 @@ syn match	snnspatNumbers	"\d" contained
 syn match	snnspatComment	"#.*$" contains=snnspatTodo
 syn keyword	snnspatTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnspatGen		Statement
-HiLink snnspatHeader		Error
-HiLink snnspatNoHeader	Define
-HiLink snnspatNumbers		Number
-HiLink snnspatComment		Comment
-HiLink snnspatError		Error
-HiLink snnspatTodo		Todo
-HiLink snnspatAccepted	NONE
-HiLink snnspatBrac		NONE
+hi def link snnspatGen		Statement
+hi def link snnspatHeader		Error
+hi def link snnspatNoHeader	Define
+hi def link snnspatNumbers		Number
+hi def link snnspatComment		Comment
+hi def link snnspatError		Error
+hi def link snnspatTodo		Todo
+hi def link snnspatAccepted	NONE
+hi def link snnspatBrac		NONE
 
-delcommand HiLink
 
 let b:current_syntax = "snnspat"
 
diff --git a/runtime/syntax/snnsres.vim b/runtime/syntax/snnsres.vim
index 2d2791696c..2f19b67dbe 100644
--- a/runtime/syntax/snnsres.vim
+++ b/runtime/syntax/snnsres.vim
@@ -36,16 +36,14 @@ syn match	snnsresNumbers	"\d" contained
 syn match	snnsresComment	"#.*$" contains=snnsresTodo
 syn keyword	snnsresTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnsresGen		Statement
-HiLink snnsresHeader		Statement
-HiLink snnsresNoHeader	Define
-HiLink snnsresNumbers		Number
-HiLink snnsresComment		Comment
-HiLink snnsresTodo		Todo
+hi def link snnsresGen		Statement
+hi def link snnsresHeader		Statement
+hi def link snnsresNoHeader	Define
+hi def link snnsresNumbers		Number
+hi def link snnsresComment		Comment
+hi def link snnsresTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "snnsres"
 
diff --git a/runtime/syntax/snobol4.vim b/runtime/syntax/snobol4.vim
index 691acdec9a..a14f15eef4 100644
--- a/runtime/syntax/snobol4.vim
+++ b/runtime/syntax/snobol4.vim
@@ -77,38 +77,36 @@ syn match       snobol4ErrInBracket display contained "[){}]\|<%\|%>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snobol4Constant        Constant
-HiLink snobol4Label           Label
-HiLink snobol4Goto            Repeat
-HiLink snobol4Conditional     Conditional
-HiLink snobol4Repeat          Repeat
-HiLink snobol4Number          Number
-HiLink snobol4Error           Error
-HiLink snobol4Statement       PreProc
-HiLink snobol4BogusStatement  snobol4Error
-HiLink snobol4String          String
-HiLink snobol4Comment         Comment
-HiLink snobol4Special         Special
-HiLink snobol4Todo            Todo
-HiLink snobol4Keyword         Keyword
-HiLink snobol4Function        Function
-HiLink snobol4MathsOperator   Operator
-HiLink snobol4ParenError      snobol4Error
-HiLink snobol4ErrInParen      snobol4Error
-HiLink snobol4ErrInBracket    snobol4Error
-HiLink snobol4SysVar          Keyword
-HiLink snobol4BogusSysVar     snobol4Error
+hi def link snobol4Constant        Constant
+hi def link snobol4Label           Label
+hi def link snobol4Goto            Repeat
+hi def link snobol4Conditional     Conditional
+hi def link snobol4Repeat          Repeat
+hi def link snobol4Number          Number
+hi def link snobol4Error           Error
+hi def link snobol4Statement       PreProc
+hi def link snobol4BogusStatement  snobol4Error
+hi def link snobol4String          String
+hi def link snobol4Comment         Comment
+hi def link snobol4Special         Special
+hi def link snobol4Todo            Todo
+hi def link snobol4Keyword         Keyword
+hi def link snobol4Function        Function
+hi def link snobol4MathsOperator   Operator
+hi def link snobol4ParenError      snobol4Error
+hi def link snobol4ErrInParen      snobol4Error
+hi def link snobol4ErrInBracket    snobol4Error
+hi def link snobol4SysVar          Keyword
+hi def link snobol4BogusSysVar     snobol4Error
 if exists("snobol4_strict_mode")
-HiLink snobol4ExtSysVar       WarningMsg
-HiLink snobol4ExtKeyword      WarningMsg
+hi def link snobol4ExtSysVar       WarningMsg
+hi def link snobol4ExtKeyword      WarningMsg
 else
-HiLink snobol4ExtSysVar       snobol4SysVar
-HiLink snobol4ExtKeyword      snobol4Keyword
+hi def link snobol4ExtSysVar       snobol4SysVar
+hi def link snobol4ExtKeyword      snobol4Keyword
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "snobol4"
 " vim: ts=8
diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
index edfdf4365c..3a7dc9e422 100644
--- a/runtime/syntax/spec.vim
+++ b/runtime/syntax/spec.vim
@@ -157,68 +157,66 @@ syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 "main types color definitions
-HiLink specSection			Structure
-HiLink specSectionMacro		Macro
-HiLink specWWWlink			PreProc
-HiLink specOpts			Operator
+hi def link specSection			Structure
+hi def link specSectionMacro		Macro
+hi def link specWWWlink			PreProc
+hi def link specOpts			Operator
 
 "yes, it's ugly, but white is sooo cool
 if &background == "dark"
 hi def specGlobalMacro		ctermfg=white
 else
-HiLink specGlobalMacro		Identifier
+hi def link specGlobalMacro		Identifier
 endif
 
 "sh colors
-HiLink shComment			Comment
-HiLink shIf				Statement
-HiLink shOperator			Special
-HiLink shQuote1			String
-HiLink shQuote2			String
-HiLink shQuoteDelim			Statement
+hi def link shComment			Comment
+hi def link shIf				Statement
+hi def link shOperator			Special
+hi def link shQuote1			String
+hi def link shQuote2			String
+hi def link shQuoteDelim			Statement
 
 "spec colors
-HiLink specBlock			Function
-HiLink specColon			Special
-HiLink specCommand			Statement
-HiLink specCommandOpts		specOpts
-HiLink specCommandSpecial		Special
-HiLink specComment			Comment
-HiLink specConfigure			specCommand
-HiLink specDate			String
-HiLink specDescriptionOpts		specOpts
-HiLink specEmail			specWWWlink
-HiLink specError			Error
-HiLink specFilesDirective		specSectionMacro
-HiLink specFilesOpts			specOpts
-HiLink specLicense			String
-HiLink specMacroNameLocal		specGlobalMacro
-HiLink specMacroNameOther		specGlobalMacro
-HiLink specManpageFile		NONE
-HiLink specMonth			specDate
-HiLink specNoNumberHilite		NONE
-HiLink specNumber			Number
-HiLink specPackageOpts		specOpts
-HiLink specPercent			Special
-HiLink specSpecialChar		Special
-HiLink specSpecialVariables		specGlobalMacro
-HiLink specSpecialVariablesNames	specGlobalMacro
-HiLink specTarCommand			specCommand
-HiLink specURL			specWWWlink
-HiLink specURLMacro			specWWWlink
-HiLink specVariables			Identifier
-HiLink specWeekday			specDate
-HiLink specListedFilesBin		Statement
-HiLink specListedFilesDoc		Statement
-HiLink specListedFilesEtc		Statement
-HiLink specListedFilesLib		Statement
-HiLink specListedFilesPrefix		Statement
-HiLink specListedFilesShare		Statement
-
-delcommand HiLink
+hi def link specBlock			Function
+hi def link specColon			Special
+hi def link specCommand			Statement
+hi def link specCommandOpts		specOpts
+hi def link specCommandSpecial		Special
+hi def link specComment			Comment
+hi def link specConfigure			specCommand
+hi def link specDate			String
+hi def link specDescriptionOpts		specOpts
+hi def link specEmail			specWWWlink
+hi def link specError			Error
+hi def link specFilesDirective		specSectionMacro
+hi def link specFilesOpts			specOpts
+hi def link specLicense			String
+hi def link specMacroNameLocal		specGlobalMacro
+hi def link specMacroNameOther		specGlobalMacro
+hi def link specManpageFile		NONE
+hi def link specMonth			specDate
+hi def link specNoNumberHilite		NONE
+hi def link specNumber			Number
+hi def link specPackageOpts		specOpts
+hi def link specPercent			Special
+hi def link specSpecialChar		Special
+hi def link specSpecialVariables		specGlobalMacro
+hi def link specSpecialVariablesNames	specGlobalMacro
+hi def link specTarCommand			specCommand
+hi def link specURL			specWWWlink
+hi def link specURLMacro			specWWWlink
+hi def link specVariables			Identifier
+hi def link specWeekday			specDate
+hi def link specListedFilesBin		Statement
+hi def link specListedFilesDoc		Statement
+hi def link specListedFilesEtc		Statement
+hi def link specListedFilesLib		Statement
+hi def link specListedFilesPrefix		Statement
+hi def link specListedFilesShare		Statement
+
 
 let b:current_syntax = "spec"
 
diff --git a/runtime/syntax/specman.vim b/runtime/syntax/specman.vim
index 4fa4c218d8..9387925ef2 100644
--- a/runtime/syntax/specman.vim
+++ b/runtime/syntax/specman.vim
@@ -135,37 +135,35 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 " The default methods for highlighting.  Can be overridden later
-HiLink	specmanConditional	Conditional
-HiLink	specmanConstraint	Conditional
-HiLink	specmanRepeat		Repeat
-HiLink	specmanString		String
-HiLink	specmanComment		Comment
-HiLink	specmanConstant		Macro
-HiLink	specmanNumber		Number
-HiLink	specmanCompare		Operator
-HiLink	specmanOperator		Operator
-HiLink	specmanLogical		Operator
-HiLink	specmanStatement	Statement
-HiLink	specmanHDL		SpecialChar
-HiLink	specmanMethod		Function
-HiLink	specmanInclude		Include
-HiLink	specmanStructure	Structure
-HiLink	specmanBoolean		Boolean
-HiLink	specmanFSM		Label
-HiLink	specmanSpecial		Special
-HiLink	specmanType		Type
-HiLink	specmanTemporal		Type
-HiLink	specmanFile		Include
-HiLink	specmanPreCondit	Include
-HiLink	specmanDefine		Typedef
-HiLink	specmanLabel		Label
-HiLink	specmanPacking		keyword
-HiLink	specmanTodo		Todo
-HiLink	specmanParenError	Error
-HiLink	specmanErrInParen	Error
-HiLink	specmanErrInBracket	Error
-delcommand	HiLink
+hi def link specmanConditional	Conditional
+hi def link specmanConstraint	Conditional
+hi def link specmanRepeat		Repeat
+hi def link specmanString		String
+hi def link specmanComment		Comment
+hi def link specmanConstant		Macro
+hi def link specmanNumber		Number
+hi def link specmanCompare		Operator
+hi def link specmanOperator		Operator
+hi def link specmanLogical		Operator
+hi def link specmanStatement	Statement
+hi def link specmanHDL		SpecialChar
+hi def link specmanMethod		Function
+hi def link specmanInclude		Include
+hi def link specmanStructure	Structure
+hi def link specmanBoolean		Boolean
+hi def link specmanFSM		Label
+hi def link specmanSpecial		Special
+hi def link specmanType		Type
+hi def link specmanTemporal		Type
+hi def link specmanFile		Include
+hi def link specmanPreCondit	Include
+hi def link specmanDefine		Typedef
+hi def link specmanLabel		Label
+hi def link specmanPacking		keyword
+hi def link specmanTodo		Todo
+hi def link specmanParenError	Error
+hi def link specmanErrInParen	Error
+hi def link specmanErrInBracket	Error
 
 let b:current_syntax = "specman"
diff --git a/runtime/syntax/spice.vim b/runtime/syntax/spice.vim
index 57ff05f807..306039bc74 100644
--- a/runtime/syntax/spice.vim
+++ b/runtime/syntax/spice.vim
@@ -51,19 +51,17 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink spiceTodo		Todo
-HiLink spiceWrapLineOperator	spiceOperator
-HiLink spiceSinglequote	spiceExpr
-HiLink spiceExpr		Function
-HiLink spiceParenError	Error
-HiLink spiceStatement		Statement
-HiLink spiceNumber		Number
-HiLink spiceComment		Comment
-HiLink spiceOperator		Operator
-
-delcommand HiLink
+
+hi def link spiceTodo		Todo
+hi def link spiceWrapLineOperator	spiceOperator
+hi def link spiceSinglequote	spiceExpr
+hi def link spiceExpr		Function
+hi def link spiceParenError	Error
+hi def link spiceStatement		Statement
+hi def link spiceNumber		Number
+hi def link spiceComment		Comment
+hi def link spiceOperator		Operator
+
 
 let b:current_syntax = "spice"
 
diff --git a/runtime/syntax/splint.vim b/runtime/syntax/splint.vim
index 14f84a8691..8eba57d288 100644
--- a/runtime/syntax/splint.vim
+++ b/runtime/syntax/splint.vim
@@ -193,52 +193,50 @@ syn cluster	cMultiGroup	add=@splintAllStuff
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink splintShortAnn		splintAnnotation
-HiLink splintAnnotation	Comment
-HiLink splintAnnError		splintError
-HiLink splintAnnError2	splintError
-HiLink splintFlag		SpecialComment
-HiLink splintGlobalFlag	splintError
-HiLink splintSpecialAnnot	splintAnnKey
-HiLink splintStateAnnot	splintAnnKey
-HiLink splintSpecTag		splintAnnKey
-HiLink splintModifies		splintAnnKey
-HiLink splintRequires		splintAnnKey
-HiLink splintGlobals		splintAnnKey
-HiLink splintGlobitem		Constant
-HiLink splintGlobannot	splintAnnKey
-HiLink splintWarning		splintAnnKey
-HiLink splintModitem		Constant
-HiLink splintIter		splintAnnKey
-HiLink splintConst		splintAnnKey
-HiLink splintAlt		splintAnnKey
-HiLink splintType		splintAnnKey
-HiLink splintGlobalType	splintAnnKey
-HiLink splintMemMgm		splintAnnKey
-HiLink splintAlias		splintAnnKey
-HiLink splintExposure		splintAnnKey
-HiLink splintDefState		splintAnnKey
-HiLink splintGlobState	splintAnnKey
-HiLink splintNullState	splintAnnKey
-HiLink splintNullPred		splintAnnKey
-HiLink splintExit		splintAnnKey
-HiLink splintExec		splintAnnKey
-HiLink splintSef		splintAnnKey
-HiLink splintDecl		splintAnnKey
-HiLink splintCase		splintAnnKey
-HiLink splintBreak		splintAnnKey
-HiLink splintUnreach		splintAnnKey
-HiLink splintSpecFunc		splintAnnKey
-HiLink splintErrSupp		splintAnnKey
-HiLink splintTypeAcc		splintAnnKey
-HiLink splintMacro		splintAnnKey
-HiLink splintSpecType		splintAnnKey
-HiLink splintAnnKey		Type
-HiLink splintError		Error
-
-delcommand HiLink
+
+hi def link splintShortAnn		splintAnnotation
+hi def link splintAnnotation	Comment
+hi def link splintAnnError		splintError
+hi def link splintAnnError2	splintError
+hi def link splintFlag		SpecialComment
+hi def link splintGlobalFlag	splintError
+hi def link splintSpecialAnnot	splintAnnKey
+hi def link splintStateAnnot	splintAnnKey
+hi def link splintSpecTag		splintAnnKey
+hi def link splintModifies		splintAnnKey
+hi def link splintRequires		splintAnnKey
+hi def link splintGlobals		splintAnnKey
+hi def link splintGlobitem		Constant
+hi def link splintGlobannot	splintAnnKey
+hi def link splintWarning		splintAnnKey
+hi def link splintModitem		Constant
+hi def link splintIter		splintAnnKey
+hi def link splintConst		splintAnnKey
+hi def link splintAlt		splintAnnKey
+hi def link splintType		splintAnnKey
+hi def link splintGlobalType	splintAnnKey
+hi def link splintMemMgm		splintAnnKey
+hi def link splintAlias		splintAnnKey
+hi def link splintExposure		splintAnnKey
+hi def link splintDefState		splintAnnKey
+hi def link splintGlobState	splintAnnKey
+hi def link splintNullState	splintAnnKey
+hi def link splintNullPred		splintAnnKey
+hi def link splintExit		splintAnnKey
+hi def link splintExec		splintAnnKey
+hi def link splintSef		splintAnnKey
+hi def link splintDecl		splintAnnKey
+hi def link splintCase		splintAnnKey
+hi def link splintBreak		splintAnnKey
+hi def link splintUnreach		splintAnnKey
+hi def link splintSpecFunc		splintAnnKey
+hi def link splintErrSupp		splintAnnKey
+hi def link splintTypeAcc		splintAnnKey
+hi def link splintMacro		splintAnnKey
+hi def link splintSpecType		splintAnnKey
+hi def link splintAnnKey		Type
+hi def link splintError		Error
+
 
 let b:current_syntax = "splint"
 
diff --git a/runtime/syntax/spup.vim b/runtime/syntax/spup.vim
index 96e0f58a0e..743c7b5711 100644
--- a/runtime/syntax/spup.vim
+++ b/runtime/syntax/spup.vim
@@ -204,65 +204,63 @@ syn sync match spupSyncUnit       grouphere spupUnit       "^UNIT"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink spupCdi	    spupSection
-HiLink spupConditions   spupSection
-HiLink spupDeclare	    spupSection
-HiLink spupEstimation   spupSection
-HiLink spupExternal	    spupSection
-HiLink spupFlowsheet    spupSection
-HiLink spupFunction	    spupSection
-HiLink spupGlobal	    spupSection
-HiLink spupHomotopy	    spupSection
-HiLink spupMacro	    spupSection
-HiLink spupModel	    spupSection
-HiLink spupOperation    spupSection
-HiLink spupOptions	    spupSection
-HiLink spupProcedure    spupSection
-HiLink spupProfiles	    spupSection
-HiLink spupReport	    spupSection
-HiLink spupTitle	    spupConstant  " this is correct, truly ;)
-HiLink spupUnit	    spupSection
+hi def link spupCdi	    spupSection
+hi def link spupConditions   spupSection
+hi def link spupDeclare	    spupSection
+hi def link spupEstimation   spupSection
+hi def link spupExternal	    spupSection
+hi def link spupFlowsheet    spupSection
+hi def link spupFunction	    spupSection
+hi def link spupGlobal	    spupSection
+hi def link spupHomotopy	    spupSection
+hi def link spupMacro	    spupSection
+hi def link spupModel	    spupSection
+hi def link spupOperation    spupSection
+hi def link spupOptions	    spupSection
+hi def link spupProcedure    spupSection
+hi def link spupProfiles	    spupSection
+hi def link spupReport	    spupSection
+hi def link spupTitle	    spupConstant  " this is correct, truly ;)
+hi def link spupUnit	    spupSection
 
-HiLink spupCdiSubs	      spupSubs
-HiLink spupConditionsSubs spupSubs
-HiLink spupDeclareSubs    spupSubs
-HiLink spupEstimationSubs spupSubs
-HiLink spupExternalSubs   spupSubs
-HiLink spupFlowsheetSubs  spupSubs
-HiLink spupFunctionSubs   spupSubs
-HiLink spupHomotopySubs   spupSubs
-HiLink spupMacroSubs      spupSubs
-HiLink spupModelSubs      spupSubs
-HiLink spupOperationSubs  spupSubs
-HiLink spupOptionsSubs    spupSubs
-HiLink spupProcedureSubs  spupSubs
-HiLink spupReportSubs     spupSubs
-HiLink spupUnitSubs	      spupSubs
+hi def link spupCdiSubs	      spupSubs
+hi def link spupConditionsSubs spupSubs
+hi def link spupDeclareSubs    spupSubs
+hi def link spupEstimationSubs spupSubs
+hi def link spupExternalSubs   spupSubs
+hi def link spupFlowsheetSubs  spupSubs
+hi def link spupFunctionSubs   spupSubs
+hi def link spupHomotopySubs   spupSubs
+hi def link spupMacroSubs      spupSubs
+hi def link spupModelSubs      spupSubs
+hi def link spupOperationSubs  spupSubs
+hi def link spupOptionsSubs    spupSubs
+hi def link spupProcedureSubs  spupSubs
+hi def link spupReportSubs     spupSubs
+hi def link spupUnitSubs	      spupSubs
 
-HiLink spupCode	       Normal
-HiLink spupComment	       Comment
-HiLink spupComment2	       spupComment
-HiLink spupConditional     Statement
-HiLink spupConstant	       Constant
-HiLink spupError	       Error
-HiLink spupHelp	       Normal
-HiLink spupIdentifier      Identifier
-HiLink spupNumber	       Constant
-HiLink spupOperator	       Special
-HiLink spupOpenBrace       spupError
-HiLink spupSection	       Statement
-HiLink spupSpecial	       spupTextprocGeneric
-HiLink spupStreams	       Type
-HiLink spupString	       Constant
-HiLink spupSubs	       Statement
-HiLink spupSymbol	       Special
-HiLink spupTextprocError   Normal
-HiLink spupTextprocGeneric PreProc
-HiLink spupTypes	       Type
+hi def link spupCode	       Normal
+hi def link spupComment	       Comment
+hi def link spupComment2	       spupComment
+hi def link spupConditional     Statement
+hi def link spupConstant	       Constant
+hi def link spupError	       Error
+hi def link spupHelp	       Normal
+hi def link spupIdentifier      Identifier
+hi def link spupNumber	       Constant
+hi def link spupOperator	       Special
+hi def link spupOpenBrace       spupError
+hi def link spupSection	       Statement
+hi def link spupSpecial	       spupTextprocGeneric
+hi def link spupStreams	       Type
+hi def link spupString	       Constant
+hi def link spupSubs	       Statement
+hi def link spupSymbol	       Special
+hi def link spupTextprocError   Normal
+hi def link spupTextprocGeneric PreProc
+hi def link spupTypes	       Type
 
-delcommand HiLink
 
 let b:current_syntax = "spup"
 
diff --git a/runtime/syntax/sqlforms.vim b/runtime/syntax/sqlforms.vim
index 358349c463..6077dd1e94 100644
--- a/runtime/syntax/sqlforms.vim
+++ b/runtime/syntax/sqlforms.vim
@@ -131,23 +131,21 @@ syntax match sqlNumber  "-\=\<[0-9]*\.\=[0-9_]\>"
 
 syntax sync ccomment sqlComment
 
-command -nargs=+ HiLink hi def link <args>
-
-HiLink sqlComment Comment
-HiLink sqlKeyword Statement
-HiLink sqlNumber Number
-HiLink sqlOperator Statement
-HiLink sqlProcedure Statement
-HiLink sqlFunction Statement
-HiLink sqlSystem Identifier
-HiLink sqlSpecial Special
-HiLink sqlStatement Statement
-HiLink sqlString String
-HiLink sqlType Type
-HiLink sqlCodes Identifier
-HiLink sqlTriggers PreProc
-
-delcommand HiLink
+
+hi def link sqlComment Comment
+hi def link sqlKeyword Statement
+hi def link sqlNumber Number
+hi def link sqlOperator Statement
+hi def link sqlProcedure Statement
+hi def link sqlFunction Statement
+hi def link sqlSystem Identifier
+hi def link sqlSpecial Special
+hi def link sqlStatement Statement
+hi def link sqlString String
+hi def link sqlType Type
+hi def link sqlCodes Identifier
+hi def link sqlTriggers PreProc
+
 
 let b:current_syntax = "sqlforms"
 
diff --git a/runtime/syntax/sqlinformix.vim b/runtime/syntax/sqlinformix.vim
index 20a88acf4b..e01912bc40 100644
--- a/runtime/syntax/sqlinformix.vim
+++ b/runtime/syntax/sqlinformix.vim
@@ -152,34 +152,32 @@ syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
 " === Comment syntax group ===
-HiLink sqlComment	Comment
+hi def link sqlComment	Comment
 
 " === Constant syntax group ===
-HiLink sqlNumber	Number
-HiLink sqlBoolean	Boolean
-HiLink sqlString	String
+hi def link sqlNumber	Number
+hi def link sqlBoolean	Boolean
+hi def link sqlString	String
 
 " === Statment syntax group ===
-HiLink sqlStatement	Statement
-HiLink sqlConditional	Conditional
-HiLink sqlRepeat		Repeat
-HiLink sqlKeyword		Keyword
-HiLink sqlOperator	Operator
-HiLink sqlException	Exception
+hi def link sqlStatement	Statement
+hi def link sqlConditional	Conditional
+hi def link sqlRepeat		Repeat
+hi def link sqlKeyword		Keyword
+hi def link sqlOperator	Operator
+hi def link sqlException	Exception
 
 " === Identifier syntax group ===
-HiLink sqlFunction	Function
+hi def link sqlFunction	Function
 
 " === Type syntax group ===
-HiLink sqlType	Type
+hi def link sqlType	Type
 
 " === Todo syntax group ===
-HiLink sqlTodo	Todo
+hi def link sqlTodo	Todo
 
-delcommand HiLink
 
 let b:current_syntax = "sqlinformix"
diff --git a/runtime/syntax/sqlj.vim b/runtime/syntax/sqlj.vim
index ea8d7ecb6c..c901145c3c 100644
--- a/runtime/syntax/sqlj.vim
+++ b/runtime/syntax/sqlj.vim
@@ -74,20 +74,18 @@ syn match sqlComment	"--.*"
 
 syn sync ccomment sqljComment
 
-command! -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink sqljComment	Comment
-HiLink sqljKeyword	sqljSpecial
-HiLink sqljNumber	Number
-HiLink sqljOperator	sqljStatement
-HiLink sqljSpecial	Special
-HiLink sqljStatement	Statement
-HiLink sqljString	String
-HiLink sqljType	Type
-HiLink sqljPre	PreProc
-
-delcommand HiLink
+hi def link sqljComment	Comment
+hi def link sqljKeyword	sqljSpecial
+hi def link sqljNumber	Number
+hi def link sqljOperator	sqljStatement
+hi def link sqljSpecial	Special
+hi def link sqljStatement	Statement
+hi def link sqljString	String
+hi def link sqljType	Type
+hi def link sqljPre	PreProc
+
 
 let b:current_syntax = "sqlj"
 
diff --git a/runtime/syntax/sqloracle.vim b/runtime/syntax/sqloracle.vim
index f9e24af98c..bf2862f497 100644
--- a/runtime/syntax/sqloracle.vim
+++ b/runtime/syntax/sqloracle.vim
@@ -128,19 +128,17 @@ syn keyword sqlFunction	xmlparse xmlpatch xmlpi xmlquery xmlroot xmlsequence xml
 syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE contained
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
-HiLink Quote            Special
-HiLink sqlComment	Comment
-HiLink sqlFunction	Function
-HiLink sqlKeyword	sqlSpecial
-HiLink sqlNumber	Number
-HiLink sqlOperator	sqlStatement
-HiLink sqlSpecial	Special
-HiLink sqlStatement	Statement
-HiLink sqlString	String
-HiLink sqlType		Type
-HiLink sqlTodo		Todo
-
-delcommand HiLink
+hi def link Quote            Special
+hi def link sqlComment	Comment
+hi def link sqlFunction	Function
+hi def link sqlKeyword	sqlSpecial
+hi def link sqlNumber	Number
+hi def link sqlOperator	sqlStatement
+hi def link sqlSpecial	Special
+hi def link sqlStatement	Statement
+hi def link sqlString	String
+hi def link sqlType		Type
+hi def link sqlTodo		Todo
+
 let b:current_syntax = "sql"
 " vim: ts=8
diff --git a/runtime/syntax/sqr.vim b/runtime/syntax/sqr.vim
index 7e73443571..40b48358c6 100644
--- a/runtime/syntax/sqr.vim
+++ b/runtime/syntax/sqr.vim
@@ -236,28 +236,26 @@ syn match	sqrError	/.\+\zs!!.*/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
-
-HiLink sqrSection Statement
-HiLink sqrParagraph Statement
-HiLink sqrReserved Statement
-HiLink sqrParameter Statement
-HiLink sqrPreProc PreProc
-HiLink sqrSubstVar PreProc
-HiLink sqrCommand Statement
-HiLink sqrParam Type
-HiLink sqrFunction Special
-
-HiLink sqrString String
-HiLink sqrStrOpen Todo
-HiLink sqrNumber Number
-HiLink sqrVariable Identifier
-
-HiLink sqrComment Comment
-HiLink sqrTodo Todo
-HiLink sqrError Error
-
-delcommand HiLink
+
+hi def link sqrSection Statement
+hi def link sqrParagraph Statement
+hi def link sqrReserved Statement
+hi def link sqrParameter Statement
+hi def link sqrPreProc PreProc
+hi def link sqrSubstVar PreProc
+hi def link sqrCommand Statement
+hi def link sqrParam Type
+hi def link sqrFunction Special
+
+hi def link sqrString String
+hi def link sqrStrOpen Todo
+hi def link sqrNumber Number
+hi def link sqrVariable Identifier
+
+hi def link sqrComment Comment
+hi def link sqrTodo Todo
+hi def link sqrError Error
+
 
 let b:current_syntax = "sqr"
 
diff --git a/runtime/syntax/squid.vim b/runtime/syntax/squid.vim
index ee2b854ad4..a8abd180a0 100644
--- a/runtime/syntax/squid.vim
+++ b/runtime/syntax/squid.vim
@@ -121,21 +121,19 @@ syn sync minlines=3
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink squidTodo	Todo
-HiLink squidComment	Comment
-HiLink squidTag	Special
-HiLink squidConf	Keyword
-HiLink squidOpt	Constant
-HiLink squidAction	String
-HiLink squidNumber	Number
-HiLink squidIP	Number
-HiLink squidAcl	Keyword
-HiLink squidStr	String
-HiLink squidRegexOpt	Special
+hi def link squidTodo	Todo
+hi def link squidComment	Comment
+hi def link squidTag	Special
+hi def link squidConf	Keyword
+hi def link squidOpt	Constant
+hi def link squidAction	String
+hi def link squidNumber	Number
+hi def link squidIP	Number
+hi def link squidAcl	Keyword
+hi def link squidStr	String
+hi def link squidRegexOpt	Special
 
-delcommand HiLink
 
 let b:current_syntax = "squid"
 
diff --git a/runtime/syntax/srec.vim b/runtime/syntax/srec.vim
index 834cec7baa..6ac22d9062 100644
--- a/runtime/syntax/srec.vim
+++ b/runtime/syntax/srec.vim
@@ -61,24 +61,22 @@ syn match srecChecksum "[0-9a-fA-F]\{2}$" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later
-HiLink srecRecStart            srecRecType
-HiLink srecRecTypeUnknown      srecRecType
-HiLink srecRecType             WarningMsg
-HiLink srecByteCount           Constant
+hi def link srecRecStart            srecRecType
+hi def link srecRecTypeUnknown      srecRecType
+hi def link srecRecType             WarningMsg
+hi def link srecByteCount           Constant
 hi def srecAddressFieldUnknown term=italic cterm=italic gui=italic
-HiLink srecNoAddress           DiffAdd
-HiLink srecDataAddress         Comment
-HiLink srecRecCount            srecNoAddress
-HiLink srecStartAddress        srecDataAddress
+hi def link srecNoAddress           DiffAdd
+hi def link srecDataAddress         Comment
+hi def link srecRecCount            srecNoAddress
+hi def link srecStartAddress        srecDataAddress
 hi def srecDataOdd             term=bold cterm=bold gui=bold
 hi def srecDataEven            term=NONE cterm=NONE gui=NONE
-HiLink srecDataUnexpected      Error
-HiLink srecChecksum            DiffChange
+hi def link srecDataUnexpected      Error
+hi def link srecChecksum            DiffChange
 
-delcommand HiLink
 
 let b:current_syntax = "srec"
 
diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim
index 051b2f9a8a..8401923e02 100644
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@@ -226,33 +226,31 @@ syn keyword sshconfigKeyword VisualHostKey
 syn keyword sshconfigKeyword XAuthLocation
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sshconfigComment        Comment
-HiLink sshconfigTodo           Todo
-HiLink sshconfigHostPort       sshconfigConstant
-HiLink sshconfigNumber         sshconfigConstant
-HiLink sshconfigConstant       Constant
-HiLink sshconfigYesNo          sshconfigEnum
-HiLink sshconfigCipher         sshconfigEnum
-HiLink sshconfigCiphers	 sshconfigEnum
-HiLink sshconfigMAC            sshconfigEnum
-HiLink sshconfigHostKeyAlgo    sshconfigEnum
-HiLink sshconfigLogLevel       sshconfigEnum
-HiLink sshconfigSysLogFacility sshconfigEnum
-HiLink sshconfigAddressFamily  sshconfigEnum
-HiLink sshconfigIPQoS		 sshconfigEnum
-HiLink sshconfigKbdInteractive sshconfigEnum
-HiLink sshconfigKexAlgo	 sshconfigEnum
-HiLink sshconfigTunnel	 sshconfigEnum
-HiLink sshconfigPreferredAuth  sshconfigEnum
-HiLink sshconfigVar            sshconfigEnum
-HiLink sshconfigEnum           Identifier
-HiLink sshconfigSpecial        Special
-HiLink sshconfigKeyword        Keyword
-HiLink sshconfigHostSect       Type
-HiLink sshconfigMatch          Type
-delcommand HiLink
+hi def link sshconfigComment        Comment
+hi def link sshconfigTodo           Todo
+hi def link sshconfigHostPort       sshconfigConstant
+hi def link sshconfigNumber         sshconfigConstant
+hi def link sshconfigConstant       Constant
+hi def link sshconfigYesNo          sshconfigEnum
+hi def link sshconfigCipher         sshconfigEnum
+hi def link sshconfigCiphers	 sshconfigEnum
+hi def link sshconfigMAC            sshconfigEnum
+hi def link sshconfigHostKeyAlgo    sshconfigEnum
+hi def link sshconfigLogLevel       sshconfigEnum
+hi def link sshconfigSysLogFacility sshconfigEnum
+hi def link sshconfigAddressFamily  sshconfigEnum
+hi def link sshconfigIPQoS		 sshconfigEnum
+hi def link sshconfigKbdInteractive sshconfigEnum
+hi def link sshconfigKexAlgo	 sshconfigEnum
+hi def link sshconfigTunnel	 sshconfigEnum
+hi def link sshconfigPreferredAuth  sshconfigEnum
+hi def link sshconfigVar            sshconfigEnum
+hi def link sshconfigEnum           Identifier
+hi def link sshconfigSpecial        Special
+hi def link sshconfigKeyword        Keyword
+hi def link sshconfigHostSect       Type
+hi def link sshconfigMatch          Type
 
 let b:current_syntax = "sshconfig"
 
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
index 28b8acaf60..1556258b25 100644
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -232,36 +232,34 @@ syn keyword sshdconfigKeyword XAuthLocation
 
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
-
-HiLink sshdconfigComment              Comment
-HiLink sshdconfigTodo                 Todo
-HiLink sshdconfigHostPort             sshdconfigConstant
-HiLink sshdconfigTime                 sshdconfigConstant
-HiLink sshdconfigNumber               sshdconfigConstant
-HiLink sshdconfigConstant             Constant
-HiLink sshdconfigYesNo                sshdconfigEnum
-HiLink sshdconfigAddressFamily        sshdconfigEnum
-HiLink sshdconfigPrivilegeSeparation  sshdconfigEnum
-HiLink sshdconfigTcpForwarding        sshdconfigEnum
-HiLink sshdconfigRootLogin            sshdconfigEnum
-HiLink sshdconfigCiphers              sshdconfigEnum
-HiLink sshdconfigMAC                  sshdconfigEnum
-HiLink sshdconfigHostKeyAlgo          sshdconfigEnum
-HiLink sshdconfigRootLogin            sshdconfigEnum
-HiLink sshdconfigLogLevel             sshdconfigEnum
-HiLink sshdconfigSysLogFacility       sshdconfigEnum
-HiLink sshdconfigVar                  sshdconfigEnum
-HiLink sshdconfigCompression          sshdconfigEnum
-HiLink sshdconfigIPQoS                sshdconfigEnum
-HiLink sshdconfigKexAlgo              sshdconfigEnum
-HiLink sshdconfigTunnel               sshdconfigEnum
-HiLink sshdconfigSubsystem            sshdconfigEnum
-HiLink sshdconfigEnum                 Function
-HiLink sshdconfigSpecial              Special
-HiLink sshdconfigKeyword              Keyword
-HiLink sshdconfigMatch                Type
-delcommand HiLink
+
+hi def link sshdconfigComment              Comment
+hi def link sshdconfigTodo                 Todo
+hi def link sshdconfigHostPort             sshdconfigConstant
+hi def link sshdconfigTime                 sshdconfigConstant
+hi def link sshdconfigNumber               sshdconfigConstant
+hi def link sshdconfigConstant             Constant
+hi def link sshdconfigYesNo                sshdconfigEnum
+hi def link sshdconfigAddressFamily        sshdconfigEnum
+hi def link sshdconfigPrivilegeSeparation  sshdconfigEnum
+hi def link sshdconfigTcpForwarding        sshdconfigEnum
+hi def link sshdconfigRootLogin            sshdconfigEnum
+hi def link sshdconfigCiphers              sshdconfigEnum
+hi def link sshdconfigMAC                  sshdconfigEnum
+hi def link sshdconfigHostKeyAlgo          sshdconfigEnum
+hi def link sshdconfigRootLogin            sshdconfigEnum
+hi def link sshdconfigLogLevel             sshdconfigEnum
+hi def link sshdconfigSysLogFacility       sshdconfigEnum
+hi def link sshdconfigVar                  sshdconfigEnum
+hi def link sshdconfigCompression          sshdconfigEnum
+hi def link sshdconfigIPQoS                sshdconfigEnum
+hi def link sshdconfigKexAlgo              sshdconfigEnum
+hi def link sshdconfigTunnel               sshdconfigEnum
+hi def link sshdconfigSubsystem            sshdconfigEnum
+hi def link sshdconfigEnum                 Function
+hi def link sshdconfigSpecial              Special
+hi def link sshdconfigKeyword              Keyword
+hi def link sshdconfigMatch                Type
 
 let b:current_syntax = "sshdconfig"
 
diff --git a/runtime/syntax/st.vim b/runtime/syntax/st.vim
index 1071caa7b1..8160c7704a 100644
--- a/runtime/syntax/st.vim
+++ b/runtime/syntax/st.vim
@@ -75,21 +75,19 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink stKeyword		Statement
-HiLink stMethod		Statement
-HiLink stComment		Comment
-HiLink stCharacter		Constant
-HiLink stString		Constant
-HiLink stSymbol		Special
-HiLink stNumber		Type
-HiLink stFloat		Type
-HiLink stError		Error
-HiLink stLocalVariables	Identifier
-HiLink stBlockVariable	Identifier
-
-delcommand HiLink
+
+hi def link stKeyword		Statement
+hi def link stMethod		Statement
+hi def link stComment		Comment
+hi def link stCharacter		Constant
+hi def link stString		Constant
+hi def link stSymbol		Special
+hi def link stNumber		Type
+hi def link stFloat		Type
+hi def link stError		Error
+hi def link stLocalVariables	Identifier
+hi def link stBlockVariable	Identifier
+
 
 let b:current_syntax = "st"
 
diff --git a/runtime/syntax/stp.vim b/runtime/syntax/stp.vim
index fbd659682d..2992d8be47 100644
--- a/runtime/syntax/stp.vim
+++ b/runtime/syntax/stp.vim
@@ -129,27 +129,25 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when and item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
-
-HiLink stpConditional Conditional
-HiLink stpComment Comment
-HiLink stpKeyword Keyword
-HiLink stpNumber Number
-HiLink stpOperator Operator
-HiLink stpSpecial Special
-HiLink stpStatement Statement
-HiLink stpString String
-HiLink stpStringError Error
-HiLink stpType Type
-HiLink stpTodo Todo
-HiLink stpFunction Function
-HiLink stpGlobals Macro
-HiLink stpParen Normal
-HiLink stpParenError Error
-HiLink stpSQLKeyword Function
-HiLink stpRepeat Repeat
-
-delcommand HiLink
+
+hi def link stpConditional Conditional
+hi def link stpComment Comment
+hi def link stpKeyword Keyword
+hi def link stpNumber Number
+hi def link stpOperator Operator
+hi def link stpSpecial Special
+hi def link stpStatement Statement
+hi def link stpString String
+hi def link stpStringError Error
+hi def link stpType Type
+hi def link stpTodo Todo
+hi def link stpFunction Function
+hi def link stpGlobals Macro
+hi def link stpParen Normal
+hi def link stpParenError Error
+hi def link stpSQLKeyword Function
+hi def link stpRepeat Repeat
+
 
 let b:current_syntax = "stp"
 
diff --git a/runtime/syntax/strace.vim b/runtime/syntax/strace.vim
index 45b70071a0..206c58919e 100644
--- a/runtime/syntax/strace.vim
+++ b/runtime/syntax/strace.vim
@@ -32,24 +32,22 @@ syn match straceOperator "[-+=*/!%&|:,]"
 syn region straceComment start="/\*" end="\*/" oneline
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink straceComment Comment
-HiLink straceVerbosed Comment
-HiLink stracePID PreProc
-HiLink straceNumber Number
-HiLink straceNumberRHS Type
-HiLink straceOtherRHS Type
-HiLink straceString String
-HiLink straceConstant Function
-HiLink straceEquals Type
-HiLink straceSysCallEmbed straceSysCall
-HiLink straceSysCall Statement
-HiLink straceParenthesis Statement
-HiLink straceOperator Normal
-HiLink straceSpecialChar Special
-HiLink straceOtherPID PreProc
+hi def link straceComment Comment
+hi def link straceVerbosed Comment
+hi def link stracePID PreProc
+hi def link straceNumber Number
+hi def link straceNumberRHS Type
+hi def link straceOtherRHS Type
+hi def link straceString String
+hi def link straceConstant Function
+hi def link straceEquals Type
+hi def link straceSysCallEmbed straceSysCall
+hi def link straceSysCall Statement
+hi def link straceParenthesis Statement
+hi def link straceOperator Normal
+hi def link straceSpecialChar Special
+hi def link straceOtherPID PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "strace"
diff --git a/runtime/syntax/svn.vim b/runtime/syntax/svn.vim
index 8b83753896..6239790f12 100644
--- a/runtime/syntax/svn.vim
+++ b/runtime/syntax/svn.vim
@@ -40,19 +40,17 @@ syn sync match svnSync  grouphere svnRegion "^--.*--$"me=s-1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink svnSummary     Keyword
-HiLink svnBlank       Error
+hi def link svnSummary     Keyword
+hi def link svnBlank       Error
 
-HiLink svnRegion      Comment
-HiLink svnDelimiter   NonText
-HiLink svnRemoved     Constant
-HiLink svnAdded       Identifier
-HiLink svnModified    Special
-HiLink svnProperty    Special
-HiLink svnRenamed     Special
+hi def link svnRegion      Comment
+hi def link svnDelimiter   NonText
+hi def link svnRemoved     Constant
+hi def link svnAdded       Identifier
+hi def link svnModified    Special
+hi def link svnProperty    Special
+hi def link svnRenamed     Special
 
-delcommand HiLink
 
 let b:current_syntax = "svn"
diff --git a/runtime/syntax/systemverilog.vim b/runtime/syntax/systemverilog.vim
index 94074bd083..f99ea8d889 100644
--- a/runtime/syntax/systemverilog.vim
+++ b/runtime/syntax/systemverilog.vim
@@ -69,18 +69,16 @@ syn keyword systemverilogStatement   implements
 syn keyword systemverilogStatement   interconnect soft nettype
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink systemverilogStatement       Statement
-HiLink systemverilogTypeDef         TypeDef
-HiLink systemverilogConditional     Conditional
-HiLink systemverilogRepeat          Repeat
-HiLink systemverilogLabel           Label
-HiLink systemverilogGlobal          Define
-HiLink systemverilogNumber          Number
+hi def link systemverilogStatement       Statement
+hi def link systemverilogTypeDef         TypeDef
+hi def link systemverilogConditional     Conditional
+hi def link systemverilogRepeat          Repeat
+hi def link systemverilogLabel           Label
+hi def link systemverilogGlobal          Define
+hi def link systemverilogNumber          Number
 
-delcommand HiLink
 
 let b:current_syntax = "systemverilog"
 
diff --git a/runtime/syntax/tads.vim b/runtime/syntax/tads.vim
index 0f63bea2fe..23a65b99ec 100644
--- a/runtime/syntax/tads.vim
+++ b/runtime/syntax/tads.vim
@@ -120,48 +120,46 @@ execute "syn sync maxlines=" . tads_sync_dist
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink tadsFunctionDef Function
-HiLink tadsFunction  Structure
-HiLink tadsClass     Structure
-HiLink tadsClassDef  Identifier
-HiLink tadsObjectDef Identifier
+hi def link tadsFunctionDef Function
+hi def link tadsFunction  Structure
+hi def link tadsClass     Structure
+hi def link tadsClassDef  Identifier
+hi def link tadsObjectDef Identifier
 " no highlight for tadsEmbedded, so it prints as normal text w/in the string
 
-HiLink tadsOperator	Operator
-HiLink tadsStructure	Structure
-HiLink tadsTodo	Todo
-HiLink tadsLabel	Label
-HiLink tadsConditional	Conditional
-HiLink tadsRepeat	Repeat
-HiLink tadsException	Exception
-HiLink tadsStatement	Statement
-HiLink tadsStorageClass	StorageClass
-HiLink tadsKeyWord   Keyword
-HiLink tadsSpecial	SpecialChar
-HiLink tadsNumber	Number
-HiLink tadsBoolean	Boolean
-HiLink tadsDoubleString	tadsString
-HiLink tadsSingleString	tadsString
-
-HiLink tadsOctalError	tadsError
-HiLink tadsCommentError	tadsError
-HiLink tadsBraceError	tadsError
-HiLink tadsInBrace	tadsError
-HiLink tadsError	Error
-
-HiLink tadsInclude	Include
-HiLink tadsPreProc	PreProc
-HiLink tadsDefine	Macro
-HiLink tadsIncluded	tadsString
-HiLink tadsPreCondit	PreCondit
-
-HiLink tadsString	String
-HiLink tadsComment	Comment
-
-delcommand HiLink
+hi def link tadsOperator	Operator
+hi def link tadsStructure	Structure
+hi def link tadsTodo	Todo
+hi def link tadsLabel	Label
+hi def link tadsConditional	Conditional
+hi def link tadsRepeat	Repeat
+hi def link tadsException	Exception
+hi def link tadsStatement	Statement
+hi def link tadsStorageClass	StorageClass
+hi def link tadsKeyWord   Keyword
+hi def link tadsSpecial	SpecialChar
+hi def link tadsNumber	Number
+hi def link tadsBoolean	Boolean
+hi def link tadsDoubleString	tadsString
+hi def link tadsSingleString	tadsString
+
+hi def link tadsOctalError	tadsError
+hi def link tadsCommentError	tadsError
+hi def link tadsBraceError	tadsError
+hi def link tadsInBrace	tadsError
+hi def link tadsError	Error
+
+hi def link tadsInclude	Include
+hi def link tadsPreProc	PreProc
+hi def link tadsDefine	Macro
+hi def link tadsIncluded	tadsString
+hi def link tadsPreCondit	PreCondit
+
+hi def link tadsString	String
+hi def link tadsComment	Comment
+
 
 
 let b:current_syntax = "tads"
diff --git a/runtime/syntax/tags.vim b/runtime/syntax/tags.vim
index a7044c04ec..3980f84a30 100644
--- a/runtime/syntax/tags.vim
+++ b/runtime/syntax/tags.vim
@@ -1,7 +1,7 @@
 " Language:		tags
 " Maintainer:	Charles E. Campbell  <NdrOchip@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:		4
+" Last Change:	Aug 31, 2016
+" Version:		6
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TAGS
 
 " quit when a syntax file was already loaded
@@ -19,17 +19,16 @@ syn match	tagComment	"^!_TAG_.*$"
 syn match	tagField	contained "[a-z]*:"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_drchip_tags_inits")
 
-HiLink tagBaseFile	PreProc
-HiLink tagComment	Comment
-HiLink tagDelim	Delimiter
-HiLink tagField	Number
-HiLink tagName	Identifier
-HiLink tagPath	PreProc
+  hi def link tagBaseFile	PreProc
+  hi def link tagComment	Comment
+  hi def link tagDelim	Delimiter
+  hi def link tagField	Number
+  hi def link tagName	Identifier
+  hi def link tagPath	PreProc
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "tags"
 
diff --git a/runtime/syntax/tak.vim b/runtime/syntax/tak.vim
index b363ea33c6..7a8fceb860 100644
--- a/runtime/syntax/tak.vim
+++ b/runtime/syntax/tak.vim
@@ -89,31 +89,29 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takMacro		Macro
-HiLink takOptions		Special
-HiLink takRoutine		Type
-HiLink takControl		Special
-HiLink takSolids		Special
-HiLink takSolidsArg		Statement
-HiLink takIdentifier		Identifier
+hi def link takMacro		Macro
+hi def link takOptions		Special
+hi def link takRoutine		Type
+hi def link takControl		Special
+hi def link takSolids		Special
+hi def link takSolidsArg		Statement
+hi def link takIdentifier		Identifier
 
-HiLink takFortran		PreProc
-HiLink takMotran		PreProc
+hi def link takFortran		PreProc
+hi def link takMotran		PreProc
 
-HiLink takComment		Comment
-HiLink takHeader		Typedef
-HiLink takIncludeFile		Type
-HiLink takInteger		Number
-HiLink takFloat		Float
-HiLink takScientific		Float
+hi def link takComment		Comment
+hi def link takHeader		Typedef
+hi def link takIncludeFile		Type
+hi def link takInteger		Number
+hi def link takFloat		Float
+hi def link takScientific		Float
 
-HiLink takEndData		Macro
+hi def link takEndData		Macro
 
-HiLink takTodo		Todo
+hi def link takTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "tak"
diff --git a/runtime/syntax/takcmp.vim b/runtime/syntax/takcmp.vim
index 6faddc2642..9426e02223 100644
--- a/runtime/syntax/takcmp.vim
+++ b/runtime/syntax/takcmp.vim
@@ -49,21 +49,19 @@ syn case ignore
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takcmpTitle		   Type
-HiLink takcmpUnit		   PreProc
+hi def link takcmpTitle		   Type
+hi def link takcmpUnit		   PreProc
 
-HiLink takcmpLabel		   Statement
+hi def link takcmpLabel		   Statement
 
-HiLink takcmpHeader		   takHeader
+hi def link takcmpHeader		   takHeader
 
-HiLink takcmpDate		   Identifier
-HiLink takcmpTime		   Identifier
-HiLink takcmpInteger		   Number
-HiLink takcmpFloat		   Special
+hi def link takcmpDate		   Identifier
+hi def link takcmpTime		   Identifier
+hi def link takcmpInteger		   Number
+hi def link takcmpFloat		   Special
 
-delcommand HiLink
 
 
 let b:current_syntax = "takcmp"
diff --git a/runtime/syntax/takout.vim b/runtime/syntax/takout.vim
index ed69ff0a21..5e5d360767 100644
--- a/runtime/syntax/takout.vim
+++ b/runtime/syntax/takout.vim
@@ -64,22 +64,20 @@ syn match takoutError	     "<<< Error >>>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takoutPos		   Statement
-HiLink takoutNeg		   PreProc
-HiLink takoutTitle		   Type
-HiLink takoutFile		   takIncludeFile
-HiLink takoutInteger		   takInteger
+hi def link takoutPos		   Statement
+hi def link takoutNeg		   PreProc
+hi def link takoutTitle		   Type
+hi def link takoutFile		   takIncludeFile
+hi def link takoutInteger		   takInteger
 
-HiLink takoutSectionDelim	    Delimiter
-HiLink takoutSectionTitle	   Exception
-HiLink takoutHeaderDelim	   SpecialComment
-HiLink takoutLabel		   Identifier
+hi def link takoutSectionDelim	    Delimiter
+hi def link takoutSectionTitle	   Exception
+hi def link takoutHeaderDelim	   SpecialComment
+hi def link takoutLabel		   Identifier
 
-HiLink takoutError		   Error
+hi def link takoutError		   Error
 
-delcommand HiLink
 
 
 let b:current_syntax = "takout"
diff --git a/runtime/syntax/tasm.vim b/runtime/syntax/tasm.vim
index 995e8b49d4..c9fc8186d0 100644
--- a/runtime/syntax/tasm.vim
+++ b/runtime/syntax/tasm.vim
@@ -93,23 +93,21 @@ syn match tasmBin "\<[01]\+B\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tasmString String
-HiLink tasmDec Number
-HiLink tasmHex Number
-HiLink tasmOct Number
-HiLink tasmBin Number
-HiLink tasmInstruction Keyword
-HiLink tasmCoprocInstr Keyword
-HiLink tasmMMXInst	Keyword
-HiLink tasmDirective PreProc
-HiLink tasmRegister Identifier
-HiLink tasmProctype PreProc
-HiLink tasmComment Comment
-HiLink tasmLabel Label
+hi def link tasmString String
+hi def link tasmDec Number
+hi def link tasmHex Number
+hi def link tasmOct Number
+hi def link tasmBin Number
+hi def link tasmInstruction Keyword
+hi def link tasmCoprocInstr Keyword
+hi def link tasmMMXInst	Keyword
+hi def link tasmDirective PreProc
+hi def link tasmRegister Identifier
+hi def link tasmProctype PreProc
+hi def link tasmComment Comment
+hi def link tasmLabel Label
 
-delcommand HiLink
 
 let b:curret_syntax = "tasm"
 
diff --git a/runtime/syntax/tcl.vim b/runtime/syntax/tcl.vim
index ff51c140e5..64efd6fec4 100644
--- a/runtime/syntax/tcl.vim
+++ b/runtime/syntax/tcl.vim
@@ -236,40 +236,38 @@ syn region  tclComment		start=/;\s*\#/hs=s+1 skip="\\$" end="$" contains=tclTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink tcltkSwitch		Special
-HiLink tclExpand		Special
-HiLink tclLabel		Label
-HiLink tclConditional		Conditional
-HiLink tclRepeat		Repeat
-HiLink tclNumber		Number
-HiLink tclError		Error
-HiLink tclCommand		Statement
-HiLink tclProcCommand		Type
-HiLink tclString		String
-HiLink tclComment		Comment
-HiLink tclSpecial		Special
-HiLink tclTodo		Todo
+
+hi def link tcltkSwitch		Special
+hi def link tclExpand		Special
+hi def link tclLabel		Label
+hi def link tclConditional		Conditional
+hi def link tclRepeat		Repeat
+hi def link tclNumber		Number
+hi def link tclError		Error
+hi def link tclCommand		Statement
+hi def link tclProcCommand		Type
+hi def link tclString		String
+hi def link tclComment		Comment
+hi def link tclSpecial		Special
+hi def link tclTodo		Todo
 " Below here are the commands and their options.
-HiLink tcltkCommandColor	Statement
-HiLink tcltkWidgetColor	Structure
-HiLink tclLineContinue	WarningMsg
+hi def link tcltkCommandColor	Statement
+hi def link tcltkWidgetColor	Structure
+hi def link tclLineContinue	WarningMsg
 if exists('g:tcl_warn_continuation')
-HiLink tclNotLineContinue	ErrorMsg
+hi def link tclNotLineContinue	ErrorMsg
 endif
-HiLink tcltkStringSwitch	Special
-HiLink tcltkArraySwitch	Special
-HiLink tcltkLsortSwitch	Special
-HiLink tcltkPackSwitch	Special
-HiLink tcltkPackConfSwitch	Special
-HiLink tcltkMaths		Special
-HiLink tcltkNamespaceSwitch	Special
-HiLink tcltkWidgetSwitch	Special
-HiLink tcltkPackConfColor	Identifier
-HiLink tclVarRef		Identifier
-
-delcommand HiLink
+hi def link tcltkStringSwitch	Special
+hi def link tcltkArraySwitch	Special
+hi def link tcltkLsortSwitch	Special
+hi def link tcltkPackSwitch	Special
+hi def link tcltkPackConfSwitch	Special
+hi def link tcltkMaths		Special
+hi def link tcltkNamespaceSwitch	Special
+hi def link tcltkWidgetSwitch	Special
+hi def link tcltkPackConfColor	Identifier
+hi def link tclVarRef		Identifier
+
 
 let b:current_syntax = "tcl"
 
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index 6cb27ea4ba..f4a0875da0 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Jul 05, 2016
-" Version:	98
+" Last Change:	Aug 31, 2016
+" Version:	100
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -48,12 +48,6 @@ let s:keepcpo= &cpo
 set cpo&vim
 scriptencoding utf-8
 
-" Define the default highlighting. {{{1
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-let did_tex_syntax_inits = 1
-command -nargs=+ HiLink hi def link <args>
-
 " by default, enable all region-based highlighting
 let s:tex_fast= "bcmMprsSvV"
 if exists("g:tex_fast")
@@ -405,7 +399,7 @@ if !exists("g:tex_no_math")
  " TexNewMathZone: function creates a mathzone with the given suffix and mathzone name. {{{2
  "                 Starred forms are created if starform is true.  Starred
  "                 forms have syntax group and synchronization groups with a
- "                 "S" appended.  Handles: cluster, syntax, sync, and HiLink.
+ "                 "S" appended.  Handles: cluster, syntax, sync, and hi link.
  fun! TexNewMathZone(sfx,mathzone,starform)
    let grpname  = "texMathZone".a:sfx
    let syncname = "texSyncMathZone".a:sfx
@@ -1260,86 +1254,87 @@ endif
 
 " ---------------------------------------------------------------------
 " Highlighting: {{{1
-if did_tex_syntax_inits == 1
- let did_tex_syntax_inits= 2
+
+" Define the default highlighting. {{{1
+if !exists("skip_tex_syntax_inits")
+
   " TeX highlighting groups which should share similar highlighting
   if !exists("g:tex_no_error")
    if !exists("g:tex_no_math")
-    HiLink texBadMath		texError
-    HiLink texMathDelimBad	texError
-    HiLink texMathError		texError
+    hi def link texBadMath		texError
+    hi def link texMathDelimBad	texError
+    hi def link texMathError		texError
     if !b:tex_stylish
-      HiLink texOnlyMath	texError
+      hi def link texOnlyMath	texError
     endif
    endif
-   HiLink texError		Error
+   hi def link texError		Error
   endif
 
   hi texBoldStyle		gui=bold	cterm=bold
   hi texItalStyle		gui=italic	cterm=italic
   hi texBoldItalStyle		gui=bold,italic cterm=bold,italic
   hi texItalBoldStyle		gui=bold,italic cterm=bold,italic
-  HiLink texCite		texRefZone
-  HiLink texDefCmd		texDef
-  HiLink texDefName		texDef
-  HiLink texDocType		texCmdName
-  HiLink texDocTypeArgs		texCmdArgs
-  HiLink texInputFileOpt	texCmdArgs
-  HiLink texInputCurlies	texDelimiter
-  HiLink texLigature		texSpecialChar
+  hi def link texCite		texRefZone
+  hi def link texDefCmd		texDef
+  hi def link texDefName		texDef
+  hi def link texDocType		texCmdName
+  hi def link texDocTypeArgs		texCmdArgs
+  hi def link texInputFileOpt	texCmdArgs
+  hi def link texInputCurlies	texDelimiter
+  hi def link texLigature		texSpecialChar
   if !exists("g:tex_no_math")
-   HiLink texMathDelimSet1	texMathDelim
-   HiLink texMathDelimSet2	texMathDelim
-   HiLink texMathDelimKey	texMathDelim
-   HiLink texMathMatcher	texMath
-   HiLink texAccent		texStatement
-   HiLink texGreek		texStatement
-   HiLink texSuperscript	texStatement
-   HiLink texSubscript		texStatement
-   HiLink texSuperscripts 	texSuperscript
-   HiLink texSubscripts 	texSubscript
-   HiLink texMathSymbol		texStatement
-   HiLink texMathZoneV		texMath
-   HiLink texMathZoneW		texMath
-   HiLink texMathZoneX		texMath
-   HiLink texMathZoneY		texMath
-   HiLink texMathZoneV		texMath
-   HiLink texMathZoneZ		texMath
+   hi def link texMathDelimSet1	texMathDelim
+   hi def link texMathDelimSet2	texMathDelim
+   hi def link texMathDelimKey	texMathDelim
+   hi def link texMathMatcher	texMath
+   hi def link texAccent		texStatement
+   hi def link texGreek		texStatement
+   hi def link texSuperscript	texStatement
+   hi def link texSubscript		texStatement
+   hi def link texSuperscripts 	texSuperscript
+   hi def link texSubscripts 	texSubscript
+   hi def link texMathSymbol		texStatement
+   hi def link texMathZoneV		texMath
+   hi def link texMathZoneW		texMath
+   hi def link texMathZoneX		texMath
+   hi def link texMathZoneY		texMath
+   hi def link texMathZoneV		texMath
+   hi def link texMathZoneZ		texMath
   endif
-  HiLink texBeginEnd		texCmdName
-  HiLink texBeginEndName	texSection
-  HiLink texSpaceCode		texStatement
-  HiLink texStyleStatement	texStatement
-  HiLink texTypeSize		texType
-  HiLink texTypeStyle		texType
+  hi def link texBeginEnd		texCmdName
+  hi def link texBeginEndName	texSection
+  hi def link texSpaceCode		texStatement
+  hi def link texStyleStatement	texStatement
+  hi def link texTypeSize		texType
+  hi def link texTypeStyle		texType
 
    " Basic TeX highlighting groups
-  HiLink texCmdArgs		Number
-  HiLink texCmdName		Statement
-  HiLink texComment		Comment
-  HiLink texDef			Statement
-  HiLink texDefParm		Special
-  HiLink texDelimiter		Delimiter
-  HiLink texInput		Special
-  HiLink texInputFile		Special
-  HiLink texLength		Number
-  HiLink texMath		Special
-  HiLink texMathDelim		Statement
-  HiLink texMathOper		Operator
-  HiLink texNewCmd		Statement
-  HiLink texNewEnv		Statement
-  HiLink texOption		Number
-  HiLink texRefZone		Special
-  HiLink texSection		PreCondit
-  HiLink texSpaceCodeChar	Special
-  HiLink texSpecialChar		SpecialChar
-  HiLink texStatement		Statement
-  HiLink texString		String
-  HiLink texTodo		Todo
-  HiLink texType		Type
-  HiLink texZone		PreCondit
+  hi def link texCmdArgs		Number
+  hi def link texCmdName		Statement
+  hi def link texComment		Comment
+  hi def link texDef			Statement
+  hi def link texDefParm		Special
+  hi def link texDelimiter		Delimiter
+  hi def link texInput		Special
+  hi def link texInputFile		Special
+  hi def link texLength		Number
+  hi def link texMath		Special
+  hi def link texMathDelim		Statement
+  hi def link texMathOper		Operator
+  hi def link texNewCmd		Statement
+  hi def link texNewEnv		Statement
+  hi def link texOption		Number
+  hi def link texRefZone		Special
+  hi def link texSection		PreCondit
+  hi def link texSpaceCodeChar	Special
+  hi def link texSpecialChar		SpecialChar
+  hi def link texStatement		Statement
+  hi def link texString		String
+  hi def link texTodo		Todo
+  hi def link texType		Type
+  hi def link texZone		PreCondit
 
-  delcommand HiLink
 endif
 
 " Cleanup: {{{1
diff --git a/runtime/syntax/texinfo.vim b/runtime/syntax/texinfo.vim
index ec353bb140..a4b7689707 100644
--- a/runtime/syntax/texinfo.vim
+++ b/runtime/syntax/texinfo.vim
@@ -355,38 +355,36 @@ syn cluster texinfoReducedAll contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
 " highlighting
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink texinfoSpecialChar	Special
-HiLink texinfoHFSpecialChar	Special
+hi def link texinfoSpecialChar	Special
+hi def link texinfoHFSpecialChar	Special
 
-HiLink texinfoError		Error
-HiLink texinfoIdent		Identifier
-HiLink texinfoAssignment	Identifier
-HiLink texinfoSinglePar	Identifier
-HiLink texinfoIndexPar	Identifier
-HiLink texinfoSIPar		Identifier
-HiLink texinfoDIEPar		Identifier
-HiLink texinfoTexCmd		PreProc
+hi def link texinfoError		Error
+hi def link texinfoIdent		Identifier
+hi def link texinfoAssignment	Identifier
+hi def link texinfoSinglePar	Identifier
+hi def link texinfoIndexPar	Identifier
+hi def link texinfoSIPar		Identifier
+hi def link texinfoDIEPar		Identifier
+hi def link texinfoTexCmd		PreProc
 
 
-HiLink texinfoAtCmd		Statement	"@-command
-HiLink texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
+hi def link texinfoAtCmd		Statement	"@-command
+hi def link texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
 					      "is String because is found as a region and is 'matchgroup'-ed
 					      "to texinfoAtCmd
-HiLink texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
+hi def link texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
 					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-HiLink texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
-HiLink texinfoMltlnAtCmd	String		"@-command in multiple lines
+hi def link texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
+hi def link texinfoMltlnAtCmd	String		"@-command in multiple lines
 					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-HiLink texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-HiLink texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
-HiLink texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-HiLink texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
+hi def link texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+hi def link texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
+hi def link texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+hi def link texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
 
-HiLink texinfoComment	Comment
+hi def link texinfoComment	Comment
 
-delcommand HiLink
 
 
 let b:current_syntax = "texinfo"
diff --git a/runtime/syntax/texmf.vim b/runtime/syntax/texmf.vim
index 4c3ccf8f45..d1268faff7 100644
--- a/runtime/syntax/texmf.vim
+++ b/runtime/syntax/texmf.vim
@@ -42,35 +42,33 @@ syn region texmfBrace matchgroup=texmfBraceBrace start="{" end="}" contains=ALLB
 syn match texmfBraceError "}"
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink texmfComment Comment
-HiLink texmfTodo Todo
+hi def link texmfComment Comment
+hi def link texmfTodo Todo
 
-HiLink texmfPassedParameter texmfVariable
-HiLink texmfVariable Identifier
+hi def link texmfPassedParameter texmfVariable
+hi def link texmfVariable Identifier
 
-HiLink texmfNumber Number
-HiLink texmfString String
+hi def link texmfNumber Number
+hi def link texmfString String
 
-HiLink texmfLHSStart texmfLHS
-HiLink texmfLHSVariable texmfLHS
-HiLink texmfLHSDot texmfLHS
-HiLink texmfLHS Type
+hi def link texmfLHSStart texmfLHS
+hi def link texmfLHSVariable texmfLHS
+hi def link texmfLHSDot texmfLHS
+hi def link texmfLHS Type
 
-HiLink texmfEquals Normal
+hi def link texmfEquals Normal
 
-HiLink texmfBraceBrace texmfDelimiter
-HiLink texmfComma texmfDelimiter
-HiLink texmfColons texmfDelimiter
-HiLink texmfDelimiter Preproc
+hi def link texmfBraceBrace texmfDelimiter
+hi def link texmfComma texmfDelimiter
+hi def link texmfColons texmfDelimiter
+hi def link texmfDelimiter Preproc
 
-HiLink texmfDoubleExclam Statement
-HiLink texmfSpecial Special
+hi def link texmfDoubleExclam Statement
+hi def link texmfSpecial Special
 
-HiLink texmfBraceError texmfError
-HiLink texmfError Error
+hi def link texmfBraceError texmfError
+hi def link texmfError Error
 
-delcommand HiLink
 
 let b:current_syntax = "texmf"
diff --git a/runtime/syntax/tf.vim b/runtime/syntax/tf.vim
index 9de93dae23..47775b8637 100644
--- a/runtime/syntax/tf.vim
+++ b/runtime/syntax/tf.vim
@@ -159,35 +159,33 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink tfComment		Comment
-HiLink tfString		String
-HiLink tfNumber		Number
-HiLink tfFloat		Float
-HiLink tfIdentifier		Identifier
-HiLink tfVar			Identifier
-HiLink tfWorld		Identifier
-HiLink tfReadonly		Identifier
-HiLink tfHook		Identifier
-HiLink tfFunctions		Function
-HiLink tfRepeat		Repeat
-HiLink tfConditional		Conditional
-HiLink tfLabel		Label
-HiLink tfStatement		Statement
-HiLink tfType		Type
-HiLink tfInclude		Include
-HiLink tfDefine		Define
-HiLink tfSpecialChar		SpecialChar
-HiLink tfSpecialCharEsc	SpecialChar
-HiLink tfParentError		Error
-HiLink tfTodo		Todo
-HiLink tfEndCommand		Delimiter
-HiLink tfJoinLines		Delimiter
-HiLink tfOperator		Operator
-HiLink tfRelation		Operator
-
-delcommand HiLink
+
+hi def link tfComment		Comment
+hi def link tfString		String
+hi def link tfNumber		Number
+hi def link tfFloat		Float
+hi def link tfIdentifier		Identifier
+hi def link tfVar			Identifier
+hi def link tfWorld		Identifier
+hi def link tfReadonly		Identifier
+hi def link tfHook		Identifier
+hi def link tfFunctions		Function
+hi def link tfRepeat		Repeat
+hi def link tfConditional		Conditional
+hi def link tfLabel		Label
+hi def link tfStatement		Statement
+hi def link tfType		Type
+hi def link tfInclude		Include
+hi def link tfDefine		Define
+hi def link tfSpecialChar		SpecialChar
+hi def link tfSpecialCharEsc	SpecialChar
+hi def link tfParentError		Error
+hi def link tfTodo		Todo
+hi def link tfEndCommand		Delimiter
+hi def link tfJoinLines		Delimiter
+hi def link tfOperator		Operator
+hi def link tfRelation		Operator
+
 
 let b:current_syntax = "tf"
 
diff --git a/runtime/syntax/tli.vim b/runtime/syntax/tli.vim
index e0e19ab98f..b96d4a2119 100644
--- a/runtime/syntax/tli.vim
+++ b/runtime/syntax/tli.vim
@@ -42,18 +42,16 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink tliNumber	Number
-HiLink tliString	String
-HiLink tliComment	Comment
-HiLink tliSpecial	SpecialChar
-HiLink tliIdentifier Identifier
-HiLink tliObject     Statement
-HiLink tliField      Type
-HiLink tliStyle      PreProc
-
-delcommand HiLink
+
+hi def link tliNumber	Number
+hi def link tliString	String
+hi def link tliComment	Comment
+hi def link tliSpecial	SpecialChar
+hi def link tliIdentifier Identifier
+hi def link tliObject     Statement
+hi def link tliField      Type
+hi def link tliStyle      PreProc
+
 
 let b:current_syntax = "tli"
 
diff --git a/runtime/syntax/tpp.vim b/runtime/syntax/tpp.vim
index b1ea35f041..1244b97f08 100644
--- a/runtime/syntax/tpp.vim
+++ b/runtime/syntax/tpp.vim
@@ -59,26 +59,24 @@ syn match tppComment "^--##.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tppAbstractOptionKey		Special
-HiLink tppPageLocalOptionKey		Keyword
-HiLink tppPageLocalSwitchKey		Keyword
-HiLink tppColorOptionKey		Keyword
-HiLink tppTimeOptionKey		Comment
-HiLink tppNewPageOptionKey		PreProc
-HiLink tppString			String
-HiLink tppColor			String
-HiLink tppTime			Number
-HiLink tppComment			Comment
-HiLink tppAbstractOption		Error
-HiLink tppPageLocalOption		Error
-HiLink tppPageLocalSwitch		Error
-HiLink tppColorOption			Error
-HiLink tppNewPageOption		Error
-HiLink tppTimeOption			Error
+hi def link tppAbstractOptionKey		Special
+hi def link tppPageLocalOptionKey		Keyword
+hi def link tppPageLocalSwitchKey		Keyword
+hi def link tppColorOptionKey		Keyword
+hi def link tppTimeOptionKey		Comment
+hi def link tppNewPageOptionKey		PreProc
+hi def link tppString			String
+hi def link tppColor			String
+hi def link tppTime			Number
+hi def link tppComment			Comment
+hi def link tppAbstractOption		Error
+hi def link tppPageLocalOption		Error
+hi def link tppPageLocalSwitch		Error
+hi def link tppColorOption			Error
+hi def link tppNewPageOption		Error
+hi def link tppTimeOption			Error
 
-delcommand HiLink
 
 let b:current_syntax = "tpp"
 
diff --git a/runtime/syntax/trasys.vim b/runtime/syntax/trasys.vim
index 1e7f75c357..d52b5eeb47 100644
--- a/runtime/syntax/trasys.vim
+++ b/runtime/syntax/trasys.vim
@@ -130,31 +130,29 @@ syn sync match trasysSync grouphere trasysComment "^HEADER DOCUMENTATION DATA"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink trasysOptions		Special
-HiLink trasysSurface		Special
-HiLink trasysSurfaceType	Constant
-HiLink trasysSurfaceArgs	Constant
-HiLink trasysArgs		Constant
-HiLink trasysOperations	Statement
-HiLink trasysSubRoutine	Statement
-HiLink trassyPrcsrSegm	PreProc
-HiLink trasysIdentifier	Identifier
-HiLink trasysComment		Comment
-HiLink trasysHeader		Typedef
-HiLink trasysMacro		Macro
-HiLink trasysInteger		Number
-HiLink trasysFloat		Float
-HiLink trasysScientific	Float
-
-HiLink trasysBlank		SpecialChar
-
-HiLink trasysEndData		Macro
-
-HiLink trasysTodo		Todo
-
-delcommand HiLink
+
+hi def link trasysOptions		Special
+hi def link trasysSurface		Special
+hi def link trasysSurfaceType	Constant
+hi def link trasysSurfaceArgs	Constant
+hi def link trasysArgs		Constant
+hi def link trasysOperations	Statement
+hi def link trasysSubRoutine	Statement
+hi def link trassyPrcsrSegm	PreProc
+hi def link trasysIdentifier	Identifier
+hi def link trasysComment		Comment
+hi def link trasysHeader		Typedef
+hi def link trasysMacro		Macro
+hi def link trasysInteger		Number
+hi def link trasysFloat		Float
+hi def link trasysScientific	Float
+
+hi def link trasysBlank		SpecialChar
+
+hi def link trasysEndData		Macro
+
+hi def link trasysTodo		Todo
+
 
 
 let b:current_syntax = "trasys"
diff --git a/runtime/syntax/tsalt.vim b/runtime/syntax/tsalt.vim
index 7bccde0e52..8dd2a24df9 100644
--- a/runtime/syntax/tsalt.vim
+++ b/runtime/syntax/tsalt.vim
@@ -169,37 +169,35 @@ syn sync ccomment tsaltComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink tsaltFunction		Statement
-HiLink tsaltSysVar		Type
-"HiLink tsaltLibFunc		UserDefFunc
-"HiLink tsaltConstants		Type
-"HiLink tsaltFuncArg		Type
-"HiLink tsaltOperator		Operator
-"HiLink tsaltLabel		Label
-"HiLink tsaltUserLabel		Label
-HiLink tsaltConditional		Conditional
-HiLink tsaltRepeat		Repeat
-HiLink tsaltCharacter		SpecialChar
-HiLink tsaltSpecialCharacter	SpecialChar
-HiLink tsaltNumber		Number
-HiLink tsaltFloat		Float
-HiLink tsaltCommentError	tsaltError
-HiLink tsaltInclude		Include
-HiLink tsaltPreProc		PreProc
-HiLink tsaltDefine		Macro
-HiLink tsaltIncluded		tsaltString
-HiLink tsaltError		Error
-HiLink tsaltStatement		Statement
-HiLink tsaltPreCondit		PreCondit
-HiLink tsaltType		Type
-HiLink tsaltString		String
-HiLink tsaltComment		Comment
-HiLink tsaltSpecial		Special
-HiLink tsaltTodo		Todo
-
-delcommand HiLink
+
+hi def link tsaltFunction		Statement
+hi def link tsaltSysVar		Type
+"hi def link tsaltLibFunc		UserDefFunc
+"hi def link tsaltConstants		Type
+"hi def link tsaltFuncArg		Type
+"hi def link tsaltOperator		Operator
+"hi def link tsaltLabel		Label
+"hi def link tsaltUserLabel		Label
+hi def link tsaltConditional		Conditional
+hi def link tsaltRepeat		Repeat
+hi def link tsaltCharacter		SpecialChar
+hi def link tsaltSpecialCharacter	SpecialChar
+hi def link tsaltNumber		Number
+hi def link tsaltFloat		Float
+hi def link tsaltCommentError	tsaltError
+hi def link tsaltInclude		Include
+hi def link tsaltPreProc		PreProc
+hi def link tsaltDefine		Macro
+hi def link tsaltIncluded		tsaltString
+hi def link tsaltError		Error
+hi def link tsaltStatement		Statement
+hi def link tsaltPreCondit		PreCondit
+hi def link tsaltType		Type
+hi def link tsaltString		String
+hi def link tsaltComment		Comment
+hi def link tsaltSpecial		Special
+hi def link tsaltTodo		Todo
+
 
 let b:current_syntax = "tsalt"
 
diff --git a/runtime/syntax/tsscl.vim b/runtime/syntax/tsscl.vim
index 32ca8d4359..fd2a5e2ba9 100644
--- a/runtime/syntax/tsscl.vim
+++ b/runtime/syntax/tsscl.vim
@@ -177,28 +177,26 @@ syn match  tssclScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink tssclCommand		Statement
-HiLink tssclKeyword		Special
-HiLink tssclEnd		Macro
-HiLink tssclUnits		Special
-
-HiLink tssclComment		Comment
-HiLink tssclDirective		Statement
-HiLink tssclConditional	Conditional
-HiLink tssclContChar		Macro
-HiLink tssclQualifier		Typedef
-HiLink tssclSymbol		Identifier
-HiLink tssclSymbol2		Symbol
-HiLink tssclString		String
-HiLink tssclOper		Operator
-
-HiLink tssclInteger		Number
-HiLink tssclFloat		Number
-HiLink tssclScientific	Number
-
-delcommand HiLink
+
+hi def link tssclCommand		Statement
+hi def link tssclKeyword		Special
+hi def link tssclEnd		Macro
+hi def link tssclUnits		Special
+
+hi def link tssclComment		Comment
+hi def link tssclDirective		Statement
+hi def link tssclConditional	Conditional
+hi def link tssclContChar		Macro
+hi def link tssclQualifier		Typedef
+hi def link tssclSymbol		Identifier
+hi def link tssclSymbol2		Symbol
+hi def link tssclString		String
+hi def link tssclOper		Operator
+
+hi def link tssclInteger		Number
+hi def link tssclFloat		Number
+hi def link tssclScientific	Number
+
 
 
 let b:current_syntax = "tsscl"
diff --git a/runtime/syntax/tssgm.vim b/runtime/syntax/tssgm.vim
index c575347c60..8ca7962e81 100644
--- a/runtime/syntax/tssgm.vim
+++ b/runtime/syntax/tssgm.vim
@@ -73,26 +73,24 @@ syn match  tssgmScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink tssgmParam		Statement
-HiLink tssgmSurfType		Type
-HiLink tssgmArgs		Special
-HiLink tssgmDelim		Typedef
-HiLink tssgmEnd		Macro
-HiLink tssgmUnits		Special
-
-HiLink tssgmDefault		SpecialComment
-HiLink tssgmComment		Statement
-HiLink tssgmCommentString	Comment
-HiLink tssgmSurfIdent		Identifier
-HiLink tssgmString		Delimiter
-
-HiLink tssgmInteger		Number
-HiLink tssgmFloat		Float
-HiLink tssgmScientific	Float
-
-delcommand HiLink
+
+hi def link tssgmParam		Statement
+hi def link tssgmSurfType		Type
+hi def link tssgmArgs		Special
+hi def link tssgmDelim		Typedef
+hi def link tssgmEnd		Macro
+hi def link tssgmUnits		Special
+
+hi def link tssgmDefault		SpecialComment
+hi def link tssgmComment		Statement
+hi def link tssgmCommentString	Comment
+hi def link tssgmSurfIdent		Identifier
+hi def link tssgmString		Delimiter
+
+hi def link tssgmInteger		Number
+hi def link tssgmFloat		Float
+hi def link tssgmScientific	Float
+
 
 
 let b:current_syntax = "tssgm"
diff --git a/runtime/syntax/tssop.vim b/runtime/syntax/tssop.vim
index f8fadab330..6a775b2358 100644
--- a/runtime/syntax/tssop.vim
+++ b/runtime/syntax/tssop.vim
@@ -54,21 +54,19 @@ syn match  tssopScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tssopParam		Statement
-HiLink tssopProp		Identifier
-HiLink tssopArgs		Special
+hi def link tssopParam		Statement
+hi def link tssopProp		Identifier
+hi def link tssopArgs		Special
 
-HiLink tssopComment		Statement
-HiLink tssopCommentString	Comment
-HiLink tssopPropName		Typedef
+hi def link tssopComment		Statement
+hi def link tssopCommentString	Comment
+hi def link tssopPropName		Typedef
 
-HiLink tssopInteger		Number
-HiLink tssopFloat		Float
-HiLink tssopScientific	Float
+hi def link tssopInteger		Number
+hi def link tssopFloat		Float
+hi def link tssopScientific	Float
 
-delcommand HiLink
 
 
 let b:current_syntax = "tssop"
diff --git a/runtime/syntax/uc.vim b/runtime/syntax/uc.vim
index e128cbf82c..90d33396c5 100644
--- a/runtime/syntax/uc.vim
+++ b/runtime/syntax/uc.vim
@@ -108,55 +108,53 @@ exec "syn sync ccomment ucComment minlines=" . uc_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink ucFuncDef			Conditional
-HiLink ucEventDef			Conditional
-HiLink ucBraces			Function
-HiLink ucBranch			Conditional
-HiLink ucLabel			Label
-HiLink ucUserLabel			Label
-HiLink ucConditional			Conditional
-HiLink ucRepeat			Repeat
-HiLink ucStorageClass			StorageClass
-HiLink ucMethodDecl			ucStorageClass
-HiLink ucClassDecl			ucStorageClass
-HiLink ucScopeDecl			ucStorageClass
-HiLink ucBoolean			Boolean
-HiLink ucSpecial			Special
-HiLink ucSpecialError			Error
-HiLink ucSpecialCharError		Error
-HiLink ucString			String
-HiLink ucCharacter			Character
-HiLink ucSpecialChar			SpecialChar
-HiLink ucNumber			Number
-HiLink ucError			Error
-HiLink ucStringError			Error
-HiLink ucStatement			Statement
-HiLink ucOperator			Operator
-HiLink ucOverLoaded			Operator
-HiLink ucComment			Comment
-HiLink ucDocComment			Comment
-HiLink ucLineComment			Comment
-HiLink ucConstant			ucBoolean
-HiLink ucTypedef			Typedef
-HiLink ucTodo				Todo
-
-HiLink ucCommentTitle			SpecialComment
-HiLink ucDocTags			Special
-HiLink ucDocParam			Function
-HiLink ucCommentStar			ucComment
-
-HiLink ucType				Type
-HiLink ucExternal			Include
-
-HiLink ucClassKeys			Conditional
-HiLink ucClassLabel			Conditional
-
-HiLink htmlComment			Special
-HiLink htmlCommentPart		Special
-
-delcommand HiLink
+
+hi def link ucFuncDef			Conditional
+hi def link ucEventDef			Conditional
+hi def link ucBraces			Function
+hi def link ucBranch			Conditional
+hi def link ucLabel			Label
+hi def link ucUserLabel			Label
+hi def link ucConditional			Conditional
+hi def link ucRepeat			Repeat
+hi def link ucStorageClass			StorageClass
+hi def link ucMethodDecl			ucStorageClass
+hi def link ucClassDecl			ucStorageClass
+hi def link ucScopeDecl			ucStorageClass
+hi def link ucBoolean			Boolean
+hi def link ucSpecial			Special
+hi def link ucSpecialError			Error
+hi def link ucSpecialCharError		Error
+hi def link ucString			String
+hi def link ucCharacter			Character
+hi def link ucSpecialChar			SpecialChar
+hi def link ucNumber			Number
+hi def link ucError			Error
+hi def link ucStringError			Error
+hi def link ucStatement			Statement
+hi def link ucOperator			Operator
+hi def link ucOverLoaded			Operator
+hi def link ucComment			Comment
+hi def link ucDocComment			Comment
+hi def link ucLineComment			Comment
+hi def link ucConstant			ucBoolean
+hi def link ucTypedef			Typedef
+hi def link ucTodo				Todo
+
+hi def link ucCommentTitle			SpecialComment
+hi def link ucDocTags			Special
+hi def link ucDocParam			Function
+hi def link ucCommentStar			ucComment
+
+hi def link ucType				Type
+hi def link ucExternal			Include
+
+hi def link ucClassKeys			Conditional
+hi def link ucClassLabel			Conditional
+
+hi def link htmlComment			Special
+hi def link htmlCommentPart		Special
+
 
 let b:current_syntax = "uc"
 
diff --git a/runtime/syntax/uil.vim b/runtime/syntax/uil.vim
index 689b187a25..ccf07d5a24 100644
--- a/runtime/syntax/uil.vim
+++ b/runtime/syntax/uil.vim
@@ -46,28 +46,26 @@ syn sync ccomment uilComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink uilCharacter		uilString
-HiLink uilSpecialCharacter	uilSpecial
-HiLink uilNumber		uilString
-HiLink uilCommentError	uilError
-HiLink uilInclude		uilPreCondit
-HiLink uilDefine		uilPreCondit
-HiLink uilIncluded		uilString
-HiLink uilSpecialFunction	uilRessource
-HiLink uilRessource		Identifier
-HiLink uilSpecialStatement	Keyword
-HiLink uilError		Error
-HiLink uilPreCondit		PreCondit
-HiLink uilType		Type
-HiLink uilString		String
-HiLink uilComment		Comment
-HiLink uilSpecial		Special
-HiLink uilTodo		Todo
+hi def link uilCharacter		uilString
+hi def link uilSpecialCharacter	uilSpecial
+hi def link uilNumber		uilString
+hi def link uilCommentError	uilError
+hi def link uilInclude		uilPreCondit
+hi def link uilDefine		uilPreCondit
+hi def link uilIncluded		uilString
+hi def link uilSpecialFunction	uilRessource
+hi def link uilRessource		Identifier
+hi def link uilSpecialStatement	Keyword
+hi def link uilError		Error
+hi def link uilPreCondit		PreCondit
+hi def link uilType		Type
+hi def link uilString		String
+hi def link uilComment		Comment
+hi def link uilSpecial		Special
+hi def link uilTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "uil"
diff --git a/runtime/syntax/vb.vim b/runtime/syntax/vb.vim
index 24c94fd5ba..8ddb1efac3 100644
--- a/runtime/syntax/vb.vim
+++ b/runtime/syntax/vb.vim
@@ -336,31 +336,29 @@ syn match   vbTypeSpecifier  "#[a-zA-Z0-9]"me=e-1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink vbBoolean		Boolean
-HiLink vbLineNumber		Comment
-HiLink vbComment		Comment
-HiLink vbConditional	Conditional
-HiLink vbConst			Constant
-HiLink vbDefine			Constant
-HiLink vbError			Error
-HiLink vbFunction		Identifier
-HiLink vbIdentifier		Identifier
-HiLink vbNumber			Number
-HiLink vbFloat			Float
-HiLink vbMethods		PreProc
-HiLink vbOperator		Operator
-HiLink vbRepeat			Repeat
-HiLink vbString			String
-HiLink vbStatement		Statement
-HiLink vbKeyword		Statement
-HiLink vbEvents			Special
-HiLink vbTodo			Todo
-HiLink vbTypes			Type
-HiLink vbTypeSpecifier	Type
+hi def link vbBoolean		Boolean
+hi def link vbLineNumber		Comment
+hi def link vbComment		Comment
+hi def link vbConditional	Conditional
+hi def link vbConst			Constant
+hi def link vbDefine			Constant
+hi def link vbError			Error
+hi def link vbFunction		Identifier
+hi def link vbIdentifier		Identifier
+hi def link vbNumber			Number
+hi def link vbFloat			Float
+hi def link vbMethods		PreProc
+hi def link vbOperator		Operator
+hi def link vbRepeat			Repeat
+hi def link vbString			String
+hi def link vbStatement		Statement
+hi def link vbKeyword		Statement
+hi def link vbEvents			Special
+hi def link vbTodo			Todo
+hi def link vbTypes			Type
+hi def link vbTypeSpecifier	Type
 
-delcommand HiLink
 
 let b:current_syntax = "vb"
 
diff --git a/runtime/syntax/vera.vim b/runtime/syntax/vera.vim
index 7952c94290..b41c0a6cbf 100644
--- a/runtime/syntax/vera.vim
+++ b/runtime/syntax/vera.vim
@@ -285,65 +285,63 @@ exec "syn sync ccomment veraComment minlines=" . b:vera_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink veraClass		Identifier
-HiLink veraObject		Identifier
-HiLink veraUserMethod		Function
-HiLink veraTask		Keyword
-HiLink veraModifier		Tag
-HiLink veraDeprecated		veraError
-HiLink veraMethods		Statement
-" HiLink veraInterface		Label
-HiLink veraInterface		Function
-
-HiLink veraFormat		veraSpecial
-HiLink veraCppString		veraString
-HiLink veraCommentL		veraComment
-HiLink veraCommentStart		veraComment
-HiLink veraLabel			Label
-HiLink veraUserLabel		Label
-HiLink veraConditional		Conditional
-HiLink veraRepeat		Repeat
-HiLink veraCharacter		Character
-HiLink veraSpecialCharacter	veraSpecial
-HiLink veraNumber		Number
-HiLink veraOctal			Number
-HiLink veraOctalZero		PreProc	 " link this to Error if you want
-HiLink veraFloat			Float
-HiLink veraOctalError		veraError
-HiLink veraParenError		veraError
-HiLink veraErrInParen		veraError
-HiLink veraErrInBracket		veraError
-HiLink veraCommentError		veraError
-HiLink veraCommentStartError	veraError
-HiLink veraSpaceError         SpaceError
-HiLink veraSpecialError		veraError
-HiLink veraOperator		Operator
-HiLink veraStructure		Structure
-HiLink veraInclude		Include
-HiLink veraPreProc		PreProc
-HiLink veraDefine		Macro
-HiLink veraIncluded		veraString
-HiLink veraError			Error
-HiLink veraStatement		Statement
-HiLink veraPreCondit		PreCondit
-HiLink veraType			Type
-" HiLink veraConstant		Constant
-HiLink veraConstant		Keyword
-HiLink veraUserConstant		Constant
-HiLink veraCommentString		veraString
-HiLink veraComment2String	veraString
-HiLink veraCommentSkip		veraComment
-HiLink veraString		String
-HiLink veraComment		Comment
-HiLink veraSpecial		SpecialChar
-HiLink veraTodo			Todo
-HiLink veraCppSkip		veraCppOut
-HiLink veraCppOut2		veraCppOut
-HiLink veraCppOut		Comment
-
-delcommand HiLink
+
+hi def link veraClass		Identifier
+hi def link veraObject		Identifier
+hi def link veraUserMethod		Function
+hi def link veraTask		Keyword
+hi def link veraModifier		Tag
+hi def link veraDeprecated		veraError
+hi def link veraMethods		Statement
+" hi def link veraInterface		Label
+hi def link veraInterface		Function
+
+hi def link veraFormat		veraSpecial
+hi def link veraCppString		veraString
+hi def link veraCommentL		veraComment
+hi def link veraCommentStart		veraComment
+hi def link veraLabel			Label
+hi def link veraUserLabel		Label
+hi def link veraConditional		Conditional
+hi def link veraRepeat		Repeat
+hi def link veraCharacter		Character
+hi def link veraSpecialCharacter	veraSpecial
+hi def link veraNumber		Number
+hi def link veraOctal			Number
+hi def link veraOctalZero		PreProc	 " link this to Error if you want
+hi def link veraFloat			Float
+hi def link veraOctalError		veraError
+hi def link veraParenError		veraError
+hi def link veraErrInParen		veraError
+hi def link veraErrInBracket		veraError
+hi def link veraCommentError		veraError
+hi def link veraCommentStartError	veraError
+hi def link veraSpaceError         SpaceError
+hi def link veraSpecialError		veraError
+hi def link veraOperator		Operator
+hi def link veraStructure		Structure
+hi def link veraInclude		Include
+hi def link veraPreProc		PreProc
+hi def link veraDefine		Macro
+hi def link veraIncluded		veraString
+hi def link veraError			Error
+hi def link veraStatement		Statement
+hi def link veraPreCondit		PreCondit
+hi def link veraType			Type
+" hi def link veraConstant		Constant
+hi def link veraConstant		Keyword
+hi def link veraUserConstant		Constant
+hi def link veraCommentString		veraString
+hi def link veraComment2String	veraString
+hi def link veraCommentSkip		veraComment
+hi def link veraString		String
+hi def link veraComment		Comment
+hi def link veraSpecial		SpecialChar
+hi def link veraTodo			Todo
+hi def link veraCppSkip		veraCppOut
+hi def link veraCppOut2		veraCppOut
+hi def link veraCppOut		Comment
+
 
 let b:current_syntax = "vera"
 
diff --git a/runtime/syntax/verilog.vim b/runtime/syntax/verilog.vim
index 4b7570a13d..bbaca491a7 100644
--- a/runtime/syntax/verilog.vim
+++ b/runtime/syntax/verilog.vim
@@ -96,25 +96,23 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink verilogCharacter       Character
-HiLink verilogConditional     Conditional
-HiLink verilogRepeat          Repeat
-HiLink verilogString          String
-HiLink verilogTodo            Todo
-HiLink verilogComment         Comment
-HiLink verilogConstant        Constant
-HiLink verilogLabel           Label
-HiLink verilogNumber          Number
-HiLink verilogOperator        Special
-HiLink verilogStatement       Statement
-HiLink verilogGlobal          Define
-HiLink verilogDirective       SpecialComment
-HiLink verilogEscape		 Special
-
-delcommand HiLink
+hi def link verilogCharacter       Character
+hi def link verilogConditional     Conditional
+hi def link verilogRepeat          Repeat
+hi def link verilogString          String
+hi def link verilogTodo            Todo
+hi def link verilogComment         Comment
+hi def link verilogConstant        Constant
+hi def link verilogLabel           Label
+hi def link verilogNumber          Number
+hi def link verilogOperator        Special
+hi def link verilogStatement       Statement
+hi def link verilogGlobal          Define
+hi def link verilogDirective       SpecialComment
+hi def link verilogEscape		 Special
+
 
 let b:current_syntax = "verilog"
 
diff --git a/runtime/syntax/verilogams.vim b/runtime/syntax/verilogams.vim
index 3e236099f5..7551b681a8 100644
--- a/runtime/syntax/verilogams.vim
+++ b/runtime/syntax/verilogams.vim
@@ -107,27 +107,25 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink verilogamsCharacter    Character
-HiLink verilogamsConditional  Conditional
-HiLink verilogamsRepeat       Repeat
-HiLink verilogamsString       String
-HiLink verilogamsTodo         Todo
-HiLink verilogamsComment      Comment
-HiLink verilogamsConstant     Constant
-HiLink verilogamsLabel        Label
-HiLink verilogamsNumber       Number
-HiLink verilogamsOperator     Special
-HiLink verilogamsStatement    Statement
-HiLink verilogamsGlobal       Define
-HiLink verilogamsDirective    SpecialComment
-HiLink verilogamsEscape       Special
-HiLink verilogamsType         Type
-HiLink verilogamsSystask      Function
+hi def link verilogamsCharacter    Character
+hi def link verilogamsConditional  Conditional
+hi def link verilogamsRepeat       Repeat
+hi def link verilogamsString       String
+hi def link verilogamsTodo         Todo
+hi def link verilogamsComment      Comment
+hi def link verilogamsConstant     Constant
+hi def link verilogamsLabel        Label
+hi def link verilogamsNumber       Number
+hi def link verilogamsOperator     Special
+hi def link verilogamsStatement    Statement
+hi def link verilogamsGlobal       Define
+hi def link verilogamsDirective    SpecialComment
+hi def link verilogamsEscape       Special
+hi def link verilogamsType         Type
+hi def link verilogamsSystask      Function
 
-delcommand HiLink
 
 let b:current_syntax = "verilogams"
 
diff --git a/runtime/syntax/vhdl.vim b/runtime/syntax/vhdl.vim
index 4a54216083..f4b11ff5dd 100644
--- a/runtime/syntax/vhdl.vim
+++ b/runtime/syntax/vhdl.vim
@@ -234,26 +234,24 @@ syn sync	minlines=600
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink	vhdlSpecial	Special
-HiLink	vhdlStatement   Statement
-HiLink	vhdlCharacter   Character
-HiLink	vhdlString	String
-HiLink	vhdlVector	Number
-HiLink	vhdlBoolean	Number
-HiLink	vhdlTodo	Todo
-HiLink	vhdlFixme	Fixme
-HiLink	vhdlComment	Comment
-HiLink	vhdlNumber	Number
-HiLink	vhdlTime	Number
-HiLink	vhdlType	Type
-HiLink	vhdlOperator    Operator
-HiLink	vhdlError	Error
-HiLink	vhdlAttribute   Special
-HiLink	vhdlPreProc	PreProc
-
-delcommand HiLink
+
+hi def link vhdlSpecial	Special
+hi def link vhdlStatement   Statement
+hi def link vhdlCharacter   Character
+hi def link vhdlString	String
+hi def link vhdlVector	Number
+hi def link vhdlBoolean	Number
+hi def link vhdlTodo	Todo
+hi def link vhdlFixme	Fixme
+hi def link vhdlComment	Comment
+hi def link vhdlNumber	Number
+hi def link vhdlTime	Number
+hi def link vhdlType	Type
+hi def link vhdlOperator    Operator
+hi def link vhdlError	Error
+hi def link vhdlAttribute   Special
+hi def link vhdlPreProc	PreProc
+
 
 let b:current_syntax = "vhdl"
 
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 91f70c6a1a..650f2e4a7b 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -139,8 +139,8 @@ syn match vimNumber	"\%(^\|[^a-zA-Z]\)\zs#\x\{6}"
 syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
 syn match vimIsCommand	"\<\h\w*\>"	contains=vimCommand
 syn match vimVar        contained	"\<\h[a-zA-Z0-9#_]*\>"
-syn match vimVar		"\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
-syn match vimFBVar      contained   "\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
+syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
+syn match vimFBVar      contained   "\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
 syn keyword vimCommand  contained	in
 
 " Insertions And Appends: insert append {{{2
@@ -772,171 +772,169 @@ syn sync match vimAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
 " Highlighting Settings {{{2
 " ====================
 
-if !exists("g:vimsyn_noerror")
- hi def link vimBehaveError	vimError
- hi def link vimCollClassErr	vimError
- hi def link vimErrSetting	vimError
- hi def link vimEmbedError	vimError
- hi def link vimFTError	vimError
- hi def link vimFunctionError	vimError
- hi def link vimFunc         	vimError
- hi def link vimHiAttribList	vimError
- hi def link vimHiCtermError	vimError
- hi def link vimHiKeyError	vimError
- hi def link vimKeyCodeError	vimError
- hi def link vimMapModErr	vimError
- hi def link vimSubstFlagErr	vimError
- hi def link vimSynCaseError	vimError
- hi def link vimBufnrWarn	vimWarn
-endif
-
-hi def link vimAbb	vimCommand
-hi def link vimAddress	vimMark
-hi def link vimAugroupError	vimError
-hi def link vimAugroupKey	vimCommand
-hi def link vimAuHighlight	vimHighlight
-hi def link vimAutoCmdOpt	vimOption
-hi def link vimAutoCmd	vimCommand
-hi def link vimAutoEvent	Type
-hi def link nvimAutoEvent	vimAutoEvent
-hi def link vimAutoSet	vimCommand
-hi def link vimBehaveModel	vimBehave
-hi def link vimBehave	vimCommand
-hi def link vimBracket	Delimiter
-hi def link vimCmplxRepeat	SpecialChar
-hi def link vimCommand	Statement
-hi def link vimComment	Comment
-hi def link vimCommentString	vimString
-hi def link vimCommentTitle	PreProc
-hi def link vimCondHL	vimCommand
-hi def link vimContinue	Special
-hi def link vimCtrlChar	SpecialChar
-hi def link vimEchoHLNone	vimGroup
-hi def link vimEchoHL	vimCommand
-hi def link vimElseIfErr	Error
-hi def link vimElseif	vimCondHL
-hi def link vimEnvvar	PreProc
-hi def link vimError	Error
-hi def link vimFBVar	vimVar
-hi def link vimFgBgAttrib	vimHiAttrib
-hi def link vimFold	Folded
-hi def link vimFTCmd	vimCommand
-hi def link vimFTOption	vimSynType
-hi def link vimFuncKey	vimCommand
-hi def link vimFuncName	Function
-hi def link vimFuncSID	Special
-hi def link vimFuncVar	Identifier
-hi def link vimGroupAdd	vimSynOption
-hi def link vimGroupName	vimGroup
-hi def link vimGroupRem	vimSynOption
-hi def link vimGroupSpecial	Special
-hi def link vimGroup	Type
-hi def link vimHiAttrib	PreProc
-hi def link vimHiClear	vimHighlight
-hi def link vimHiCtermFgBg	vimHiTerm
-hi def link vimHiCTerm	vimHiTerm
-hi def link vimHighlight	vimCommand
-hi def link vimHiGroup	vimGroupName
-hi def link vimHiGuiFgBg	vimHiTerm
-hi def link vimHiGuiFont	vimHiTerm
-hi def link vimHiGuiRgb	vimNumber
-hi def link vimHiGui	vimHiTerm
-hi def link vimHiNmbr	Number
-hi def link vimHiStartStop	vimHiTerm
-hi def link vimHiTerm	Type
-hi def link vimHLGroup	vimGroup
-hi def link nvimHLGroup	vimHLGroup
-hi def link vimHLMod	PreProc
-hi def link vimInsert	vimString
-hi def link vimIskSep	Delimiter
-hi def link vimKeyCode	vimSpecFile
-hi def link vimKeyword	Statement
-hi def link vimLet	vimCommand
-hi def link vimLineComment	vimComment
-hi def link vimMapBang	vimCommand
-hi def link vimMapModKey	vimFuncSID
-hi def link vimMapMod	vimBracket
-hi def link vimMap	vimCommand
-hi def link nvimMap	vimMap
-hi def link vimMark	Number
-hi def link vimMarkNumber	vimNumber
-hi def link vimMenuMod	vimMapMod
-hi def link vimMenuNameMore	vimMenuName
-hi def link vimMenuName	PreProc
-hi def link vimMtchComment	vimComment
-hi def link vimNorm	vimCommand
-hi def link vimNotation	Special
-hi def link vimNotFunc	vimCommand
-hi def link vimNotPatSep	vimString
-hi def link vimNumber	Number
-hi def link vimOperError	Error
-hi def link vimOper	Operator
-hi def link vimOption	PreProc
-hi def link vimParenSep	Delimiter
-hi def link vimPatSepErr	vimPatSep
-hi def link vimPatSepR	vimPatSep
-hi def link vimPatSep	SpecialChar
-hi def link vimPatSepZone	vimString
-hi def link vimPatSepZ	vimPatSep
-hi def link vimPattern	Type
-hi def link vimPlainMark	vimMark
-hi def link vimPlainRegister	vimRegister
-hi def link vimRegister	SpecialChar
-hi def link vimScriptDelim	Comment
-hi def link vimSearchDelim	Statement
-hi def link vimSearch	vimString
-hi def link vimSep	Delimiter
-hi def link vimSetMod	vimOption
-hi def link vimSetSep	Statement
-hi def link vimSetString	vimString
-hi def link vimSpecFile	Identifier
-hi def link vimSpecFileMod	vimSpecFile
-hi def link vimSpecial	Type
-hi def link vimStatement	Statement
-hi def link vimStringCont	vimString
-hi def link vimString	String
-hi def link vimSubst1	vimSubst
-hi def link vimSubstDelim	Delimiter
-hi def link vimSubstFlags	Special
-hi def link vimSubstSubstr	SpecialChar
-hi def link vimSubstTwoBS	vimString
-hi def link vimSubst	vimCommand
-hi def link vimSynCaseError	Error
-hi def link vimSynCase	Type
-hi def link vimSyncC	Type
-hi def link vimSyncError	Error
-hi def link vimSyncGroupName	vimGroupName
-hi def link vimSyncGroup	vimGroupName
-hi def link vimSyncKey	Type
-hi def link vimSyncNone	Type
-hi def link vimSynContains	vimSynOption
-hi def link vimSynError	Error
-hi def link vimSynKeyContainedin	vimSynContains
-hi def link vimSynKeyOpt	vimSynOption
-hi def link vimSynMtchGrp	vimSynOption
-hi def link vimSynMtchOpt	vimSynOption
-hi def link vimSynNextgroup	vimSynOption
-hi def link vimSynNotPatRange	vimSynRegPat
-hi def link vimSynOption	Special
-hi def link vimSynPatRange	vimString
-hi def link vimSynRegOpt	vimSynOption
-hi def link vimSynRegPat	vimString
-hi def link vimSynReg	Type
-hi def link vimSyntax	vimCommand
-hi def link vimSynType	vimSpecial
-hi def link vimTodo	Todo
-hi def link vimUnmap	vimMap
-hi def link nvimUnmap	vimMap
-hi def link vimUserAttrbCmpltFunc	Special
-hi def link vimUserAttrbCmplt	vimSpecial
-hi def link vimUserAttrbKey	vimOption
-hi def link vimUserAttrb	vimSpecial
-hi def link vimUserAttrbError	Error
-hi def link vimUserCmdError	Error
-hi def link vimUserCommand	vimCommand
-hi def link vimUserFunc	Normal
-hi def link vimVar	Identifier
-hi def link vimWarn	WarningMsg
+if !exists("skip_vim_syntax_inits")
+ if !exists("g:vimsyn_noerror")
+  hi def link vimBehaveError	vimError
+  hi def link vimCollClassErr	vimError
+  hi def link vimErrSetting	vimError
+  hi def link vimEmbedError	vimError
+  hi def link vimFTError	vimError
+  hi def link vimFunctionError	vimError
+  hi def link vimFunc         	vimError
+  hi def link vimHiAttribList	vimError
+  hi def link vimHiCtermError	vimError
+  hi def link vimHiKeyError	vimError
+  hi def link vimKeyCodeError	vimError
+  hi def link vimMapModErr	vimError
+  hi def link vimSubstFlagErr	vimError
+  hi def link vimSynCaseError	vimError
+  hi def link vimBufnrWarn	vimWarn
+ endif
+
+ hi def link vimAbb	vimCommand
+ hi def link vimAddress	vimMark
+ hi def link vimAugroupError	vimError
+ hi def link vimAugroupKey	vimCommand
+ hi def link vimAuHighlight	vimHighlight
+ hi def link vimAutoCmdOpt	vimOption
+ hi def link vimAutoCmd	vimCommand
+ hi def link vimAutoEvent	Type
+ hi def link vimAutoSet	vimCommand
+ hi def link vimBehaveModel	vimBehave
+ hi def link vimBehave	vimCommand
+ hi def link vimBracket	Delimiter
+ hi def link vimCmplxRepeat	SpecialChar
+ hi def link vimCommand	Statement
+ hi def link vimComment	Comment
+ hi def link vimCommentString	vimString
+ hi def link vimCommentTitle	PreProc
+ hi def link vimCondHL	vimCommand
+ hi def link vimContinue	Special
+ hi def link vimCtrlChar	SpecialChar
+ hi def link vimEchoHLNone	vimGroup
+ hi def link vimEchoHL	vimCommand
+ hi def link vimElseIfErr	Error
+ hi def link vimElseif	vimCondHL
+ hi def link vimEnvvar	PreProc
+ hi def link vimError	Error
+ hi def link vimFBVar	vimVar
+ hi def link vimFgBgAttrib	vimHiAttrib
+ hi def link vimFold	Folded
+ hi def link vimFTCmd	vimCommand
+ hi def link vimFTOption	vimSynType
+ hi def link vimFuncKey	vimCommand
+ hi def link vimFuncName	Function
+ hi def link vimFuncSID	Special
+ hi def link vimFuncVar	Identifier
+ hi def link vimGroupAdd	vimSynOption
+ hi def link vimGroupName	vimGroup
+ hi def link vimGroupRem	vimSynOption
+ hi def link vimGroupSpecial	Special
+ hi def link vimGroup	Type
+ hi def link vimHiAttrib	PreProc
+ hi def link vimHiClear	vimHighlight
+ hi def link vimHiCtermFgBg	vimHiTerm
+ hi def link vimHiCTerm	vimHiTerm
+ hi def link vimHighlight	vimCommand
+ hi def link vimHiGroup	vimGroupName
+ hi def link vimHiGuiFgBg	vimHiTerm
+ hi def link vimHiGuiFont	vimHiTerm
+ hi def link vimHiGuiRgb	vimNumber
+ hi def link vimHiGui	vimHiTerm
+ hi def link vimHiNmbr	Number
+ hi def link vimHiStartStop	vimHiTerm
+ hi def link vimHiTerm	Type
+ hi def link vimHLGroup	vimGroup
+ hi def link vimHLMod	PreProc
+ hi def link vimInsert	vimString
+ hi def link vimIskSep	Delimiter
+ hi def link vimKeyCode	vimSpecFile
+ hi def link vimKeyword	Statement
+ hi def link vimLet	vimCommand
+ hi def link vimLineComment	vimComment
+ hi def link vimMapBang	vimCommand
+ hi def link vimMapModKey	vimFuncSID
+ hi def link vimMapMod	vimBracket
+ hi def link vimMap	vimCommand
+ hi def link vimMark	Number
+ hi def link vimMarkNumber	vimNumber
+ hi def link vimMenuMod	vimMapMod
+ hi def link vimMenuNameMore	vimMenuName
+ hi def link vimMenuName	PreProc
+ hi def link vimMtchComment	vimComment
+ hi def link vimNorm	vimCommand
+ hi def link vimNotation	Special
+ hi def link vimNotFunc	vimCommand
+ hi def link vimNotPatSep	vimString
+ hi def link vimNumber	Number
+ hi def link vimOperError	Error
+ hi def link vimOper	Operator
+ hi def link vimOption	PreProc
+ hi def link vimParenSep	Delimiter
+ hi def link vimPatSepErr	vimPatSep
+ hi def link vimPatSepR	vimPatSep
+ hi def link vimPatSep	SpecialChar
+ hi def link vimPatSepZone	vimString
+ hi def link vimPatSepZ	vimPatSep
+ hi def link vimPattern	Type
+ hi def link vimPlainMark	vimMark
+ hi def link vimPlainRegister	vimRegister
+ hi def link vimRegister	SpecialChar
+ hi def link vimScriptDelim	Comment
+ hi def link vimSearchDelim	Statement
+ hi def link vimSearch	vimString
+ hi def link vimSep	Delimiter
+ hi def link vimSetMod	vimOption
+ hi def link vimSetSep	Statement
+ hi def link vimSetString	vimString
+ hi def link vimSpecFile	Identifier
+ hi def link vimSpecFileMod	vimSpecFile
+ hi def link vimSpecial	Type
+ hi def link vimStatement	Statement
+ hi def link vimStringCont	vimString
+ hi def link vimString	String
+ hi def link vimSubst1	vimSubst
+ hi def link vimSubstDelim	Delimiter
+ hi def link vimSubstFlags	Special
+ hi def link vimSubstSubstr	SpecialChar
+ hi def link vimSubstTwoBS	vimString
+ hi def link vimSubst	vimCommand
+ hi def link vimSynCaseError	Error
+ hi def link vimSynCase	Type
+ hi def link vimSyncC	Type
+ hi def link vimSyncError	Error
+ hi def link vimSyncGroupName	vimGroupName
+ hi def link vimSyncGroup	vimGroupName
+ hi def link vimSyncKey	Type
+ hi def link vimSyncNone	Type
+ hi def link vimSynContains	vimSynOption
+ hi def link vimSynError	Error
+ hi def link vimSynKeyContainedin	vimSynContains
+ hi def link vimSynKeyOpt	vimSynOption
+ hi def link vimSynMtchGrp	vimSynOption
+ hi def link vimSynMtchOpt	vimSynOption
+ hi def link vimSynNextgroup	vimSynOption
+ hi def link vimSynNotPatRange	vimSynRegPat
+ hi def link vimSynOption	Special
+ hi def link vimSynPatRange	vimString
+ hi def link vimSynRegOpt	vimSynOption
+ hi def link vimSynRegPat	vimString
+ hi def link vimSynReg	Type
+ hi def link vimSyntax	vimCommand
+ hi def link vimSynType	vimSpecial
+ hi def link vimTodo	Todo
+ hi def link vimUnmap	vimMap
+ hi def link vimUserAttrbCmpltFunc	Special
+ hi def link vimUserAttrbCmplt	vimSpecial
+ hi def link vimUserAttrbKey	vimOption
+ hi def link vimUserAttrb	vimSpecial
+ hi def link vimUserAttrbError	Error
+ hi def link vimUserCmdError	Error
+ hi def link vimUserCommand	vimCommand
+ hi def link vimUserFunc	Normal
+ hi def link vimVar	Identifier
+ hi def link vimWarn	WarningMsg
+endif
 
 " Current Syntax Variable: {{{2
 let b:current_syntax = "vim"
diff --git a/runtime/syntax/virata.vim b/runtime/syntax/virata.vim
index 3023f13a91..0ed54fa899 100644
--- a/runtime/syntax/virata.vim
+++ b/runtime/syntax/virata.vim
@@ -155,54 +155,52 @@ syn sync minlines=50		"for multiple region nesting
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Sub Links:
-HiLink virataDefSubstError	virataPreProcError
-HiLink virataDefSubst		virataPreProc
-HiLink virataInAlter		virataOperator
-HiLink virataInExec		virataOperator
-HiLink virataInExport		virataOperator
-HiLink virataInImport		virataOperator
-HiLink virataInInstance	virataOperator
-HiLink virataInMake		virataOperator
-HiLink virataInModule		virataOperator
-HiLink virataInProcess	virataOperator
-HiLink virataInMacAddr	virataHexNumber
+hi def link virataDefSubstError	virataPreProcError
+hi def link virataDefSubst		virataPreProc
+hi def link virataInAlter		virataOperator
+hi def link virataInExec		virataOperator
+hi def link virataInExport		virataOperator
+hi def link virataInImport		virataOperator
+hi def link virataInInstance	virataOperator
+hi def link virataInMake		virataOperator
+hi def link virataInModule		virataOperator
+hi def link virataInProcess	virataOperator
+hi def link virataInMacAddr	virataHexNumber
 
 " Comment Group:
-HiLink virataComment		Comment
-HiLink virataSpclComment	SpecialComment
-HiLink virataInCommentTodo	Todo
+hi def link virataComment		Comment
+hi def link virataSpclComment	SpecialComment
+hi def link virataInCommentTodo	Todo
 
 " Constant Group:
-HiLink virataString		String
-HiLink virataStringError	Error
-HiLink virataCharacter	Character
-HiLink virataSpclChar		Special
-HiLink virataDecNumber	Number
-HiLink virataHexNumber	Number
-HiLink virataSizeNumber	Number
-HiLink virataNumberError	Error
+hi def link virataString		String
+hi def link virataStringError	Error
+hi def link virataCharacter	Character
+hi def link virataSpclChar		Special
+hi def link virataDecNumber	Number
+hi def link virataHexNumber	Number
+hi def link virataSizeNumber	Number
+hi def link virataNumberError	Error
 
 " Identifier Group:
-HiLink virataIdentError	Error
+hi def link virataIdentError	Error
 
 " PreProc Group:
-HiLink virataPreProc		PreProc
-HiLink virataDefine		Define
-HiLink virataInclude		Include
-HiLink virataPreCondit	PreCondit
-HiLink virataPreProcError	Error
-HiLink virataPreProcWarn	Todo
+hi def link virataPreProc		PreProc
+hi def link virataDefine		Define
+hi def link virataInclude		Include
+hi def link virataPreCondit	PreCondit
+hi def link virataPreProcError	Error
+hi def link virataPreProcWarn	Todo
 
 " Directive Group:
-HiLink virataStatement	Statement
-HiLink virataCfgStatement	Statement
-HiLink virataOperator		Operator
-HiLink virataDirective	Keyword
+hi def link virataStatement	Statement
+hi def link virataCfgStatement	Statement
+hi def link virataOperator		Operator
+hi def link virataDirective	Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "virata"
 
diff --git a/runtime/syntax/vmasm.vim b/runtime/syntax/vmasm.vim
index a4b71229ec..c5cbb1e3a2 100644
--- a/runtime/syntax/vmasm.vim
+++ b/runtime/syntax/vmasm.vim
@@ -194,7 +194,6 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " Comment Constant Error Identifier PreProc Special Statement Todo Type
@@ -206,34 +205,33 @@ command -nargs=+ HiLink hi def link <args>
 " Statement		Conditional Exception Keyword Label Operator Repeat
 " Type		StorageClass Structure Typedef
 
-HiLink vmasmComment		Comment
-HiLink vmasmTodo		Todo
+hi def link vmasmComment		Comment
+hi def link vmasmTodo		Todo
 
-HiLink vmasmhexNumber		Number		" Constant
-HiLink vmasmoctNumber		Number		" Constant
-HiLink vmasmbinNumber		Number		" Constant
-HiLink vmasmdecNumber		Number		" Constant
-HiLink vmasmfloatNumber	Number		" Constant
+hi def link vmasmhexNumber		Number		" Constant
+hi def link vmasmoctNumber		Number		" Constant
+hi def link vmasmbinNumber		Number		" Constant
+hi def link vmasmdecNumber		Number		" Constant
+hi def link vmasmfloatNumber	Number		" Constant
 
-"  HiLink vmasmString		String		" Constant
+"  hi def link vmasmString		String		" Constant
 
-HiLink vmasmReg		Identifier
-HiLink vmasmOperator		Identifier
+hi def link vmasmReg		Identifier
+hi def link vmasmOperator		Identifier
 
-HiLink vmasmInclude		Include		" PreProc
-HiLink vmasmMacro		Macro		" PreProc
-" HiLink vmasmMacroParam	Keyword		" Statement
+hi def link vmasmInclude		Include		" PreProc
+hi def link vmasmMacro		Macro		" PreProc
+" hi def link vmasmMacroParam	Keyword		" Statement
 
-HiLink vmasmDirective		Special
-HiLink vmasmPreCond		Special
+hi def link vmasmDirective		Special
+hi def link vmasmPreCond		Special
 
 
-HiLink vmasmOpcode		Statement
-HiLink vmasmCond		Conditional	" Statement
-HiLink vmasmRepeat		Repeat		" Statement
+hi def link vmasmOpcode		Statement
+hi def link vmasmCond		Conditional	" Statement
+hi def link vmasmRepeat		Repeat		" Statement
 
-HiLink vmasmLabel		Type
-delcommand HiLink
+hi def link vmasmLabel		Type
 
 let b:current_syntax = "vmasm"
 
diff --git a/runtime/syntax/vrml.vim b/runtime/syntax/vrml.vim
index 530becb55a..2474493c94 100644
--- a/runtime/syntax/vrml.vim
+++ b/runtime/syntax/vrml.vim
@@ -196,28 +196,26 @@ syn region VRMLString start=+"+ skip=+\\\\\|\\"+ end=+"+ fold contains=VRMLSpeci
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink VRMLCharacter  VRMLString
-HiLink VRMLSpecialCharacter VRMLSpecial
-HiLink VRMLNumber     VRMLString
-HiLink VRMLValues     VRMLString
-HiLink VRMLString     String
-HiLink VRMLSpecial    Special
-HiLink VRMLComment    Comment
-HiLink VRMLNodes      Statement
-HiLink VRMLFields     Type
-HiLink VRMLEvents     Type
-HiLink VRMLfTypes     LineNr
+
+hi def link VRMLCharacter  VRMLString
+hi def link VRMLSpecialCharacter VRMLSpecial
+hi def link VRMLNumber     VRMLString
+hi def link VRMLValues     VRMLString
+hi def link VRMLString     String
+hi def link VRMLSpecial    Special
+hi def link VRMLComment    Comment
+hi def link VRMLNodes      Statement
+hi def link VRMLFields     Type
+hi def link VRMLEvents     Type
+hi def link VRMLfTypes     LineNr
 "  hi     VRMLfTypes     ctermfg=6 guifg=Brown
-HiLink VRMLInstances  PreCondit
-HiLink VRMLRoutes     PreCondit
-HiLink VRMLProtos     PreProc
-HiLink VRMLRouteNode  Identifier
-HiLink VRMLInstName   Identifier
-HiLink VRMLTypes      Identifier
-
-delcommand HiLink
+hi def link VRMLInstances  PreCondit
+hi def link VRMLRoutes     PreCondit
+hi def link VRMLProtos     PreProc
+hi def link VRMLRouteNode  Identifier
+hi def link VRMLInstName   Identifier
+hi def link VRMLTypes      Identifier
+
 
 let b:current_syntax = "vrml"
 
diff --git a/runtime/syntax/vsejcl.vim b/runtime/syntax/vsejcl.vim
index 5a106c2ef8..f329836236 100644
--- a/runtime/syntax/vsejcl.vim
+++ b/runtime/syntax/vsejcl.vim
@@ -21,17 +21,15 @@ syn match vsejclParms /(.\{-})/ contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink vsejclComment		Comment
-HiLink vsejclField		Type
-HiLink vsejclKeyword		Statement
-HiLink vsejclObject		Constant
-HiLink vsejclString		Constant
-HiLink vsejclMisc			Special
-HiLink vsejclParms		Constant
+hi def link vsejclComment		Comment
+hi def link vsejclField		Type
+hi def link vsejclKeyword		Statement
+hi def link vsejclObject		Constant
+hi def link vsejclString		Constant
+hi def link vsejclMisc			Special
+hi def link vsejclParms		Constant
 
-delcommand HiLink
 
 let b:current_syntax = "vsejcl"
 
diff --git a/runtime/syntax/wdiff.vim b/runtime/syntax/wdiff.vim
index bdc7be7131..d0afadff2f 100644
--- a/runtime/syntax/wdiff.vim
+++ b/runtime/syntax/wdiff.vim
@@ -21,11 +21,9 @@ syn region wdiffNew start="{+" end="+}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink wdiffOld       Special
-HiLink wdiffNew       Identifier
+hi def link wdiffOld       Special
+hi def link wdiffNew       Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "wdiff"
diff --git a/runtime/syntax/webmacro.vim b/runtime/syntax/webmacro.vim
index 2c32f537d8..fb1fff6d3d 100644
--- a/runtime/syntax/webmacro.vim
+++ b/runtime/syntax/webmacro.vim
@@ -45,22 +45,20 @@ syn match webmacroHash "[#{}\$]" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink webmacroComment CommentTitle
-HiLink webmacroVariable PreProc
-HiLink webmacroIf webmacroStatement
-HiLink webmacroForeach webmacroStatement
-HiLink webmacroSet webmacroStatement
-HiLink webmacroInclude webmacroStatement
-HiLink webmacroParse webmacroStatement
-HiLink webmacroStatement Function
-HiLink webmacroNumber Number
-HiLink webmacroBoolean Boolean
-HiLink webmacroSpecial Special
-HiLink webmacroString String
-HiLink webmacroBracesError Error
-delcommand HiLink
+hi def link webmacroComment CommentTitle
+hi def link webmacroVariable PreProc
+hi def link webmacroIf webmacroStatement
+hi def link webmacroForeach webmacroStatement
+hi def link webmacroSet webmacroStatement
+hi def link webmacroInclude webmacroStatement
+hi def link webmacroParse webmacroStatement
+hi def link webmacroStatement Function
+hi def link webmacroNumber Number
+hi def link webmacroBoolean Boolean
+hi def link webmacroSpecial Special
+hi def link webmacroString String
+hi def link webmacroBracesError Error
 
 let b:current_syntax = "webmacro"
 
diff --git a/runtime/syntax/winbatch.vim b/runtime/syntax/winbatch.vim
index e787a5d09f..15ea0fc77b 100644
--- a/runtime/syntax/winbatch.vim
+++ b/runtime/syntax/winbatch.vim
@@ -156,20 +156,18 @@ syn keyword winbatchImplicit xsendmessage xverifyccard yield
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink winbatchLabel		PreProc
-HiLink winbatchCtl		Operator
-HiLink winbatchStatement	Statement
-HiLink winbatchTodo		Todo
-HiLink winbatchString		String
-HiLink winbatchVar		Type
-HiLink winbatchComment	Comment
-HiLink winbatchImplicit	Special
-HiLink winbatchNumber		Number
-HiLink winbatchConstant	StorageClass
+hi def link winbatchLabel		PreProc
+hi def link winbatchCtl		Operator
+hi def link winbatchStatement	Statement
+hi def link winbatchTodo		Todo
+hi def link winbatchString		String
+hi def link winbatchVar		Type
+hi def link winbatchComment	Comment
+hi def link winbatchImplicit	Special
+hi def link winbatchNumber		Number
+hi def link winbatchConstant	StorageClass
 
-delcommand HiLink
 
 let b:current_syntax = "winbatch"
 
diff --git a/runtime/syntax/wml.vim b/runtime/syntax/wml.vim
index b9169d003b..73bf822e40 100644
--- a/runtime/syntax/wml.vim
+++ b/runtime/syntax/wml.vim
@@ -130,23 +130,21 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink wmlNextLine	Special
-HiLink wmlUse		Include
-HiLink wmlUsed	String
-HiLink wmlBody	Special
-HiLink wmlDiverted	Label
-HiLink wmlDivert	Delimiter
-HiLink wmlDivertEnd	Delimiter
-HiLink wmlLocationId	Label
-HiLink wmlLocation	Delimiter
-" HiLink wmlLocationed	Delimiter
-HiLink wmlDefineName	String
-HiLink wmlComment	Comment
-HiLink wmlInclude	Include
-HiLink wmlSharpBang	PreProc
-
-delcommand HiLink
+
+hi def link wmlNextLine	Special
+hi def link wmlUse		Include
+hi def link wmlUsed	String
+hi def link wmlBody	Special
+hi def link wmlDiverted	Label
+hi def link wmlDivert	Delimiter
+hi def link wmlDivertEnd	Delimiter
+hi def link wmlLocationId	Label
+hi def link wmlLocation	Delimiter
+" hi def link wmlLocationed	Delimiter
+hi def link wmlDefineName	String
+hi def link wmlComment	Comment
+hi def link wmlInclude	Include
+hi def link wmlSharpBang	PreProc
+
 
 let b:current_syntax = "wml"
diff --git a/runtime/syntax/wsml.vim b/runtime/syntax/wsml.vim
index f2fbbf25c1..d01294caac 100644
--- a/runtime/syntax/wsml.vim
+++ b/runtime/syntax/wsml.vim
@@ -77,38 +77,36 @@ syn cluster wsmlTop add=wsmlString,wsmlCharacter,wsmlNumber,wsmlSpecial,wsmlStri
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink wsmlHeader			TypeDef
-HiLink wsmlNamespace			TypeDef
-HiLink wsmlOntology			Statement
-HiLink wsmlAxiom			TypeDef
-HiLink wsmlService			TypeDef
-HiLink wsmlNFP			TypeDef
-HiLink wsmlTopLevel			TypeDef
-HiLink wsmlMediation			TypeDef 
-HiLink wsmlBehavioral		TypeDef
-HiLink wsmlChoreographyPri		TypeDef
-HiLink wsmlChoreographySec		Operator
-HiLink wsmlChoreographyTer		Special
-HiLink wsmlString			String
-HiLink wsmlIdentifier		Normal 
-HiLink wsmlSqName                     Normal
-HiLink wsmlVariable			Define
-HiLink wsmlKeywordsInsideLEs		Operator
-HiLink wsmlOperator			Operator
-HiLink wsmlBrace			Operator
-HiLink wsmlCharacter			Character
-HiLink wsmlNumber			Number
-HiLink wsmlDataTypes			Special
-HiLink wsmlComment			Comment
-HiLink wsmlDocComment		Comment
-HiLink wsmlLineComment		Comment
-HiLink wsmlTodo			Todo
-HiLink wsmlFixMe			Error
-HiLink wsmlCommentTitle		SpecialComment
-HiLink wsmlCommentStar		wsmlComment
+hi def link wsmlHeader			TypeDef
+hi def link wsmlNamespace			TypeDef
+hi def link wsmlOntology			Statement
+hi def link wsmlAxiom			TypeDef
+hi def link wsmlService			TypeDef
+hi def link wsmlNFP			TypeDef
+hi def link wsmlTopLevel			TypeDef
+hi def link wsmlMediation			TypeDef 
+hi def link wsmlBehavioral		TypeDef
+hi def link wsmlChoreographyPri		TypeDef
+hi def link wsmlChoreographySec		Operator
+hi def link wsmlChoreographyTer		Special
+hi def link wsmlString			String
+hi def link wsmlIdentifier		Normal 
+hi def link wsmlSqName                     Normal
+hi def link wsmlVariable			Define
+hi def link wsmlKeywordsInsideLEs		Operator
+hi def link wsmlOperator			Operator
+hi def link wsmlBrace			Operator
+hi def link wsmlCharacter			Character
+hi def link wsmlNumber			Number
+hi def link wsmlDataTypes			Special
+hi def link wsmlComment			Comment
+hi def link wsmlDocComment		Comment
+hi def link wsmlLineComment		Comment
+hi def link wsmlTodo			Todo
+hi def link wsmlFixMe			Error
+hi def link wsmlCommentTitle		SpecialComment
+hi def link wsmlCommentStar		wsmlComment
 
-delcommand HiLink
 
 let b:current_syntax = "wsml"
 let b:spell_options="contained"
diff --git a/runtime/syntax/xdefaults.vim b/runtime/syntax/xdefaults.vim
index 1dfcc34ae5..7da5969cde 100644
--- a/runtime/syntax/xdefaults.vim
+++ b/runtime/syntax/xdefaults.vim
@@ -107,27 +107,25 @@ syn keyword xdefaultsSymbol contained Y_RESOLUTION
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink xdefaultsLabel		Type
-HiLink xdefaultsValue		Constant
-HiLink xdefaultsComment	Comment
-HiLink xdefaultsCommentH	xdefaultsComment
-HiLink xdefaultsPreProc	PreProc
-HiLink xdefaultsInclude	xdefaultsPreProc
-HiLink xdefaultsCppSkip	xdefaultsCppOut
-HiLink xdefaultsCppOut2	xdefaultsCppOut
-HiLink xdefaultsCppOut	Comment
-HiLink xdefaultsIncluded	String
-HiLink xdefaultsDefine	Macro
-HiLink xdefaultsSymbol	Statement
-HiLink xdefaultsSpecial	Statement
-HiLink xdefaultsErrorLine	Error
-HiLink xdefaultsCommentError	Error
-HiLink xdefaultsPunct		Normal
-HiLink xdefaultsLineEnd	Special
-HiLink xdefaultsTodo		Todo
-
-delcommand HiLink
+hi def link xdefaultsLabel		Type
+hi def link xdefaultsValue		Constant
+hi def link xdefaultsComment	Comment
+hi def link xdefaultsCommentH	xdefaultsComment
+hi def link xdefaultsPreProc	PreProc
+hi def link xdefaultsInclude	xdefaultsPreProc
+hi def link xdefaultsCppSkip	xdefaultsCppOut
+hi def link xdefaultsCppOut2	xdefaultsCppOut
+hi def link xdefaultsCppOut	Comment
+hi def link xdefaultsIncluded	String
+hi def link xdefaultsDefine	Macro
+hi def link xdefaultsSymbol	Statement
+hi def link xdefaultsSpecial	Statement
+hi def link xdefaultsErrorLine	Error
+hi def link xdefaultsCommentError	Error
+hi def link xdefaultsPunct		Normal
+hi def link xdefaultsLineEnd	Special
+hi def link xdefaultsTodo		Todo
+
 
 let b:current_syntax = "xdefaults"
 
diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim
index efb7d66c0c..59fc497e62 100644
--- a/runtime/syntax/xkb.vim
+++ b/runtime/syntax/xkb.vim
@@ -47,35 +47,33 @@ syn keyword xkbTModif default hidden partial virtual
 syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xkbModif xkbPreproc
-HiLink xkbTModif xkbPreproc
-HiLink xkbPreproc Preproc
+hi def link xkbModif xkbPreproc
+hi def link xkbTModif xkbPreproc
+hi def link xkbPreproc Preproc
 
-HiLink xkbIdentifier Keyword
-HiLink xkbFunction Function
-HiLink xkbSect Type
-HiLink xkbPhysicalKey Identifier
-HiLink xkbKeyword Keyword
+hi def link xkbIdentifier Keyword
+hi def link xkbFunction Function
+hi def link xkbSect Type
+hi def link xkbPhysicalKey Identifier
+hi def link xkbKeyword Keyword
 
-HiLink xkbComment Comment
-HiLink xkbTodo Todo
+hi def link xkbComment Comment
+hi def link xkbTodo Todo
 
-HiLink xkbConstant Constant
-HiLink xkbString String
+hi def link xkbConstant Constant
+hi def link xkbString String
 
-HiLink xkbSpecialChar xkbSpecial
-HiLink xkbSpecial Special
+hi def link xkbSpecialChar xkbSpecial
+hi def link xkbSpecial Special
 
-HiLink xkbParenError xkbBalancingError
-HiLink xkbBraceError xkbBalancingError
-HiLink xkbBraketError xkbBalancingError
-HiLink xkbBalancingError xkbError
-HiLink xkbCommentStartError xkbCommentError
-HiLink xkbCommentError xkbError
-HiLink xkbError Error
+hi def link xkbParenError xkbBalancingError
+hi def link xkbBraceError xkbBalancingError
+hi def link xkbBraketError xkbBalancingError
+hi def link xkbBalancingError xkbError
+hi def link xkbCommentStartError xkbCommentError
+hi def link xkbCommentError xkbError
+hi def link xkbError Error
 
-delcommand HiLink
 
 let b:current_syntax = "xkb"
diff --git a/runtime/syntax/xmath.vim b/runtime/syntax/xmath.vim
index a81adf53cc..22b3e85dae 100644
--- a/runtime/syntax/xmath.vim
+++ b/runtime/syntax/xmath.vim
@@ -1,11 +1,12 @@
 " Vim syntax file
 " Language:	xmath (a simulation tool)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Sep 11, 2006
-" Version:	7
+" Last Change:	Aug 31, 2016
+" Version:	9
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XMATH
 
-" quit when a syntax file was already loaded
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
@@ -191,34 +192,33 @@ syn sync match xmathSyncComment	grouphere xmathCommentBlock "#{"
 syn sync match xmathSyncComment	groupthere NONE "}#"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink xmathBraceError	xmathError
-HiLink xmathCmd	xmathStatement
-HiLink xmathCommentBlock	xmathComment
-HiLink xmathCurlyError	xmathError
-HiLink xmathFuncCmd	xmathStatement
-HiLink xmathParenError	xmathError
-
-" The default methods for highlighting.  Can be overridden later
-HiLink xmathCharacter	Character
-HiLink xmathComma	Delimiter
-HiLink xmathComment	Comment
-HiLink xmathCommentBlock	Comment
-HiLink xmathConditional	Conditional
-HiLink xmathError	Error
-HiLink xmathFunc	Function
-HiLink xmathLabel	PreProc
-HiLink xmathNumber	Number
-HiLink xmathRepeat	Repeat
-HiLink xmathSpecial	Type
-HiLink xmathSpecialChar	SpecialChar
-HiLink xmathStatement	Statement
-HiLink xmathString	String
-HiLink xmathTodo	Todo
-
-delcommand HiLink
+if !exists("skip_xmath_syntax_inits")
+
+  hi def link xmathBraceError	xmathError
+  hi def link xmathCmd	xmathStatement
+  hi def link xmathCommentBlock	xmathComment
+  hi def link xmathCurlyError	xmathError
+  hi def link xmathFuncCmd	xmathStatement
+  hi def link xmathParenError	xmathError
+
+  " The default methods for highlighting.  Can be overridden later
+  hi def link xmathCharacter	Character
+  hi def link xmathComma	Delimiter
+  hi def link xmathComment	Comment
+  hi def link xmathCommentBlock	Comment
+  hi def link xmathConditional	Conditional
+  hi def link xmathError	Error
+  hi def link xmathFunc	Function
+  hi def link xmathLabel	PreProc
+  hi def link xmathNumber	Number
+  hi def link xmathRepeat	Repeat
+  hi def link xmathSpecial	Type
+  hi def link xmathSpecialChar	SpecialChar
+  hi def link xmathStatement	Statement
+  hi def link xmathString	String
+  hi def link xmathTodo	Todo
+
+endif
 
 let b:current_syntax = "xmath"
 
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
index 8cc92a1189..2021c3a967 100644
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -124,15 +124,13 @@ endif		" has("gui_running")
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xpmType		Type
-HiLink xpmStorageClass	StorageClass
-HiLink xpmTodo		Todo
-HiLink xpmComment		Comment
-HiLink xpmPixelString	String
+hi def link xpmType		Type
+hi def link xpmStorageClass	StorageClass
+hi def link xpmTodo		Todo
+hi def link xpmComment		Comment
+hi def link xpmPixelString	String
 
-delcommand HiLink
 
 let b:current_syntax = "xpm"
 
diff --git a/runtime/syntax/xpm2.vim b/runtime/syntax/xpm2.vim
index 908f3914e5..1d0eb572fd 100644
--- a/runtime/syntax/xpm2.vim
+++ b/runtime/syntax/xpm2.vim
@@ -20,7 +20,6 @@ syn keyword xpm2Todo		TODO FIXME XXX  contained
 syn match   xpm2Comment		"\!.*$"  contains=@Spell,xpm2Todo
 
 
-command -nargs=+ HiLink hi def link <args>
 command -nargs=+ Hi hi def <args>
 
 if has("gui_running")
@@ -55,7 +54,7 @@ if has("gui_running")
 	if s !~ '/'
 	  exe 'syn match xpm2Values /' . s . '/'
 	endif
-	HiLink xpm2Values Statement
+	hi def link xpm2Values Statement
 
 	let n = 1			" n = color index
 
@@ -104,11 +103,11 @@ if has("gui_running")
 	" now create syntax items
 	" highlight the color string as normal string (no pixel string)
 	exe 'syn match xpm2Col'.n.'Def /'.s.'/ contains=xpm2Col'.n.'inDef'
-	exe 'HiLink xpm2Col'.n.'Def Constant'
+	exe 'hi def link xpm2Col'.n.'Def Constant'
 
 	" but highlight the first whitespace after chars in its color
 	exe 'syn match xpm2Col'.n.'inDef /^'.chars.'/hs=s+'.(cpp).' contained'
-	exe 'HiLink xpm2Col'.n.'inDef xpm2Color'.n
+	exe 'hi def link xpm2Col'.n.'inDef xpm2Color'.n
 
 	" remove the following whitespace from chars
 	let chars = substitute(chars, '\\s\\+$', '', '')
@@ -138,13 +137,12 @@ endif		" has("gui_running")
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 " The default highlighting.
-HiLink xpm2Type		Type
-HiLink xpm2StorageClass	StorageClass
-HiLink xpm2Todo		Todo
-HiLink xpm2Comment		Comment
-HiLink xpm2PixelString	String
+hi def link xpm2Type		Type
+hi def link xpm2StorageClass	StorageClass
+hi def link xpm2Todo		Todo
+hi def link xpm2Comment		Comment
+hi def link xpm2PixelString	String
 
-delcommand HiLink
 delcommand Hi
 
 let b:current_syntax = "xpm2"
diff --git a/runtime/syntax/xs.vim b/runtime/syntax/xs.vim
index 9a9140fdd0..d4ac9d1bc7 100644
--- a/runtime/syntax/xs.vim
+++ b/runtime/syntax/xs.vim
@@ -3243,20 +3243,18 @@ syn keyword xsMacro xiv_iv xuv_uv yystype
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xsPrivate    Error
-HiLink xsSuperseded Error
-HiLink xsType       Type
-HiLink xsString     String
-HiLink xsConstant   Constant
-HiLink xsException  Exception
-HiLink xsKeyword    Keyword
-HiLink xsFunction   Function
-HiLink xsVariable   Identifier
-HiLink xsMacro      Macro
+hi def link xsPrivate    Error
+hi def link xsSuperseded Error
+hi def link xsType       Type
+hi def link xsString     String
+hi def link xsConstant   Constant
+hi def link xsException  Exception
+hi def link xsKeyword    Keyword
+hi def link xsFunction   Function
+hi def link xsVariable   Identifier
+hi def link xsMacro      Macro
 
-delcommand HiLink
 
 let b:current_syntax = "xs"
 
diff --git a/runtime/syntax/xxd.vim b/runtime/syntax/xxd.vim
index 1145ebccf2..f3c43e816c 100644
--- a/runtime/syntax/xxd.vim
+++ b/runtime/syntax/xxd.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:		bin using xxd
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:		8
+" Last Change:	Aug 31, 2016
+" Version:		10
 " Notes:		use :help xxd   to see how to invoke it
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XXD
 
@@ -17,14 +17,13 @@ syn match xxdAscii				"  .\{,16\}\r\=$"hs=s+2	contains=xxdDot
 syn match xxdDot	contained	"[.\r]"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_xxd_syntax_inits")
 
-HiLink xxdAddress	Constant
-HiLink xxdSep		Identifier
-HiLink xxdAscii	Statement
+ hi def link xxdAddress	Constant
+ hi def link xxdSep		Identifier
+ hi def link xxdAscii	Statement
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "xxd"
 
diff --git a/runtime/syntax/yacc.vim b/runtime/syntax/yacc.vim
index 634c12ee5e..8d5eb13071 100644
--- a/runtime/syntax/yacc.vim
+++ b/runtime/syntax/yacc.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Yacc
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Apr 02, 2015
-" Version:	13
-" URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+" Last Change:	Aug 31, 2016
+" Version:	15
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_YACC
 "
 " Options: {{{1
 "   g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C
@@ -87,7 +87,7 @@ syn sync fromstart
 
 " ---------------------------------------------------------------------
 " Define the default highlighting. {{{1
-if !exists("did_yacc_syn_inits")
+if !exists("skip_yacc_syn_inits")
   hi def link yaccBrkt	yaccStmt
   hi def link yaccComment	Comment
   hi def link yaccCurly	Delimiter
diff --git a/runtime/syntax/z8a.vim b/runtime/syntax/z8a.vim
index 054f6390e6..6809eb98cd 100644
--- a/runtime/syntax/z8a.vim
+++ b/runtime/syntax/z8a.vim
@@ -83,21 +83,19 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-
-HiLink z8aSection		Special
-HiLink z8aLabel		Label
-HiLink z8aSpecialLabel	Label
-HiLink z8aComment		Comment
-HiLink z8aInstruction	Statement
-HiLink z8aSpecInst		Statement
-HiLink z8aInclude		Include
-HiLink z8aPreCondit		PreCondit
-HiLink z8aPreProc		PreProc
-HiLink z8aNumber		Number
-HiLink z8aString		String
-
-delcommand HiLink
+
+hi def link z8aSection		Special
+hi def link z8aLabel		Label
+hi def link z8aSpecialLabel	Label
+hi def link z8aComment		Comment
+hi def link z8aInstruction	Statement
+hi def link z8aSpecInst		Statement
+hi def link z8aInclude		Include
+hi def link z8aPreCondit		PreCondit
+hi def link z8aPreProc		PreProc
+hi def link z8aNumber		Number
+hi def link z8aString		String
+
 
 let b:current_syntax = "z8a"
 " vim: ts=8
diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index 10cab0342e..3fb300c63f 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -5,7 +5,7 @@
 #
 # UNUA TRADUKISTO Dominique PELLE   <dominique.pelle ĉe gmail.com>
 # PROVLEGANTO(J)  Felipe CASTRO     <fefcas ĉe gmail.com>
-#                 Antono MECHELYNCK <antoine.mechelynck ĉe skynet.be>
+#                 Antono MECHELYNCK <antoine.mechelynck ĉe gmail.com>
 #                 Yves NEVELSTEEN
 #
 # Uzitaj vortaroj kaj fakvortaroj:
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 20:54+0200\n"
-"PO-Revision-Date: 2016-08-26 20:30+0200\n"
+"POT-Creation-Date: 2017-01-16 00:30+0100\n"
+"PO-Revision-Date: 2017-01-16 01:14+0100\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@@ -32,13 +32,20 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#, fuzzy
-#~ msgid "Unable to get option value"
-#~ msgstr "fiaskis akiri valoron de opcio"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: bf_key_init() alvokita kun malplena pasvorto"
 
-#, fuzzy
-#~ msgid "internal error: unknown option type"
-#~ msgstr "interna eraro: neniu vim-a listero"
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Misuzo de pezkomenca/pezfina en blowfish"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: Testo de sha256 malsukcesis"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Testo de blowfish malsukcesis"
 
 msgid "[Location List]"
 msgstr "[Listo de lokoj]"
@@ -59,6 +66,9 @@ msgstr "E83: Ne eblas disponigi bufron, nun uzas alian..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Bufro ne povas esti registrita"
 
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: Provo de forviŝo de bufro, kiu estas uzanta"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Neniu bufro estis malŝargita"
 
@@ -106,19 +116,17 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Ne eblas iri antaŭ la unuan bufron"
 
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
-"E89: Neniu skribo de post la lasta ŝanĝo de la bufro %<PRId64> (aldonu ! por "
+"E89: Neniu skribo de post la lasta ŝanĝo de la bufro %ld (aldonu ! por "
 "transpasi)"
 
-#. wrap around (may cause duplicates)
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Averto: Listo de dosiernomoj troas"
 
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: Bufro %<PRId64> ne trovita"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: Bufro %ld ne trovita"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -129,8 +137,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Neniu bufro kongruas kun %s"
 
 #, c-format
-msgid "line %<PRId64>"
-msgstr "linio %<PRId64>"
+msgid "line %ld"
+msgstr "linio %ld"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Bufro kun tiu nomo jam ekzistas"
@@ -158,12 +166,12 @@ msgid "1 line --%d%%--"
 msgstr "1 linio --%d%%--"
 
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> linioj --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld linioj --%d%%--"
 
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "linio %<PRId64> de %<PRId64> --%d%%-- kol "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "linio %ld de %ld --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Neniu nomo]"
@@ -209,6 +217,13 @@ msgstr ""
 msgid "Signs for %s:"
 msgstr "Emfazaj simbolaĵoj de %s:"
 
+#, c-format
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    linio=%ld  id=%d  nomo=%s"
+
+msgid "E902: Cannot connect to port"
+msgstr "E902: Ne eblas konekti al pordo"
+
 msgid "E901: gethostbyname() in channel_open()"
 msgstr "E901: gethostbyname() en channel_open()"
 
@@ -237,24 +252,69 @@ msgid "E631: %s(): write failed"
 msgstr "E631: %s(): Konservo malsukcesis"
 
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    linio=%<PRId64>  id=%d  nomo=%s"
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: Ne eblas uzi reagfunkcion kun %s()"
 
-msgid "E545: Missing colon"
-msgstr "E545: Mankas dupunkto"
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: ne eblas uzi ch_evalexpr()/ch_sendexpr() kun kruda aŭ nl kanalo"
 
-msgid "E546: Illegal mode"
-msgstr "E546: Reĝimo nepermesata"
+msgid "E906: not an open channel"
+msgstr "E906: ne estas malfermita kanalo"
 
-msgid "E548: digit expected"
-msgstr "E548: cifero atendata"
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: dosiero _io bezonas _name"
 
-msgid "E549: Illegal percentage"
-msgstr "E549: Nevalida procento"
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: bufro in_io bezonas in_buf aŭ in_name"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: bufro devas esti ŝargita: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: Dosiero estas ĉifrita per nekonata metodo"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "Averto: uzo de malfortika ĉifrada metodo; vidu :help 'cm'"
+
+msgid "Enter encryption key: "
+msgstr "Tajpu la ŝlosilon de ĉifrado: "
+
+msgid "Enter same key again: "
+msgstr "Tajpu la ŝlosilon denove: "
+
+msgid "Keys don't match!"
+msgstr "Ŝlosiloj ne kongruas!"
+
+msgid "[crypted]"
+msgstr "[ĉifrita]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Mankas dupunkto en la vortaro: %s"
 
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: Ne eblas dosierdiferenci pli ol %<PRId64> bufrojn"
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Ripetita ŝlosilo en la vortaro: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Mankas komo en la vortaro: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Mankas fino de vortaro '}': %s"
+
+msgid "extend() argument"
+msgstr "argumento de extend()"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: Ŝlosilo jam ekzistas: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: Ne eblas dosierdiferenci pli ol %ld bufrojn"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Ne eblas legi aŭ skribi provizorajn dosierojn"
@@ -262,6 +322,9 @@ msgstr "E810: Ne eblas legi aŭ skribi provizorajn dosierojn"
 msgid "E97: Cannot create diffs"
 msgstr "E97: Ne eblas krei dosierdiferencojn"
 
+msgid "Patch file"
+msgstr "Flika dosiero"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: Ne eblas legi eliron de flikilo \"patch\""
 
@@ -406,55 +469,17 @@ msgstr "kongruo %d de %d"
 msgid "match %d"
 msgstr "kongruo %d"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Neatenditaj signoj en \":let\""
 
 #, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: indekso de listo ekster limoj: %<PRId64>"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Nedifinita variablo: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: Mankas ']'"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Argumento de %s devas esti Listo"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: Argumento de %s devas esti Listo aŭ Vortaro"
-
-msgid "E714: List required"
-msgstr "E714: Listo bezonata"
-
-msgid "E715: Dictionary required"
-msgstr "E715: Vortaro bezonata"
-
-msgid "E928: String required"
-msgstr "E928: Ĉeno bezonata"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: Tro da argumentoj por funkcio: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Ŝlosilo malekzistas en Vortaro: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: La funkcio %s jam ekzistas (aldonu ! por anstataŭigi ĝin)"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: Rikordo de vortaro jam ekzistas"
-
-msgid "E718: Funcref required"
-msgstr "E718: Funcref bezonata"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Uzo de [:] ne eblas kun Vortaro"
 
@@ -513,7 +538,7 @@ msgstr "E109: Mankas ':' post '?'"
 msgid "E691: Can only compare List with List"
 msgstr "E691: Eblas nur kompari Liston kun Listo"
 
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: Nevalida operacio de Listoj"
 
 msgid "E735: Can only compare Dictionary with Dictionary"
@@ -522,9 +547,6 @@ msgstr "E735: Eblas nur kompari Vortaron kun Vortaro"
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Nevalida operacio de Vortaro"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Eblas nur kompari Funcref kun Funcref"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Nevalida operacio de Funcref-oj"
 
@@ -675,30 +697,37 @@ msgstr "argumento de add()"
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() uzeblas nur en Enmeta reĝimo"
 
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
 msgid "&Ok"
 msgstr "&Bone"
 
 #, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: Ŝlosilo jam ekzistas: %s"
-
-msgid "extend() argument"
-msgstr "argumento de extend()"
-
-msgid "map() argument"
-msgstr "argumento de map()"
-
-msgid "filter() argument"
-msgstr "argumento de filter()"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld linioj: "
+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"
 
+msgid "E922: expected a dict"
+msgstr "E922: vortaro atendita"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: Dua argumento de function() devas esti listo aŭ Vortaro"
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"&Bone\n"
+"&Rezigni"
+
 msgid "called inputrestore() more often than inputsave()"
 msgstr "alvokis inputrestore() pli ofte ol inputsave()"
 
@@ -708,6 +737,9 @@ msgstr "argumento de insert()"
 msgid "E786: Range not allowed"
 msgstr "E786: Amplekso nepermesebla"
 
+msgid "E916: not a valid job"
+msgstr "E916: nevalida tasko"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: Nevalida datumtipo de len()"
 
@@ -724,6 +756,16 @@ msgstr "E727: Komenco preter fino"
 msgid "<empty>"
 msgstr "<malplena>"
 
+msgid "E240: No connection to Vim server"
+msgstr "E240: Neniu konekto al Vim-servilo"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: Ne eblas sendi al %s"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: Ne eblas legi respondon de servilo"
+
 msgid "remove() argument"
 msgstr "argumento de remove()"
 
@@ -733,6 +775,9 @@ 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'"
@@ -740,180 +785,27 @@ msgstr "E927: Nevalida ago: '%s'"
 msgid "sort() argument"
 msgstr "argumento de sort()"
 
-#, fuzzy
-#~ msgid "uniq() argument"
-#~ msgstr "argumento de add()"
+msgid "uniq() argument"
+msgstr "argumento de uniq()"
 
 msgid "E702: Sort compare function failed"
-msgstr "E702: Ordiga funkcio fiaskis"
+msgstr "E702: Ordiga funkcio malsukcesis"
 
-#, fuzzy
-#~ msgid "E882: Uniq compare function failed"
-#~ msgstr "E702: Ordiga funkcio fiaskis"
+msgid "E882: Uniq compare function failed"
+msgstr "E882: kompara funkcio de uniq() malsukcesis"
 
 msgid "(Invalid)"
 msgstr "(Nevalida)"
 
-msgid "E677: Error writing temp file"
-msgstr "E677: Eraro dum skribo de provizora dosiero"
-
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Uzo de Glitpunktnombro kiel Nombro"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Uzo de Funcref kiel Nombro"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: Uzo de Listo kiel Nombro"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Uzo de Vortaro kiel Nombro"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: Uzo de Funcref kiel Glitpunktnombro"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: Uzo de Ĉeno kiel Glitpunktnombro"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: Uzo de Listo kiel Glitpunktnombro"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: Uzo de Vortaro kiel Glitpunktnombro"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: uzo de Funcref kiel Ĉeno"
-
-msgid "E730: using List as a String"
-msgstr "E730: uzo de Listo kiel Ĉeno"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: uzo de Vortaro kiel Ĉeno"
-
-msgid "E908: using an invalid value as a String"
-msgstr "E908: uzo de nevalida valoro kiel Ĉeno"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Nekongrua datumtipo de variablo: %s"
-
-#, 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 finiĝi 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"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Nedifinita funkcio: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: Mankas '(': %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: Ne eblas uzi g: ĉi tie"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: Nevalida argumento: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: Ripetita nomo de argumento: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: Mankas \":endfunction\""
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: Nomo de funkcio konfliktas kun variablo: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Ne eblas redifini funkcion %s: Estas nuntempe uzata"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: Nomo de funkcio ne kongruas kun dosiernomo de skripto: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: Nomo de funkcio bezonata"
-
-#, fuzzy, c-format
-#~ msgid "E128: Function name must start with a capital or \"s:\": %s"
-#~ msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ enhavi dupunkton: %s"
-
-#, fuzzy, c-format
-#~ msgid "E884: Function name cannot contain a colon: %s"
-#~ msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ enhavi dupunkton: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Ne eblas forviŝi funkcion %s: Estas nuntempe uzata"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: Profundo de funkcia alvoko superas 'maxfuncdepth'"
-
-#, c-format
-msgid "calling %s"
-msgstr "alvokas %s"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s ĉesigita"
-
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s liveras #%<PRId64>"
-
 #, c-format
-msgid "%s returning %s"
-msgstr "%s liveras %s"
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: nevalida indekso de \"submatch\": %d"
 
-#, c-format
-msgid "continuing in %s"
-msgstr "daŭrigas en %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: \":return\" ekster funkcio"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# mallokaj variabloj:\n"
+msgid "E677: Error writing temp file"
+msgstr "E677: Eraro dum skribo de provizora dosiero"
 
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLaste ŝaltita de "
-
-msgid "No old files"
-msgstr "Neniu malnova dosiero"
+msgid "E921: Invalid callback argument"
+msgstr "E921: Nevalida argumento de reagfunctio"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -934,12 +826,12 @@ msgid "1 line moved"
 msgstr "1 linio movita"
 
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> linioj movitaj"
+msgid "%ld lines moved"
+msgstr "%ld linioj movitaj"
 
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> linioj filtritaj"
+msgid "%ld lines filtered"
+msgstr "%ld linioj filtritaj"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filtraj* Aŭtokomandoj ne rajtas ŝanĝi aktualan bufron"
@@ -968,7 +860,7 @@ msgid " oldfiles"
 msgstr " malnovaj dosieroj"
 
 msgid " FAILED"
-msgstr " FIASKIS"
+msgstr " MALSUKCESIS"
 
 #. avoid a wait_return for this message, it's annoying
 #, c-format
@@ -976,6 +868,10 @@ msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Dosiero viminfo ne skribeblas: %s"
 
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: Tro da provizoraj dosieroj viminfo, kiel %s!"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: Ne eblas skribi dosieron viminfo %s!"
 
@@ -983,6 +879,10 @@ msgstr "E138: Ne eblas skribi dosieron viminfo %s!"
 msgid "Writing viminfo file \"%s\""
 msgstr "Skribas dosieron viminfo \"%s\""
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: Ne eblas renomi dosieron viminfo al %s!"
+
 #. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
@@ -1001,6 +901,16 @@ msgstr "# Valoro de 'encoding' kiam tiu dosiero estis kreita\n"
 msgid "Illegal starting char"
 msgstr "Nevalida eka signo"
 
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Linioj komencantaj per |, kopiitaj sen ŝanĝo:\n"
+
+msgid "Save As"
+msgstr "Konservi kiel"
+
 msgid "Write partial file?"
 msgstr "Ĉu skribi partan dosieron?"
 
@@ -1020,8 +930,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Permutodosiero .swp ekzistas: %s (:silent! por transpasi)"
 
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: Neniu dosiernomo de bufro %<PRId64>"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: Neniu dosiernomo de bufro %ld"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Dosiero ne skribita: Skribo malŝaltita per la opcio 'write'"
@@ -1048,6 +958,9 @@ msgstr ""
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" estas nurlegebla (aldonu ! por transpasi)"
 
+msgid "Edit File"
+msgstr "Redakti dosieron"
+
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Aŭtokomandoj neatendite forviŝis novan bufron %s"
@@ -1075,19 +988,19 @@ msgid "1 substitution"
 msgstr "1 anstataŭigo"
 
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> kongruoj"
+msgid "%ld matches"
+msgstr "%ld kongruoj"
 
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> anstataŭigoj"
+msgid "%ld substitutions"
+msgstr "%ld anstataŭigoj"
 
 msgid " on 1 line"
 msgstr " en 1 linio"
 
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " en %<PRId64> linioj"
+msgid " on %ld lines"
+msgstr " en %ld linioj"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Ne eblas fari \":global\" rekursie"
@@ -1130,10 +1043,6 @@ msgid "Sorry, help file \"%s\" not found"
 msgstr "Bedaŭrinde, la helpdosiero \"%s\" ne troveblas"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: Ne estas dosierujo: %s"
-
-#, c-format
 msgid "E151: No match: %s"
 msgstr "E151: Neniu kongruo: %s"
 
@@ -1154,6 +1063,10 @@ msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Ripetita etikedo \"%s\" en dosiero %s/%s"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: Ne estas dosierujo: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Nekonata simbola komando: %s"
 
@@ -1182,8 +1095,15 @@ msgid "E934: Cannot jump to a buffer that does not have a name"
 msgstr "E934: Ne eblas salti al sennoma bufro"
 
 #, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: Nevalida identigilo de simbolo: %<PRId64>"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: Nevalida identigilo de simbolo: %ld"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Ne eblas ŝanĝi simbolon %s"
+
+msgid " (NOT FOUND)"
+msgstr "  (NETROVITA)"
 
 msgid " (not supported)"
 msgstr " (nesubtenata)"
@@ -1198,8 +1118,8 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Eniras sencimigan reĝimon.  Tajpu \"cont\" por daŭrigi."
 
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "linio %<PRId64>: %s"
+msgid "line %ld: %s"
+msgstr "linio %ld: %s"
 
 #, c-format
 msgid "cmd: %s"
@@ -1213,8 +1133,8 @@ msgid "frame at highest level: %d"
 msgstr "kadro je la plej alta nivelo: %d"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "Kontrolpunkto en \"%s%s\" linio %<PRId64>"
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Kontrolpunkto en \"%s%s\" linio %ld"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1224,8 +1144,8 @@ msgid "No breakpoints defined"
 msgstr "Neniu kontrolpunkto estas difinita"
 
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  linio %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  linio %ld"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
@@ -1269,6 +1189,9 @@ msgstr "Serĉado de \"%s\""
 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\""
@@ -1278,16 +1201,16 @@ msgid "could not source \"%s\""
 msgstr "ne eblis ruli \"%s\""
 
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "linio %<PRId64>: ne eblis ruli \"%s\""
+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 %<PRId64>: sourcing \"%s\""
-msgstr "linio %<PRId64>: rulas \"%s\""
+msgid "line %ld: sourcing \"%s\""
+msgstr "linio %ld: rulas \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1329,8 +1252,6 @@ msgstr "Aktuala %slingvo: \"%s\""
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Ne eblas ŝanĝi la lingvon al \"%s\""
 
-#. don't redisplay the window
-#. don't wait for return
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Eniras reĝimon Ex. Tajpu \"visual\" por iri al reĝimo Normala."
 
@@ -1362,12 +1283,10 @@ msgstr "E493: Inversa amplekso donita"
 msgid "Backwards range given, OK to swap"
 msgstr "Inversa amplekso donita, permuteblas"
 
-#. append
-#. typed wrong
 msgid "E494: Use w or w>>"
 msgstr "E494: Uzu w aŭ w>>"
 
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Bedaŭrinde, tiu komando ne haveblas en tiu versio"
 
 msgid "E172: Only one file name allowed"
@@ -1384,8 +1303,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 plia redaktenda dosiero"
 
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: %<PRId64> pliaj redaktendaj dosieroj"
+msgid "E173: %ld more files to edit"
+msgstr "E173: %ld pliaj redaktendaj dosieroj"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
@@ -1451,6 +1370,9 @@ msgstr ""
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: Uzula kompletigo bezonas funkcian argumenton"
 
+msgid "unknown"
+msgstr "nekonata"
+
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: Ne eblas trovi agordaron de koloroj '%s'"
@@ -1464,6 +1386,9 @@ msgstr "E784: Ne eblas fermi lastan langeton"
 msgid "Already only one tab page"
 msgstr "Jam nur unu langeto"
 
+msgid "Edit File in new window"
+msgstr "Redakti Dosieron en nova fenestro"
+
 #, c-format
 msgid "Tab page %d"
 msgstr "Langeto %d"
@@ -1471,6 +1396,9 @@ msgstr "Langeto %d"
 msgid "No swap file"
 msgstr "Neniu permutodosiero .swp"
 
+msgid "Append File"
+msgstr "Postaldoni dosieron"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: Ne eblas ŝanĝi dosierujon, bufro estas ŝanĝita (aldonu ! por transpasi)"
@@ -1484,6 +1412,10 @@ msgstr "E187: Nekonata"
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: \":winsize\" bezonas du numerajn argumentojn"
 
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "Pozicio de fenestro: X %d, Y %d"
+
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: Akiro de pozicio de fenestro ne estas realigita por tiu platformo"
@@ -1491,6 +1423,22 @@ msgstr ""
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: \":winpos\" bezonas du numerajn argumentojn"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: Ne eblas uzi :redir en execute()"
+
+msgid "Save Redirection"
+msgstr "Konservi alidirekton"
+
+# DP: mi ne certas pri superflugo
+msgid "Save View"
+msgstr "Konservi superflugon"
+
+msgid "Save Session"
+msgstr "Konservi seancon"
+
+msgid "Save Setup"
+msgstr "Konservi agordaron"
+
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Ne eblas krei dosierujon %s"
@@ -1510,6 +1458,9 @@ msgstr "E191: Argumento devas esti litero, citilo aŭ retrocitilo"
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Tro profunda rekursia alvoko de \":normal\""
 
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: #< ne haveblas sen la eblo +eval"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Neniu alterna dosiernomo por anstataŭigi al '#'"
 
@@ -1532,9 +1483,9 @@ msgstr "E498: neniu dosiernomo \":source\" por anstataŭigi al \"<sfile>\""
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: neniu uzebla numero de linio por \"<slnum>\""
 
-#, fuzzy, c-format
-#~ msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-#~ msgstr "E499: Malplena dosiernomo por '%' aŭ '#', nur funkcias kun \":p:h\""
+#, no-c-format
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: Malplena dosiernomo por '%' aŭ '#', nur funkcias kun \":p:h\""
 
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: Liveras malplenan ĉenon"
@@ -1542,6 +1493,9 @@ msgstr "E500: Liveras malplenan ĉenon"
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Ne eblas malfermi dosieron viminfo en lega reĝimo"
 
+msgid "E196: No digraphs in this version"
+msgstr "E196: Neniu duliteraĵo en tiu versio"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Ne eblas lanĉi (:throw) escepton kun prefikso 'Vim'"
 
@@ -1559,8 +1513,8 @@ msgid "Exception discarded: %s"
 msgstr "Escepto ne konservita: %s"
 
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, linio %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, linio %ld"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1693,33 +1647,6 @@ msgstr "E198: cmd_pchar preter la longo de komando"
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktiva fenestro aŭ bufro forviŝita"
 
-msgid "E854: path too long for completion"
-msgstr "E854: tro longa vojo por kompletigo"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Nevalida vojo: '**[nombro]' devas esti ĉe la fino de la vojo aŭ "
-"sekvita de '%s'."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Ne eblas trovi dosierujon \"%s\" en cdpath"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Ne eblas trovi dosieron \"%s\" en serĉvojo"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo"
-
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Aŭtokomandoj ŝanĝis bufron aŭ nomon de bufro"
 
@@ -1732,6 +1659,9 @@ 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]"
 
@@ -1750,26 +1680,25 @@ msgstr "E200: La aŭtokomandoj *ReadPre igis la dosieron nelegebla"
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: La aŭtokomandoj *ReadPre ne rajtas ŝanĝi la aktualan bufron"
 
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: Legado el stdin...\n"
 
+msgid "Reading from stdin..."
+msgstr "Legado el stdin..."
+
 #. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Konverto igis la dosieron nelegebla!"
 
-#. fifo or socket
 msgid "[fifo/socket]"
 msgstr "[rektvica memoro/kontaktoskatolo]"
 
-#. fifo
 msgid "[fifo]"
 msgstr "[rektvica memoro]"
 
-#. or socket
 msgid "[socket]"
 msgstr "[kontaktoskatolo]"
 
-#. or character special
 msgid "[character special]"
 msgstr "[speciala signo]"
 
@@ -1786,12 +1715,12 @@ msgid "[converted]"
 msgstr "[konvertita]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[ERARO DE KONVERTO en linio %<PRId64>]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[ERARO DE KONVERTO en linio %ld]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[NEVALIDA BAJTO en linio %<PRId64>]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[NEVALIDA BAJTO en linio %ld]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERAROJ DE LEGADO]"
@@ -1800,7 +1729,7 @@ msgid "Can't find temp file for conversion"
 msgstr "Ne eblas trovi provizoran dosieron por konverti"
 
 msgid "Conversion with 'charconvert' failed"
-msgstr "Konverto kun 'charconvert' fiaskis"
+msgstr "Konverto kun 'charconvert' malsukcesis"
 
 msgid "can't read output of 'charconvert'"
 msgstr "ne eblas legi la eligon de 'charconvert'"
@@ -1814,9 +1743,18 @@ 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)"
 
@@ -1835,7 +1773,9 @@ 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)"
 
-#. Can't write without a tempfile!
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: La rimeda forko estus perdita (aldonu ! por transpasi)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Ne eblas trovi provizoran dosieron por skribi"
 
@@ -1850,20 +1790,21 @@ msgstr "E212: Ne eblas malfermi la dosieron por skribi"
 
 # AM: fsync: ne traduku (nomo de C-komando)
 msgid "E667: Fsync failed"
-msgstr "E667: Fsync fiaskis"
+msgstr "E667: Fsync malsukcesis"
 
 msgid "E512: Close failed"
-msgstr "E512: Fermo fiaskis"
+msgstr "E512: Fermo malsukcesis"
 
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: skriberaro, konverto fiaskis (igu 'fenc' malplena por transpasi)"
+msgstr ""
+"E513: skriberaro, konverto malsukcesis (igu 'fenc' malplena por transpasi)"
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: skriberaro, konverto fiaskis en linio %<PRId64> (igu 'fenc' malplena  "
+"E513: skriberaro, konverto malsukcesis en linio %ld (igu 'fenc' malplena  "
 "por transpasi)"
 
 msgid "E514: write error (file system full?)"
@@ -1873,8 +1814,8 @@ msgid " CONVERSION ERROR"
 msgstr " ERARO DE KONVERTO"
 
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " en linio %<PRId64>;"
+msgid " in line %ld;"
+msgstr " en linio %ld;"
 
 msgid "[Device]"
 msgstr "[Aparatdosiero]"
@@ -1935,15 +1876,15 @@ msgid "1 line, "
 msgstr "1 linio, "
 
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> linioj, "
+msgid "%ld lines, "
+msgstr "%ld linioj, "
 
 msgid "1 character"
 msgstr "1 signo"
 
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> signoj"
+msgid "%lld characters"
+msgstr "%lld signoj"
 
 msgid "[noeol]"
 msgstr "[sen EOL]"
@@ -2025,6 +1966,9 @@ msgstr "E462: Ne eblis prepari por reŝargi \"%s\""
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Ne eblis reŝargi \"%s\""
 
+msgid "--Deleted--"
+msgstr "--Forviŝita--"
+
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
@@ -2034,12 +1978,12 @@ msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Ne ekzistas tia grupo: \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Ne eblas forviŝi la aktualan grupon"
+
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: Forviŝo de augroup kiu estas ankoraŭ uzata"
 
-msgid "--Deleted--"
-msgstr "--Forviŝita--"
-
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Nevalida signo post *: %s"
@@ -2106,7 +2050,6 @@ msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld linio faldita "
 msgstr[1] "+--%3ld linioj falditaj "
 
-#. buffer has already been read
 msgid "E222: Add to read buffer"
 msgstr "E222: Aldoni al lega bufro"
 
@@ -2138,329 +2081,294 @@ msgstr "Neniu mapo trovita"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Nevalida reĝimo"
 
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-msgid "--No lines in buffer--"
-msgstr "--Neniu linio en bufro--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-msgid "E470: Command aborted"
-msgstr "E470: komando ĉesigita"
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: Malsukcesis krei novan procezon por la grafika interfaco"
 
-msgid "E471: Argument required"
-msgstr "E471: Argumento bezonata"
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: La ida procezo malsukcesis startigi la grafikan interfacon"
 
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ devus esti sekvita de /, ? aŭ &"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Ne eblas lanĉi la grafikan interfacon"
 
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr ""
-"E11: Nevalida en fenestro de komanda linio; <CR> plenumas, CTRL-C eliras"
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Ne eblas legi el \"%s\""
 
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgid "E665: Cannot start GUI, no valid font found"
 msgstr ""
-"E12: Nepermesebla komando el exrc/vimrc en aktuala dosierujo aŭ etikeda serĉo"
+"E665: Ne eblas startigi grafikan interfacon, neniu valida tiparo trovita"
 
-msgid "E171: Missing :endif"
-msgstr "E171: Mankas \":endif\""
-
-msgid "E600: Missing :endtry"
-msgstr "E600: Mankas \":endtry\""
-
-msgid "E170: Missing :endwhile"
-msgstr "E170: Mankas \":endwhile\""
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' nevalida"
 
-msgid "E170: Missing :endfor"
-msgstr "E170: Mankas \":endfor\""
-
-msgid "E588: :endwhile without :while"
-msgstr "E588: \":endwhile\" sen \":while\""
-
-msgid "E588: :endfor without :for"
-msgstr "E588: \":endfor\" sen \":for\""
-
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: Dosiero ekzistas (aldonu ! por transpasi)"
-
-msgid "E472: Command failed"
-msgstr "E472: La komando fiaskis"
-
-msgid "E473: Internal error"
-msgstr "E473: Interna eraro"
-
-msgid "Interrupted"
-msgstr "Interrompita"
-
-msgid "E14: Invalid address"
-msgstr "E14: Nevalida adreso"
-
-msgid "E474: Invalid argument"
-msgstr "E474: Nevalida argumento"
-
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: Nevalida argumento: %s"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Valoro de 'imactivatekey' estas nevalida"
 
 #, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: Nevalida esprimo: %s"
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Ne eblas disponigi koloron %s"
 
-msgid "E16: Invalid range"
-msgstr "E16: Nevalida amplekso"
+msgid "No match at cursor, finding next"
+msgstr "Neniu kongruo ĉe kursorpozicio, trovas sekvan"
 
-msgid "E476: Invalid command"
-msgstr "E476: Nevalida komando"
+msgid "<cannot open> "
+msgstr "<ne eblas malfermi> "
 
 #, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" estas dosierujo"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: ne eblas akiri tiparon %s"
 
-#, fuzzy
-#~ msgid "E900: Invalid job id"
-#~ msgstr "E49: Nevalida grando de rulumo"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: ne eblas reveni al la aktuala dosierujo"
 
-#~ msgid "E901: Job table is full"
-#~ msgstr ""
+msgid "Pathname:"
+msgstr "Serĉvojo:"
 
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Alvoko al biblioteko fiaskis por \"%s()\""
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: ne eblas akiri aktualan dosierujon"
 
-msgid "E19: Mark has invalid line number"
-msgstr "E19: Marko havas nevalidan numeron de linio"
+msgid "OK"
+msgstr "Bone"
 
-msgid "E20: Mark not set"
-msgstr "E20: Marko ne estas agordita"
+msgid "Cancel"
+msgstr "Rezigni"
 
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Ne eblas fari ŝanĝojn, 'modifiable' estas malŝaltita"
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr ""
+"Fenestraĵo de rulumskalo: Ne eblis akiri geometrion de reduktita rastrumbildo"
 
-msgid "E22: Scripts nested too deep"
-msgstr "E22: Tro profunde ingitaj skriptoj"
+msgid "Vim dialog"
+msgstr "Vim dialogo"
 
-msgid "E23: No alternate file"
-msgstr "E23: Neniu alterna dosiero"
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: Ne eblas krei BalloonEval kun ambaŭ mesaĝo kaj reagfunkcio"
 
-msgid "E24: No such abbreviation"
-msgstr "E24: Ne estas tia mallongigo"
+msgid "_Cancel"
+msgstr "_Rezigni"
 
-msgid "E477: No ! allowed"
-msgstr "E477: Neniu ! permesebla"
+msgid "_Save"
+msgstr "_Konservi"
 
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: Grafika interfaco ne uzeblas: Malŝaltita dum kompilado"
+msgid "_Open"
+msgstr "_Malfermi"
 
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: Neniu grupo de emfazo kiel: %s"
+msgid "_OK"
+msgstr "_Bone"
 
-msgid "E29: No inserted text yet"
-msgstr "E29: Ankoraŭ neniu enmetita teksto"
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"&Jes\n"
+"&Ne\n"
+"&Rezigni"
 
-msgid "E30: No previous command line"
-msgstr "E30: Neniu antaŭa komanda linio"
+msgid "Yes"
+msgstr "Jes"
 
-msgid "E31: No such mapping"
-msgstr "E31: Neniu tiel mapo"
+msgid "No"
+msgstr "Ne"
 
-msgid "E479: No match"
-msgstr "E479: Neniu kongruo"
+# todo '_' is for hotkey, i guess?
+msgid "Input _Methods"
+msgstr "Enigaj _metodoj"
 
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: Neniu kongruo: %s"
+msgid "VIM - Search and Replace..."
+msgstr "VIM - Serĉi kaj anstataŭigi..."
 
-msgid "E32: No file name"
-msgstr "E32: Neniu dosiernomo"
+msgid "VIM - Search..."
+msgstr "VIM- Serĉi..."
 
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: Neniu antaŭa regulesprimo de anstataŭigo"
+msgid "Find what:"
+msgstr "Serĉi kion:"
 
-msgid "E34: No previous command"
-msgstr "E34: Neniu antaŭa komando"
+msgid "Replace with:"
+msgstr "Anstataŭigi per:"
 
-msgid "E35: No previous regular expression"
-msgstr "E35: Neniu antaŭa regulesprimo"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "Kongrui kun nur plena vorto"
 
-msgid "E481: No range allowed"
-msgstr "E481: Amplekso nepermesebla"
+#. match case button
+msgid "Match case"
+msgstr "Uskleca kongruo"
 
-msgid "E36: Not enough room"
-msgstr "E36: Ne sufiĉe da spaco"
+msgid "Direction"
+msgstr "Direkto"
 
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Ne eblas krei dosieron %s"
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "Supren"
 
-msgid "E483: Can't get temp file name"
-msgstr "E483: Ne eblas akiri provizoran dosiernomon"
+msgid "Down"
+msgstr "Suben"
 
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: Ne eblas malfermi dosieron %s"
+msgid "Find Next"
+msgstr "Trovi sekvantan"
 
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: Ne eblas legi dosieron %s"
+msgid "Replace"
+msgstr "Anstataŭigi"
 
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Neniu skribo de post lasta ŝanĝo (aldonu ! por transpasi)"
+msgid "Replace All"
+msgstr "Anstataŭigi ĉiujn"
 
-#, fuzzy
-#~ msgid "E37: No write since last change"
-#~ msgstr "[Neniu skribo de post lasta ŝanĝo]\n"
+msgid "_Close"
+msgstr "_Fermi"
 
-msgid "E38: Null argument"
-msgstr "E38: Nula argumento"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: Ricevis peton \"die\" (morti) el la seanca administrilo\n"
 
-msgid "E39: Number expected"
-msgstr "E39: Nombro atendita"
+msgid "Close tab"
+msgstr "Fermi langeton"
 
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: Ne eblas malfermi eraran dosieron %s"
+msgid "New tab"
+msgstr "Nova langeto"
 
-msgid "E41: Out of memory!"
-msgstr "E41: Ne plu restas memoro!"
+msgid "Open Tab..."
+msgstr "Malfermi langeton..."
 
-msgid "Pattern not found"
-msgstr "Ŝablono ne trovita"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: Ĉefa fenestro neatendite detruiĝis\n"
 
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Ŝablono ne trovita: %s"
+msgid "&Filter"
+msgstr "&Filtri"
 
-msgid "E487: Argument must be positive"
-msgstr "E487: La argumento devas esti pozitiva"
+msgid "&Cancel"
+msgstr "&Rezigni"
 
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Ne eblas reiri al antaŭa dosierujo"
+msgid "Directories"
+msgstr "Dosierujoj"
 
-msgid "E42: No Errors"
-msgstr "E42: Neniu eraro"
+msgid "Filter"
+msgstr "Filtri"
 
-msgid "E776: No location list"
-msgstr "E776: Neniu listo de loko"
+msgid "&Help"
+msgstr "&Helpo"
 
-msgid "E43: Damaged match string"
-msgstr "E43: Difekta kongruenda ĉeno"
+msgid "Files"
+msgstr "Dosieroj"
 
-msgid "E44: Corrupted regexp program"
-msgstr "E44: Difekta programo de regulesprimo"
+msgid "&OK"
+msgstr "&Bone"
 
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: La opcio 'readonly' estas ŝaltita '(aldonu ! por transpasi)"
+msgid "Selection"
+msgstr "Apartigo"
 
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: Ne eblas ŝanĝi nurlegeblan variablon \"%s\""
+msgid "Find &Next"
+msgstr "Trovi &Sekvanta"
 
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: Ne eblas agordi variablon en la sabloludejo: \"%s\""
+msgid "&Replace"
+msgstr "&Anstataŭigi"
 
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Ne eblas uzi malplenan ŝlosilon de Vortaro"
+msgid "Replace &All"
+msgstr "Anstataŭigi ĉi&on"
 
-msgid "E47: Error while reading errorfile"
-msgstr "E47: Eraro dum legado de erardosiero"
+msgid "&Undo"
+msgstr "&Malfari"
 
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: Nepermesebla en sabloludejo"
+msgid "Open tab..."
+msgstr "Malfermi langeton..."
 
-msgid "E523: Not allowed here"
-msgstr "E523: Nepermesebla tie"
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "Trovi ĉenon (uzu '\\\\' por trovi '\\')"
 
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Reĝimo de ekrano ne subtenata"
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "Trovi kaj anstataŭigi (uzu '\\\\' por trovi '\\')"
 
-msgid "E49: Invalid scroll size"
-msgstr "E49: Nevalida grando de rulumo"
-
-msgid "E91: 'shell' option is empty"
-msgstr "E91: La opcio 'shell' estas malplena"
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "Ne uzata"
 
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Ne eblis legi datumojn de simboloj!"
+msgid "Directory\t*.nothing\n"
+msgstr "Dosierujo\t*.nenio\n"
 
-msgid "E72: Close error on swap file"
-msgstr "E72: Eraro dum malfermo de permutodosiero .swp"
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: Ne eblas trovi titolon de fenestro \"%s\""
 
-msgid "E73: tag stack empty"
-msgstr "E73: malplena stako de etikedo"
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: Ne subtenata argumento: \"-%s\"; Uzu la version OLE."
 
-msgid "E74: Command too complex"
-msgstr "E74: Komando tro kompleksa"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: Ne eblas malfermi fenestron interne de aplikaĵo MDI"
 
-msgid "E75: Name too long"
-msgstr "E75: Nomo tro longa"
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr ""
+"Vim E458: Ne eblas disponigi rikordon de kolormapo, iuj koloroj estas eble "
+"neĝustaj"
 
-msgid "E76: Too many ["
-msgstr "E76: Tro da ["
+#, c-format
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr "E250: Tiparoj de tiuj signaroj mankas en aro de tiparo %s:"
 
-msgid "E77: Too many file names"
-msgstr "E77: Tro da dosiernomoj"
+#, c-format
+msgid "E252: Fontset name: %s"
+msgstr "E252: Nomo de tiparo: %s"
 
-msgid "E488: Trailing characters"
-msgstr "E488: Vostaj signoj"
+#, c-format
+msgid "Font '%s' is not fixed-width"
+msgstr "Tiparo '%s' ne estas egallarĝa"
 
-msgid "E78: Unknown mark"
-msgstr "E78: Nekonata marko"
+#, c-format
+msgid "E253: Fontset name: %s"
+msgstr "E253: Nomo de tiparo: %s"
 
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: Ne eblas malvolvi ĵokerojn"
+#, c-format
+msgid "Font0: %s"
+msgstr "Font0: %s"
 
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ne rajtas esti malpli ol 'winminheight'"
+#, c-format
+msgid "Font1: %s"
+msgstr "Font1: %s"
 
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ne rajtas esti malpli ol 'winminwidth'"
+#, c-format
+msgid "Font%ld width is not twice that of font0"
+msgstr "Font%ld ne estas duoble pli larĝa ol font0"
 
-msgid "E80: Error while writing"
-msgstr "E80: Eraro dum skribado"
+#, c-format
+msgid "Font0 width: %ld"
+msgstr "Larĝo de font0: %ld"
 
-msgid "Zero count"
-msgstr "Nul kvantoro"
+#, c-format
+msgid "Font1 width: %ld"
+msgstr "Larĝo de Font1: %ld"
 
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: Uzo de <SID> ekster kunteksto de skripto"
+msgid "Invalid font specification"
+msgstr "Nevalida tiparo specifita"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Interna eraro: %s"
+msgid "&Dismiss"
+msgstr "&Forlasi"
 
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ŝablono uzas pli da memoro ol 'maxmempattern'"
+msgid "no specific match"
+msgstr "Neniu specifa kongruo"
 
-msgid "E749: empty buffer"
-msgstr "E749: malplena bufro"
+msgid "Vim - Font Selector"
+msgstr "Vim - Elektilo de tiparo"
 
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: La bufro %<PRId64> ne ekzistas"
+msgid "Name:"
+msgstr "Nomo:"
 
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: Nevalida serĉa ŝablono aŭ disigilo"
+#. create toggle button
+msgid "Show size in Points"
+msgstr "Montri grandon en punktoj"
 
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Dosiero estas ŝargita en alia bufro"
+msgid "Encoding:"
+msgstr "Kodoprezento:"
 
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: La opcio '%s' ne estas ŝaltita"
+msgid "Font:"
+msgstr "Tiparo:"
 
-msgid "E850: Invalid register name"
-msgstr "E850: Nevalida nomo de reĝistro"
+msgid "Style:"
+msgstr "Stilo:"
 
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "serĉo atingis SUPRON, daŭrigonte al SUBO"
+msgid "Size:"
+msgstr "Grando:"
 
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "serĉo atingis SUBON, daŭrigonte al SUPRO"
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: ERARO en aŭtomato de korea alfabeto"
 
 msgid "E550: Missing colon"
 msgstr "E550: Mankas dupunkto"
@@ -2551,7 +2459,7 @@ msgid "Sending to printer..."
 msgstr "Sendas al presilo..."
 
 msgid "E365: Failed to print PostScript file"
-msgstr "E365: Presado de PostSkripta dosiero fiaskis"
+msgstr "E365: Presado de PostSkripta dosiero malsukcesis"
 
 msgid "Print job sent."
 msgstr "Laboro de presado sendita."
@@ -2591,6 +2499,9 @@ msgstr "E257: cstag: etikedo netrovita"
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: Eraro de stat(%s): %d"
 
+msgid "E563: stat error"
+msgstr "E563: Eraro de stat"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s ne estas dosierujo aŭ valida datumbazo de cscope"
@@ -2600,8 +2511,8 @@ msgid "Added cscope database %s"
 msgstr "Aldonis datumbazon de cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: eraro dum legado de konekto de cscope %<PRId64>"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: eraro dum legado de konekto de cscope %ld"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nekonata tipo de serĉo de cscope"
@@ -2612,18 +2523,17 @@ msgstr "E566: Ne eblis krei duktojn de cscope"
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Ne eblis forki cscope"
 
-#, fuzzy
-#~ msgid "cs_create_connection setpgid failed"
-#~ msgstr "plenumo de cs_create_connection fiaskis"
+msgid "cs_create_connection setpgid failed"
+msgstr "plenumo de cs_create_connection-setgpid malsukcesis"
 
 msgid "cs_create_connection exec failed"
-msgstr "plenumo de cs_create_connection fiaskis"
+msgstr "plenumo de cs_create_connection malsukcesis"
 
 msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen de to_fp fiaskis"
+msgstr "cs_create_connection: fdopen de to_fp malsukcesis"
 
 msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen de fr_fp fiaskis"
+msgstr "cs_create_connection: fdopen de fr_fp malsukcesis"
 
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: Ne eblis naskigi procezon cscope"
@@ -2669,6 +2579,13 @@ msgstr ""
 "       s: Trovi tiun C-simbolon\n"
 "       t: Trovi tiun ĉenon\n"
 
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: ne eblas malfermi datumbazon de cscope: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: ne eblas akiri informojn pri la datumbazo de cscope"
+
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ripetita datumbazo de cscope ne aldonita"
 
@@ -2711,6 +2628,222 @@ msgstr "neniu konekto de cscope\n"
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    nomo de datumbazo                   prefiksa vojo\n"
 
+msgid "Lua library cannot be loaded."
+msgstr "La biblioteko Lua no ŝargeblis."
+
+msgid "cannot save undo information"
+msgstr "ne eblas konservi informojn de malfaro"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+msgstr ""
+"E815: Bedaŭrinde, tiu komando estas malŝaltita, ne eblis ŝargi la "
+"bibliotekojn."
+
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: Bedaŭrinde, tiu komando estas malŝaltita, ne eblis ŝargi la modulon de "
+"MzScheme racket/base."
+
+msgid "invalid expression"
+msgstr "nevalida esprimo"
+
+msgid "expressions disabled at compile time"
+msgstr "esprimoj malŝaltitaj dum kompilado"
+
+msgid "hidden option"
+msgstr "kaŝita opcio"
+
+msgid "unknown option"
+msgstr "nekonata opcio"
+
+msgid "window index is out of range"
+msgstr "indekso de fenestro estas ekster limoj"
+
+msgid "couldn't open buffer"
+msgstr "ne eblis malfermi bufron"
+
+msgid "cannot delete line"
+msgstr "ne eblas forviŝi linion"
+
+msgid "cannot replace line"
+msgstr "ne eblas anstataŭigi linion"
+
+msgid "cannot insert line"
+msgstr "ne eblas enmeti linion"
+
+msgid "string cannot contain newlines"
+msgstr "ĉeno ne rajtas enhavi liniavancojn"
+
+msgid "error converting Scheme values to Vim"
+msgstr "eraro dum konverto de Scheme-valoro al Vim"
+
+msgid "Vim error: ~a"
+msgstr "Eraro de Vim: ~a"
+
+msgid "Vim error"
+msgstr "Eraro de Vim"
+
+msgid "buffer is invalid"
+msgstr "bufro estas nevalida"
+
+msgid "window is invalid"
+msgstr "fenestro estas nevalida"
+
+msgid "linenr out of range"
+msgstr "numero de linio ekster limoj"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "nepermesebla en sabloludejo de Vim"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Vim ne povas plenumi :python post uzo de :py3"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Pitono ne "
+"ŝargeblis."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887` Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Pitono ne "
+"ŝargeblis."
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Ne eblas alvoki Pitonon rekursie"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: Vim ne povas plenumi :py3  post uzo de :python"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ devas esti apero de Ĉeno"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: Bedaŭrinde tiu komando estas malŝaltita, la biblioteko Ruby ne "
+"ŝargeblis."
+
+msgid "E267: unexpected return"
+msgstr "E267: \"return\" neatendita"
+
+msgid "E268: unexpected next"
+msgstr "E268: \"next\" neatendita"
+
+msgid "E269: unexpected break"
+msgstr "E269: \"break\" neatendita"
+
+msgid "E270: unexpected redo"
+msgstr "E270: \"redo\" neatendita"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: \"retry\" ekster klaŭzo \"rescue\""
+
+msgid "E272: unhandled exception"
+msgstr "E272: netraktita escepto"
+
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: nekonata stato de longjmp: %d"
+
+msgid "invalid buffer number"
+msgstr "nevalida numero de bufro"
+
+msgid "not implemented yet"
+msgstr "ankoraŭ ne realigita"
+
+#. ???
+msgid "cannot set line(s)"
+msgstr "ne eblas meti la linio(j)n"
+
+msgid "invalid mark name"
+msgstr "nevalida nomo de marko"
+
+msgid "mark not set"
+msgstr "marko ne estas metita"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "linio %d kolumno %d"
+
+msgid "cannot insert/append line"
+msgstr "ne eblas enmeti/postaldoni linion"
+
+msgid "line number out of range"
+msgstr "numero de linio ekster limoj"
+
+msgid "unknown flag: "
+msgstr "nekonata flago: "
+
+# DP: ĉu traduki vimOption
+msgid "unknown vimOption"
+msgstr "nekonata vimOption"
+
+msgid "keyboard interrupt"
+msgstr "klavara interrompo"
+
+msgid "vim error"
+msgstr "eraro de Vim"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr "ne eblas krei komandon de bufro/fenestro: objekto estas forviŝiĝanta"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"ne eblas registri postalvokan komandon: bufro/fenestro estas jam forviŝiĝanta"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: NERIPAREBLA TCL-ERARO: reflist difekta!? Bv. retpoŝti al vim-dev@vim."
+"org"
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"ne eblas registri postalvokan komandon: referenco de bufro/fenestro ne "
+"troveblas"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: Bedaŭrinde tiu komando estas malŝaltita: la biblioteko Tcl ne "
+"ŝargeblis."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: elira kodo %d"
+
+msgid "cannot get line"
+msgstr "ne eblas akiri linion"
+
+msgid "Unable to register a command server name"
+msgstr "Ne eblas registri nomon de komanda servilo"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: Sendo de komando al cela programo malsukcesis"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: Nevalida identigilo de servilo uzita: %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr ""
+"E251: Ecoj de registro de apero de VIM estas nevalide formata. Forviŝita!"
+
+#, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: Ripetita ŝlosilo en JSON: \"%s\""
+
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Mankas komo en Listo: %s"
@@ -2741,6 +2874,15 @@ msgstr "Nevalida argumento por"
 msgid "%d files to edit\n"
 msgstr "%d redaktendaj dosieroj\n"
 
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans ne estas subtenata kun tiu grafika interfaco\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' ne uzeblas: malŝaltita dum kompilado\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "Tiu Vim ne estis kompilita kun la kompara eblo."
+
 msgid "Attempt to open script file again: \""
 msgstr "Provas malfermi skriptan dosieron denove: \""
 
@@ -2750,6 +2892,12 @@ msgstr "Ne eblas malfermi en lega reĝimo: \""
 msgid "Cannot open for script output: \""
 msgstr "Ne eblas malfermi por eligo de skripto: \""
 
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: Eraro: malsukcesis lanĉi gvim el NetBeans\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: Eraro: Tiu versio de Vim ne ruliĝas en terminalo Cygwin\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Averto: Eligo ne estas al terminalo\n"
 
@@ -2805,6 +2953,13 @@ msgstr ""
 
 msgid ""
 "\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"Kie uskleco estas ignorita antaŭaldonu / por igi flagon majuskla"
+
+msgid ""
+"\n"
 "\n"
 "Arguments:\n"
 msgstr ""
@@ -2818,6 +2973,18 @@ msgstr "--\t\t\tNur dosiernomoj post tio"
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tNe malvolvi ĵokerojn"
 
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\t\tRegistri tiun gvim al OLE"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\t\tMalregistri gvim de OLE"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\t\tRuli per grafika interfaco (kiel \"gvim\")"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f  aŭ  --nofork\tMalfono: ne forki kiam lanĉas grafikan interfacon"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tReĝimo Vi (kiel \"vi\")"
 
@@ -2879,6 +3046,12 @@ msgstr "-r (kun dosiernomo)\tRestaŭri kolapsintan seancon"
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\tKiel -r"
 
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\t\tNe uzi newcli por malfermi fenestrojn"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <aparatdosiero>\t\tUzi <aparatdosiero>-n por eneligo"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\tKomenci en araba reĝimo"
 
@@ -2891,9 +3064,20 @@ msgstr "-F\t\t\tKomenci en persa reĝimo"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminalo>\tAgordi terminalon al <terminalo>"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr ""
+"--not-a-term\t\tPreterpasi averton por enigo/eligo, kiu ne estas terminalo"
+
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr ""
+"--ttyfail\t\tEliri se le eniro aŭ eliro ne estas terminalo"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\tUzi <vimrc> anstataŭ iun ajn .vimrc"
 
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\t\tUzi <gvimrc> anstataŭ iun ajn .gvimrc"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tNe ŝargi kromaĵajn skriptojn"
 
@@ -2935,6 +3119,50 @@ msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr ""
 "-W <eligaskripto>\tSkribi ĉiujn tajpitajn komandojn al dosiero <eligaskripto>"
 
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\tRedakti ĉifradan dosieron"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <ekrano>\tKonekti Vim al tiu X-servilo"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tNe konekti al X-servilo"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <dosieroj>\tRedakti <dosieroj>-n en Vim-servilo se eblas"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <dosieroj>  Same, sed ne plendi se ne estas servilo"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr ""
+"--remote-wait <dosieroj>  Kiel --remote sed atendi ĝis dosieroj estas "
+"redaktitaj"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent <dosieroj> Same, sed ne plendi se ne estas servilo"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <dosieroj> Kiel --remote sed uzi langeton por "
+"ĉiu dosiero"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <klavoj> Sendi <klavoj>-n al Vim-servilo kaj eliri"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr "--remote-expr <espr>\tKomputi <espr> en Vim-servilo kaj afiŝi rezulton"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr "--serverlist\t\tListigi haveblajn nomojn de Vim-serviloj kaj eliri"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <nomo>\tSendu al/iĝi la Vim-servilo <nomo>"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr ""
 "--startuptime <dosiero>  Skribi mesaĝojn de komenca tempomezurado al "
@@ -2949,6 +3177,118 @@ msgstr "-h  aŭ  --help\tAfiŝi Helpon (tiun mesaĝon) kaj eliri"
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tAfiŝi informon de versio kaj eliri"
 
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"Argumentoj agnoskitaj de gvim (versio Motif):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"Argumentoj agnoskitaj de gvim (versio neXtaw):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"Argumentoj agnoskitaj de gvim (versio Athena):\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <ekrano>\tLanĉi vim sur <ekrano>"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\tLanĉi vim piktograme"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr "-background <koloro>\tUzi <koloro>-n por la fona koloro (ankaŭ: -bg)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr ""
+"-foreground <koloro>\tUzi <koloro>-n por la malfona koloro (ankaŭ: -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <tiparo>\tUzi <tiparo>-n por normala teksto (ankaŭ: -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <tiparo>\tUzi <tiparo>-n por grasa teksto"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <tiparo>\tUzi <tiparo>-n por kursiva teksto"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr "-geometry <geom>\tUzi <geom> kiel komenca geometrio (ankaŭ: -geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr "-borderwidth <larĝo>\tUzi <larĝo>-n kiel larĝo de bordero (ankaŭ: -bw)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <larĝo>  Uzi <larĝo>-n kiel larĝo de rulumskalo (ankaŭ: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr ""
+"-menuheight <alto>\tUzi <alto>-n kiel alto de menuzona alto (ankaŭ: -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\tUzi inversan videon (ankaŭ: -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\tNe uzi inversan videon (ankaŭ: +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <rimedo>\tAgordi la specifitan <rimedo>-n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"Argumentoj agnoskitaj de gvim (versio GTK+):\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr "-display <ekrano>\tLanĉi Vim sur tiu <ekrano> (ankaŭ: --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <rolo>\tDoni unikan rolon por identigi la ĉefan fenestron"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tMalfermi Vim en alia GTK fenestraĵo"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tIgas gvim afiŝi la identigilon de vindozo sur stdout"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <gepatra titolo>\tMalfermi Vim en gepatra aplikaĵo"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\tMalfermi Vim en alia win32 fenestraĵo"
+
+msgid "No display"
+msgstr "Neniu ekrano"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr ": Sendo malsukcesis.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": Sendo malsukcesis. Provo de loka plenumo\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d de %d redaktita(j)"
+
+msgid "No display: Send expression failed.\n"
+msgstr "Neniu ekrano: Sendado de esprimo malsukcesis.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": Sendado de esprimo malsukcesis.\n"
+
 msgid "No marks set"
 msgstr "Neniu marko"
 
@@ -3005,6 +3345,28 @@ msgstr ""
 msgid "Missing '>'"
 msgstr "Mankas '>'"
 
+msgid "E543: Not a valid codepage"
+msgstr "E543: Nevalida kodpaĝo"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: Ne eblas agordi valorojn de IC"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: Kreado de eniga kunteksto malsukcesis"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: Malfermo de eniga metodo malsukcesis"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr "E287: Averto: Ne eblis agordi detruan reagfunkcion al IM"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: eniga metodo subtenas neniun stilon"
+
+# DP: mi ne scias, kio estas "preedit"
+msgid "E289: input method doesn't support my preedit type"
+msgstr "E289: eniga metodo ne subtenas mian antaŭredaktan tipon"
+
 msgid "E293: block was not locked"
 msgstr "E293: bloko ne estis ŝlosita"
 
@@ -3032,6 +3394,9 @@ msgstr "E298: Ĉu ne akiris blokon n-ro 1?"
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Ĉu ne akiris blokon n-ro 2?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: Eraro dum ĝisdatigo de ĉifrada permutodosiero .swp"
+
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Ve, perdis la permutodosieron .swp!!!"
@@ -3047,7 +3412,6 @@ msgstr ""
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Ne akiris blokon 0??"
 
-#. no swap files found
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Neniu permutodosiero .swp trovita por %s"
@@ -3092,6 +3456,11 @@ msgstr ""
 ",\n"
 "aŭ la dosiero estas difekta."
 
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr "E833: %s estas ĉifrata kaj tiu versio de Vim ne subtenas ĉifradon"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " difektiĝis (paĝa grando pli malgranda ol minimuma valoro).\n"
 
@@ -3107,6 +3476,39 @@ msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Averto: Originala dosiero eble ŝanĝiĝis"
 
 #, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "Perumutodosiero .swp estas ĉifrata: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"Se vi tajpis novan ŝlosilon de ĉifrado sed ne skribis la tekstan dosieron,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"tajpu la novan ŝlosilon de ĉifrado."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"Se vi skribis la tekstan dosieron post ŝanĝo de la ŝlosilo de ĉifrado, premu "
+"enenklavon"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"por uzi la saman ŝlosilon por la teksta dosiero kaj permuto dosiero .swp"
+
+#, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Ne eblas legi blokon 1 de %s"
 
@@ -3175,6 +3577,10 @@ msgstr ""
 "La dosiero .swp nun forviŝindas.\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr ""
+"Uzas ŝlosilon de ĉifrado el permuto dosiero .swp por la teksta dosiero.\n"
+
 #. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "Permutodosiero .swp trovita:"
@@ -3251,6 +3657,13 @@ msgstr " (ankoraŭ ruliĝas)"
 
 msgid ""
 "\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [ne uzebla per tiu versio de Vim]"
+
+msgid ""
+"\n"
 "         [not usable on this computer]"
 msgstr ""
 "\n"
@@ -3269,15 +3682,15 @@ msgid "File preserved"
 msgstr "Dosiero konservita"
 
 msgid "E314: Preserve failed"
-msgstr "E314: Konservo fiaskis"
+msgstr "E314: Konservo malsukcesis"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: nevalida lnum: %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get: nevalida lnum: %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: ne eblas trovi linion %<PRId64>"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get: ne eblas trovi linion %ld"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: nevalida referenco de bloko id 3"
@@ -3295,8 +3708,8 @@ msgid "deleted block 1?"
 msgstr "ĉu forviŝita bloko 1?"
 
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: Ne eblas trovi linion %<PRId64>"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: Ne eblas trovi linion %ld"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: nevalida referenco de bloko id"
@@ -3305,12 +3718,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count estas nul"
 
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: numero de linio ekster limoj: %<PRId64> preter la fino"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: numero de linio ekster limoj: %ld preter la fino"
 
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: nevalida nombro de linioj en bloko %<PRId64>"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: nevalida nombro de linioj en bloko %ld"
 
 msgid "Stack size increases"
 msgstr "Stako pligrandiĝas"
@@ -3338,6 +3751,8 @@ msgstr "Dum malfermo de dosiero \""
 msgid "      NEWER than swap file!\n"
 msgstr "      PLI NOVA ol permutodosiero .swp!\n"
 
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@@ -3349,9 +3764,6 @@ msgstr ""
 "    por ne havi du malsamajn aperojn de la sama dosiero, kiam vi faros\n"
 "    ŝanĝojn. Eliru aŭ daŭrigu singarde.\n"
 
-msgid "  Quit, or continue with caution.\n"
-msgstr "  Eliru, aŭ daŭrigu singarde.\n"
-
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Redakta seanco de tiu dosiero kolapsis.\n"
 
@@ -3417,21 +3829,9 @@ msgstr ""
 "&Eliri\n"
 "Ĉe&sigi"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
 msgid "E326: Too many swap files found"
 msgstr "E326: Tro da dosieroj trovitaj"
 
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: Ne plu restas memoro! (disponigo de %<PRIu64> bajtoj)"
-
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Parto de vojo de menuero ne estas sub-menuo"
 
@@ -3464,6 +3864,9 @@ msgstr ""
 "\n"
 "--- Menuoj ---"
 
+msgid "Tear off this menu"
+msgstr "Disigi tiun menuon"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Vojo de menuo devas konduki al menuero"
 
@@ -3493,6 +3896,9 @@ msgstr "linio %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nevalida nomo de reĝistro: '%s'"
 
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr "Flegado de mesaĝoj: Dominique PELLÉ <dominique.pelle@gmail.com>"
+
 msgid "Interrupt: "
 msgstr "Interrompo: "
 
@@ -3500,8 +3906,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Premu ENEN-KLAVON aŭ tajpu komandon por daŭrigi"
 
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s linio %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s linio %ld"
 
 msgid "-- More --"
 msgstr "-- Pli --"
@@ -3519,15 +3925,6 @@ msgstr ""
 "&Jes\n"
 "&Ne"
 
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Jes\n"
-"&Ne\n"
-"&Rezigni"
-
 # AM: ĉu Vim konvertos unuliterajn respondojn?
 # DP: jes, '&' bone funkcias (mi kontrolis)
 msgid ""
@@ -3543,11 +3940,24 @@ 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"
+
+#. TODO: non-GUI file selector here
+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()"
 
 msgid "E807: Expected Float argument for printf()"
-msgstr "E807: Atendis Glitpunktnombron kiel argumento de printf()"
+msgstr "E807: Atendis Glitpunktnombron kiel argumenton de printf()"
 
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Tro da argumentoj al printf()"
@@ -3569,12 +3979,12 @@ msgid "1 line less"
 msgstr "1 malplia linio"
 
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> pliaj linioj"
+msgid "%ld more lines"
+msgstr "%ld pliaj linioj"
 
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> malpliaj linioj"
+msgid "%ld fewer lines"
+msgstr "%ld malpliaj linioj"
 
 msgid " (Interrupted)"
 msgstr " (Interrompita)"
@@ -3582,16 +3992,112 @@ msgstr " (Interrompita)"
 msgid "Beep!"
 msgstr "Bip!"
 
+msgid "ERROR: "
+msgstr "ERARO: "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[bajtoj] totalaj disponigitaj/maldisponigitaj %lu-%lu, nun uzataj %lu, "
+"kulmina uzo %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+msgstr ""
+"[alvokoj] totalaj re/malloc() %lu, totalaj free() %lu\n"
+"\n"
+
+msgid "E340: Line is becoming too long"
+msgstr "E340: Linio iĝas tro longa"
+
+#, c-format
+msgid "E341: Internal error: lalloc(%ld, )"
+msgstr "E341: Interna eraro: lalloc(%ld, )"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: Ne plu restas memoro! (disponigo de %lu bajtoj)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Alvokas ŝelon por plenumi: \"%s\""
 
+msgid "E545: Missing colon"
+msgstr "E545: Mankas dupunkto"
+
+msgid "E546: Illegal mode"
+msgstr "E546: Reĝimo nepermesata"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: Nevalida formo de muskursoro"
+
+msgid "E548: digit expected"
+msgstr "E548: cifero atendata"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: Nevalida procento"
+
+msgid "E854: path too long for completion"
+msgstr "E854: tro longa vojo por kompletigo"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: Nevalida vojo: '**[nombro]' devas esti ĉe la fino de la vojo aŭ "
+"sekvita de '%s'."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: Ne eblas trovi dosierujon \"%s\" en cdpath"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: Ne eblas trovi dosieron \"%s\" en serĉvojo"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr ""
+"E668: Nevalida permeso de dosiero de informo de konekto NetBeans: \"%s\""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: Konekto de NetBeans perdita por bufro %ld"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans ne estas subtenata kun tiu grafika interfaco"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: nebeans jam konektata"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s estas nurlegebla (aldonu ! por transpasi)"
+
 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"
 
@@ -3610,7 +4116,7 @@ msgstr "E662: Ĉe komenco de ŝanĝlisto"
 msgid "E663: At end of changelist"
 msgstr "E663: Ĉe fino de ŝanĝlisto"
 
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Tajpu \":quit<Enenklavo>\" por eliri el Vim"
 
 #, c-format
@@ -3622,37 +4128,41 @@ msgid "1 line %sed %d times"
 msgstr "1 linio %sita %d foje"
 
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> linio %sita 1 foje"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld linio %sita 1 foje"
 
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> linioj %sitaj %d foje"
+msgid "%ld lines %sed %d times"
+msgstr "%ld linioj %sitaj %d foje"
 
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> krommarĝenendaj linioj... "
+msgid "%ld lines to indent... "
+msgstr "%ld krommarĝenendaj linioj... "
 
 msgid "1 line indented "
 msgstr "1 linio krommarĝenita "
 
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> linioj krommarĝenitaj "
+msgid "%ld lines indented "
+msgstr "%ld linioj krommarĝenitaj "
 
 msgid "E748: No previously used register"
 msgstr "E748: Neniu reĝistro antaŭe uzata"
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
-msgstr "ne eblas kopii; forviŝi tamene"
+msgstr "ne eblas kopii; tamen forviŝi"
 
 msgid "1 line changed"
 msgstr "1 linio ŝanĝita"
 
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> linioj ŝanĝitaj"
+msgid "%ld lines changed"
+msgstr "%ld linioj ŝanĝitaj"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "malokupas %ld liniojn"
 
 msgid "block of 1 line yanked"
 msgstr "bloko de 1 linio kopiita"
@@ -3661,12 +4171,12 @@ msgid "1 line yanked"
 msgstr "1 linio kopiita"
 
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "bloko de %<PRId64> linioj kopiita"
+msgid "block of %ld lines yanked"
+msgstr "bloko de %ld linioj kopiita"
 
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> linioj kopiitaj"
+msgid "%ld lines yanked"
+msgstr "%ld linioj kopiitaj"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3694,45 +4204,44 @@ msgstr ""
 msgid "E574: Unknown register type %d"
 msgstr "E574: Nekonata tipo de reĝistro %d"
 
+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 "%<PRId64> Cols; "
-msgstr "%<PRId64> Kolumnoj; "
+msgid "%ld Cols; "
+msgstr "%ld Kolumnoj; "
 
 #, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
 msgstr ""
-"Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; "
-"%<PRId64> de %<PRId64> Bajtoj"
+"Apartigis %s%ld de %ld Linioj; %lld de %lld Vortoj; %lld de %lld Bajtoj"
 
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; "
-"%<PRId64> de %<PRId64> Signoj; %<PRId64> de %<PRId64> Bajtoj"
+"Apartigis %s%ld de %ld Linioj; %lld de %lld Vortoj; %lld de %lld Signoj; "
+"%lld de %lld Bajtoj"
 
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; "
-"Bajto %<PRId64> de %<PRId64>"
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "Kol %s de %s; Linio %ld de %ld; Vorto %lld de %lld; Bajto %lld de %lld"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; "
-"Signo %<PRId64> de %<PRId64>; Bajto %<PRId64> de %<PRId64>"
+"Kol %s de %s; Linio %ld de %ld; Vorto %lld de %lld; Signo %lld de %lld; "
+"Bajto %lld de %lld"
 
 #, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> por BOM)"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld por BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Folio %N"
@@ -3740,7 +4249,6 @@ msgstr "%<%f%h%m%=Folio %N"
 msgid "Thanks for flying Vim"
 msgstr "Dankon pro flugi per Vim"
 
-#. found a mismatch: skip
 msgid "E518: Unknown option"
 msgstr "E518: Nekonata opcio"
 
@@ -3770,6 +4278,12 @@ 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"
 
@@ -3779,6 +4293,9 @@ 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"
+
 msgid "E524: Missing colon"
 msgstr "E524: Mankas dupunkto"
 
@@ -3798,6 +4315,21 @@ 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 post <%c>"
@@ -3809,6 +4341,9 @@ msgstr "E536: komo bezonata"
 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"
 
@@ -3816,7 +4351,7 @@ msgid "E541: too many items"
 msgstr "E541: tro da elementoj"
 
 msgid "E542: unbalanced groups"
-msgstr "E542: misekvilibritaj grupoj"
+msgstr "E542: misekvilibraj grupoj"
 
 msgid "E590: A preview window already exists"
 msgstr "E590: Antaŭvida fenestro jam ekzistas"
@@ -3882,19 +4417,104 @@ msgstr "E357: 'langmap': Kongrua signo mankas por %s"
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': Ekstraj signoj post punktokomo: %s"
 
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Ne eblas plenumi ŝelon "
+msgid "cannot open "
+msgstr "ne eblas malfermi "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM: Ne eblas malfermi fenestron!\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "Bezonas version 2.04 de Amigados aŭ pli novan\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "Bezonas %s-on versio %ld\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "Ne eblas malfermi NIL:\n"
+
+msgid "Cannot create "
+msgstr "Ne eblas krei "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vim eliras kun %d\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "ne eblas ŝanĝi reĝimon de konzolo?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize: ne estas konzolo??\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: Ne eblas plenumi ŝelon kun opcio -f"
+
+msgid "Cannot execute "
+msgstr "Ne eblas plenumi "
+
+msgid "shell "
+msgstr "ŝelo "
+
+msgid " returned\n"
+msgstr " liveris\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE tro malgranda."
+
+msgid "I/O ERROR"
+msgstr "ERARO DE ENIGO/ELIGO"
+
+msgid "Message"
+msgstr "Mesaĝo"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: Elekto de presilo malsukcesis"
+
+#, c-format
+msgid "to %s on %s"
+msgstr "al %s de %s"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: Nekonata tiparo de presilo: %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: Eraro de presado: %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "Presas '%s'"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr "E244: Nevalida nomo de signaro \"%s\" en nomo de tiparo \"%s\""
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: Nevalida nomo de kvalito \"%s\" en nomo de tiparo \"%s\""
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: Nevalida signo '%c' en nomo de tiparo \"%s\""
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "Malfermo de vidigo X daŭris %ld msek"
 
 msgid ""
 "\n"
-"shell returned "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"ŝelo liveris "
+"Vim: Alvenis X eraro\n"
+
+msgid "Testing the X display failed"
+msgstr "Testo de la vidigo X malsukcesis"
+
+msgid "Opening the X display timed out"
+msgstr "Tempolimo okazis dum malfermo de vidigo X"
 
 msgid ""
 "\n"
@@ -3919,13 +4539,115 @@ msgid "Could not get security context %s for %s. Removing it!"
 msgstr ""
 "Ne povis akiri kuntekston de sekureco %s por %s. Gi nun estas forigata!"
 
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"Ne eblas plenumi ŝelon sh\n"
+
+msgid ""
+"\n"
+"shell returned "
+msgstr ""
+"\n"
+"ŝelo liveris "
+
+msgid ""
+"\n"
+"Cannot create pipes\n"
+msgstr ""
+"\n"
+"Ne eblas krei duktojn\n"
+
+msgid ""
+"\n"
+"Cannot fork\n"
+msgstr ""
+"\n"
+"Ne eblas forki\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"Ne eblas plenumi ŝelon "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"Komando terminigita\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "XSMP perdis la konekton ICE"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
+msgid "Opening the X display failed"
+msgstr "Malfermo de vidigo X malsukcesis"
+
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP: traktado de peto konservi-mem"
+
+msgid "XSMP opening connection"
+msgstr "XSMP: malfermo de konekto"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP: kontrolo de konekto ICE malsukcesis"
+
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Ne eblas trovi dosieron \"%s\" en serĉvojo"
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP: SmcOpenConnection malsukcesis: %s"
+
+msgid "At line"
+msgstr "Ĉe linio"
+
+msgid "Could not load vim32.dll!"
+msgstr "Ne eblis ŝargi vim32.dll!"
+
+msgid "VIM Error"
+msgstr "Eraro de VIM"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "Ne eblis ripari referencojn de funkcioj al la DLL!"
+
+# DP: la eventoj estas tiuj, kiuj estas en la sekvantaj ĉenoj
+#, c-format
+msgid "Vim: Caught %s event\n"
+msgstr "Vim: Kaptis eventon %s\n"
+
+msgid "close"
+msgstr "fermo"
+
+msgid "logoff"
+msgstr "elsaluto"
+
+msgid "shutdown"
+msgstr "sistemfermo"
+
+msgid "E371: Command not found"
+msgstr "E371: Netrovebla komando"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"VIMRUN.EXE ne troveblas en via $PATH.\n"
+"Eksteraj komandoj ne paŭzos post kompletigo.\n"
+"Vidu  :help win32-vimrun  por pliaj informoj."
+
+msgid "Vim Warning"
+msgstr "Averto de Vim"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "la ŝelo liveris %d"
 
 #, c-format
 msgid "E372: Too many %%%c in format string"
@@ -3960,6 +4682,15 @@ msgstr "E379: Nomo de dosierujo mankas aŭ estas malplena"
 msgid "E553: No more items"
 msgstr "E553: Ne plu estas eroj"
 
+msgid "E924: Current window was closed"
+msgstr "E924: Aktuala vindozo fermiĝis"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: Aktuala rapidriparo ŝanĝiĝis"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: Aktuala listo de lokoj ŝanĝiĝis"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d de %d)%s%s: "
@@ -3983,6 +4714,9 @@ msgstr "Neniu ano"
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
 
+msgid "Error file"
+msgstr "Erara Dosiero"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Dosiernomo mankas aŭ nevalida ŝablono"
 
@@ -4017,7 +4751,7 @@ msgid "E55: Unmatched %s)"
 msgstr "E55: Neekvilibra %s"
 
 msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( estas permesebla tie"
+msgstr "E66: \\z( estas nepermesebla tie"
 
 # DP: vidu http://www.thefreedictionary.com/et+al.
 msgid "E67: \\z1 et al. not allowed here"
@@ -4088,6 +4822,10 @@ msgstr "E554: Sintaksa eraro en %s{...}"
 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 "
@@ -4095,6 +4833,9 @@ 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 "Ŝangota al malavanca motoro de regulesprimo por ŝablono: "
+
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue"
 
@@ -4102,17 +4843,21 @@ msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue"
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA-regulesprimo) Mispoziciigita %c"
 
-#, fuzzy, c-format
-#~ msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-#~ msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo "
+#, c-format
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo: %ld"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Nekonata operatoro '\\z%c'"
 
-#, fuzzy, c-format
-#~ msgid "E867: (NFA) Unknown operator '\\%%%c'"
-#~ msgstr "E867: (NFA) Nekonata operatoro '\\z%c'"
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) Nekonata operatoro '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Eraro dum prekomputado de NFA kun ekvivalentoklaso!"
 
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
@@ -4131,9 +4876,8 @@ msgstr ""
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA-regulesprimo) tro da '('"
 
-#, fuzzy
-#~ msgid "E879: (NFA regexp) Too many \\z("
-#~ msgstr "E872: (NFA-regulesprimo) tro da '('"
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA-regulesprimo) tro da \\z("
 
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA-regulesprimo) propra end-eraro"
@@ -4151,6 +4895,9 @@ msgstr ""
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmomorigi 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 ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
@@ -4347,13 +5094,6 @@ msgstr "E762: Signo en FOL, LOW aŭ UPP estas ekster limoj"
 msgid "Compressing word tree..."
 msgstr "Densigas arbon de vortoj..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: Literumilo ne estas ŝaltita"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "Averto: Ne eblas trovi vortliston \"%s.%s.spl\" aŭ \"%s.ascii.spl\""
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Legado de literuma dosiero \"%s\""
@@ -4403,6 +5143,10 @@ msgid "Conversion in %s not supported: from %s to %s"
 msgstr "Konverto en %s nesubtenata: de %s al %s"
 
 #, c-format
+msgid "Conversion in %s not supported"
+msgstr "Konverto en %s nesubtenata"
+
+#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Nevalida valoro de FLAG en %s linio %d: %s"
 
@@ -4586,6 +5330,9 @@ msgstr "Nekonata flago en %s linio %d: %s"
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "Ignoris %d vorto(j)n kun neaskiaj signoj"
 
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: Ne sufiĉe da memoro, vortlisto estos nekompleta."
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "Densigis %d de %d nodoj; %d (%d%%) restantaj"
@@ -4593,14 +5340,16 @@ msgstr "Densigis %d de %d nodoj; %d (%d%%) restantaj"
 msgid "Reading back spell file..."
 msgstr "Relegas la dosieron de literumo..."
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "Fonetika analizado..."
 
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "Nombro de vortoj post fonetika analizado: %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "Nombro de vortoj post fonetika analizado: %ld"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4635,66 +5384,22 @@ msgid "Done!"
 msgstr "Farita!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' ne havas %<PRId64> rikordojn"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' ne havas %ld rikordojn"
 
-#, fuzzy, c-format
-#~ msgid "Word '%.*s' removed from %s"
-#~ msgstr "Vorto fortirita el %s"
-
-#, fuzzy, c-format
-#~ msgid "Word '%.*s' added to %s"
-#~ msgstr "Vorto aldonita al %s"
-
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: Signoj de vorto malsamas tra literumaj dosieroj"
-
-msgid "Sorry, no suggestions"
-msgstr "Bedaŭrinde ne estas sugestoj"
-
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "Bedaŭrinde estas nur %<PRId64> sugestoj"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
 #, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Anstataŭigi \"%.*s\" per:"
+msgid "Word '%.*s' removed from %s"
+msgstr "Vorto '%.*s' fortirita el %s"
 
 #, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
+msgid "Word '%.*s' added to %s"
+msgstr "Vorto '%.*s' aldonita al %s"
 
-msgid "E752: No previous spell replacement"
-msgstr "E752: Neniu antaŭa literuma anstataŭigo"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Netrovita: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: Tio ne ŝajnas esti dosiero .sug: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Malnova dosiero .sug, bezonas ĝisdatigon: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: Dosiero .sug estas por pli nova versio de Vim: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: Dosiero .sug ne kongruas kun dosiero .spl: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: eraro dum legado de dosiero .sug: %s"
+msgid "E763: Word characters differ between spell files"
+msgstr "E763: Signoj de vorto malsamas tra literumaj dosieroj"
 
 #. This should have been checked when generating the .spl
-#. file.
+#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: ripetita signo en rikordo MAP"
 
@@ -4802,7 +5507,6 @@ msgstr "E848: Tro da sintaksaj grupoj"
 msgid "E400: No cluster specified"
 msgstr "E400: Neniu fasko specifita"
 
-#. end delimiter not found
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: Disigilo de ŝablono netrovita: %s"
@@ -4842,9 +5546,10 @@ msgstr "E409: Nekonata nomo de grupo: %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Nevalida \":syntax\" subkomando: %s"
 
-#~ msgid ""
-#~ "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-#~ msgstr ""
+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  TOTALO    NOMBRO  KONGRUO PLEJ MALRAPID  MEZA   NOMO               ŜABLONO"
 
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: rekursia buklo dum ŝargo de syncolor.vim"
@@ -4859,7 +5564,7 @@ msgstr "E412: Ne sufiĉaj argumentoj: \":highlight link %s\""
 
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: Tro argumentoj: \":highlight link %s\""
+msgstr "E413: Tro da argumentoj: \":highlight link %s\""
 
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: grupo havas agordojn, ligilo de emfazo ignorita"
@@ -4967,6 +5672,10 @@ msgstr ""
 msgid "Searching tags file %s"
 msgstr "Serĉado de dosiero de etikedoj %s"
 
+#, c-format
+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"
 
@@ -4975,8 +5684,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Eraro de formato en etikeda dosiero \"%s\""
 
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Antaŭ bajto %<PRId64>"
+msgid "Before byte %ld"
+msgstr "Antaŭ bajto %ld"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5026,14 +5735,26 @@ msgstr ""
 "\n"
 "--- Klavoj de terminalo ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "Ne povas malfermi $VIMRUNTIME/rgb.txt"
+
+msgid "new shell started\n"
+msgstr "nova ŝelo lanĉita\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Eraro dum legado de eniro, elironta...\n"
 
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "Uzis CUT_BUFFER0 anstataŭ malplenan apartigon"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#, fuzzy
-#~ msgid "E881: Line count changed unexpectedly"
-#~ msgstr "E834: Nombro de linioj ŝanĝiĝis neatendite"
+msgid "E881: Line count changed unexpectedly"
+msgstr "E881: Nombro de linioj ŝanĝiĝis neatendite"
+
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "Malfaro neebla; tamen daŭrigi"
 
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
@@ -5082,6 +5803,18 @@ msgid "E823: Not an undo file: %s"
 msgstr "E823: Ne estas malfara dosiero: %s"
 
 #, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: Ne ĉifrata dosiero havas ĉifratan malfaran dosieron: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: Malĉifrado de malfara dosiero malsukcesis: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: Malfara dosiero estas ĉifrata: %s"
+
+#, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: Malkongrua malfara dosiero: %s"
 
@@ -5099,8 +5832,8 @@ msgid "Already at newest change"
 msgstr "Jam al la plej nova ŝanĝo"
 
 #, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: Malfara numero %<PRId64> netrovita"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: Malfara numero %ld netrovita"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: nevalidaj numeroj de linioj"
@@ -5124,8 +5857,8 @@ msgid "changes"
 msgstr "ŝanĝoj"
 
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
 
 msgid "before"
 msgstr "antaŭ"
@@ -5140,8 +5873,8 @@ msgid "number changes  when               saved"
 msgstr "numero ŝanĝoj   tempo              konservita"
 
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "antaŭ %<PRId64> sekundoj"
+msgid "%ld seconds ago"
+msgstr "antaŭ %ld sekundoj"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin estas nepermesebla post malfaro"
@@ -5152,6 +5885,189 @@ msgstr "E439: listo de malfaro estas difekta"
 msgid "E440: undo line missing"
 msgstr "E440: linio de malfaro mankas"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: La funkcio %s jam ekzistas (aldonu ! por anstataŭigi ĝin)"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Rikordo de vortaro jam ekzistas"
+
+msgid "E718: Funcref required"
+msgstr "E718: Funcref bezonata"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: Nekonata funkcio: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: Nevalida argumento: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Ripetita nomo de argumento: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: Tro da argumentoj por funkcio: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: Nevalidaj argumentoj por funkcio: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: Profundo de funkcia alvoko superas 'maxfuncdepth'"
+
+#, c-format
+msgid "calling %s"
+msgstr "alvokas %s"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s ĉesigita"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s liveras #%ld"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s liveras %s"
+
+msgid "E699: Too many arguments"
+msgstr "E699: Tro da argumentoj"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Nekonata funkcio: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: funkcio estis forviŝita: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: Ne sufiĉe da argumentoj por funkcio: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <SID> estas uzata ekster kunteksto de skripto: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Alvoko de funkcio dict sen Vortaro: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: Nomo de funkcio bezonata"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ per \"s:\": %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: Nomo de funkcio ne povas enhavi dupunkton: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Nedifinita funkcio: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: Mankas '(': %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: Ne eblas uzi g: ĉi tie"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: Fermo-funkcio devus esti je la plej alta nivelo: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: Mankas \":endfunction\""
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: Nomo de funkcio konfliktas kun variablo: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: Ne eblas redifini funkcion %s: Estas nuntempe uzata"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: Nomo de funkcio ne kongruas kun dosiernomo de skripto: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: Ne eblas forviŝi funkcion %s: Estas nuntempe uzata"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: \":return\" ekster funkcio"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Mankas krampoj: %s"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"Grafika versio MS-Vindozo 64-bitoj"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"Grafika versio MS-Vindozo 32-bitoj"
+
+msgid " with OLE support"
+msgstr " kun subteno de OLE"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"Versio konzola MS-Vindozo 64-bitoj"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"Versio konzola MS-Vindozo 32-bitoj"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"Versio Mak OS X (unikso)"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"Versio Mak OS X"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"Versio Mak OS"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"Versio OpenVMS"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -5186,9 +6102,70 @@ msgstr ""
 "\n"
 "Grandega versio "
 
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Granda versio "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"Normala versio "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Malgranda versio "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Malgrandega versio "
+
 msgid "without GUI."
 msgstr "sen grafika interfaco."
 
+msgid "with GTK3 GUI."
+msgstr "kun grafika interfaco GTK3."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "kun grafika interfaco GTK2-GNOME."
+
+msgid "with GTK2 GUI."
+msgstr "kun grafika interfaco GTK2."
+
+msgid "with X11-Motif GUI."
+msgstr "kun grafika interfaco X11-Motif."
+
+msgid "with X11-neXtaw GUI."
+msgstr "kun grafika interfaco X11-neXtaw."
+
+msgid "with X11-Athena GUI."
+msgstr "kun grafika interfaco X11-Athena."
+
+msgid "with Photon GUI."
+msgstr "kun grafika interfaco Photon."
+
+msgid "with GUI."
+msgstr "sen grafika interfaco."
+
+msgid "with Carbon GUI."
+msgstr "kun grafika interfaco Carbon."
+
+msgid "with Cocoa GUI."
+msgstr "kun grafika interfaco Cocoa."
+
+msgid "with (classic) GUI."
+msgstr "kun (klasika) grafika interfaco."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Ebloj inkluzivitaj (+) aŭ ne (-):\n"
 
@@ -5210,6 +6187,24 @@ msgstr "         dosiero exrc de uzanto: \""
 msgid "  2nd user exrc file: \""
 msgstr "     2-a dosiero exrc de uzanto: \""
 
+msgid "  system gvimrc file: \""
+msgstr "         sistema dosiero gvimrc: \""
+
+msgid "    user gvimrc file: \""
+msgstr "       dosiero gvimrc de uzanto: \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "   2-a dosiero gvimrc de uzanto: \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "   3-a dosiero gvimrc de uzanto: \""
+
+msgid "       defaults file: \""
+msgstr "           dosiero de defaŭltoj: \""
+
+msgid "    system menu file: \""
+msgstr "       dosiero de sistema menuo: \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "               defaŭlto de $VIM: \""
 
@@ -5219,6 +6214,9 @@ msgstr "         defaŭlto de VIMRUNTIME: \""
 msgid "Compilation: "
 msgstr "Kompilado: "
 
+msgid "Compiler: "
+msgstr "Kompililo: "
+
 msgid "Linking: "
 msgstr "Ligado: "
 
@@ -5254,8 +6252,8 @@ msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "tajpu  :help<Enenklavo>  aŭ  <F1> por aliri la helpon  "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-msgid "type  :help version7<Enter>   for version info"
-msgstr "tajpu  :help version7<Enenklavo>  por informo de versio"
+msgid "type  :help version8<Enter>   for version info"
+msgstr "tajpu  :help version8<Enenklavo>  por informo de versio"
 
 msgid "Running in Vi compatible mode"
 msgstr "Ruliĝas en reĝimo kongrua kun Vi"
@@ -5268,6 +6266,30 @@ msgstr "tajpu :set nocp<Enenklavo>        por Vim defaŭltoj    "
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "tajpu :help cp-default<Enenklavo> por pliaj informoj   "
 
+# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
+msgid "menu  Help->Orphans           for information    "
+msgstr "menuo  Help->Orfinoj              por pliaj informoj   "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "Ruliĝas senreĝime, tajpita teksto estas enmetita"
+
+# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "menuo Redakti->Mallokaj Agordoj->Baskuligi Enmetan Reĝimon"
+
+# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
+msgid "                              for two modes      "
+msgstr "                                  por du reĝimoj       "
+
+# DP: tiu ĉeno pli longas (mi ne volas igi ĉiujn aliajn ĉenojn
+#     pli longajn)
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "menuo Redakti->Mallokaj Agordoj->Baskuligi Reĝimon Kongruan kun Vi"
+
+# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
+msgid "                              for Vim defaults   "
+msgstr "                                  por defaŭltoj de Vim "
+
 msgid "Sponsor Vim development!"
 msgstr "Subtenu la programadon de Vim!"
 
@@ -5313,1737 +6335,703 @@ msgstr "E445: La alia fenestro enhavas ŝanĝojn"
 msgid "E446: No file name under cursor"
 msgstr "E446: Neniu dosiernomo sub la kursoro"
 
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() alvokita kun malplena pasvorto"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Misuzo de pezkomenca/pezfina en blowfish"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: Testo de sha256 fiaskis"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Testo de blowfish fiaskis"
-
-#~ msgid "Patch file"
-#~ msgstr "Flika dosiero"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&Bone\n"
-#~ "&Rezigni"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Neniu konekto al Vim-servilo"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: Ne eblas sendi al %s"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: Ne eblas legi respondon de servilo"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: Ne eblas sendi al kliento"
-
-#~ msgid "Save As"
-#~ msgstr "Konservi kiel"
-
-#~ msgid "Edit File"
-#~ msgstr "Redakti dosieron"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (NETROVITA)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Ruli Vim-skripton"
-
-#~ msgid "unknown"
-#~ msgstr "nekonata"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "Redakti Dosieron en nova fenestro"
-
-#~ msgid "Append File"
-#~ msgstr "Postaldoni dosieron"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Pozicio de fenestro: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "Konservi alidirekton"
-
-# DP: mi ne certas pri superflugo
-#~ msgid "Save View"
-#~ msgstr "Konservi superflugon"
-
-#~ msgid "Save Session"
-#~ msgstr "Konservi seancon"
-
-#~ msgid "Save Setup"
-#~ msgstr "Konservi agordaron"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< ne haveblas sen la eblo +eval"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: Neniu duliteraĵo en tiu versio"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "estas aparatdosiero (malŝaltita per la opcio 'opendevice')"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "Legado el stdin..."
-
-#~ msgid "[crypted]"
-#~ msgstr "[ĉifrita]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: Dosiero estas ĉifrata per nekonata metodo"
-
-#~ msgid "Warning: Using a weak encryption method; see :help 'cm'"
-#~ msgstr "Averto: uzo de malfortika ĉifrada metodo; vidu :help 'cm'"
-
-#~ 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 "writing to device disabled with 'opendevice' option"
-#~ msgstr "skribo al aparatdosiero malŝaltita per la opcio 'opendevice'"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: La rimeda forko estus perdita (aldonu ! por transpasi)"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: Ne sukcesis krei novan procezon por la grafika interfaco"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: La ida procezo ne sukcesis startigi la grafikan interfacon"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: Ne eblas lanĉi la grafikan interfacon"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: Ne eblas legi el \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr ""
-#~ "E665: Ne eblas startigi grafikan interfacon, neniu valida tiparo trovita"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' nevalida"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: Valoro de 'imactivatekey' estas nevalida"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: Ne eblas disponigi koloron %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "Neniu kongruo ĉe kursorpozicio, trovas sekvan"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<ne eblas malfermi> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: ne eblas akiri tiparon %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: ne eblas reveni al la aktuala dosierujo"
-
-#~ msgid "Pathname:"
-#~ msgstr "Serĉvojo:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: ne eblas akiri aktualan dosierujon"
-
-#~ msgid "OK"
-#~ msgstr "Bone"
-
-#~ msgid "Cancel"
-#~ msgstr "Rezigni"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr ""
-#~ "Fenestraĵo de rulumskalo: Ne eblis akiri geometrion de reduktita "
-#~ "rastrumbildo"
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim dialogo"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: Ne eblas krei BalloonEval kun ambaŭ mesaĝo kaj reagfunkcio"
-
-msgid "Yes"
-msgstr "Jes"
-
-msgid "No"
-msgstr "Ne"
-
-# todo '_' is for hotkey, i guess?
-#~ msgid "Input _Methods"
-#~ msgstr "Enigaj _metodoj"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - Serĉi kaj anstataŭigi..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM- Serĉi..."
-
-#~ msgid "Find what:"
-#~ msgstr "Serĉi kion:"
-
-#~ msgid "Replace with:"
-#~ msgstr "Anstataŭigi per:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "Kongrui kun nur plena vorto"
-
-#~ msgid "Match case"
-#~ msgstr "Uskleca kongruo"
-
-#~ msgid "Direction"
-#~ msgstr "Direkto"
-
-#~ msgid "Up"
-#~ msgstr "Supren"
-
-#~ msgid "Down"
-#~ msgstr "Suben"
-
-#~ msgid "Find Next"
-#~ msgstr "Trovi sekvantan"
-
-#~ msgid "Replace"
-#~ msgstr "Anstataŭigi"
-
-#~ msgid "Replace All"
-#~ msgstr "Anstataŭigi ĉiujn"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: Ricevis peton \"die\" (morti) el la seanca administrilo\n"
-
-#~ msgid "Close tab"
-#~ msgstr "Fermi langeton"
-
-#~ msgid "New tab"
-#~ msgstr "Nova langeto"
-
-#~ msgid "Open Tab..."
-#~ msgstr "Malfermi langeton..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: Ĉefa fenestro neatendite detruiĝis\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&Filtri"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Rezigni"
-
-#~ msgid "Directories"
-#~ msgstr "Dosierujoj"
-
-#~ msgid "Filter"
-#~ msgstr "Filtri"
-
-#~ msgid "&Help"
-#~ msgstr "&Helpo"
-
-#~ msgid "Files"
-#~ msgstr "Dosieroj"
-
-#~ msgid "&OK"
-#~ msgstr "&Bone"
-
-#~ msgid "Selection"
-#~ msgstr "Apartigo"
-
-#~ msgid "Find &Next"
-#~ msgstr "Trovi &Sekvanta"
-
-#~ msgid "&Replace"
-#~ msgstr "&Anstataŭigi"
-
-#~ msgid "Replace &All"
-#~ msgstr "Anstataŭigi ĉi&on"
-
-#~ msgid "&Undo"
-#~ msgstr "&Malfari"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: Ne eblas trovi titolon de fenestro \"%s\""
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Ne subtenata argumento: \"-%s\"; Uzu la version OLE."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: Ne eblas malfermi fenestron interne de aplikaĵo MDI"
-
-#~ msgid "Open tab..."
-#~ msgstr "Malfermi langeton..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Trovi ĉenon (uzu '\\\\' por trovi '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Trovi kaj anstataŭigi (uzu '\\\\' por trovi '\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "Ne uzata"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Dosierujo\t*.nenio\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: Ne eblas disponigi rikordon de kolormapo, iuj koloroj estas "
-#~ "eble neĝustaj"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: Tiparoj de tiuj signaroj mankas en aro de tiparo %s:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Nomo de tiparo: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "Tiparo '%s' ne estas egallarĝa"
-
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: Nomo de tiparo: %s\n"
-
-#~ msgid "Font0: %s\n"
-#~ msgstr "Font0: %s\n"
-
-#~ msgid "Font1: %s\n"
-#~ msgstr "Font1: %s\n"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "Font%<PRId64> ne estas duoble pli larĝa ol font0\n"
-
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "Larĝo de font0: %<PRId64>\n"
-
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Larĝo de Font1: %<PRId64>\n"
-#~ "\n"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "Nevalida tiparo specifita"
-
-#~ msgid "&Dismiss"
-#~ msgstr "&Forlasi"
-
-#~ msgid "no specific match"
-#~ msgstr "Neniu specifa kongruo"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - Elektilo de tiparo"
-
-#~ msgid "Name:"
-#~ msgstr "Nomo:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "Montri grandon en punktoj"
-
-#~ msgid "Encoding:"
-#~ msgstr "Kodoprezento:"
-
-#~ msgid "Font:"
-#~ msgstr "Tiparo:"
-
-#~ msgid "Style:"
-#~ msgstr "Stilo:"
-
-#~ msgid "Size:"
-#~ msgstr "Grando:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: ERARO en aŭtomato de korea alfabeto"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: Eraro de stat"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: ne eblas malfermi datumbazon de cscope: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: ne eblas akiri informojn pri la datumbazo de cscope"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "La biblioteko Lua no ŝargeblis."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "ne eblas konservi informojn de malfaro"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: Bedaŭrinde, tiu komando estas malŝaltita, ne eblis ŝargi la "
-#~ "bibliotekojn."
-
-#~ msgid "invalid expression"
-#~ msgstr "nevalida esprimo"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "esprimoj malŝaltitaj dum kompilado"
-
-#~ msgid "hidden option"
-#~ msgstr "kaŝita opcio"
-
-#~ msgid "unknown option"
-#~ msgstr "nekonata opcio"
-
-#~ msgid "window index is out of range"
-#~ msgstr "indekso de fenestro estas ekster limoj"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "ne eblis malfermi bufron"
-
-#~ msgid "cannot delete line"
-#~ msgstr "ne eblas forviŝi linion"
-
-#~ msgid "cannot replace line"
-#~ msgstr "ne eblas anstataŭigi linion"
-
-#~ msgid "cannot insert line"
-#~ msgstr "ne eblas enmeti linion"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "ĉeno ne rajtas enhavi liniavancojn"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "eraro dum konverto de Scheme-valoro al Vim"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Eraro de Vim: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Eraro de Vim"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "bufro estas nevalida"
-
-#~ msgid "window is invalid"
-#~ msgstr "fenestro estas nevalida"
-
-#~ msgid "linenr out of range"
-#~ msgstr "numero de linio ekster limoj"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "nepermesebla en sabloludejo de Vim"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: Vim ne povas plenumi :python post uzo de :py3"
-
-#~ msgid "only string keys are allowed"
-#~ msgstr "nur ĉenaj ŝlosiloj estas permeseblaj"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Pitono ne "
-#~ "ŝargeblis."
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Ne eblas alvoki Pitonon rekursie"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: Vim ne povas plenumi :py3  post uzo de :python"
-
-#~ msgid "index must be int or slice"
-#~ msgstr "indekso devas esti 'int' aŭ 'slice'"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ devas esti apero de Ĉeno"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: Bedaŭrinde tiu komando estas malŝaltita, la biblioteko Ruby ne "
-#~ "ŝargeblis."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: \"return\" neatendita"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: \"next\" neatendita"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: \"break\" neatendita"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: \"redo\" neatendita"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: \"retry\" ekster klaŭzo \"rescue\""
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: netraktita escepto"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: nekonata stato de longjmp: %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "Baskuligi realigon/difinon"
-
-#~ msgid "Show base class of"
-#~ msgstr "Vidigi bazan klason de"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "Montri anajn homonimigajn funkciojn"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "Rekuperi el dosiero"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "Rekuperi el projekto"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "Rekuperi de ĉiuj projektoj"
-
-#~ msgid "Retrieve"
-#~ msgstr "Rekuperi"
-
-#~ msgid "Show source of"
-#~ msgstr "Vidigi fonton de"
-
-#~ msgid "Find symbol"
-#~ msgstr "Trovi simbolon"
-
-#~ msgid "Browse class"
-#~ msgstr "Foliumi klasojn"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "Montri klason en hierarkio"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "Montri klason en hierarkio restriktita"
-
-# todo
-#~ msgid "Xref refers to"
-#~ msgstr "Xref ligas al"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref ligiĝas de"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref havas"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref uzita de"
-
-# DP: mi ne certas pri kio temas
-#~ msgid "Show docu of"
-#~ msgstr "Vidigi dokumentaron de"
-
-#~ msgid "Generate docu for"
-#~ msgstr "Krei dokumentaron de"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "Konekto al SNiFF+ neeblas. Kontrolu medion (sniffemacs trovendas en "
-#~ "$PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: Eraro dum lego. Malkonektita"
-
-# DP: Tiuj 3 mesaĝoj estas kune
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ estas aktuale "
-
-#~ msgid "not "
-#~ msgstr "ne "
-
-#~ msgid "connected"
-#~ msgstr "konektita"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: Nekonata peto de SNiFF+: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: Eraro dum konekto al SNiFF+"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ ne estas konektita"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: Ne estas bufro SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: Eraro dum skribo. Malkonektita"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "nevalida numero de bufro"
-
-#~ msgid "not implemented yet"
-#~ msgstr "ankoraŭ ne realigita"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "ne eblas meti la linio(j)n"
-
-#~ msgid "invalid mark name"
-#~ msgstr "nevalida nomo de marko"
-
-#~ msgid "mark not set"
-#~ msgstr "marko ne estas metita"
-
-#~ msgid "row %d column %d"
-#~ msgstr "linio %d kolumno %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "ne eblas enmeti/postaldoni linion"
-
-#~ msgid "line number out of range"
-#~ msgstr "numero de linio ekster limoj"
-
-#~ msgid "unknown flag: "
-#~ msgstr "nekonata flago: "
-
-# DP: ĉu traduki vimOption
-#~ msgid "unknown vimOption"
-#~ msgstr "nekonata vimOption"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "klavara interrompo"
-
-#~ msgid "vim error"
-#~ msgstr "eraro de Vim"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "ne eblas krei komandon de bufro/fenestro: objekto estas forviŝiĝanta"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "ne eblas registri postalvokan komandon: bufro/fenestro estas jam "
-#~ "forviŝiĝanta"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: NERIPAREBLA TCL-ERARO: reflist difekta!? Bv. retpoŝti al vim-"
-#~ "dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "ne eblas registri postalvokan komandon: referenco de bufro/fenestro ne "
-#~ "troveblas"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: Bedaŭrinde tiu komando estas malŝaltita: la biblioteko Tcl ne "
-#~ "ŝargeblis."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: elira kodo %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "ne eblas akiri linion"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "Ne eblas registri nomon de komanda servilo"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: Sendo de komando al cela programo fiaskis"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: Nevalida identigilo de servilo uzita: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: Ecoj de registro de apero de VIM estas nevalide formata. Forviŝita!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans ne estas subtenata kun tiu grafika interfaco\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "Tiu Vim ne estis kompilita kun la kompara eblo."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' ne uzeblas: malŝaltita dum kompilado\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: Eraro: Fiaskis lanĉi gvim el NetBeans\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "Kie uskleco estas ignorita antaŭaldonu / por igi flagon majuskla"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tRegistri tiun gvim al OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tMalregistri gvim de OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tRuli per grafika interfaco (kiel \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  aŭ  --nofork\tMalfono: ne forki kiam lanĉas grafikan interfacon"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\tNe uzi newcli por malfermi fenestrojn"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <aparatdosiero>\t\tUzi <aparatdosiero>-n por eneligo"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\tUzi <gvimrc> anstataŭ iun ajn .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\tRedakti ĉifradan dosieron"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <ekrano>\tKonekti Vim al tiu X-servilo"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tNe konekti al X-servilo"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <dosieroj>\tRedakti <dosieroj>-n en Vim-servilo se eblas"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <dosieroj>  Same, sed ne plendi se ne estas servilo"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <dosieroj>  Kiel --remote sed atendi ĝis dosieroj estas "
-#~ "redaktitaj"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <dosieroj> Same, sed ne plendi se ne estas servilo"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <dosieroj> Kiel --remote sed uzi langeton "
-#~ "por ĉiu dosiero"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <klavoj> Sendi <klavoj>-n al Vim-servilo kaj eliri"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <espr>\tKomputi <espr> en Vim-servilo kaj afiŝi rezulton"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tListigi haveblajn nomojn de Vim-serviloj kaj eliri"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <nomo>\tSendu al/iĝi la Vim-servilo <nomo>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumentoj agnoskitaj de gvim (versio Motif):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumentoj agnoskitaj de gvim (versio neXtaw):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumentoj agnoskitaj de gvim (versio Athena):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <ekrano>\tLanĉi vim sur <ekrano>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tLanĉi vim piktograme"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr ""
-#~ "-background <koloro>\tUzi <koloro>-n por la fona koloro (ankaŭ: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <koloro>\tUzi <koloro>-n por la malfona koloro (ankaŭ: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <tiparo>\tUzi <tiparo>-n por normala teksto (ankaŭ: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <tiparo>\tUzi <tiparo>-n por grasa teksto"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <tiparo>\tUzi <tiparo>-n por kursiva teksto"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\tUzi <geom> kiel komenca geometrio (ankaŭ: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr ""
-#~ "-borderwidth <larĝo>\tUzi <larĝo>-n kiel larĝo de bordero (ankaŭ: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <larĝo>  Uzi <larĝo>-n kiel larĝo de rulumskalo (ankaŭ: -"
-#~ "sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <alto>\tUzi <alto>-n kiel alto de menuzona alto (ankaŭ: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tUzi inversan videon (ankaŭ: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tNe uzi inversan videon (ankaŭ: +rv)"
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: Ne eblas trovi dosieron \"%s\" en serĉvojo"
 
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <rimedo>\tAgordi la specifitan <rimedo>-n"
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: Nevalida ID: %ld (devas esti egala aŭ pli granda ol 1)"
 
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumentoj agnoskitaj de gvim (versio GTK+):\n"
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID jam uzata: %ld"
 
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <ekrano>\tLanĉi Vim sur tiu <ekrano> (ankaŭ: --display)"
+msgid "List or number required"
+msgstr "Listo aŭ nombro bezonata"
 
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <rolo>\tDoni unikan rolon por identigi la ĉefan fenestron"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: Nevalida ID: %ld (devas esti egala aŭ pli granda ol 1)"
 
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tMalfermi Vim en alia GTK fenestraĵo"
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID netrovita: %ld"
 
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\tIgas gvim afiŝi la identigilon de vindozo sur stdout"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: Ne eblis ŝargi bibliotekon %s"
 
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <gepatra titolo>\tMalfermi Vim en gepatra aplikaĵo"
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Perl ne ŝargeblis."
 
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tMalfermi Vim en alia win32 fenestraĵo"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: Plenumo de Perl esprimoj malpermesata en sabloludejo sen la modulo Safe"
 
-#~ msgid "No display"
-#~ msgstr "Neniu ekrano"
+msgid "Edit with &multiple Vims"
+msgstr "Redakti per &pluraj Vim-oj"
 
-#~ msgid ": Send failed.\n"
-#~ msgstr ": Sendo fiaskis.\n"
+msgid "Edit with single &Vim"
+msgstr "Redakti per unuopa &Vim"
 
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": Sendo fiaskis. Provo de loka plenumo\n"
+msgid "Diff with Vim"
+msgstr "Kompari per Vim"
 
-#~ msgid "%d of %d edited"
-#~ msgstr "%d de %d redaktita(j)"
+msgid "Edit with &Vim"
+msgstr "Redakti per &Vim"
 
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Neniu ekrano: Sendado de esprimo fiaskis.\n"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "Redakti per ekzistanta Vim - "
 
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": Sendado de esprimo fiaskis.\n"
+msgid "Edits the selected file(s) with Vim"
+msgstr "Redakti la apartigita(j)n dosiero(j)n per Vim"
 
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: Nevalida kodpaĝo"
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "Eraro dum kreo de procezo: Kontrolu ĉu gvim estas en via serĉvojo!"
 
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: Ne eblas agordi valorojn de IC"
+msgid "gvimext.dll error"
+msgstr "Eraro de gvimext.dll"
 
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: Ne eblis krei enigan kuntekston"
+msgid "Path length too long!"
+msgstr "Serĉvojo estas tro longa!"
 
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: Ne eblis malfermi enigan metodon"
+msgid "--No lines in buffer--"
+msgstr "--Neniu linio en bufro--"
 
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: Averto: Ne eblis agordi detruan reagfunkcion al IM"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: komando ĉesigita"
 
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: eniga metodo subtenas neniun stilon"
+msgid "E471: Argument required"
+msgstr "E471: Argumento bezonata"
 
-# DP: mi ne scias, kio estas "preedit"
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: eniga metodo ne subtenas mian antaŭredaktan tipon"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: Eraro dum ĝisdatigo de ĉifrada permutodosiero .swp"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr "E833: %s estas ĉifrata kaj tiu versio de Vim ne subtenas ĉifradon"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "Perumutodosiero .swp estas ĉifrata: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "Se vi tajpis novan ŝlosilon de ĉifrado sed ne skribis la tekstan dosieron,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "tajpu la novan ŝlosilon de ĉifrado."
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ devus esti sekvita de /, ? aŭ &"
 
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "Se vi skribis la tekstan dosieron post ŝanĝo de la ŝlosilo de ĉifrado, "
-#~ "premu enenklavon"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr ""
+"E11: Nevalida en fenestro de komanda linio; <CR> plenumas, CTRL-C eliras"
 
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "por uzi la saman ŝlosilon por la teksta dosiero kaj permuto dosiero .swp"
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: Nepermesebla komando el exrc/vimrc en aktuala dosierujo aŭ etikeda serĉo"
 
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr ""
-#~ "Uzas ŝlosilon de ĉifrado el permuto dosiero .swp por la teksta dosiero.\n"
+msgid "E171: Missing :endif"
+msgstr "E171: Mankas \":endif\""
 
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [ne uzebla per tiu versio de Vim]"
+msgid "E600: Missing :endtry"
+msgstr "E600: Mankas \":endtry\""
 
-#~ msgid "Tear off this menu"
-#~ msgstr "Disigi tiun menuon"
+msgid "E170: Missing :endwhile"
+msgstr "E170: Mankas \":endwhile\""
 
-#~ msgid "Select Directory dialog"
-#~ msgstr "Dialogujo de dosiera elekto"
+msgid "E170: Missing :endfor"
+msgstr "E170: Mankas \":endfor\""
 
-#~ msgid "Save File dialog"
-#~ msgstr "Dialogujo de dosiera konservo"
+msgid "E588: :endwhile without :while"
+msgstr "E588: \":endwhile\" sen \":while\""
 
-#~ msgid "Open File dialog"
-#~ msgstr "Dialogujo de dosiera malfermo"
+msgid "E588: :endfor without :for"
+msgstr "E588: \":endfor\" sen \":for\""
 
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: Bedaŭrinde ne estas dosierfoliumilo en konzola reĝimo"
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: Dosiero ekzistas (aldonu ! por transpasi)"
 
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: konservo de dosieroj...\n"
+msgid "E472: Command failed"
+msgstr "E472: La komando malsukcesis"
 
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: Finita.\n"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Nekonata familio de tiparo: %s"
 
-#~ msgid "ERROR: "
-#~ msgstr "ERARO: "
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Nekonata tiparo: %s"
 
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[bajtoj] totalaj disponigitaj/maldisponigitaj %<PRIu64>-%<PRIu64>, nun "
-#~ "uzataj %<PRIu64>, kulmina uzo %<PRIu64>\n"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: La tiparo \"%s\" ne estas egallarĝa"
 
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[alvokoj] totalaj re/malloc() %<PRIu64>, totalaj free() %<PRIu64>\n"
-#~ "\n"
+msgid "E473: Internal error"
+msgstr "E473: Interna eraro"
 
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: Linio iĝas tro longa"
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Interna eraro: %s"
 
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Interna eraro: lalloc(%<PRId64>, )"
+msgid "Interrupted"
+msgstr "Interrompita"
 
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Nevalida formo de muskursoro"
+msgid "E14: Invalid address"
+msgstr "E14: Nevalida adreso"
 
-#~ msgid "Enter encryption key: "
-#~ msgstr "Tajpu la ŝlosilon de ĉifrado: "
+msgid "E474: Invalid argument"
+msgstr "E474: Nevalida argumento"
 
-#~ msgid "Enter same key again: "
-#~ msgstr "Tajpu la ŝlosilon denove: "
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Nevalida argumento: %s"
 
-#~ msgid "Keys don't match!"
-#~ msgstr "Ŝlosiloj ne kongruas!"
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: Nevalida esprimo: %s"
 
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Ne eblas konekti al Netbeans n-ro 2"
+msgid "E16: Invalid range"
+msgstr "E16: Nevalida amplekso"
 
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Ne eblas konekti al Netbeans"
+msgid "E476: Invalid command"
+msgstr "E476: Nevalida komando"
 
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: Nevalida permeso de dosiero de informo de konekto NetBeans: \"%s\""
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" estas dosierujo"
 
-#~ msgid "read from Netbeans socket"
-#~ msgstr "lego el kontaktoskatolo de Netbeans"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Alvoko al biblioteko malsukcesis por \"%s()\""
 
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: Konekto de NetBeans perdita por bufro %<PRId64>"
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Ne eblis ŝargi bibliotekan funkcion %s"
 
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: netbeans ne estas subtenata kun tiu grafika interfaco"
+msgid "E19: Mark has invalid line number"
+msgstr "E19: Marko havas nevalidan numeron de linio"
 
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: nebeans jam konektata"
+msgid "E20: Mark not set"
+msgstr "E20: Marko ne estas agordita"
 
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s estas nurlegebla (aldonu ! por transpasi)"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: Ne eblas fari ŝanĝojn, 'modifiable' estas malŝaltita"
 
-# DP: ĉu Eval devas esti tradukita?
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: Eval eblo ne disponeblas"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: Tro profunde ingitaj skriptoj"
 
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "malokupas %<PRId64> liniojn"
+msgid "E23: No alternate file"
+msgstr "E23: Neniu alterna dosiero"
 
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: term ne ŝanĝeblas en grafika interfaco"
+msgid "E24: No such abbreviation"
+msgstr "E24: Ne estas tia mallongigo"
 
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: Uzu \":gui\" por lanĉi la grafikan interfacon"
+msgid "E477: No ! allowed"
+msgstr "E477: Neniu ! permesebla"
 
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: Ne ŝanĝeblas en la grafika interfaco GTK+ 2"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: Grafika interfaco ne uzeblas: Malŝaltita dum kompilado"
 
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Nevalida(j) tiparo(j)"
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: La hebrea ne uzeblas: Malŝaltita dum kompilado\n"
 
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: ne eblas elekti tiparon"
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: La persa ne uzeblas: Malŝaltita dum kompilado\n"
 
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Nevalida tiparo"
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: La araba ne uzeblas: Malŝaltita dum kompilado\n"
 
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: ne eblas elekti larĝan tiparon"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: Neniu grupo de emfazo kiel: %s"
 
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Nevalida larĝa tiparo"
+msgid "E29: No inserted text yet"
+msgstr "E29: Ankoraŭ neniu enmetita teksto"
 
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: Neniu muso subtenata"
+msgid "E30: No previous command line"
+msgstr "E30: Neniu antaŭa komanda linio"
 
-#~ msgid "cannot open "
-#~ msgstr "ne eblas malfermi "
+msgid "E31: No such mapping"
+msgstr "E31: Neniu tiel mapo"
 
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: Ne eblas malfermi fenestron!\n"
+msgid "E479: No match"
+msgstr "E479: Neniu kongruo"
 
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Bezonas version 2.04 de Amigados aŭ pli novan\n"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: Neniu kongruo: %s"
 
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "Bezonas %s-on versio %<PRId64>\n"
+msgid "E32: No file name"
+msgstr "E32: Neniu dosiernomo"
 
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "Ne eblas malfermi NIL:\n"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: Neniu antaŭa regulesprimo de anstataŭigo"
 
-#~ msgid "Cannot create "
-#~ msgstr "Ne eblas krei "
+msgid "E34: No previous command"
+msgstr "E34: Neniu antaŭa komando"
 
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim eliras kun %d\n"
+msgid "E35: No previous regular expression"
+msgstr "E35: Neniu antaŭa regulesprimo"
 
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "ne eblas ŝanĝi reĝimon de konzolo?!\n"
+msgid "E481: No range allowed"
+msgstr "E481: Amplekso nepermesebla"
 
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: ne estas konzolo??\n"
+msgid "E36: Not enough room"
+msgstr "E36: Ne sufiĉe da spaco"
 
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: Ne eblas plenumi ŝelon kun opcio -f"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: neniu registrita servilo nomita \"%s\""
 
-#~ msgid "Cannot execute "
-#~ msgstr "Ne eblas plenumi "
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: Ne eblas krei dosieron %s"
 
-#~ msgid "shell "
-#~ msgstr "ŝelo "
+msgid "E483: Can't get temp file name"
+msgstr "E483: Ne eblas akiri provizoran dosiernomon"
 
-#~ msgid " returned\n"
-#~ msgstr " liveris\n"
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: Ne eblas malfermi dosieron %s"
 
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE tro malgranda."
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Ne eblas legi dosieron %s"
 
-#~ msgid "I/O ERROR"
-#~ msgstr "ERARO DE ENIGO/ELIGO"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Neniu skribo de post lasta ŝanĝo (aldonu ! por transpasi)"
 
-#~ msgid "Message"
-#~ msgstr "Mesaĝo"
+msgid "E37: No write since last change"
+msgstr "E37: Neniu skribo de post lasta ŝanĝo"
 
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' ne estas 80, ne eblas plenumi eksternajn komandojn"
+msgid "E38: Null argument"
+msgstr "E38: Nula argumento"
 
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: Elekto de presilo fiaskis"
+msgid "E39: Number expected"
+msgstr "E39: Nombro atendita"
 
-#~ msgid "to %s on %s"
-#~ msgstr "al %s de %s"
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: Ne eblas malfermi eraran dosieron %s"
 
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Nekonata tiparo de presilo: %s"
+msgid "E233: cannot open display"
+msgstr "E233: ne eblas malfermi vidigon"
 
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: Eraro de presado: %s"
+msgid "E41: Out of memory!"
+msgstr "E41: Ne plu restas memoro!"
 
-#~ msgid "Printing '%s'"
-#~ msgstr "Presas '%s'"
+msgid "Pattern not found"
+msgstr "Ŝablono ne trovita"
 
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: Nevalida nomo de signaro \"%s\" en nomo de tiparo \"%s\""
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Ŝablono ne trovita: %s"
 
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Nevalida signo '%c' en nomo de tiparo \"%s\""
+msgid "E487: Argument must be positive"
+msgstr "E487: La argumento devas esti pozitiva"
 
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: Duobla signalo, eliranta\n"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: Ne eblas reiri al antaŭa dosierujo"
 
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: Kaptis mortigantan signalon %s\n"
+msgid "E42: No Errors"
+msgstr "E42: Neniu eraro"
 
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: Kaptis mortigantan signalon\n"
+msgid "E776: No location list"
+msgstr "E776: Neniu listo de lokoj"
 
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "Malfermo de vidigo X daŭris %<PRId64> msek"
+msgid "E43: Damaged match string"
+msgstr "E43: Difekta kongruenda ĉeno"
 
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: Alvenis X eraro\n"
+msgid "E44: Corrupted regexp program"
+msgstr "E44: Difekta programo de regulesprimo"
 
-#~ msgid "Testing the X display failed"
-#~ msgstr "Testo de la vidigo X fiaskis"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: La opcio 'readonly' estas ŝaltita '(aldonu ! por transpasi)"
 
-#~ msgid "Opening the X display timed out"
-#~ msgstr "Tempolimo okazis dum malfermo de vidigo X"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: Ne eblas ŝanĝi nurlegeblan variablon \"%s\""
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ne eblas plenumi ŝelon sh\n"
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: Ne eblas agordi variablon en la sabloludejo: \"%s\""
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ne eblas krei duktojn\n"
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Ne eblas uzi malplenan ŝlosilon de Vortaro"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ne eblas forki\n"
+msgid "E715: Dictionary required"
+msgstr "E715: Vortaro bezonata"
 
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Komando terminigita\n"
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: indekso de listo ekster limoj: %ld"
 
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP perdis la konekton ICE"
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: Tro da argumentoj por funkcio: %s"
 
-#~ msgid "Opening the X display failed"
-#~ msgstr "Malfermo de vidigo X fiaskis"
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Ŝlosilo malekzistas en Vortaro: %s"
 
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP: traktado de peto konservi-mem"
+msgid "E714: List required"
+msgstr "E714: Listo bezonata"
 
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP: malfermo de konekto"
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: Argumento de %s devas esti Listo aŭ Vortaro"
 
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP: kontrolo de konekto ICE fiaskis"
+msgid "E47: Error while reading errorfile"
+msgstr "E47: Eraro dum legado de erardosiero"
 
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP: SmcOpenConnection fiaskis: %s"
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: Nepermesebla en sabloludejo"
 
-#~ msgid "At line"
-#~ msgstr "Ĉe linio"
+msgid "E523: Not allowed here"
+msgstr "E523: Nepermesebla tie"
 
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "Ne eblis ŝargi vim32.dll!"
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Reĝimo de ekrano ne subtenata"
 
-#~ msgid "VIM Error"
-#~ msgstr "Eraro de VIM"
+msgid "E49: Invalid scroll size"
+msgstr "E49: Nevalida grando de rulumo"
 
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "Ne eblis ripari referencojn de funkcioj al la DLL!"
+msgid "E91: 'shell' option is empty"
+msgstr "E91: La opcio 'shell' estas malplena"
 
-#~ msgid "shell returned %d"
-#~ msgstr "la ŝelo liveris %d"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Ne eblis legi datumojn de simboloj!"
 
-# DP: la eventoj estas tiuj, kiuj estas en la sekvantaj ĉenoj
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: Kaptis eventon %s\n"
+msgid "E72: Close error on swap file"
+msgstr "E72: Eraro dum malfermo de permutodosiero .swp"
 
-#~ msgid "close"
-#~ msgstr "fermo"
+msgid "E73: tag stack empty"
+msgstr "E73: malplena stako de etikedo"
 
-#~ msgid "logoff"
-#~ msgstr "elsaluto"
+msgid "E74: Command too complex"
+msgstr "E74: Komando tro kompleksa"
 
-#~ msgid "shutdown"
-#~ msgstr "sistemfermo"
+msgid "E75: Name too long"
+msgstr "E75: Nomo tro longa"
 
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: Netrovebla komando"
+msgid "E76: Too many ["
+msgstr "E76: Tro da ["
 
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE ne troveblas en via $PATH.\n"
-#~ "Eksteraj komandoj ne paŭzos post kompletigo.\n"
-#~ "Vidu  :help win32-vimrun  por pliaj informoj."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Averto de Vim"
-
-#~ msgid "Error file"
-#~ msgstr "Erara Dosiero"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: Eraro dum prekomputado de NFA kun ekvivalentoklaso!"
-
-#~ msgid "E999: (NFA regexp internal error) Should not process NOT node !"
-#~ msgstr ""
-#~ "E999: (interna eraro de NFA-regulesprimo) Ne devus procezi nodon 'NOT'!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr "Averto: Ne eblas trovi vortliston \"%s_%s.spl\" aŭ \"%s_ascii.spl\""
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "Konverto en %s nesubtenata"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: Ne sufiĉe da memoro, vortlisto estos nekompleta."
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Vojo de etikeda dosiero trunkita por %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "nova ŝelo lanĉita\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "Uzis CUT_BUFFER0 anstataŭ malplenan apartigon"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "Malfaro neebla; daŭrigi tamene"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: Ne ĉifrata dosiero havas ĉifratan malfaran dosieron: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: Malĉifrado de malfara dosiero fiaskis: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Malfara dosiero estas ĉifrata: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Grafika versio MS-Vindozo 16/32-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Grafika versio MS-Vindozo 64-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Grafika versio MS-Vindozo 32-bitoj"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " en reĝimo Win32s"
-
-#~ msgid " with OLE support"
-#~ msgstr " kun subteno de OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio konzola MS-Vindozo 64-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio konzola MS-Vindozo 32-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio MS-Vindozo 16-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio MS-DOS 32-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio MS-DOS 16-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio Mak OS X (unikso)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio Mak OS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio Mak OS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Granda versio "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Normala versio "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Malgranda versio "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Malgrandega versio "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "kun grafika interfaco GTK2-GNOME."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "kun grafika interfaco GTK2."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "kun grafika interfaco X11-Motif."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "kun grafika interfaco X11-neXtaw."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "kun grafika interfaco X11-Athena."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "kun grafika interfaco Photon."
-
-#~ msgid "with GUI."
-#~ msgstr "sen grafika interfaco."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "kun grafika interfaco Carbon."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "kun grafika interfaco Cocoa."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "kun (klasika) grafika interfaco."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "         sistema dosiero gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "       dosiero gvimrc de uzanto: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "   2-a dosiero gvimrc de uzanto: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "   3-a dosiero gvimrc de uzanto: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "       dosiero de sistema menuo: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "Kompililo: "
+msgid "E77: Too many file names"
+msgstr "E77: Tro da dosiernomoj"
 
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "menuo  Help->Orfinoj              por pliaj informoj   "
+msgid "E488: Trailing characters"
+msgstr "E488: Vostaj signoj"
 
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "Ruliĝas senreĝime, tajpita teksto estas enmetita"
+msgid "E78: Unknown mark"
+msgstr "E78: Nekonata marko"
 
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "menuo Redakti->Mallokaj Agordoj->Baskuligi Enmetan Reĝimon"
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: Ne eblas malvolvi ĵokerojn"
 
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "                              for two modes      "
-#~ msgstr "                                  por du reĝimoj       "
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ne rajtas esti malpli ol 'winminheight'"
 
-# DP: tiu ĉeno pli longas (mi ne volas igi ĉiujn aliajn ĉenojn
-#     pli longajn)
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "menuo Redakti->Mallokaj Agordoj->Baskuligi Reĝimon Kongruan kun Vi"
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ne rajtas esti malpli ol 'winminwidth'"
 
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                                  por defaŭltoj de Vim "
+msgid "E80: Error while writing"
+msgstr "E80: Eraro dum skribado"
 
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "AVERTO: Trovis Vindozon 95/98/ME"
+msgid "Zero count"
+msgstr "Nul kvantoro"
 
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "tajpu  :help windows95<Enenklavo> por pliaj informoj   "
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: Uzo de <SID> ekster kunteksto de skripto"
 
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: Ne eblis ŝargi bibliotekon %s"
+msgid "E449: Invalid expression received"
+msgstr "E449: Nevalida esprimo ricevita"
 
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Perl ne "
-#~ "ŝargeblis."
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Regiono estas gardita, ne eblas ŝanĝi"
 
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: Plenumo de Perl esprimoj malpermesata en sabloludejo sen la modulo "
-#~ "Safe"
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ne permesas ŝanĝojn en nurlegeblaj dosieroj"
 
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "Redakti per &pluraj Vim-oj"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: ŝablono uzas pli da memoro ol 'maxmempattern'"
 
-#~ msgid "Edit with single &Vim"
-#~ msgstr "Redakti per unuopa &Vim"
+msgid "E749: empty buffer"
+msgstr "E749: malplena bufro"
 
-#~ msgid "Diff with Vim"
-#~ msgstr "Kompari per Vim"
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: La bufro %ld ne ekzistas"
 
-#~ msgid "Edit with &Vim"
-#~ msgstr "Redakti per &Vim"
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: Nevalida serĉa ŝablono aŭ disigilo"
 
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "Redakti per ekzistanta Vim - "
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Dosiero estas ŝargita en alia bufro"
 
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "Redakti la apartigita(j)n dosiero(j)n per Vim"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: La opcio '%s' ne estas ŝaltita"
 
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "Eraro dum kreo de procezo: Kontrolu ĉu gvim estas en via serĉvojo!"
+msgid "E850: Invalid register name"
+msgstr "E850: Nevalida nomo de reĝistro"
 
-#~ msgid "gvimext.dll error"
-#~ msgstr "Eraro de gvimext.dll"
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: Dosierujo ne trovita en '%s': \"%s\""
 
-#~ msgid "Path length too long!"
-#~ msgstr "Serĉvojo estas tro longa!"
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "serĉo atingis SUPRON, daŭrigonte al SUBO"
 
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Nekonata familio de tiparo: %s"
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "serĉo atingis SUBON, daŭrigonte al SUPRO"
 
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Nekonata tiparo: %s"
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "Ŝlosilo de ĉifrado bezonata por \"%s\""
 
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: La tiparo \"%s\" ne estas egallarĝa"
+msgid "empty keys are not allowed"
+msgstr "malplenaj ŝlosiloj nepermeseblaj"
 
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: Ne eblis ŝargi bibliotekan funkcion %s"
+msgid "dictionary is locked"
+msgstr "vortaro estas ŝlosita"
 
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: La hebrea ne uzeblas: Malŝaltita dum kompilado\n"
+msgid "list is locked"
+msgstr "listo estas ŝlosita"
 
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: La persa ne uzeblas: Malŝaltita dum kompilado\n"
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "aldono de ŝlosilo '%s' al vortaro malsukcesis"
 
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: La araba ne uzeblas: Malŝaltita dum kompilado\n"
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "indekso devas esti 'int' aŭ 'slice', ne %s"
 
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: neniu registrita servilo nomita \"%s\""
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "atendis aperon de str() aŭ unicode(), sed ricevis %s"
 
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: ne eblas malfermi vidigon"
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "atendis aperon de bytes() aŭ str(), sed ricevis %s"
 
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Nevalida esprimo ricevita"
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "atendis int(), long() aŭ ion konverteblan al long(), sed ricevis %s"
 
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: Regiono estas gardita, ne eblas ŝanĝi"
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "atendis int() aŭ ion konverteblan al int(), sed ricevis %s"
 
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans ne permesas ŝanĝojn en nurlegeblaj dosieroj"
+msgid "value is too large to fit into C int type"
+msgstr "valoro estas tro grada por C-tipo 'int'"
 
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "Ŝlosilo de ĉifrado bezonata por \"%s\""
+msgid "value is too small to fit into C int type"
+msgstr "valoro estas tro malgranda por C-tipo 'int'"
 
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "ne eblas forviŝi atributojn de OutputObject"
+msgid "number must be greater than zero"
+msgstr "nombro devas esti pli granda ol nul"
 
-#~ msgid "softspace must be an integer"
-#~ msgstr "malmolspaceto (softspace) devas esti entjero"
+msgid "number must be greater or equal to zero"
+msgstr "nombro devas esti egala aŭ pli granda ol nul"
 
-#~ msgid "invalid attribute"
-#~ msgstr "nevalida atributo"
+msgid "can't delete OutputObject attributes"
+msgstr "ne eblas forviŝi atributojn de OutputObject"
 
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines() bezonas liston de ĉenoj"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "nevalida atributo: %s"
 
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Pitono: Eraro de pravalorizo de eneligaj objektoj"
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Pitono: Eraro de pravalorizo de eneligaj objektoj"
 
-#~ msgid "empty keys are not allowed"
-#~ msgstr "malplenaj ŝlosiloj nepermeseblaj"
+msgid "failed to change directory"
+msgstr "malsukcesis ŝanĝi dosierujon"
 
-#~ msgid "Cannot delete DictionaryObject attributes"
-#~ msgstr "ne eblas forviŝi atributojn de DictionaryObject"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "atendis 3-opon kiel rezulto de imp.find_module(), sed ricevis %s"
 
-#~ msgid "Cannot modify fixed dictionary"
-#~ msgstr "Ne eblas ŝanĝi fiksan vortaron"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "atendis 3-opon kiel rezulto de imp.find_module(), sed ricevis %d-opon"
 
-#~ msgid "Cannot set this attribute"
-#~ msgstr "Ne eblas agordi tiun atributon"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "interna eraro: imp.find_module liveris opon kun NULL"
 
-#~ msgid "dict is locked"
-#~ msgstr "vortaro estas ŝlosita"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "ne eblas forviŝi atributojn de 'vim.Dictionary'"
 
-#~ msgid "failed to add key to dictionary"
-#~ msgstr "aldono de ŝlosilo al vortaro fiaskis"
+msgid "cannot modify fixed dictionary"
+msgstr "ne eblas ŝanĝi fiksan vortaron"
 
-#~ msgid "list index out of range"
-#~ msgstr "indekso de listo ekster limoj"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "ne eblas agordi atributon %s"
 
-#~ msgid "internal error: failed to get vim list item"
-#~ msgstr "interna eraro: obteno de vim-a listero fiaskis"
+msgid "hashtab changed during iteration"
+msgstr "hakettabelo ŝanĝiĝis dum iteracio"
 
-#~ msgid "list is locked"
-#~ msgstr "listo estas ŝlosita"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "atendis 2-longan sekvencon, sed ricevis %d-longan sekvencon"
 
-#~ msgid "Failed to add item to list"
-#~ msgstr "Aldono de listero fiaskis"
+msgid "list constructor does not accept keyword arguments"
+msgstr "konstruilo de listo ne akceptas ŝlosilvortajn argumentojn"
 
-#~ msgid "can only assign lists to slice"
-#~ msgstr "nur eblas pravalorizi listojn al segmento"
+msgid "list index out of range"
+msgstr "indekso de listo ekster limoj"
 
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "interna eraro: aldono de listero fiaskis"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "interna eraro: obteno de vim-a listero %d malsukcesis"
 
-#~ msgid "can only concatenate with lists"
-#~ msgstr "eblas nur kunmeti kun listoj"
+msgid "slice step cannot be zero"
+msgstr "paŝo de sekco ne povas esti nul"
 
-#~ msgid "cannot delete vim.dictionary attributes"
-#~ msgstr "ne eblas forviŝi atributojn de 'vim.dictionary'"
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr "provis valorizi sekvencon kun pli ol %d eroj en etendita sekco"
 
-#~ msgid "cannot modify fixed list"
-#~ msgstr "ne eblas ŝanĝi fiksan liston"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "interna eraro: neniu vim-a listero %d"
 
-#~ msgid "cannot set this attribute"
-#~ msgstr "ne eblas agordi tiun atributon"
+msgid "internal error: not enough list items"
+msgstr "interna eraro: ne sufiĉaj listeroj"
 
-#~ msgid "'self' argument must be a dictionary"
-#~ msgstr "argumento 'self' devas esti vortaro"
+msgid "internal error: failed to add item to list"
+msgstr "interna eraro: aldono de listero malsukcesis"
 
-#~ msgid "failed to run function"
-#~ msgstr "fiaskis ruli funkcion"
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr "provis valorizi sekvencon kun %d eroj al etendita sekco kun %d eroj"
 
-#~ msgid "unable to unset global option"
-#~ msgstr "ne povis malŝalti mallokan opcion"
+msgid "failed to add item to list"
+msgstr "aldono de listero malsukcesis"
 
-#~ msgid "unable to unset option without global value"
-#~ msgstr "ne povis malŝalti opcion sen malloka valoro"
+msgid "cannot delete vim.List attributes"
+msgstr "ne eblas forviŝi atributojn de 'vim.List'"
 
-#~ msgid "object must be integer"
-#~ msgstr "objekto devas esti entjero."
+msgid "cannot modify fixed list"
+msgstr "ne eblas ŝanĝi fiksan liston"
 
-#~ msgid "object must be string"
-#~ msgstr "objekto devas esti ĉeno"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "sennoma funkcio %s ne ekzistas"
 
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "provo de referenco al forviŝita langeto"
+#, c-format
+msgid "function %s does not exist"
+msgstr "funkcio %s ne ekzistas"
 
-#~ msgid "<tabpage object (deleted) at %p>"
-#~ msgstr "<langeta objekto (forviŝita) ĉe %p>"
+#, c-format
+msgid "failed to run function %s"
+msgstr "malsukcesis ruli funkcion %s"
 
-#~ msgid "<tabpage object (unknown) at %p>"
-#~ msgstr "<langeta objekto (nekonata) ĉe %p>"
+msgid "unable to get option value"
+msgstr "malsukcesis akiri valoron de opcio"
 
-#~ msgid "<tabpage %d>"
-#~ msgstr "<langeto %d>"
+msgid "internal error: unknown option type"
+msgstr "interna eraro: nekonata tipo de opcio"
 
-#~ msgid "no such tab page"
-#~ msgstr "ne estas tia langeto"
+msgid "problem while switching windows"
+msgstr "problemo dum salto al vindozoj"
 
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "provo de referenco al forviŝita fenestro"
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "ne povis malŝalti mallokan opcion %s"
 
-#~ msgid "readonly attribute"
-#~ msgstr "nurlegebla atributo"
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "ne povis malŝalti opcion %s, kiu ne havas mallokan valoron"
 
-#~ msgid "cursor position outside buffer"
-#~ msgstr "kursoro poziciita ekster bufro"
+msgid "attempt to refer to deleted tab page"
+msgstr "provo de referenco al forviŝita langeto"
 
-#~ msgid "<window object (deleted) at %p>"
-#~ msgstr "<fenestra objekto (forviŝita) ĉe %p>"
+msgid "no such tab page"
+msgstr "ne estas tia langeto"
 
-#~ msgid "<window object (unknown) at %p>"
-#~ msgstr "<objekta fenestro (nekonata) ĉe %p>"
+msgid "attempt to refer to deleted window"
+msgstr "provo de referenco al forviŝita fenestro"
 
-#~ msgid "<window %d>"
-#~ msgstr "<fenestro %d>"
+msgid "readonly attribute: buffer"
+msgstr "nurlegebla atributo: buffer"
 
-#~ msgid "no such window"
-#~ msgstr "ne estas tia fenestro"
+msgid "cursor position outside buffer"
+msgstr "kursoro poziciita ekster bufro"
 
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "provo de referenco al forviŝita bufro"
+msgid "no such window"
+msgstr "ne estas tia fenestro"
 
-#~ msgid "<buffer object (deleted) at %p>"
-#~ msgstr "<bufra objekto (forviŝita) ĉe %p>"
+msgid "attempt to refer to deleted buffer"
+msgstr "provo de referenco al forviŝita bufro"
 
-#~ msgid "key must be integer"
-#~ msgstr "ŝlosilo devas esti entjero."
+msgid "failed to rename buffer"
+msgstr "malsukcesis renomi bufron"
 
-#~ msgid "expected vim.buffer object"
-#~ msgstr "atendis objekton vim.buffer"
+msgid "mark name must be a single character"
+msgstr "nomo de marko devas esti unuopa signo"
 
-#~ msgid "failed to switch to given buffer"
-#~ msgstr "ne povis salti al la specifita bufro"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "atendis objekton vim.Buffer, sed ricevis %s"
 
-#~ msgid "expected vim.window object"
-#~ msgstr "atendis objekton vim.window"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "salto al la bufro %d malsukcesis"
 
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "ne povis trovi vindozon en la nuna langeto"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "atendis objekton vim.window, sed ricevis %s"
 
-#~ msgid "did not switch to the specified window"
-#~ msgstr "ne saltis al la specifita vindozo"
+msgid "failed to find window in the current tab page"
+msgstr "malsukcesis trovi vindozon en la nuna langeto"
 
-#~ msgid "expected vim.tabpage object"
-#~ msgstr "atendis objekton vim.tabpage"
+msgid "did not switch to the specified window"
+msgstr "ne saltis al la specifita vindozo"
 
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "ne saltis al la specifita langeto"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "atendis objekton vim.TabPage, sed ricevis %s"
 
-#~ msgid "failed to run the code"
-#~ msgstr "fiaskis ruli la kodon"
+msgid "did not switch to the specified tab page"
+msgstr "ne saltis al la specifita langeto"
 
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: Eval ne revenis kun valida python-objekto"
+msgid "failed to run the code"
+msgstr "malsukcesis ruli la kodon"
 
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: Konverto de revena python-objekto al vim-valoro fiaskis"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval ne revenis kun valida python-objekto"
 
-#~ msgid "unable to convert to vim structure"
-#~ msgstr "ne povis konverti al vim-strukturo"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: Konverto de revena python-objekto al vim-valoro malsukcesis"
 
-#~ msgid "NULL reference passed"
-#~ msgstr "NULL-referenco argumento"
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "ne povis konverti %s al vim-vortaro"
 
-#~ msgid "internal error: invalid value type"
-#~ msgstr "interna eraro: nevalida tipo de valoro"
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "ne povis konverti %s al vim-listo"
 
-#~ msgid "E863: return value must be an instance of str"
-#~ msgstr "E863: elira valoro devas esti apero de str"
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "ne povis konverti %s al vim-strukturo"
 
-#~ msgid "E860: Eval did not return a valid python 3 object"
-#~ msgstr "E860: Eval ne revenis kun valida python3-objekto"
+msgid "internal error: NULL reference passed"
+msgstr "interna eraro: NULL-referenco argumento"
 
-#~ msgid "E861: Failed to convert returned python 3 object to vim value"
-#~ msgstr "E861: Konverto de revena python3-objekto al vim-valoro fiaskis"
+msgid "internal error: invalid value type"
+msgstr "interna eraro: nevalida tipo de valoro"
 
-#~ msgid "Only boolean objects are allowed"
-#~ msgstr "Nur buleaj objektoj estas permeseblaj"
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Valorizo de sys.path_hooks malsukcesis: sys.path_hooks ne estas listo\n"
+"Vi nun devas fari tion:\n"
+"- postaldoni vim.path_hook al sys.path_hooks\n"
+"- postaldoni vim.VIM_SPECIAL_PATH al sys.path\n"
 
-#~ msgid "no such key in dictionary"
-#~ msgstr "tiu ŝlosilo ne ekzistas en vortaro"
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Agordo de serĉvojo malsukcesis: sys.path ne estas listo\n"
+"Vi nun devas aldoni vim.VIM_SPECIAL_PATH al sys.path"
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 4b1b0476ca..c0df5f2170 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -1,3 +1,4 @@
+
 # French Translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -6,7 +7,7 @@
 #  FIRST AUTHOR  DindinX         <David.Odin@bigfoot.com>     2000.
 # SECOND AUTHOR  Adrien Beau     <version.francaise@free.fr>  2002, 2003.
 #  THIRD AUTHOR  David Blanchet  <david.blanchet@free.fr>     2006, 2008.
-# FOURTH AUTHOR  Dominique Pell� <dominique.pelle@gmail.com>  2008, 2015.
+# FOURTH AUTHOR  Dominique Pell� <dominique.pelle@gmail.com>  2008, 2017.
 #
 # Latest translation available at:
 #   http://dominique.pelle.free.fr/vim-fr.php
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Fran�ais)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 20:54+0200\n"
-"PO-Revision-Date: 2016-08-26 20:34+0200\n"
+"POT-Creation-Date: 2017-01-16 00:30+0100\n"
+"PO-Revision-Date: 2017-01-16 00:51+0100\n"
 "Last-Translator: Dominique Pell� <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -24,13 +25,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO_8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#, fuzzy
-#~ msgid "Unable to get option value"
-#~ msgstr "impossible d'obtenir la valeur d'une option"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: bf_key_init() appel�e avec un mot de passe vide"
+
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: petit/gros boutisme incorrect dans blowfish"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: le test de sha256 a �chou�"
 
-#, fuzzy
-#~ msgid "internal error: unknown option type"
-#~ msgstr "erreur interne : pas d'�l�ment de liste vim"
+msgid "E819: Blowfish test failed"
+msgstr "E819: le test de blowfish a �chou�"
 
 # DB - TODO : Trouver une traduction valable et attest�e pour "location".
 msgid "[Location List]"
@@ -56,6 +64,9 @@ msgstr ""
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Le tampon ne peut pas �tre enregistr�"
 
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: Tentative de suppression d'un tampon en cours d'utilisation"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Aucun tampon n'a �t� d�charg�"
 
@@ -106,20 +117,18 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Impossible d'aller avant le premier tampon"
 
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
-"E89: Le tampon %<PRId64> n'a pas �t� enregistr� (ajoutez ! pour passer outre)"
+"E89: Le tampon %ld n'a pas �t� enregistr� (ajoutez ! pour passer outre)"
 
-#. wrap around (may cause duplicates)
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Alerte : La liste des noms de fichier d�borde"
 
 # AB - Vu le code source, la version fran�aise est meilleure que la
 #      version anglaise. Ce message est similaire au message E86.
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: Le tampon %<PRId64> n'existe pas"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: Le tampon %ld n'existe pas"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 #, c-format
@@ -131,8 +140,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Aucun tampon ne correspond � %s"
 
 #, c-format
-msgid "line %<PRId64>"
-msgstr "ligne %<PRId64>"
+msgid "line %ld"
+msgstr "ligne %ld"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Un tampon porte d�j� ce nom"
@@ -163,14 +172,14 @@ msgid "1 line --%d%%--"
 msgstr "1 ligne --%d%%--"
 
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> lignes --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld lignes --%d%%--"
 
 # AB - Faut-il remplacer "sur" par "de" ?
 # DB - Mon avis : oui.
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "ligne %<PRId64> sur %<PRId64> --%d%%-- col "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "ligne %ld sur %ld --%d%%-- col "
 
 # DB - Je trouvais [Aucun fichier] (VO : [No file]) plus naturel
 #      lors du lancement de Vim en mode graphique (ce message
@@ -223,6 +232,13 @@ msgstr ""
 msgid "Signs for %s:"
 msgstr "Symboles dans %s :"
 
+#, c-format
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    ligne=%ld  id=%d  nom=%s"
+
+msgid "E902: Cannot connect to port"
+msgstr "E902: Impossible de se connecter au port"
+
 msgid "E901: gethostbyname() in channel_open()"
 msgstr "E901: gethostbyname() dans channel_open()"
 
@@ -230,7 +246,7 @@ msgid "E898: socket() in channel_open()"
 msgstr "E898: socket() dans channel_open()"
 
 msgid "E903: received command with non-string argument"
-msgstr "E903: commande re�ue avec une argument qui n'est pas une cha�ne"
+msgstr "E903: commande re�ue avec un argument qui n'est pas une cha�ne"
 
 msgid "E904: last argument for expr/call must be a number"
 msgstr "E904: le dernier argument de expr/call doit �tre un nombre"
@@ -251,28 +267,72 @@ msgid "E631: %s(): write failed"
 msgstr "E631: %s() : erreur d'�criture"
 
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ligne=%<PRId64>  id=%d  nom=%s"
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: Impossible d'utiliser un callback avec %s()"
 
-msgid "E545: Missing colon"
-msgstr "E545: ':' manquant"
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr ""
+"E912: Impossible d'utiliser ch_evalexpr()/ch_sendexpr() avec un canal brut "
+"ou nl"
 
-msgid "E546: Illegal mode"
-msgstr "E546: Mode non autoris�"
+msgid "E906: not an open channel"
+msgstr "E906: pas un canal ouvert"
 
-msgid "E548: digit expected"
-msgstr "E548: chiffre attendu"
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: fichier _io n�cessite _name"
 
-msgid "E549: Illegal percentage"
-msgstr "E549: Pourcentage non autoris�"
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: tampon in_io n�cessite in_buf ou in_name "
 
-# AB - Je n'ai pas trouv� de traduction satisfaisante au verbe "diff". Comme
-#      Vim fait en pratique appel au programme "diff" pour evaluer les
-#      diff�rences entre fichiers, "to diff" a �t� traduit par "utiliser diff"
-#      et d'autres expressions appropri�es.
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: Impossible d'utiliser diff sur plus de %<PRId64> tampons"
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: le tampon doit �tre charg� : %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: Le fichier est chiffr� avec une m�thode inconnue"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr ""
+"Alerte : utilisation d'une m�thode de chiffrage faible ; consultez :help 'cm'"
+
+msgid "Enter encryption key: "
+msgstr "Tapez la cl� de chiffrement : "
+
+msgid "Enter same key again: "
+msgstr "Tapez la cl� � nouveau : "
+
+msgid "Keys don't match!"
+msgstr "Les cl�s ne correspondent pas !"
+
+msgid "[crypted]"
+msgstr "[chiffr�]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Il manque ':' dans le Dictionnaire %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Cl� dupliqu�e dans le Dictionnaire : %s"
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Il manque une virgule dans le Dictionnaire : %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Il manque '}' � la fin du Dictionnaire : %s"
+
+msgid "extend() argument"
+msgstr "argument de extend()"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: La cl� existe d�j� : %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: Impossible d'utiliser diff sur plus de %ld tampons"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Impossible de lire ou �crire des fichiers temporaires"
@@ -281,6 +341,9 @@ msgstr "E810: Impossible de lire ou �crire des fichiers temporaires"
 msgid "E97: Cannot create diffs"
 msgstr "E97: diff ne fonctionne pas"
 
+msgid "Patch file"
+msgstr "Fichier rustine"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: Le fichier interm�diaire produit par patch n'a pu �tre lu"
 
@@ -459,59 +522,17 @@ msgstr "Correspondance %d sur %d"
 msgid "match %d"
 msgstr "Correspondance %d"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Caract�res inattendus avant '='"
 
 #, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: index de Liste hors limites : %<PRId64> au-del� de la fin"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Variable non d�finie : %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']' manquant"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: L'argument de %s doit �tre une Liste"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: L'argument de %s doit �tre une Liste ou un Dictionnaire"
-
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Impossible d'utiliser une cl� vide dans un Dictionnaire"
-
-msgid "E714: List required"
-msgstr "E714: Liste requise"
-
-msgid "E715: Dictionary required"
-msgstr "E715: Dictionnaire requis"
-
-msgid "E928: String required"
-msgstr "E928: Chaine requis"
-
-# DB : Suggestion
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: La fonction %s a re�u trop d'arguments"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: La cl� %s n'existe pas dans le Dictionnaire"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: La fonction %s existe d�j� (ajoutez ! pour la remplacer)"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: Une entr�e du Dictionnaire porte d�j� ce nom"
-
-msgid "E718: Funcref required"
-msgstr "E718: R�f�rence de fonction (Funcref) requise"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Utilisation de [:] impossible avec un Dictionnaire"
 
@@ -548,7 +569,7 @@ msgid "E708: [:] must come last"
 msgstr "E708: [:] ne peut �tre sp�cifi� qu'en dernier"
 
 msgid "E709: [:] requires a List value"
-msgstr "E709: [:] n?cessite une Liste"
+msgstr "E709: [:] n�cessite une Liste"
 
 msgid "E710: List value has more items than target"
 msgstr "E710: La Liste a plus d'�l�ments que la destination"
@@ -574,8 +595,8 @@ msgstr "E109: Il manque ':' apr�s '?'"
 msgid "E691: Can only compare List with List"
 msgstr "E691: Une Liste ne peut �tre compar�e qu'avec une Liste"
 
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: Op�ration invalide avec les Listes"
+msgid "E692: Invalid operation for List"
+msgstr "E692: Op�ration invalide avec les Liste"
 
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: Un Dictionnaire ne peut �tre compar� qu'avec un Dictionnaire"
@@ -583,10 +604,6 @@ msgstr "E735: Un Dictionnaire ne peut �tre compar� qu'avec un Dictionnaire"
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Op�ration invalide avec les Dictionnaires"
 
-# DB - todo : Traduction valable (et courte) pour Funcref ?
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Une Funcref ne peut �tre compar�e qu'� une Funcref"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Op�ration invalide avec les Funcrefs"
 
@@ -599,6 +616,9 @@ msgstr "E110: ')' manquant"
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Impossible d'indexer une Funcref"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Impossible d'indexer une variable sp�ciale"
+
 # AB - La version fran�aise est meilleure que la version anglaise.
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -745,30 +765,39 @@ msgstr "E785: complete() n'est utilisable que dans le mode Insertion"
 
 # AB - Texte par d�faut du bouton de la bo�te de dialogue affich�e par la
 #      fonction confirm().
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "extend() argument"
-msgstr "argument de extend()"
-
 #, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: un mappage existe d�j� pour %s"
-
-msgid "map() argument"
-msgstr "argument de map()"
-
-msgid "filter() argument"
-msgstr "argument de filter()"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld lignes : "
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld ligne : "
+msgstr[1] "+-%s%3ld lignes : "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Fonction inconnue : %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: dictionnaire attendu"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr ""
+"E923: Le second argument de function() doit �tre une liste ou un dictionnaire"
+
+# AB - Textes des boutons de la bo�te de dialogue affich�e par inputdialog().
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"&Ok\n"
+"&Annuler"
+
 # AB - La version fran�aise est meilleure que la version anglaise.
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() a �t� appel� plus de fois qu'inputsave()"
@@ -779,6 +808,9 @@ msgstr "argument de insert()"
 msgid "E786: Range not allowed"
 msgstr "E786: Les plages ne sont pas autoris�es"
 
+msgid "E916: not a valid job"
+msgstr "E916: t�che invalide"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: Type invalide avec len()"
 
@@ -795,6 +827,19 @@ msgstr "E727: D�but au-del� de la fin"
 msgid "<empty>"
 msgstr "<vide>"
 
+# AB - � mon avis, la version anglaise est erron�e.
+# DB : V�rifier
+msgid "E240: No connection to Vim server"
+msgstr "E240: Pas de connexion au serveur X"
+
+# AB - La version fran�aise est meilleure que la version anglaise.
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: L'envoi au serveur %s a �chou�"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: Impossible de lire la r�ponse du serveur"
+
 msgid "remove() argument"
 msgstr "argument de remove()"
 
@@ -804,6 +849,10 @@ msgstr "E655: Trop de liens symboliques (cycle ?)"
 msgid "reverse() argument"
 msgstr "argument de reverse()"
 
+# AB - La version fran�aise est meilleure que la version anglaise.
+msgid "E258: Unable to send to client"
+msgstr "E258: La r�ponse n'a pas pu �tre envoy�e au client"
+
 #, c-format
 msgid "E927: Invalid action: '%s'"
 msgstr "E927: Action invalide : � %s �"
@@ -811,185 +860,27 @@ msgstr "E927: Action invalide : � %s �"
 msgid "sort() argument"
 msgstr "argument de sort()"
 
-#, fuzzy
-#~ msgid "uniq() argument"
-#~ msgstr "argument de add()"
+msgid "uniq() argument"
+msgstr "argument de uniq()"
 
 msgid "E702: Sort compare function failed"
 msgstr "E702: La fonction de comparaison de sort() a �chou�"
 
-#, fuzzy
-#~ msgid "E882: Uniq compare function failed"
-#~ msgstr "E702: La fonction de comparaison de sort() a �chou�"
+msgid "E882: Uniq compare function failed"
+msgstr "E882: La fonction de comparaison de uniq() a �chou�"
 
 msgid "(Invalid)"
 msgstr "(Invalide)"
 
-msgid "E677: Error writing temp file"
-msgstr "E677: Erreur lors de l'�criture du fichier temporaire"
-
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Utilisation d'un Flottant comme un Nombre"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Utilisation d'une Funcref comme un Nombre"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: Utilisation d'une Liste comme un Nombre"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Utilisation d'un Dictionnaire comme un Nombre"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: Utilisation d'une Funcref comme une Cha�ne"
-
-msgid "E730: using List as a String"
-msgstr "E730: Utilisation d'une Liste comme une Cha�ne"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: Utilisation d'un Dictionnaire comme une Cha�ne"
-
-# DB : On doit pouvoir trouver nettement mieux que �a.
 #, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Type de variable incoh�rent pour %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: Impossible de supprimer la variable %s"
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: num�ro de submatch invalide : %d"
 
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Le nom d'une Funcref doit commencer par une majuscule : %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Le nom d'une variable entre en conflit avec la fonction %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: La valeur de %s est verrouill�e"
-
-msgid "Unknown"
-msgstr "Inconnu"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: Impossible de modifier la valeur de %s"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: variable trop imbriqu�e pour en faire une copie"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Fonction non d�finie : %s"
-
-# AB - La version fran�aise est plus consistante que la version anglaise.
-# AB - Je suis partag� entre la concision d'une traduction assez litt�rale et
-#      la lourdeur d'une traduction plus correcte.
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: Il manque '(' apr�s %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: Impossible d'utiliser g: ici"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: Argument invalide : %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: Nom d'argument dupliqu� : %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: Il manque :endfunction"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: Le nom de fonction entre en conflit avec la variable : %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Impossible de red�finir fonction %s : d�j� utilis�e"
-
-# DB - Le contenu du "c-format" est le nom de la fonction.
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: Le nom de la fonction %s ne correspond pas le nom du script"
-
-msgid "E129: Function name required"
-msgstr "E129: Nom de fonction requis"
-
-#, fuzzy, c-format
-#~ msgid "E128: Function name must start with a capital or \"s:\": %s"
-#~ msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'"
-
-#, fuzzy, c-format
-#~ msgid "E884: Function name cannot contain a colon: %s"
-#~ msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'"
-
-# AB - Il est difficile de cr�er une version fran�aise qui fasse moins de 80
-#      caract�res de long, nom de la fonction compris : "It is in use" est une
-#      expression tr�s dense. Traductions possibles : "elle est utilis�e",
-#      "elle s'ex�cute" ou "elle est occup�e".
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Impossible d'effacer %s : cette fonction est utilis�e"
-
-# AB - V�rifier dans la litt�rature technique s'il n'existe pas une meilleure
-#      traduction pour "function call depth".
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr ""
-"E132: La profondeur d'appel de fonction est sup�rieure � 'maxfuncdepth'"
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "calling %s"
-msgstr "appel de %s"
-
-# AB - V�rifier.
-#, c-format
-msgid "%s aborted"
-msgstr "%s annul�e"
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s a retourn� #%<PRId64>"
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "%s returning %s"
-msgstr "%s a retourn� \"%s\""
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "continuing in %s"
-msgstr "de retour dans %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return en dehors d'une fonction"
-
-# AB - La version fran�aise est capitalis�e pour �tre en accord avec les autres
-#      commentaires enregistr�s dans le fichier viminfo.
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# Variables globales:\n"
-
-# DB - Plus pr�cis ("la derni�re fois") ?
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tModifi� la derni�re fois dans "
+msgid "E677: Error writing temp file"
+msgstr "E677: Erreur lors de l'�criture du fichier temporaire"
 
-msgid "No old files"
-msgstr "Aucun vieux fichier"
+msgid "E921: Invalid callback argument"
+msgstr "E921: Argument de callback invalide"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -1012,12 +903,12 @@ msgid "1 line moved"
 msgstr "1 ligne d�plac�e"
 
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> lignes d�plac�es"
+msgid "%ld lines moved"
+msgstr "%ld lignes d�plac�es"
 
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> lignes filtr�es"
+msgid "%ld lines filtered"
+msgstr "%ld lignes filtr�es"
 
 # AB - J'ai volontairement omis l'ast�risque initiale car je pense que le
 #      motif "Filter*" d�crit plus clairement les quatre autocommandes li�es
@@ -1079,6 +970,10 @@ msgstr " �CHEC"
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: L'�criture dans le fichier %s est interdite"
 
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: Trop de fichiers temporaires viminfo, comme %s!"
+
 # AB - Le point d'exclamation est superflu.
 # AB - Le mot "viminfo" a �t� retir� pour que le message ne d�passe pas 80
 #      caract�res dans le cas courant o� %s = /home/12345678/.viminfo
@@ -1091,6 +986,10 @@ msgstr "E138: Impossible d'�crire le fichier %s"
 msgid "Writing viminfo file \"%s\""
 msgstr "�criture du fichier viminfo \"%s\""
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: Impossible de renommer viminfo en %s"
+
 #. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
@@ -1112,6 +1011,19 @@ msgstr "# 'encoding' dans lequel ce fichier a �t� �crit\n"
 msgid "Illegal starting char"
 msgstr "Caract�re initial non valide"
 
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Lignes commen�ant par |, copi�es litt�ralement :\n"
+
+# AB - Ceci est un titre de bo�te de dialogue. V�rifier que la version
+#      fran�aise est correcte pour les trois r�f�rences ; j'ai un doute quant
+#      � la troisi�me.
+msgid "Save As"
+msgstr "Enregistrer sous - Vim"
+
 # AB - Ceci est un contenu de bo�te de dialogue (�ventuellement en mode texte).
 # AB - La version fran�aise est meilleure que la version anglaise.
 msgid "Write partial file?"
@@ -1136,8 +1048,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Le fichier d'�change %s existe d�j� (:silent! pour passer outre)"
 
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: Pas de nom de fichier pour le tampon %<PRId64>"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: Pas de nom de fichier pour le tampon %ld"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 msgid "E142: File not written: Writing is disabled by 'write' option"
@@ -1168,6 +1080,10 @@ msgstr ""
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" est en lecture seule (ajoutez ! pour passer outre)"
 
+# AB - Ceci est un titre de bo�te de dialogue.
+msgid "Edit File"
+msgstr "Ouvrir un fichier - Vim"
+
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - J'h�site � ajouter "� sa cr�ation" apr�s le nom du tampon. Ce message
 #      devrait n'�tre affich� qu'apr�s une tentative d'ouverture de fichier,
@@ -1205,19 +1121,19 @@ msgid "1 substitution"
 msgstr "1 substitution"
 
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> correspondances"
+msgid "%ld matches"
+msgstr "%ld correspondances"
 
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> substitutions"
+msgid "%ld substitutions"
+msgstr "%ld substitutions"
 
 msgid " on 1 line"
 msgstr " sur 1 ligne"
 
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " sur %<PRId64> lignes"
+msgid " on %ld lines"
+msgstr " sur %ld lignes"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message devrait contenir une r�f�rence � :vglobal.
@@ -1271,10 +1187,6 @@ msgid "Sorry, help file \"%s\" not found"
 msgstr "D�sol�, le fichier d'aide \"%s\" est introuvable"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: %s n'est pas un r�pertoire"
-
-#, c-format
 msgid "E151: No match: %s"
 msgstr "E151: Aucune correspondance : %s"
 
@@ -1299,6 +1211,10 @@ msgstr "E670: Encodages diff�rents dans les fichiers d'aide en langue %s"
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Marqueur \"%s\" dupliqu� dans le fichier %s/%s"
 
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: %s n'est pas un r�pertoire"
+
 # AB - Il faut respecter l'esprit plus que la lettre.
 #, c-format
 msgid "E160: Unknown sign command: %s"
@@ -1337,8 +1253,15 @@ msgstr "E934: Impossible de sauter � un tampon sans nom"
 # AB - Vu le code source, la version fran�aise est meilleure que la
 #      version anglaise.
 #, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: Le symbole %<PRId64> est introuvable"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: Le symbole %ld est introuvable"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Impossible de changer le symbole %s"
+
+msgid " (NOT FOUND)"
+msgstr "  (INTROUVABLE)"
 
 msgid " (not supported)"
 msgstr " (non support�)"
@@ -1355,16 +1278,23 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Mode d�bogage activ�. Tapez \"cont\" pour continuer."
 
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "ligne %<PRId64> : %s"
+msgid "line %ld: %s"
+msgstr "ligne %ld : %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmde : %s"
 
+msgid "frame is zero"
+msgstr "le cadre de pile est z�ro"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "cadre de pile au niveau le plus haut : %d"
+
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "Point d'arr�t dans %s%s ligne %<PRId64>"
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Point d'arr�t dans %s%s ligne %ld"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1376,8 +1306,8 @@ msgstr "Aucun point d'arr�t n'est d�fini"
 # AB - Le deuxi�me %s est remplac� par "func" ou "file" sans que l'on puisse
 #      traduire ces mots.
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  ligne %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  ligne %ld"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\""
@@ -1427,6 +1357,9 @@ msgstr "Recherche de \"%s\""
 msgid "not found in '%s': \"%s\""
 msgstr "introuvable dans '%s' : \"%s\""
 
+msgid "Source Vim script"
+msgstr "Sourcer un script - Vim"
+
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Impossible de sourcer un r�pertoire : \"%s\""
@@ -1436,16 +1369,16 @@ msgid "could not source \"%s\""
 msgstr "impossible de sourcer \"%s\""
 
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "ligne %<PRId64> : impossible de sourcer \"%s\""
+msgid "line %ld: could not source \"%s\""
+msgstr "ligne %ld : impossible de sourcer \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "sourcement \"%s\""
 
 #, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "ligne %<PRId64> : sourcement de \"%s\""
+msgid "line %ld: sourcing \"%s\""
+msgstr "ligne %ld : sourcement de \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1490,8 +1423,6 @@ msgstr "Langue courante pour %s : \"%s\""
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Impossible de choisir la langue \"%s\""
 
-#. don't redisplay the window
-#. don't wait for return
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Mode Ex activ�. Tapez \"visual\" pour passer en mode Normal."
 
@@ -1523,12 +1454,10 @@ msgstr "E493: La plage sp�cifi�e est invers�e"
 msgid "Backwards range given, OK to swap"
 msgstr "La plage sp�cifi�e est invers�e, OK pour l'inverser"
 
-#. append
-#. typed wrong
 msgid "E494: Use w or w>>"
 msgstr "E494: Utilisez w ou w>>"
 
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: D�sol�, cette commande n'est pas disponible dans cette version"
 
 msgid "E172: Only one file name allowed"
@@ -1545,8 +1474,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: encore 1 fichier � �diter"
 
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: encore %<PRId64> fichiers � �diter"
+msgid "E173: %ld more files to edit"
+msgstr "E173: encore %ld fichiers � �diter"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La commande existe d�j� : ajoutez ! pour la red�finir"
@@ -1609,7 +1538,10 @@ msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: Seul le compl�tement personnalis� accepte un argument"
 
 msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Le compl�tement personnalis� requiert une fonction en argument"
+msgstr "E467: Le compl�tement personnalis� n�cessite une fonction en argument"
+
+msgid "unknown"
+msgstr "inconnu"
 
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
@@ -1624,6 +1556,9 @@ msgstr "E784: Impossible de fermer le dernier onglet"
 msgid "Already only one tab page"
 msgstr "Il ne reste d�j� plus qu'un seul onglet"
 
+msgid "Edit File in new window"
+msgstr "Ouvrir un fichier dans une nouvelle fen�tre - Vim"
+
 #, c-format
 msgid "Tab page %d"
 msgstr "Onglet %d"
@@ -1631,6 +1566,9 @@ msgstr "Onglet %d"
 msgid "No swap file"
 msgstr "Pas de fichier d'�change"
 
+msgid "Append File"
+msgstr "Ajouter fichier"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: Tampon modifi� : impossible de changer de r�pertoire (ajoutez ! pour "
@@ -1643,7 +1581,11 @@ msgid "E187: Unknown"
 msgstr "E187: Inconnu"
 
 msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize requiert deux arguments num�riques"
+msgstr "E465: :winsize n�cessite deux arguments num�riques"
+
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "Position de la fen�tre : X %d, Y %d"
 
 # DB : Suggestion, sans doute perfectible.
 msgid "E188: Obtaining window position not implemented for this platform"
@@ -1651,7 +1593,22 @@ msgstr ""
 "E188: R�cup�rer la position de la fen�tre non impl�ment� dans cette version"
 
 msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos requiert deux arguments num�riques"
+msgstr "E466: :winpos n�cessite deux arguments num�riques"
+
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: Impossible d'utiliser :redir dans execute()"
+
+msgid "Save Redirection"
+msgstr "Enregistrer la redirection"
+
+msgid "Save View"
+msgstr "Enregistrer la vue - Vim"
+
+msgid "Save Session"
+msgstr "Enregistrer la session - Vim"
+
+msgid "Save Setup"
+msgstr "Enregistrer les r�glages - Vim"
 
 #, c-format
 msgid "E739: Cannot create directory: %s"
@@ -1672,6 +1629,9 @@ msgstr "E191: L'argument doit �tre une lettre ou une (contre-)apostrophe"
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Appel r�cursif de :normal trop important"
 
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: #< n'est pas disponible sans la fonctionnalit� +eval"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Aucun nom de fichier alternatif � substituer � '#'"
 
@@ -1690,7 +1650,7 @@ msgstr "E498: Aucun nom de fichier :source � substituer � \"<sfile>\""
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: aucun num�ro de ligne � utiliser pour \"<slnum>\""
 
-#, c-format
+#, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: Nom de fichier vide pour '%' ou '#', ne marche qu'avec \":p:h\""
 
@@ -1700,6 +1660,9 @@ msgstr "E500: �valu� en une cha�ne vide"
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Impossible d'ouvrir le viminfo en lecture"
 
+msgid "E196: No digraphs in this version"
+msgstr "E196: Pas de digraphes dans cette version"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Impossible d'�mettre des exceptions avec 'Vim' comme pr�fixe"
 
@@ -1717,8 +1680,8 @@ msgid "Exception discarded: %s"
 msgstr "Exception �limin�e : %s"
 
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, ligne %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, ligne %ld"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1858,33 +1821,6 @@ msgstr "E198: cmd_pchar au-del� de la longueur de la commande"
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Fen�tre ou tampon actif effac�"
 
-msgid "E854: path too long for completion"
-msgstr "E854: chemin trop long pour compl�tement"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Chemin invalide : '**[nombre]' doit �tre � la fin du chemin ou �tre "
-"suivi de '%s'."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: R�pertoire \"%s\" introuvable dans 'cdpath'"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Fichier \"%s\" introuvable dans 'path'"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Plus de r�pertoire \"%s\" dans 'cdpath'"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Plus de fichier \"%s\" dans 'path'"
-
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Des autocommandes ont chang� le tampon ou le nom du tampon"
 
@@ -1897,6 +1833,9 @@ msgstr "est un r�pertoire"
 msgid "is not a file"
 msgstr "n'est pas un fichier"
 
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "est un p�riph�rique (d�sactiv� par l'option 'opendevice')"
+
 msgid "[New File]"
 msgstr "[Nouveau fichier]"
 
@@ -1917,26 +1856,25 @@ msgstr ""
 "E201: Autocommandes *ReadPre ne doivent pas modifier le contenu du tampon "
 "courant"
 
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim : Lecture de stdin...\n"
 
+msgid "Reading from stdin..."
+msgstr "Lecture de stdin..."
+
 #. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: La conversion a rendu le fichier illisible !"
 
-#. fifo or socket
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
 
-#. fifo
 msgid "[fifo]"
 msgstr "[fifo]"
 
-#. or socket
 msgid "[socket]"
 msgstr "[socket]"
 
-#. or character special
 msgid "[character special]"
 msgstr "[caract�re sp�cial]"
 
@@ -1953,12 +1891,12 @@ msgid "[converted]"
 msgstr "[converti]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[ERREUR DE CONVERSION � la ligne %<PRId64>]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[ERREUR DE CONVERSION � la ligne %ld]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[OCTET INVALIDE � la ligne %<PRId64>]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[OCTET INVALIDE � la ligne %ld]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERREURS DE LECTURE]"
@@ -1983,9 +1921,18 @@ msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr ""
 "E204: L'autocommande a modifi� le nombre de lignes de mani�re inattendue"
 
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans interdit l'�criture des tampons non modifi�s"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "Netbeans interdit l'�criture partielle de ses tampons"
+
 msgid "is not a file or writable device"
 msgstr "n'est pas un fichier ou un p�riph�rique inscriptible"
 
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "�criture vers un p�riph�rique d�sactiv� par l'option 'opendevice'"
+
 msgid "is read-only (add ! to override)"
 msgstr "est en lecture seule (ajoutez ! pour passer outre)"
 
@@ -2008,7 +1955,10 @@ msgid "E510: Can't make backup file (add ! to override)"
 msgstr ""
 "E510: Impossible de g�n�rer la copie de secours (ajoutez ! pour passer outre)"
 
-#. Can't write without a tempfile!
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr ""
+"E460: Les ressources partag�es seraient perdues (ajoutez ! pour passer outre)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Impossible de g�n�rer un fichier temporaire pour y �crire"
 
@@ -2033,11 +1983,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Erreur d'�criture, �chec de conversion � la ligne %<PRId64> (videz "
-"'fenc' pour passer outre)"
+"E513: Erreur d'�criture, �chec de conversion � la ligne %ld (videz 'fenc' "
+"pour passer outre)"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: erreur d'�criture (syst�me de fichiers plein ?)"
@@ -2046,8 +1996,8 @@ msgid " CONVERSION ERROR"
 msgstr " ERREUR DE CONVERSION"
 
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " � la ligne %<PRId64>"
+msgid " in line %ld;"
+msgstr " � la ligne %ld"
 
 msgid "[Device]"
 msgstr "[P�riph.]"
@@ -2111,15 +2061,15 @@ msgid "1 line, "
 msgstr "1 ligne, "
 
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> lignes, "
+msgid "%ld lines, "
+msgstr "%ld lignes, "
 
 msgid "1 character"
 msgstr "1 caract�re"
 
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> caract�res"
+msgid "%lld characters"
+msgstr "%lld caract�res"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2204,6 +2154,9 @@ msgstr "E462: Impossible de pr�parer le rechargement de \"%s\""
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Impossible de recharger \"%s\""
 
+msgid "--Deleted--"
+msgstr "--Effac�--"
+
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "Autocommandes marqu�es pour auto-suppression : %s <tampon=%d>"
@@ -2213,12 +2166,12 @@ msgstr "Autocommandes marqu�es pour auto-suppression : %s <tampon=%d>"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Aucun groupe \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Impossible de supprimer le groupe courant"
+
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: Effacement d'augroup toujours en usage"
 
-msgid "--Deleted--"
-msgstr "--Effac�--"
-
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Caract�re non valide apr�s * : %s"
@@ -2286,7 +2239,6 @@ msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld ligne repli�e "
 msgstr[1] "+--%3ld lignes repli�es "
 
-#. buffer has already been read
 msgid "E222: Add to read buffer"
 msgstr "E222: Ajout au tampon de lecture"
 
@@ -2318,333 +2270,308 @@ msgstr "Aucun mappage trouv�"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap : mode invalide"
 
-# msgstr "--Pas de lignes dans le tampon--"
-# DB - todo : ou encore : msgstr "--Aucune ligne dans le tampon--"
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-msgid "--No lines in buffer--"
-msgstr "--Le tampon est vide--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-msgid "E470: Command aborted"
-msgstr "E470: Commande annul�e"
-
-msgid "E471: Argument required"
-msgstr "E471: Argument requis"
-
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ devrait �tre suivi de /, ? ou &"
-
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgid "E851: Failed to create a new process for the GUI"
 msgstr ""
-"E11: Invalide dans la fen�tre ligne-de-commande ; <CR> ex�cute, CTRL-C quitte"
+"E851: �chec lors de la cr�ation d'un nouveau processus pour l'interface "
+"graphique"
 
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgid "E852: The child process failed to start the GUI"
 msgstr ""
-"E12: commande non autoris�e depuis un exrc/vimrc dans r�pertoire courant ou "
-"une recherche de marqueur"
+"E852: Le processus fils n'a pas r�ussi � d�marrer l'interface graphique"
 
-msgid "E171: Missing :endif"
-msgstr "E171: :endif manquant"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Impossible de d�marrer l'interface graphique"
 
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry manquant"
-
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile manquant"
-
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor manquant"
-
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile sans :while"
-
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor sans :for"
-
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: Le fichier existe d�j� (ajoutez ! pour passer outre)"
-
-msgid "E472: Command failed"
-msgstr "E472: La commande a �chou�"
-
-msgid "E473: Internal error"
-msgstr "E473: Erreur interne"
-
-msgid "Interrupted"
-msgstr "Interrompu"
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Impossible de lire \"%s\""
 
-msgid "E14: Invalid address"
-msgstr "E14: Adresse invalide"
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr ""
+"E665: Impossible de d�marrer l'IHM graphique, aucune police valide trouv�e"
 
-msgid "E474: Invalid argument"
-msgstr "E474: Argument invalide"
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' est invalide"
 
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: Argument invalide : %s"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Valeur de 'imactivatekey' invalide"
 
 #, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: Expression invalide : %s"
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Impossible d'allouer la couleur %s"
 
-msgid "E16: Invalid range"
-msgstr "E16: Plage invalide"
+msgid "No match at cursor, finding next"
+msgstr "Aucune correspondance sous le curseur, recherche de la suivante"
 
-msgid "E476: Invalid command"
-msgstr "E476: Commande invalide"
+msgid "<cannot open> "
+msgstr "<impossible d'ouvrir> "
 
 #, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" est un r�pertoire"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile : impossible d'obtenir la police %s"
 
-#, fuzzy
-#~ msgid "E900: Invalid job id"
-#~ msgstr "E49: Valeur de d�filement invalide"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile : impossible de revenir dans le r�pertoire courant"
 
-#~ msgid "E901: Job table is full"
-#~ msgstr ""
+msgid "Pathname:"
+msgstr "Chemin :"
 
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: L'appel � la biblioth�que a �chou� pour \"%s()\""
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile : impossible d'obtenir le r�pertoire courant"
 
-msgid "E19: Mark has invalid line number"
-msgstr "E19: La marque a un num�ro de ligne invalide"
+msgid "OK"
+msgstr "Ok"
 
-msgid "E20: Mark not set"
-msgstr "E20: Marque non positionn�e"
+msgid "Cancel"
+msgstr "Annuler"
 
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Impossible de modifier, 'modifiable' est d�sactiv�"
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Widget scrollbar : Impossible d'obtenir la g�om�trie du pixmap 'thumb'"
 
-msgid "E22: Scripts nested too deep"
-msgstr "E22: Trop de r�cursion dans les scripts"
+msgid "Vim dialog"
+msgstr "Vim"
 
-msgid "E23: No alternate file"
-msgstr "E23: Pas de fichier alternatif"
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: Impossible de cr�er un BalloonEval avec message ET callback"
 
-msgid "E24: No such abbreviation"
-msgstr "E24: Cette abr�viation n'existe pas"
+msgid "_Cancel"
+msgstr "_Annuler"
 
-msgid "E477: No ! allowed"
-msgstr "E477: Le ! n'est pas autoris�"
+msgid "_Save"
+msgstr "_Enregistrer"
 
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: L'interface graphique n'a pas �t� compil�e dans cette version"
+msgid "_Open"
+msgstr "_Ouvrir"
 
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: Aucun nom de groupe de surbrillance %s"
+msgid "_OK"
+msgstr "_Ok"
 
-msgid "E29: No inserted text yet"
-msgstr "E29: Pas encore de texte ins�r�"
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"&Oui\n"
+"&Non\n"
+"&Annuler"
 
-msgid "E30: No previous command line"
-msgstr "E30: Aucune ligne de commande pr�c�dente"
+msgid "Yes"
+msgstr "Oui"
 
-msgid "E31: No such mapping"
-msgstr "E31: Mappage inexistant"
+msgid "No"
+msgstr "Non"
 
-msgid "E479: No match"
-msgstr "E479: Aucune correspondance"
+# todo '_' is for hotkey, i guess?
+msgid "Input _Methods"
+msgstr "_M�thodes de saisie"
 
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: Aucune correspondance : %s"
+msgid "VIM - Search and Replace..."
+msgstr "Remplacer - Vim"
 
-msgid "E32: No file name"
-msgstr "E32: Aucun nom de fichier"
+msgid "VIM - Search..."
+msgstr "Rechercher - Vim"
 
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: Aucune expression r�guli�re de substitution pr�c�dente"
+msgid "Find what:"
+msgstr "Rechercher :"
 
-msgid "E34: No previous command"
-msgstr "E34: Aucune commande pr�c�dente"
+msgid "Replace with:"
+msgstr "Remplacer par :"
 
-msgid "E35: No previous regular expression"
-msgstr "E35: Aucune expression r�guli�re pr�c�dente"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "Mots entiers seulement"
 
-msgid "E481: No range allowed"
-msgstr "E481: Les plages ne sont pas autoris�es"
+#. match case button
+msgid "Match case"
+msgstr "Respecter la casse"
 
-msgid "E36: Not enough room"
-msgstr "E36: Pas assez de place"
+msgid "Direction"
+msgstr "Direction"
 
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Impossible de cr�er le fichier %s"
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "Haut"
 
-msgid "E483: Can't get temp file name"
-msgstr "E483: Impossible d'obtenir un nom de fichier temporaire"
+msgid "Down"
+msgstr "Bas"
 
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: Impossible d'ouvrir le fichier \"%s\""
+msgid "Find Next"
+msgstr "Suivant"
 
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: Impossible de lire le fichier %s"
+msgid "Replace"
+msgstr "Remplacer"
 
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Modifications non enregistr�es (ajoutez ! pour passer outre)"
+msgid "Replace All"
+msgstr "Remplacer tout"
 
-# AB - Il faut respecter l'esprit plus que la lettre. Dans le cas pr�sent,
-#      nettement plus.
-#, fuzzy
-#~ msgid "E37: No write since last change"
-#~ msgstr "[Attention : tout n'est pas enregistr�]\n"
+msgid "_Close"
+msgstr "_Fermer"
 
-msgid "E38: Null argument"
-msgstr "E38: Argument null"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim : Une requ�te \"die\" a �t� re�ue par le gestionnaire de session\n"
 
-msgid "E39: Number expected"
-msgstr "E39: Nombre attendu"
+msgid "Close tab"
+msgstr "Fermer l'onglet"
 
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: Impossible d'ouvrir le fichier d'erreurs %s"
+msgid "New tab"
+msgstr "Nouvel onglet"
 
-msgid "E41: Out of memory!"
-msgstr "E41: M�moire �puis�e"
+# DB - todo : un peu long. Cet entr�e de menu permet d'ouvrir un fichier
+#      dans un nouvel onglet via le s�lecteur de fichiers graphique.
+msgid "Open Tab..."
+msgstr "Ouvrir dans un onglet..."
 
-msgid "Pattern not found"
-msgstr "Motif introuvable"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim : Fen�tre principale d�truite inopin�ment\n"
 
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Motif introuvable : %s"
+msgid "&Filter"
+msgstr "&Filtrer"
 
-msgid "E487: Argument must be positive"
-msgstr "E487: L'argument doit �tre positif"
+msgid "&Cancel"
+msgstr "&Annuler"
 
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Impossible de retourner au r�pertoire pr�c�dent"
+msgid "Directories"
+msgstr "R�pertoires"
 
-msgid "E42: No Errors"
-msgstr "E42: Aucune erreur"
+msgid "Filter"
+msgstr "Filtre"
 
-# DB - TODO : trouver une traduction valable et attest�e pour "location".
-msgid "E776: No location list"
-msgstr "E776: Aucune liste d'emplacements"
+msgid "&Help"
+msgstr "&Aide"
 
-msgid "E43: Damaged match string"
-msgstr "E43: La cha�ne de recherche est endommag�e"
+msgid "Files"
+msgstr "Fichiers"
 
-msgid "E44: Corrupted regexp program"
-msgstr "E44: L'automate de regexp est corrompu"
+msgid "&OK"
+msgstr "&Ok"
 
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: L'option 'readonly' est activ�e (ajoutez ! pour passer outre)"
+msgid "Selection"
+msgstr "S�lection"
 
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: La variable \"%s\" est en lecture seule"
+msgid "Find &Next"
+msgstr "Suiva&nt"
 
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr ""
-"E794: Impossible de modifier une variable depuis le bac � sable : \"%s\""
+msgid "&Replace"
+msgstr "&Remplacer"
 
-msgid "E47: Error while reading errorfile"
-msgstr "E47: Erreur lors de la lecture du fichier d'erreurs"
+msgid "Replace &All"
+msgstr "Rempl&acer tout"
 
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: Op�ration interdite dans le bac � sable"
+msgid "&Undo"
+msgstr "Ann&uler"
 
-msgid "E523: Not allowed here"
-msgstr "E523: Interdit � cet endroit"
+msgid "Open tab..."
+msgstr "Ouvrir dans un onglet..."
 
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Choix du mode d'�cran non support�"
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "Chercher une cha�ne (utilisez '\\\\' pour chercher un '\\')"
 
-msgid "E49: Invalid scroll size"
-msgstr "E49: Valeur de d�filement invalide"
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "Chercher et remplacer (utilisez '\\\\' pour trouver un '\\')"
 
-msgid "E91: 'shell' option is empty"
-msgstr "E91: L'option 'shell' est vide"
+# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
+#      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
+#      fichier.
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "Non utilis�"
 
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Impossible de lire les donn�es du symbole !"
+# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
+#      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
+#      fichier.
+msgid "Directory\t*.nothing\n"
+msgstr "R�pertoire\t*.rien\n"
 
-msgid "E72: Close error on swap file"
-msgstr "E72: Erreur lors de la fermeture du fichier d'�change"
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: Titre de fen�tre \"%s\" introuvable"
 
-msgid "E73: tag stack empty"
-msgstr "E73: La pile des marqueurs est vide"
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: Argument non support� : \"-%s\" ; Utilisez la version OLE."
 
-msgid "E74: Command too complex"
-msgstr "E74: Commande trop complexe"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: Impossible d'ouvrir une fen�tre dans une application MDI"
 
-msgid "E75: Name too long"
-msgstr "E75: Nom trop long"
+# DB - todo : perfectible.
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr ""
+"Vim E458: Erreur d'allocation de couleurs, couleurs possiblement incorrectes"
 
-msgid "E76: Too many ["
-msgstr "E76: Trop de ["
+# DB - todo : La VF est-elle compr�hensible ?
+#, c-format
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr ""
+"E250: Des polices manquent dans %s pour les jeux de caract�res suivants :"
 
-msgid "E77: Too many file names"
-msgstr "E77: Trop de noms de fichiers"
+#, c-format
+msgid "E252: Fontset name: %s"
+msgstr "E252: Nom du jeu de polices : %s"
 
-msgid "E488: Trailing characters"
-msgstr "E488: Caract�res surnum�raires"
+#, c-format
+msgid "Font '%s' is not fixed-width"
+msgstr "La police '%s' n'a pas une largeur fixe"
 
-msgid "E78: Unknown mark"
-msgstr "E78: Marque inconnue"
+#, c-format
+msgid "E253: Fontset name: %s"
+msgstr "E253: Nom du jeu de polices : %s"
 
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: Impossible de d�velopper les m�tacaract�res"
+#, c-format
+msgid "Font0: %s"
+msgstr "Font0: %s"
 
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ne peut pas �tre plus petit que 'winminheight'"
+#, c-format
+msgid "Font1: %s"
+msgstr "Font1: %s"
 
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ne peut pas �tre plus petit que 'winminwidth'"
+#, c-format
+msgid "Font%ld width is not twice that of font0"
+msgstr "La largeur de Font%ld n'est pas le double de celle de Font0"
 
-msgid "E80: Error while writing"
-msgstr "E80: Erreur lors de l'�criture"
+#, c-format
+msgid "Font0 width: %ld"
+msgstr "Largeur de Font0 : %ld"
 
-msgid "Zero count"
-msgstr "Le quantificateur est nul"
+#, c-format
+msgid "Font1 width: %ld"
+msgstr "Largeur de Font1 : %ld"
 
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> utilis� en dehors d'un script"
+# DB - todo : Pas certain de mon coup, ici...
+msgid "Invalid font specification"
+msgstr "La sp�cification de la police est invalide"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Erreur interne : %s"
+msgid "&Dismiss"
+msgstr "Aban&donner"
 
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: le motif utilise plus de m�moire que 'maxmempattern'"
+# DB - todo : Pas certain de mon coup, ici...
+msgid "no specific match"
+msgstr "aucune correspondance particuli�re"
 
-msgid "E749: empty buffer"
-msgstr "E749: tampon vide"
+msgid "Vim - Font Selector"
+msgstr "Choisir une police - Vim"
 
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: Le tampon %<PRId64> n'existe pas"
+msgid "Name:"
+msgstr "Nom :"
 
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: D�limiteur ou motif de recherche invalide"
+#. create toggle button
+msgid "Show size in Points"
+msgstr "Afficher la taille en Points"
 
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Le fichier est charg� dans un autre tampon"
+msgid "Encoding:"
+msgstr "Encodage :"
 
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: L'option '%s' n'est pas activ�e"
+msgid "Font:"
+msgstr "Police :"
 
-msgid "E850: Invalid register name"
-msgstr "E850: Nom de registre invalide"
+msgid "Style:"
+msgstr "Style :"
 
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "La recherche a atteint le HAUT, et continue en BAS"
+msgid "Size:"
+msgstr "Taille :"
 
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "La recherche a atteint le BAS, et continue en HAUT"
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: ERREUR dans l'automate Hangul"
 
 msgid "E550: Missing colon"
 msgstr "E550: ':' manquant"
@@ -2778,6 +2705,9 @@ msgstr "E257: cstag : marqueur introuvable"
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: Erreur stat(%s) : %d"
 
+msgid "E563: stat error"
+msgstr "E563: Erreur stat"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s n'est pas un r�pertoire ou une base de donn�es cscope valide"
@@ -2787,8 +2717,8 @@ msgid "Added cscope database %s"
 msgstr "Base de donn�es cscope %s ajout�e"
 
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: erreur lors de la lecture de la connexion cscope %<PRId64>"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: erreur lors de la lecture de la connexion cscope %ld"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: type de recherche cscope inconnu"
@@ -2799,9 +2729,8 @@ msgstr "E566: Impossible de cr�er les tuyaux (pipes) cscope"
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Impossible de forker pour cscope"
 
-#, fuzzy
-#~ msgid "cs_create_connection setpgid failed"
-#~ msgstr "exec de cs_create_connection a �chou�"
+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection setpgid a �chou�"
 
 msgid "cs_create_connection exec failed"
 msgstr "exec de cs_create_connection a �chou�"
@@ -2857,6 +2786,14 @@ msgstr ""
 "       s: Trouver ce symbole C\n"
 "       t: Trouver cette cha�ne\n"
 
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: impossible d'ouvrir la base de donn�es cscope %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr ""
+"E626: impossible d'obtenir des informations sur la base de donn�es cscope"
+
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: base de donn�es cscope redondante non ajout�e"
 
@@ -2900,6 +2837,221 @@ msgstr "aucune connexion cscope\n"
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    nom de la base de donn�es           chemin\n"
 
+msgid "Lua library cannot be loaded."
+msgstr "La biblioth�que Lua n'a pas pu �tre charg�e."
+
+msgid "cannot save undo information"
+msgstr "impossible d'enregistrer les informations d'annulation"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+msgstr ""
+"E815: D�sol�, cette commande est d�sactiv�e : les biblioth�ques MzScheme "
+"n'ont pas pu �tre charg�es."
+
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: D�sol�, cette commande est d�sactiv�e : le module MzScheme racket/base "
+"ne peut pas �tre charg�."
+
+msgid "invalid expression"
+msgstr "expression invalide"
+
+msgid "expressions disabled at compile time"
+msgstr "expressions d�sactiv�es lors de la compilation"
+
+msgid "hidden option"
+msgstr "option cach�e"
+
+msgid "unknown option"
+msgstr "option inconnue"
+
+msgid "window index is out of range"
+msgstr "num�ro de fen�tre hors limites"
+
+msgid "couldn't open buffer"
+msgstr "impossible d'ouvrir le tampon"
+
+msgid "cannot delete line"
+msgstr "impossible d'effacer la ligne"
+
+msgid "cannot replace line"
+msgstr "impossible de remplacer la ligne"
+
+msgid "cannot insert line"
+msgstr "impossible d'ins�rer la ligne"
+
+msgid "string cannot contain newlines"
+msgstr "une cha�ne ne peut pas contenir de saut-de-ligne"
+
+msgid "error converting Scheme values to Vim"
+msgstr "erreur lors de la conversion d'une valeur de Scheme � Vim"
+
+msgid "Vim error: ~a"
+msgstr "Erreur Vim : ~a"
+
+msgid "Vim error"
+msgstr "Erreur Vim"
+
+msgid "buffer is invalid"
+msgstr "tampon invalide"
+
+msgid "window is invalid"
+msgstr "fen�tre invalide"
+
+msgid "linenr out of range"
+msgstr "num�ro de ligne hors limites"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "non autoris� dans le bac � sable"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Vim ne peut pas ex�cuter :python apr�s avoir utilis� :py3"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: D�sol�, commande d�sactiv�e : la biblioth�que Python n'a pas pu �tre "
+"charg�e."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: D�sol�, commande d�sactiv�e : la biblioth�que Python n'a pas pu �tre "
+"charg�e."
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Impossible d'invoquer Python r�cursivement"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: Vim ne peut pas ex�cuter :py3 apr�s avoir utilis� :python"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ doit �tre une instance de cha�ne (String)"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: D�sol�, commande d�sactiv�e : la biblioth�que Ruby n'a pas pu �tre "
+"charg�e."
+
+msgid "E267: unexpected return"
+msgstr "E267: � return � inattendu"
+
+msgid "E268: unexpected next"
+msgstr "E268: � next � inattendu"
+
+msgid "E269: unexpected break"
+msgstr "E269: � break � inattendu"
+
+msgid "E270: unexpected redo"
+msgstr "E270: � redo � inattendu"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: � retry � hors d'une clause � rescue �"
+
+msgid "E272: unhandled exception"
+msgstr "E272: Exception non prise en charge"
+
+# DB - todo
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: contexte de longjmp inconnu : %d"
+
+msgid "invalid buffer number"
+msgstr "num�ro de tampon invalide"
+
+msgid "not implemented yet"
+msgstr "pas encore impl�ment�"
+
+# DB - TODO : le contexte est celui d'une annulation.
+#. ???
+msgid "cannot set line(s)"
+msgstr "Impossible de remettre la/les ligne(s)"
+
+msgid "invalid mark name"
+msgstr "nom de marque invalide"
+
+msgid "mark not set"
+msgstr "marque non positionn�e"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "ligne %d colonne %d"
+
+msgid "cannot insert/append line"
+msgstr "Impossible d'ins�rer/ajouter de lignes"
+
+msgid "line number out of range"
+msgstr "num�ro de ligne hors limites"
+
+msgid "unknown flag: "
+msgstr "drapeau inconnu : "
+
+msgid "unknown vimOption"
+msgstr "vimOption inconnue"
+
+msgid "keyboard interrupt"
+msgstr "interruption clavier"
+
+msgid "vim error"
+msgstr "erreur Vim"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr ""
+"Impossible de cr�er commande de tampon/fen�tre : objet en cours d'effacement"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"Impossible d'inscrire la commande de rappel : tampon/fen�tre en effacement"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: ERREUR FATALE TCL: reflist corrompue ?! Contactez vim-dev@vim.org, SVP."
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"Impossible d'inscrire la commande de rappel : r�f. tampon/fen�tre introuvable"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: D�sol�, commande d�sactiv�e: la biblioth�que Tcl n'a pas pu �tre "
+"charg�e."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: code de sortie %d"
+
+msgid "cannot get line"
+msgstr "Impossible d'obtenir la ligne"
+
+msgid "Unable to register a command server name"
+msgstr "Impossible d'inscrire un nom de serveur de commande"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: �chec de l'envoi de la commande au programme cible"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: Id utilis� pour le serveur invalide : %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr "E251: Entr�e registre de l'instance de Vim mal format�e. Suppression !"
+
+#, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: Cl� dupliqu�e dans le document JSON : \"%s\""
+
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Il manque une virgule dans la Liste %s"
@@ -2930,6 +3082,15 @@ msgstr "Argument invalide pour"
 msgid "%d files to edit\n"
 msgstr "%d fichiers � �diter\n"
 
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans n'est pas support� avec cette interface graphique\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' ne peut pas �tre utilis� : d�sactiv� � la compilation\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "Ce Vim n'a pas �t� compil� avec la fonctionnalit� diff"
+
 msgid "Attempt to open script file again: \""
 msgstr "Nouvelle tentative pour ouvrir le script : \""
 
@@ -2939,6 +3100,14 @@ msgstr "Impossible d'ouvrir en lecture : \""
 msgid "Cannot open for script output: \""
 msgstr "Impossible d'ouvrir pour la sortie script : \""
 
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim : Erreur : Impossible de d�marrer gvim depuis NetBeans\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr ""
+"Vim : Erreur : Cette version de Vim ne fonctionne pas dans un terminal "
+"Cygwin\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim : Alerte : La sortie ne s'effectue pas sur un terminal\n"
 
@@ -2991,6 +3160,15 @@ msgstr ""
 "\n"
 "    ou :"
 
+# DB - todo (VMS uniquement).
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"pour lesquels la casse est indiff�rente (/ pour que le drapeau soit "
+"majuscule)"
+
 msgid ""
 "\n"
 "\n"
@@ -3006,6 +3184,20 @@ msgstr "--\t\tSeuls des noms de fichier sont sp�cifi�s apr�s ceci"
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\tNe pas d�velopper les m�tacaract�res"
 
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\tInscrire ce gvim pour OLE"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\tD�sinscrire gvim de OLE"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\tLancer l'interface graphique (comme \"gvim\")"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr ""
+"-f, --nofork\tPremier-plan : ne pas d�tacher l'interface graphique du "
+"terminal"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\tMode Vi (comme \"vi\")"
 
@@ -3066,6 +3258,12 @@ msgstr "-r <fichier>\tR�cup�rer une session plant�e"
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\tComme -r"
 
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\tNe pas utiliser newcli pour l'ouverture des fen�tres"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <p�riph>\tUtiliser <p�riph�rique> pour les E/S"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\tD�marrer en mode arabe"
 
@@ -3078,9 +3276,20 @@ msgstr "-F\t\tD�marrer en mode farsi"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <term>\tR�gler le type du terminal sur <terminal>"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr ""
+"--no-a-term\t\tAucun avertissement si l'entr�e/sortie n'est pas un terminal"
+
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr ""
+"--ttyfail\t\tQuitte si l'entr�e ou la sortie ne sont pas un terminal"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\tUtiliser <vimrc> au lieu du vimrc habituel"
 
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\tUtiliser <gvimrc> au lieu du gvimrc habituel"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\tNe charger aucun greffon"
 
@@ -3118,6 +3327,53 @@ msgstr "-w <dest>\tAjouter toutes les commandes tap�es dans le fichier <dest>"
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <dest>\t�crire toutes les commandes tap�es dans le fichier <dest>"
 
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\t�diter des fichiers chiffr�s"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <display>\tConnecter Vim au serveur X sp�cifi�"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tNe pas se connecter � un serveur X"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <fich>\t�diter les <fichiers> dans un serveur Vim si possible"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-silent ...\tPareil, mais pas d'erreur s'il n'y a aucun serveur"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr ""
+"--remote-wait <fich>\tComme --remote mais ne quitter qu'� la fin de l'�dition"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent\tPareil, mais pas d'erreur s'il n'y a aucun serveur"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <fich>\tComme --remote mais ouvrir un onglet "
+"pour chaque fichier"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <tche>\tEnvoyer <touches> � un serveur Vim puis quitter"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr ""
+"--remote-expr <expr>\t�valuer <expr> dans un serveur Vim, afficher le "
+"r�sultat"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr ""
+"--serverlist\t\tLister les noms des serveurs Vim disponibles et quitter"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <nom>\tEnvoyer au/devenir le serveur Vim nomm� <nom>"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr ""
 "--startuptime <fich>\t�crire les messages d'horodatage au d�marrage dans "
@@ -3132,6 +3388,120 @@ msgstr "-h ou --help\t\tAfficher l'aide (ce message) puis quitter"
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tAfficher les informations de version et quitter"
 
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"Arguments reconnus par gvim (version Motif) :\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"Arguments reconnus par gvim (version neXtaw) :\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"Arguments reconnus par gvim (version Athena) :\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <�cran>\tLancer Vim sur ce <display>"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\tIconifier Vim au d�marrage"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr ""
+"-background <coul>\tUtiliser <couleur> pour l'arri�re-plan\t   (abrv : -bg)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr ""
+"-foreground <coul>\tUtiliser <couleur> pour le texte normal\t   (abrv : -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <fonte>\tUtiliser <fonte> pour le texte normal\t   (abrv : -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <fonte>\tUtiliser <fonte> pour le texte gras"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <fonte>\tUtiliser <fonte> pour le texte italique"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr "-geometry <g�om>\tUtiliser cette <g�om�trie> initiale\t (abrv : -geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr ""
+"-borderwidth <�pais>\tUtiliser cette <�paisseur> de bordure\t   (abrv : -bw)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <lg>\tUtiliser cette <largeur> de barre de d�fil. (abrv: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr "-menuheight <haut>\tUtiliser cette <hauteur> de menu\t   (abrv : -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\tUtiliser la vid�o inverse\t\t   (abrv : -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\tNe pas utiliser de vid�o inverse\t   (abrv : +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <ressource>\tConfigurer la <ressource> sp�cifi�e"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"Arguments reconnus par gvim (version GTK+) :\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr ""
+"-display <display>\tLancer Vim sur ce <display>\t(�galement : --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <r�le>\tDonner un r�le pour identifier la fen�tre principale"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tOuvrir Vim dans un autre widget GTK"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tGvim affiche l'ID de la fen�tre sur stdout"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <titre parent>\tOuvrir Vim dans une application parente"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\tOuvrir Vim dans un autre widget win32"
+
+msgid "No display"
+msgstr "Aucun display"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr " : L'envoi a �chou�.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr " : L'envoi a �chou�. Tentative d'ex�cution locale\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d �dit�s sur %d"
+
+msgid "No display: Send expression failed.\n"
+msgstr "Aucun display : L'envoi de l'expression a �chou�.\n"
+
+msgid ": Send expression failed.\n"
+msgstr " : L'envoi de l'expression a �chou�.\n"
+
 msgid "No marks set"
 msgstr "Aucune marque positionn�e"
 
@@ -3188,6 +3558,30 @@ msgstr ""
 msgid "Missing '>'"
 msgstr "'>' manquant"
 
+msgid "E543: Not a valid codepage"
+msgstr "E543: Page de codes non valide"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: Impossible de r�gler les valeurs IC"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: �chec de la cr�ation du contexte de saisie"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: �chec de l'ouverture de la m�thode de saisie"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr ""
+"E287: Alerte : Impossible d'inscrire le callback de destruction dans la MS"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: la m�thode de saisie ne supporte aucun style"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr ""
+"E289: le type de pr��dition de Vim n'est pas support� par la m�thode de "
+"saisie"
+
 msgid "E293: block was not locked"
 msgstr "E293: le bloc n'�tait pas verrouill�"
 
@@ -3215,6 +3609,9 @@ msgstr "E298: Bloc n�1 non r�cup�r� ?"
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Bloc n�2 non r�cup�r� ?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: Erreur lors de la mise � jour du fichier d'�change crypt�"
+
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Oups, le fichier d'�change a disparu !"
@@ -3229,7 +3626,6 @@ msgstr "E303: Impossible d'ouvrir fichier .swp pour \"%s\", r�cup. impossible"
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0() : bloc 0 non r�cup�r� ?!"
 
-#. no swap files found
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Aucun fichier d'�change trouv� pour %s"
@@ -3275,6 +3671,12 @@ msgstr ""
 ",\n"
 "ou le fichier a �t� endommag�."
 
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: %s est chiffr� et cette version de Vim ne supporte pas le chiffrement"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " a �t� endommag� (taille de page inf�rieure � la valeur minimale).\n"
 
@@ -3290,6 +3692,40 @@ msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Alerte : Le fichier original a pu �tre modifi�"
 
 #, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "Fichier d'�change chiffr� : \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"Si vous avez tap� une nouvelle cl� de chiffrement mais n'avez pas enregistr� "
+"le fichier texte,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"tapez la nouvelle cl� de chiffrement."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"Si vous avez �crit le fichier texte apr�s avoir chang� la cl� de "
+"chiffrement, appuyez sur entr�e"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"afin d'utiliser la m�me cl� pour le fichier texte et le fichier d'�change"
+
+#, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Impossible de lire le bloc 1 de %s"
 
@@ -3360,6 +3796,11 @@ msgstr ""
 "Il est conseill� d'effacer maintenant le fichier .swp.\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr ""
+"Utilisation de la cl� de chiffrement du fichier d'�change pour le fichier "
+"texte.\n"
+
 #. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "Fichiers d'�change trouv�s :"
@@ -3436,6 +3877,13 @@ msgstr " (en cours d'ex�cution)"
 
 msgid ""
 "\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [inutilisable avec cette version de Vim]"
+
+msgid ""
+"\n"
 "         [not usable on this computer]"
 msgstr ""
 "\n"
@@ -3457,12 +3905,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: �chec de la pr�servation"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get : num�ro de ligne invalide : %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get : num�ro de ligne invalide : %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get : ligne %<PRId64> introuvable"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get : ligne %ld introuvable"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: mauvais id de pointeur de bloc 3"
@@ -3480,8 +3928,8 @@ msgid "deleted block 1?"
 msgstr "bloc 1 effac� ?"
 
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: Ligne %<PRId64> introuvable"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: Ligne %ld introuvable"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: mauvais id de pointeur de bloc"
@@ -3490,12 +3938,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count vaut z�ro"
 
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: num�ro de ligne hors limites : %<PRId64> au-del� de la fin"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: num�ro de ligne hors limites : %ld au-del� de la fin"
 
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: nombre de lignes erron� dans le bloc %<PRId64>"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: nombre de lignes erron� dans le bloc %ld"
 
 msgid "Stack size increases"
 msgstr "La taille de la pile s'accro�t"
@@ -3523,19 +3971,19 @@ msgstr "Lors de l'ouverture du fichier \""
 msgid "      NEWER than swap file!\n"
 msgstr "      PLUS R�CENT que le fichier d'�change !\n"
 
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) Un autre programme est peut-�tre en train d'�diter ce fichier.\n"
 "    Si c'est le cas, faites attention � ne pas vous retrouver avec\n"
-"    deux versions diff�rentes du m�me fichier en faisant des modifications."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "  Quittez, ou continuez prudemment.\n"
+"    deux versions diff�rentes du m�me fichier en faisant des modifications.\n"
+"    Quitter ou continuer avec attention.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Une session d'�dition de ce fichier a plant�.\n"
@@ -3600,21 +4048,9 @@ msgstr ""
 "&Quitter\n"
 "&Abandonner"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
 msgid "E326: Too many swap files found"
 msgstr "E326: Trop de fichiers d'�change trouv�s"
 
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: M�moire �puis�e ! (allocation de %<PRIu64> octets)"
-
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Une partie du chemin de l'�l�ment de menu n'est pas un sous-menu"
 
@@ -3649,6 +4085,9 @@ msgstr ""
 "\n"
 "--- Menus ---"
 
+msgid "Tear off this menu"
+msgstr "D�tacher ce menu"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Le chemin du menu doit conduire � un �l�ment de menu"
 
@@ -3679,6 +4118,9 @@ msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nom de registre invalide : '%s'"
 
 # DB - todo : mettre � jour ?
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr "Maintenance des messages : Dominique Pell� <dominique.pelle@gmail.com>"
+
 msgid "Interrupt: "
 msgstr "Interruption : "
 
@@ -3686,8 +4128,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Appuyez sur ENTR�E ou tapez une commande pour continuer"
 
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s, ligne %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s, ligne %ld"
 
 msgid "-- More --"
 msgstr "-- Plus --"
@@ -3709,15 +4151,6 @@ msgstr ""
 msgid ""
 "&Yes\n"
 "&No\n"
-"&Cancel"
-msgstr ""
-"&Oui\n"
-"&Non\n"
-"&Annuler"
-
-msgid ""
-"&Yes\n"
-"&No\n"
 "Save &All\n"
 "&Discard All\n"
 "&Cancel"
@@ -3728,6 +4161,21 @@ msgstr ""
 "Tout aban&donner\n"
 "&Annuler"
 
+# DB : Les trois messages qui suivent sont des titres de bo�tes
+#      de dialogue par d�faut.
+msgid "Select Directory dialog"
+msgstr "S�lecteur de r�pertoire"
+
+msgid "Save File dialog"
+msgstr "Enregistrer un fichier"
+
+msgid "Open File dialog"
+msgstr "Ouvrir un fichier"
+
+#. TODO: non-GUI file selector here
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: D�sol�, pas de s�lecteur de fichiers en mode console"
+
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Pas assez d'arguments pour printf()"
 
@@ -3753,12 +4201,12 @@ msgid "1 line less"
 msgstr "1 ligne en moins"
 
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> lignes en plus"
+msgid "%ld more lines"
+msgstr "%ld lignes en plus"
 
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> lignes en moins"
+msgid "%ld fewer lines"
+msgstr "%ld lignes en moins"
 
 msgid " (Interrupted)"
 msgstr " (Interrompu)"
@@ -3766,16 +4214,111 @@ msgstr " (Interrompu)"
 msgid "Beep!"
 msgstr "Bip !"
 
+msgid "ERROR: "
+msgstr "ERREUR : "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[octets] total allou�-lib�r� %lu-%lu, utilis� %lu, pic %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+msgstr ""
+"[appels] total re/malloc() %lu, total free() %lu\n"
+"\n"
+
+msgid "E340: Line is becoming too long"
+msgstr "E340: La ligne devient trop longue"
+
+#, c-format
+msgid "E341: Internal error: lalloc(%ld, )"
+msgstr "E341: Erreur interne : lalloc(%ld, )"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: M�moire �puis�e ! (allocation de %lu octets)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Appel du shell pour ex�cuter : \"%s\""
 
+msgid "E545: Missing colon"
+msgstr "E545: ':' manquant"
+
+msgid "E546: Illegal mode"
+msgstr "E546: Mode non autoris�"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: Forme de curseur invalide"
+
+msgid "E548: digit expected"
+msgstr "E548: chiffre attendu"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: Pourcentage non autoris�"
+
+msgid "E854: path too long for completion"
+msgstr "E854: chemin trop long pour compl�tement"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: Chemin invalide : '**[nombre]' doit �tre � la fin du chemin ou �tre "
+"suivi de '%s'."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: R�pertoire \"%s\" introuvable dans 'cdpath'"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: Fichier \"%s\" introuvable dans 'path'"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: Plus de r�pertoire \"%s\" dans 'cdpath'"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: Plus de fichier \"%s\" dans 'path'"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr ""
+"E668: Mode d'acc�s incorrect au fichier d'infos de connexion NetBeans : \"%s"
+"\""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: Connexion NetBeans perdue pour le tampon %ld"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans n'est pas support� avec cette interface graphique"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: netbeans d�j� connect�"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s est en lecture seule (ajoutez ! pour passer outre)"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: Aucun identifiant sous le curseur"
 
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' est vide"
 
+msgid "E775: Eval feature not available"
+msgstr "E775: La fonctionnalit� d'�valuation n'est pas disponible"
+
 # DB : Il est ici question du mode Visuel.
 msgid "Warning: terminal cannot highlight"
 msgstr "Alerte : le terminal ne peut pas surligner"
@@ -3795,7 +4338,7 @@ msgstr "E662: Au d�but de la liste des modifications"
 msgid "E663: At end of changelist"
 msgstr "E663: � la fin de la liste des modifications"
 
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "tapez  :q<Entr�e>  pour quitter Vim"
 
 #, c-format
@@ -3807,23 +4350,23 @@ msgid "1 line %sed %d times"
 msgstr "1 ligne %s�e %d fois"
 
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> lignes %s�es 1 fois"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld lignes %s�es 1 fois"
 
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> lignes %s�es %d fois"
+msgid "%ld lines %sed %d times"
+msgstr "%ld lignes %s�es %d fois"
 
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> lignes � indenter... "
+msgid "%ld lines to indent... "
+msgstr "%ld lignes � indenter... "
 
 msgid "1 line indented "
 msgstr "1 ligne indent�e "
 
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> lignes indent�es "
+msgid "%ld lines indented "
+msgstr "%ld lignes indent�es "
 
 msgid "E748: No previously used register"
 msgstr "E748: Aucun registre n'a �t� pr�c�demment utilis�"
@@ -3837,8 +4380,12 @@ msgid "1 line changed"
 msgstr "1 ligne modifi�e"
 
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> lignes modifi�es"
+msgid "%ld lines changed"
+msgstr "%ld lignes modifi�es"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "lib�ration de %ld lignes"
 
 msgid "block of 1 line yanked"
 msgstr "bloc de 1 ligne copi�"
@@ -3847,12 +4394,12 @@ msgid "1 line yanked"
 msgstr "1 ligne copi�e"
 
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "bloc de %<PRId64> lignes copi�"
+msgid "block of %ld lines yanked"
+msgstr "bloc de %ld lignes copi�"
 
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> lignes copi�es"
+msgid "%ld lines yanked"
+msgstr "%ld lignes copi�es"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3880,45 +4427,47 @@ msgstr ""
 msgid "E574: Unknown register type %d"
 msgstr "E574: Type de registre %d inconnu"
 
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: le motif de recherche et le registre d'expression ne peuvent pas "
+"contenir deux lignes ou plus"
+
 #, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> Colonnes ; "
+msgid "%ld Cols; "
+msgstr "%ld Colonnes ; "
 
 #, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
 msgstr ""
-"%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> "
-"sur %<PRId64> Octets s�lectionn�s"
+"%s%ld sur %ld Lignes ; %lld sur %lld Mots ; %lld sur %lld Octets s�lectionn�s"
 
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> "
-"sur %<PRId64> Caract�res ; %<PRId64> sur %<PRId64> octets s�lectionn�s"
+"%s%ld sur %ld Lignes ; %lld sur %lld Mots ; %lld sur %lld Caract�res ; %lld "
+"sur %lld octets s�lectionn�s"
 
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
 msgstr ""
-"Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur "
-"%<PRId64> ; Octet %<PRId64> sur %<PRId64>"
+"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %lld sur %lld ; Octet %lld sur "
+"%lld"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur "
-"%<PRId64> ; Caract�re %<PRId64> sur %<PRId64> ; Octet %<PRId64> sur %<PRId64>"
+"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %lld sur %lld ; Caract�re %lld "
+"sur %lld ; Octet %lld sur %lld"
 
 #, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> pour le BOM)"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld pour le BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Page %N"
@@ -3926,7 +4475,6 @@ msgstr "%<%f%h%m%=Page %N"
 msgid "Thanks for flying Vim"
 msgstr "Merci d'avoir choisi Vim"
 
-#. found a mismatch: skip
 msgid "E518: Unknown option"
 msgstr "E518: Option inconnue"
 
@@ -3956,6 +4504,12 @@ msgstr "Pour l'option %s"
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' ne doit pas �tre une cha�ne vide"
 
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: Impossible de modifier term dans l'interface graphique"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: Utilisez \":gui\" pour d�marrer l'interface graphique"
+
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' et 'patchmode' sont �gaux"
 
@@ -3965,6 +4519,9 @@ msgstr "E834: Conflits avec la valeur de 'listchars'"
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: Conflits avec la valeur de 'fillchars'"
 
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: Non modifiable dans l'interface graphique GTK+ 2"
+
 msgid "E524: Missing colon"
 msgstr "E524: ':' manquant"
 
@@ -3984,6 +4541,21 @@ msgstr "E528: Une valeur ' doit �tre sp�cifi�e"
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: contient des caract�res � largeur double non-imprimables"
 
+msgid "E596: Invalid font(s)"
+msgstr "E596: Police(s) invalide(s)"
+
+msgid "E597: can't select fontset"
+msgstr "E597: Impossible de s�lectionner un jeu de polices"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: Jeu de polices invalide"
+
+msgid "E533: can't select wide font"
+msgstr "E533: Impossible de s�lectionner une police � largeur double"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: Police � largeur double invalide"
+
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Caract�re invalide apr�s <%c>"
@@ -3995,6 +4567,9 @@ msgstr "E536: virgule requise"
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' doit �tre vide ou contenir %s"
 
+msgid "E538: No mouse support"
+msgstr "E538: La souris n'est pas support�e"
+
 # DB - Le code est sans ambigu�t� sur le caract�re manquant.
 #      � d�faut d'une traduction valable, au moins comprend-on
 #      ce qui se passe.
@@ -4011,7 +4586,7 @@ msgid "E590: A preview window already exists"
 msgstr "E590: Il existe d�j� une fen�tre de pr�visualisation"
 
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: L'arabe requiert l'UTF-8, tapez ':set encoding=utf-8'"
+msgstr "W17: L'arabe n�cessite l'UTF-8, tapez ':set encoding=utf-8'"
 
 #, c-format
 msgid "E593: Need at least %d lines"
@@ -4071,12 +4646,135 @@ msgstr "E357: 'langmap' : Aucun caract�re correspondant pour %s"
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap' : Caract�res surnum�raires apr�s point-virgule : %s"
 
+msgid "cannot open "
+msgstr "impossible d'ouvrir "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM : Impossible d'ouvrir la fen�tre !\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "Amigados version 2.04 ou ult�rieure est n�cessaire\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "%s version %ld est n�cessaire\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "Impossible d'ouvrir NIL :\n"
+
+msgid "Cannot create "
+msgstr "Impossible de cr�er "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vim quitte avec %d\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "Impossible de modifier le mode de la console ?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize : pas une console ?!\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: Impossible d'ex�cuter un shell avec l'option -f"
+
+msgid "Cannot execute "
+msgstr "Impossible d'ex�cuter "
+
+msgid "shell "
+msgstr "le shell "
+
+msgid " returned\n"
+msgstr " a �t� retourn�\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE trop petit."
+
+msgid "I/O ERROR"
+msgstr "ERREUR d'E/S"
+
+msgid "Message"
+msgstr "Message"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: La s�lection de l'imprimante a �chou�"
+
+# DB - Contenu des c-formats : Imprimante puis Port.
+#, c-format
+msgid "to %s on %s"
+msgstr "vers %s sur %s"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: Police d'imprimante inconnue : %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: Erreur d'impression : %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "Impression de '%s'"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr "E244: Jeu de caract�res \"%s\" invalide dans le nom de fonte \"%s\""
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: Nom de qualit� \"%s\" invalide dans le nom de fonte \"%s\""
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: Caract�re '%c' invalide dans le nom de fonte \"%s\""
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "L'ouverture du display X a pris %ld ms"
+
 msgid ""
 "\n"
-"Cannot execute shell "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"Impossible d'ex�cuter le shell "
+"Vim : R�ception d'une erreur X\n"
+
+msgid "Testing the X display failed"
+msgstr "Le test du display X a �chou�"
+
+msgid "Opening the X display timed out"
+msgstr "L'ouverture du display X a d�pass� le d�lai d'attente"
+
+msgid ""
+"\n"
+"Could not get security context for "
+msgstr ""
+"\n"
+"Impossible d'obtenir le contexte de s�curit� pour "
+
+msgid ""
+"\n"
+"Could not set security context for "
+msgstr ""
+"\n"
+"Impossible de modifier le contexte de s�curit� pour "
+
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "Impossible d'initialiser le contexte de s�curit� %s pour %s"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr ""
+"Impossible d'obtenir le contexte de s�curit� %s pour %s. Il sera supprim� !"
+
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"Impossible d'ex�cuter le shell sh\n"
 
 msgid ""
 "\n"
@@ -4087,25 +4785,99 @@ msgstr ""
 
 msgid ""
 "\n"
-"Could not get security context for "
+"Cannot create pipes\n"
 msgstr ""
 "\n"
-"Impossible d'obtenir le contexte de s�curit� pour "
+"Impossible de cr�er des tuyaux (pipes)\n"
 
 msgid ""
 "\n"
-"Could not set security context for "
+"Cannot fork\n"
 msgstr ""
 "\n"
-"Impossible de modifier le contexte de s�curit� pour "
+"Impossible de forker\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"Impossible d'ex�cuter le shell "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"Commande interrompue\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "XSMP a perdu la connexion ICE"
 
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
+msgid "Opening the X display failed"
+msgstr "L'ouverture du display X a �chou�"
+
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP : prise en charge d'une requ�te save-yourself"
+
+msgid "XSMP opening connection"
+msgstr "XSMP : ouverture de la connexion"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP : �chec de la surveillance de connexion ICE"
+
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Le fichier \"%s\" est introuvable dans 'path'"
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP : SmcOpenConnection a �chou� : %s"
+
+msgid "At line"
+msgstr "� la ligne"
+
+msgid "Could not load vim32.dll!"
+msgstr "Impossible de charger vim32.dll !"
+
+msgid "VIM Error"
+msgstr "Erreur VIM"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "Impossible d'initialiser les pointeurs de fonction vers la DLL !"
+
+# DB - Les �v�nements en question sont ceux des messages qui suivent.
+#, c-format
+msgid "Vim: Caught %s event\n"
+msgstr "Vim : �v�nement %s intercept�\n"
+
+msgid "close"
+msgstr "de fermeture"
+
+msgid "logoff"
+msgstr "de d�connexion"
+
+msgid "shutdown"
+msgstr "d'arr�t"
+
+msgid "E371: Command not found"
+msgstr "E371: Commande introuvable"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"VIMRUN.EXE est introuvable votre $PATH.\n"
+"Les commandes externes ne feront pas de pause une fois termin�es.\n"
+"Consultez  :help win32-vimrun  pour plus d'informations."
+
+msgid "Vim Warning"
+msgstr "Alerte Vim"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "le shell a retourn� %d"
 
 #, c-format
 msgid "E372: Too many %%%c in format string"
@@ -4140,6 +4912,15 @@ msgstr "E379: Nom de r�pertoire vide ou absent"
 msgid "E553: No more items"
 msgstr "E553: Plus d'�l�ments"
 
+msgid "E924: Current window was closed"
+msgstr "E924: La fen�tre courante doit �tre ferm�e"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: Le quickfix courant a chang�"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: La liste d'emplacements courante a chang�"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d sur %d)%s%s : "
@@ -4163,6 +4944,9 @@ msgstr "Aucune entr�e"
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: �criture impossible, l'option 'buftype' est activ�e"
 
+msgid "Error file"
+msgstr "Fichier d'erreurs"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Nom de fichier manquant ou motif invalide"
 
@@ -4267,6 +5051,10 @@ msgstr "E554: Erreur de syntaxe dans %s{...}"
 msgid "External submatches:\n"
 msgstr "Sous-correspondances externes :\n"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (regexp NFA) %s ne peut pas �tre r�p�t�"
+
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -4274,6 +5062,9 @@ msgstr ""
 "E864: \\%#= peut �tre suivi uniquement de 0, 1 ou 2. Le moteur automatique "
 "sera utilis� "
 
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Moteur RE avec backtracking utilis� pour le motif : "
+
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Fin de regexp rencontr�e pr�matur�ment"
 
@@ -4281,17 +5072,21 @@ msgstr "E865: (NFA) Fin de regexp rencontr�e pr�matur�ment"
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (regexp NFA) %c au mauvais endroit"
 
-#, fuzzy, c-format
-#~ msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-#~ msgstr "E877: (regexp NFA) Classe de caract�re invalide "
+#, c-format
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (regexp NFA) Classe de caract�re invalide : %ld"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Op�rateur inconnu '\\z%c'"
 
-#, fuzzy, c-format
-#~ msgid "E867: (NFA) Unknown operator '\\%%%c'"
-#~ msgstr "E867: (NFA) Op�rateur inconnu '\\z%c'"
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) Op�rateur inconnu '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Erreur lors de la construction du NFA avec classe d'�quivalence"
 
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
@@ -4308,9 +5103,8 @@ msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi !"
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (regexp NFA) Trop de '('"
 
-#, fuzzy
-#~ msgid "E879: (NFA regexp) Too many \\z("
-#~ msgstr "E872: (regexp NFA) Trop de '('"
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (regexp NFA) Trop de \\z("
 
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) erreur de terminaison"
@@ -4328,6 +5122,10 @@ msgstr ""
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (regexp NFA) Pas assez de m�moire pour stocker le NFA"
 
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr ""
+"E878: (NFA) Impossible d'allouer la m�moire pour parcourir les branches !"
+
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
@@ -4526,13 +5324,6 @@ msgstr "E762: Un caract�re dans FOL, LOW ou UPP est hors-limites"
 msgid "Compressing word tree..."
 msgstr "Compression de l'arbre des mots"
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: La v�rification orthographique n'est pas activ�e"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "Alerte : Liste de mots \"%s.%s.spl\" ou \"%s.ascii.spl\" introuvable"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Lecture du fichier orthographique \"%s\""
@@ -4582,6 +5373,10 @@ msgid "Conversion in %s not supported: from %s to %s"
 msgstr "La conversion dans %s non support�e : de %s vers %s"
 
 #, c-format
+msgid "Conversion in %s not supported"
+msgstr "La conversion dans %s non support�e"
+
+#, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Valeur de FLAG invalide dans %s ligne %d : %s"
 
@@ -4769,6 +5564,9 @@ msgstr "Drapeaux non reconnus dans %s ligne %d : %s"
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "%d mot(s) ignor�(s) avec des caract�res non-ASCII"
 
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: m�moire insuffisante, liste de mots peut-�tre incompl�te"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "%d noeuds compress�s sur %d ; %d (%d%%) restants "
@@ -4776,14 +5574,16 @@ msgstr "%d noeuds compress�s sur %d ; %d (%d%%) restants "
 msgid "Reading back spell file..."
 msgstr "Relecture du fichier orthographique"
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "Analyse phon�tique en cours..."
 
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "Nombre de mots apr�s l'analyse phon�tique : %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "Nombre de mots apr�s l'analyse phon�tique : %ld"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4819,70 +5619,25 @@ msgstr "Termin� !"
 
 # DB - todo : perfectible.
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' n'a pas %<PRId64> entr�es"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' n'a pas %ld entr�es"
 
-#, fuzzy, c-format
-#~ msgid "Word '%.*s' removed from %s"
-#~ msgstr "Mot retir� de %s"
+#, c-format
+msgid "Word '%.*s' removed from %s"
+msgstr "Mot '%.*s' retir� de %s"
 
-#, fuzzy, c-format
-#~ msgid "Word '%.*s' added to %s"
-#~ msgstr "Mot ajout� dans %s"
+#, c-format
+msgid "Word '%.*s' added to %s"
+msgstr "Mot '%.*s' ajout� dans %s"
 
 msgid "E763: Word characters differ between spell files"
 msgstr ""
 "E763: Les caract�res de mots diff�rent entre les fichiers orthographiques"
 
-msgid "Sorry, no suggestions"
-msgstr "D�sol�, aucune suggestion"
-
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "D�sol�, seulement %<PRId64> suggestions"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Remplacer \"%.*s\" par :"
-
-# DB - todo : l'int�r�t de traduire ce message m'�chappe.
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: Pas de suggestion orthographique pr�c�dente"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Introuvable : %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: %s ne semble pas �tre un fichier .sug"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Fichier de suggestions obsol�te, mise � jour n�cessaire : %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: Fichier .sug pr�vu pour une version de Vim plus r�cente : %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: Le fichier .sug ne correspond pas au fichier .spl : %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: Erreur lors de la lecture de fichier de suggestions : %s"
-
 #. This should have been checked when generating the .spl
-#. file.
+#. * file.
 msgid "E783: duplicate char in MAP entry"
-msgstr "E783: caract�res dupliqu� dans l'entr�e MAP"
+msgstr "E783: caract�re dupliqu� dans l'entr�e MAP"
 
 msgid "No Syntax items defined for this buffer"
 msgstr "Aucun �l�ment de syntaxe d�fini pour ce tampon"
@@ -4891,6 +5646,9 @@ msgstr "Aucun �l�ment de syntaxe d�fini pour ce tampon"
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Argument invalide : %s"
 
+msgid "syntax iskeyword "
+msgstr "syntaxe iskeyword "
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Aucune grappe de syntaxe %s"
@@ -4971,6 +5729,10 @@ msgid "E789: Missing ']': %s"
 msgstr "E789: ']' manquant : %s"
 
 #, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: Caract�re surnum�raire apr�s ']': %s]%s"
+
+#, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' manquant : %s"
 
@@ -4984,7 +5746,6 @@ msgstr "E848: Trop de grappes de syntaxe"
 msgid "E400: No cluster specified"
 msgstr "E400: Aucune grappe sp�cifi�e"
 
-#. end delimiter not found
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: D�limiteur de motif introuvable : %s"
@@ -5025,9 +5786,10 @@ msgstr "E409: Nom de groupe inconnu : %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Sous-commande de :syntax invalide : %s"
 
-#~ msgid ""
-#~ "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-#~ msgstr ""
+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  TOTAL      NOMBRE MATCH   PLUS LENT   MOYEN     NOM                MOTIF"
 
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: boucle r�cursive lors du chargement de syncolor.vim"
@@ -5150,6 +5912,10 @@ msgstr ""
 msgid "Searching tags file %s"
 msgstr "Examen du fichier de marqueurs %s"
 
+#, c-format
+msgid "E430: Tag file path truncated for %s\n"
+msgstr "E430: Chemin de fichiers de marqueurs tronqu� pour %s\n"
+
 msgid "Ignoring long line in tags file"
 msgstr "Ignore longue ligne dans le fichier de marqueurs"
 
@@ -5158,8 +5924,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Erreur de format dans le fichier de marqueurs \"%s\""
 
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Avant l'octet %<PRId64>"
+msgid "Before byte %ld"
+msgstr "Avant l'octet %ld"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5210,14 +5976,28 @@ msgstr ""
 "\n"
 "--- Touches du terminal ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "Impossible d'ouvrir $VIMRUNTIME/rgb.txt"
+
+msgid "new shell started\n"
+msgstr "nouveau shell d�marr�\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim : Erreur lors de la lecture de l'entr�e, sortie...\n"
 
+# DB - Message de d�bogage.
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "CUT_BUFFER0 utilis� plut�t qu'une s�lection vide"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#, fuzzy
-#~ msgid "E881: Line count changed unexpectedly"
-#~ msgstr "E834: Le nombre de lignes a �t� chang� inopin�ment"
+msgid "E881: Line count changed unexpectedly"
+msgstr "E881: Le nombre de lignes a �t� chang� inopin�ment"
+
+# DB - Question O/N.
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "Annulation impossible ; continuer"
 
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
@@ -5268,6 +6048,18 @@ msgid "E823: Not an undo file: %s"
 msgstr "E823: Ce n'est pas un fichier d'annulations : %s"
 
 #, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: Fichier non-chiffr� a un fichier d'annulations chiffr� : %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: D�chiffrage du fichier d'annulation a �chou� : %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: Le fichier d'annulations est chiffr� : %s"
+
+#, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: Fichier d'annulations incompatible : %s"
 
@@ -5287,8 +6079,8 @@ msgid "Already at newest change"
 msgstr "D�j� � la modification la plus r�cente"
 
 #, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: Annulation n� %<PRId64> introuvable"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: Annulation n� %ld introuvable"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo : num�ros de ligne erron�s"
@@ -5312,8 +6104,8 @@ msgid "changes"
 msgstr "modifications"
 
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s ; %s #%<PRId64> ; %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s ; %s #%ld ; %s"
 
 msgid "before"
 msgstr "avant"
@@ -5329,8 +6121,8 @@ msgid "number changes  when               saved"
 msgstr "num�ro modif.   instant            enregistr�"
 
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "il y a %<PRId64> secondes"
+msgid "%ld seconds ago"
+msgstr "il y a %ld secondes"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin n'est pas autoris� apr�s une annulation"
@@ -5341,6 +6133,208 @@ msgstr "E439: la liste d'annulation est corrompue"
 msgid "E440: undo line missing"
 msgstr "E440: ligne d'annulation manquante"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: La fonction %s existe d�j� (ajoutez ! pour la remplacer)"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Une entr�e du Dictionnaire porte d�j� ce nom"
+
+msgid "E718: Funcref required"
+msgstr "E718: R�f�rence de fonction (Funcref) requise"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: Fonction inconnue : %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: Argument invalide : %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Nom d'argument dupliqu� : %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: Trop d'arguments pour la fonction %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: Arguments invalides pour la fonction %s"
+
+# AB - V�rifier dans la litt�rature technique s'il n'existe pas une meilleure
+#      traduction pour "function call depth".
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr ""
+"E132: La profondeur d'appel de fonction est sup�rieure � 'maxfuncdepth'"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+#, c-format
+msgid "calling %s"
+msgstr "appel de %s"
+
+# AB - V�rifier.
+#, c-format
+msgid "%s aborted"
+msgstr "%s annul�e"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s a retourn� #%ld"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+#, c-format
+msgid "%s returning %s"
+msgstr "%s a retourn� \"%s\""
+
+msgid "E699: Too many arguments"
+msgstr "E699: Trop d'arguments"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Fonction inconnue : %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: La fonction a �t� effac�e: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: La fonction %s n'a pas re�u assez d'arguments"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <SID> utilis� en dehors d'un script : %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Appel d'une fonction � dict � sans Dictionnaire : %s"
+
+msgid "E129: Function name required"
+msgstr "E129: Nom de fonction requis"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr ""
+"E128: Le nom de la fonction doit commencer par une majuscule ou \"s:\": %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr ""
+"E884: Le nom de la fonction ne peut pas contenir le caract�re deux-points : "
+"%s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Fonction non d�finie : %s"
+
+# AB - La version fran�aise est plus consistante que la version anglaise.
+# AB - Je suis partag� entre la concision d'une traduction assez litt�rale et
+#      la lourdeur d'une traduction plus correcte.
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: Il manque '(' apr�s %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: Impossible d'utiliser g: ici"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr ""
+"E932: une fonction fermeture ne devrait pas �tre au niveau principal : %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: Il manque :endfunction"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: Le nom de fonction entre en conflit avec la variable : %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: Impossible de red�finir fonction %s : d�j� utilis�e"
+
+# DB - Le contenu du "c-format" est le nom de la fonction.
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: Le nom de la fonction %s ne correspond pas le nom du script"
+
+# AB - Il est difficile de cr�er une version fran�aise qui fasse moins de 80
+#      caract�res de long, nom de la fonction compris : "It is in use" est une
+#      expression tr�s dense. Traductions possibles : "elle est utilis�e",
+#      "elle s'ex�cute" ou "elle est occup�e".
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: Impossible d'effacer %s : cette fonction est utilis�e"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return en dehors d'une fonction"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Parenth�ses manquantes : %s"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"Version graphique MS-Windows 64 bits"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"Version graphique MS-Windows 32 bits"
+
+msgid " with OLE support"
+msgstr " supportant l'OLE"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"Version console MS-Windows 64 bits"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"Version console MS-Windows 32 bits"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"Version MaxOS X (unix)"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"Version MacOS X"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"Version MacOS"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"Version OpenVMS"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -5375,9 +6369,70 @@ msgstr ""
 "\n"
 "�norme version "
 
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Grosse version "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"Version normale "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Petite version "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Version minuscule "
+
 msgid "without GUI."
 msgstr "sans interface graphique."
 
+msgid "with GTK3 GUI."
+msgstr "avec interface graphique GTK3."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "avec interface graphique GTK2-GNOME."
+
+msgid "with GTK2 GUI."
+msgstr "avec interface graphique GTK2."
+
+msgid "with X11-Motif GUI."
+msgstr "avec interface graphique X11-Motif."
+
+msgid "with X11-neXtaw GUI."
+msgstr "avec interface graphique X11-neXtaw."
+
+msgid "with X11-Athena GUI."
+msgstr "avec interface graphique X11-Athena."
+
+msgid "with Photon GUI."
+msgstr "avec interface graphique Photon."
+
+msgid "with GUI."
+msgstr "avec une interface graphique."
+
+msgid "with Carbon GUI."
+msgstr "avec interface graphique Carbon."
+
+msgid "with Cocoa GUI."
+msgstr "avec interface graphique Cocoa."
+
+msgid "with (classic) GUI."
+msgstr "avec interface graphique (classic)."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Fonctionnalit�s incluses (+) ou non (-) :\n"
 
@@ -5399,6 +6454,24 @@ msgstr "      fichier exrc utilisateur : \""
 msgid "  2nd user exrc file: \""
 msgstr "  2me fichier exrc utilisateur : \""
 
+msgid "  system gvimrc file: \""
+msgstr "        fichier gvimrc syst�me : \""
+
+msgid "    user gvimrc file: \""
+msgstr "    fichier gvimrc utilisateur : \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "2me fichier gvimrc utilisateur : \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "3me fichier gvimrc utilisateur : \""
+
+msgid "       defaults file: \""
+msgstr " fichier de valeurs par d�faut : \""
+
+msgid "    system menu file: \""
+msgstr "          fichier menu syst�me : \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "               $VIM par d�faut : \""
 
@@ -5408,6 +6481,9 @@ msgstr "        $VIMRUNTIME par d�faut : \""
 msgid "Compilation: "
 msgstr "Compilation : "
 
+msgid "Compiler: "
+msgstr "Compilateur : "
+
 msgid "Linking: "
 msgstr "�dition de liens : "
 
@@ -5429,26 +6505,17 @@ msgstr "Vim est un logiciel libre"
 msgid "Help poor children in Uganda!"
 msgstr "Aidez les enfants pauvres d'Ouganda !"
 
-msgid "type  :help nvim<Enter>       if you are new! "
-msgstr "tapez  :help nvim<Entr�e>       si vous �tes nouveau!             "
-
-msgid "type  :CheckHealth<Enter>     to optimize Nvim"
-msgstr "tapez  :CheckHealth<Entr�e>     pour optimiser Nvim               "
+msgid "type  :help iccf<Enter>       for information "
+msgstr "tapez  :help iccf<Entr�e>       pour plus d'informations          "
 
 msgid "type  :q<Enter>               to exit         "
 msgstr "tapez  :q<Entr�e>               pour sortir du programme          "
 
-msgid "type  :help<Enter>            for help        "
-msgstr "tapez  :help<Entr�e>            pour obtenir de l'aide            "
-
-msgid "type  :help iccf<Enter>       for information "
-msgstr "tapez  :help iccf<Entr�e>       pour plus d'informations          "
-
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "tapez  :help<Entr�e>  ou  <F1>  pour acc�der � l'aide en ligne    "
 
-msgid "type  :help version7<Enter>   for version info"
-msgstr "tapez  :help version7<Entr�e>   pour lire les notes de mise � jour"
+msgid "type  :help version8<Enter>   for version info"
+msgstr "tapez  :help version8<Entr�e>   pour lire les notes de mise � jour"
 
 # DB - Pour les trois messages qui suivent :
 #        :set cp
@@ -5462,6 +6529,27 @@ msgstr "tapez  :set nocp<Entr�e>       pour la d�sactiver"
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "tapez  :help cp-default<Entr�e>  pour plus d'info"
 
+msgid "menu  Help->Orphans           for information    "
+msgstr "menu  Aide->Orphelins            pour plus d'info"
+
+msgid "Running modeless, typed text is inserted"
+msgstr "Les modes sont d�sactiv�s, le texte saisi est ins�r�"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "menu  �dition->R�glages Globaux->Insertion Permanente"
+
+# DB - todo
+msgid "                              for two modes      "
+msgstr "                                  pour les modes     "
+
+# DB - todo
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "menu  �dition->R�glages Globaux->Compatibilit� Vi"
+
+# DB - todo
+msgid "                              for Vim defaults   "
+msgstr "                                pour d�f. de Vim "
+
 msgid "Sponsor Vim development!"
 msgstr "Sponsorisez le d�veloppement de Vim !"
 
@@ -5506,1711 +6594,724 @@ msgstr "E445: Les modifications de l'autre fen�tre n'ont pas �t� enregistr�es"
 msgid "E446: No file name under cursor"
 msgstr "E446: Aucun nom de fichier sous le curseur"
 
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() appel�e avec un mot de passe vide"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: petit/gros boutisme incorrect dans blowfish"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: le test de sha256 a �chou�"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: le test de blowfish a �chou�"
-
-#~ msgid "Patch file"
-#~ msgstr "Fichier rustine"
-
-# AB - Textes des boutons de la bo�te de dialogue affich�e par inputdialog().
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&Ok\n"
-#~ "&Annuler"
-
-# AB - � mon avis, la version anglaise est erron�e.
-# DB : V�rifier
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Pas de connexion au serveur X"
-
-# AB - La version fran�aise est meilleure que la version anglaise.
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: L'envoi au serveur %s � �chou�"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: Impossible de lire la r�ponse du serveur"
-
-# AB - La version fran�aise est meilleure que la version anglaise.
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: La r�ponse n'a pas pu �tre envoy�e au client"
-
-# AB - Ceci est un titre de bo�te de dialogue. V�rifier que la version
-#      fran�aise est correcte pour les trois r�f�rences ; j'ai un doute quant
-#      � la troisi�me.
-#~ msgid "Save As"
-#~ msgstr "Enregistrer sous - Vim"
-
-# AB - Ceci est un titre de bo�te de dialogue.
-#~ msgid "Edit File"
-#~ msgstr "Ouvrir un fichier - Vim"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (INTROUVABLE)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Sourcer un script - Vim"
-
-#~ msgid "unknown"
-#~ msgstr "inconnu"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "Ouvrir un fichier dans une nouvelle fen�tre - Vim"
-
-#~ msgid "Append File"
-#~ msgstr "Ajouter fichier"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Position de la fen�tre : X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "Enregistrer la redirection"
-
-#~ msgid "Save View"
-#~ msgstr "Enregistrer la vue - Vim"
-
-#~ msgid "Save Session"
-#~ msgstr "Enregistrer la session - Vim"
-
-#~ msgid "Save Setup"
-#~ msgstr "Enregistrer les r�glages - Vim"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< n'est pas disponible sans la fonctionnalit� +eval"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: Pas de digraphes dans cette version"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "est un p�riph�rique (d�sactiv� par l'option 'opendevice')"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "Lecture de stdin..."
-
-#~ msgid "[crypted]"
-#~ msgstr "[chiffr�]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: Le fichier est chiffr� avec une m�thode inconnue"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans interdit l'�criture des tampons non modifi�s"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "Netbeans interdit l'�criture partielle de ses tampons"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "�criture vers un p�riph�rique d�sactiv� par l'option 'opendevice'"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr ""
-#~ "E460: Les ressources partag�es seraient perdues (ajoutez ! pour passer "
-#~ "outre)"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr ""
-#~ "E851: �chec lors de la cr�ation d'un nouveau processus pour l'interface "
-#~ "graphique"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr ""
-#~ "E852: Le processus fils n'a pas r�ussi � d�marrer l'interface graphique"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: Impossible de d�marrer l'interface graphique"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: Impossible de lire \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr ""
-#~ "E665: Impossible de d�marrer l'IHM graphique, aucune police valide trouv�e"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' est invalide"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: Valeur de 'imactivatekey' invalide"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: Impossible d'allouer la couleur %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "Aucune correspondance sous le curseur, recherche de la suivante"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<impossible d'ouvrir> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile : impossible d'obtenir la police %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr ""
-#~ "E614: vim_SelFile : impossible de revenir dans le r�pertoire courant"
-
-#~ msgid "Pathname:"
-#~ msgstr "Chemin :"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile : impossible d'obtenir le r�pertoire courant"
-
-#~ msgid "OK"
-#~ msgstr "Ok"
-
-#~ msgid "Cancel"
-#~ msgstr "Annuler"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr ""
-#~ "Widget scrollbar : Impossible d'obtenir la g�om�trie du pixmap 'thumb'"
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: Impossible de cr�er un BalloonEval avec message ET callback"
-
-msgid "Yes"
-msgstr "Oui"
-
-msgid "No"
-msgstr "Non"
-
-# todo '_' is for hotkey, i guess?
-#~ msgid "Input _Methods"
-#~ msgstr "_M�thodes de saisie"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "Remplacer - Vim"
-
-#~ msgid "VIM - Search..."
-#~ msgstr "Rechercher - Vim"
-
-#~ msgid "Find what:"
-#~ msgstr "Rechercher :"
-
-#~ msgid "Replace with:"
-#~ msgstr "Remplacer par :"
-
-#~ msgid "Match whole word only"
-#~ msgstr "Mots entiers seulement"
-
-#~ msgid "Match case"
-#~ msgstr "Respecter la casse"
-
-#~ msgid "Direction"
-#~ msgstr "Direction"
-
-#~ msgid "Up"
-#~ msgstr "Haut"
-
-#~ msgid "Down"
-#~ msgstr "Bas"
-
-#~ msgid "Find Next"
-#~ msgstr "Suivant"
-
-#~ msgid "Replace"
-#~ msgstr "Remplacer"
-
-#~ msgid "Replace All"
-#~ msgstr "Remplacer tout"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr ""
-#~ "Vim : Une requ�te \"die\" a �t� re�ue par le gestionnaire de session\n"
-
-#~ msgid "Close tab"
-#~ msgstr "Fermer l'onglet"
-
-#~ msgid "New tab"
-#~ msgstr "Nouvel onglet"
-
-# DB - todo : un peu long. Cet entr�e de menu permet d'ouvrir un fichier
-#      dans un nouvel onglet via le s�lecteur de fichiers graphique.
-#~ msgid "Open Tab..."
-#~ msgstr "Ouvrir dans un onglet..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim : Fen�tre principale d�truite inopin�ment\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&Filtrer"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Annuler"
-
-#~ msgid "Directories"
-#~ msgstr "R�pertoires"
-
-#~ msgid "Filter"
-#~ msgstr "Filtre"
-
-#~ msgid "&Help"
-#~ msgstr "&Aide"
-
-#~ msgid "Files"
-#~ msgstr "Fichiers"
-
-#~ msgid "&OK"
-#~ msgstr "&Ok"
-
-#~ msgid "Selection"
-#~ msgstr "S�lection"
-
-#~ msgid "Find &Next"
-#~ msgstr "Suiva&nt"
-
-#~ msgid "&Replace"
-#~ msgstr "&Remplacer"
-
-#~ msgid "Replace &All"
-#~ msgstr "Rempl&acer tout"
-
-#~ msgid "&Undo"
-#~ msgstr "Ann&uler"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: Titre de fen�tre \"%s\" introuvable"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Argument non support� : \"-%s\" ; Utilisez la version OLE."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: Impossible d'ouvrir une fen�tre dans une application MDI"
-
-#~ msgid "Open tab..."
-#~ msgstr "Ouvrir dans un onglet..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Chercher une cha�ne (utilisez '\\\\' pour chercher un '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Chercher et remplacer (utilisez '\\\\' pour trouver un '\\')"
-
-# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
-#      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
-#      fichier.
-#~ msgid "Not Used"
-#~ msgstr "Non utilis�"
-
-# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
-#      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
-#      fichier.
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "R�pertoire\t*.rien\n"
-
-# DB - todo : perfectible.
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: Erreur d'allocation de couleurs, couleurs possiblement "
-#~ "incorrectes"
-
-# DB - todo : La VF est-elle compr�hensible ?
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr ""
-#~ "E250: Des polices manquent dans %s pour les jeux de caract�res suivants :"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Nom du jeu de polices : %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "La police '%s' n'a pas une largeur fixe"
-
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: Nom du jeu de polices : %s\n"
-
-#~ msgid "Font0: %s\n"
-#~ msgstr "Font0: %s\n"
-
-#~ msgid "Font1: %s\n"
-#~ msgstr "Font1: %s\n"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "La largeur de Font%<PRId64> n'est pas le double de celle de Font0\n"
-
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "Largeur de Font0 : %<PRId64>\n"
-
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Largeur de Font1 : %<PRId64>\n"
-#~ "\n"
-
-# DB - todo : Pas certain de mon coup, ici...
-#~ msgid "Invalid font specification"
-#~ msgstr "La sp�cification de la police est invalide"
-
-#~ msgid "&Dismiss"
-#~ msgstr "Aban&donner"
-
-# DB - todo : Pas certain de mon coup, ici...
-#~ msgid "no specific match"
-#~ msgstr "aucune correspondance particuli�re"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Choisir une police - Vim"
-
-#~ msgid "Name:"
-#~ msgstr "Nom :"
-
-#~ msgid "Show size in Points"
-#~ msgstr "Afficher la taille en Points"
-
-#~ msgid "Encoding:"
-#~ msgstr "Encodage :"
-
-#~ msgid "Font:"
-#~ msgstr "Police :"
-
-#~ msgid "Style:"
-#~ msgstr "Style :"
-
-#~ msgid "Size:"
-#~ msgstr "Taille :"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: ERREUR dans l'automate Hangul"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: Erreur stat"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: impossible d'ouvrir la base de donn�es cscope %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr ""
-#~ "E626: impossible d'obtenir des informations sur la base de donn�es cscope"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "La biblioth�que Lua n'a pas pu �tre charg�e."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "impossible d'enregistrer les informations d'annulation"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: D�sol�, cette commande est d�sactiv�e : les biblioth�ques MzScheme "
-#~ "n'ont pas pu �tre charg�es."
-
-#~ msgid "invalid expression"
-#~ msgstr "expression invalide"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "expressions d�sactiv�e lors de la compilation"
-
-#~ msgid "hidden option"
-#~ msgstr "option cach�e"
-
-#~ msgid "unknown option"
-#~ msgstr "option inconnue"
-
-#~ msgid "window index is out of range"
-#~ msgstr "num�ro de fen�tre hors limites"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "impossible d'ouvrir le tampon"
-
-#~ msgid "cannot delete line"
-#~ msgstr "impossible d'effacer la ligne"
-
-#~ msgid "cannot replace line"
-#~ msgstr "impossible de remplacer la ligne"
-
-#~ msgid "cannot insert line"
-#~ msgstr "impossible d'ins�rer la ligne"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "une cha�ne ne peut pas contenir de saut-de-ligne"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "erreur lors de la conversion d'une valeur de Scheme � Vim"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Erreur Vim : ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Erreur Vim"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "tampon invalide"
-
-#~ msgid "window is invalid"
-#~ msgstr "fen�tre invalide"
-
-#~ msgid "linenr out of range"
-#~ msgstr "num�ro de ligne hors limites"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "non autoris� dans le bac � sable"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: Vim ne peut pas ex�cuter :python apr�s avoir utilis� :py3"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: D�sol�, commande d�sactiv�e : la biblioth�que Python n'a pas pu "
-#~ "�tre charg�e."
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Impossible d'invoquer Python r�cursivement"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: Vim ne peut pas ex�cuter :py3 apr�s avoir utilis� :python"
-
-#~ msgid "index must be int or slice"
-#~ msgstr "index doit �tre int ou slice"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ doit �tre une instance de cha�ne (String)"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: D�sol�, commande d�sactiv�e : la biblioth�que Ruby n'a pas pu �tre "
-#~ "charg�e."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: � return � inattendu"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: � next � inattendu"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: � break � inattendu"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: � redo � inattendu"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: � retry � hors d'une clause � rescue �"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: Exception non prise en charge"
-
-# DB - todo
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: contexte de longjmp inconnu : %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "Basculer impl�mentation/d�finition"
-
-#~ msgid "Show base class of"
-#~ msgstr "Montrer la classe de base de"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "Montrer les fonctions membres surcharg�es"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "R�cup�rer du fichier"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "R�cup�rer du projet"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "R�cup�rer de tous les projets"
-
-#~ msgid "Retrieve"
-#~ msgstr "R�cup�rer"
-
-#~ msgid "Show source of"
-#~ msgstr "Montrer source de"
-
-#~ msgid "Find symbol"
-#~ msgstr "Trouver symbole"
-
-#~ msgid "Browse class"
-#~ msgstr "Parcourir classe"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "Montrer classe dans hi�rarchie"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "Montrer classe dans hi�rarchie restreinte"
-
-# todo
-#~ msgid "Xref refers to"
-#~ msgstr "Xref r�f�rence"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref est r�f�renc� par"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref a un(e)"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref utilis�e par"
-
-#~ msgid "Show docu of"
-#~ msgstr "Montrer doc de"
-
-#~ msgid "Generate docu for"
-#~ msgstr "G�n�rer la doc de"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "Connexion � SNiFF+ impossible. V�rifiez l'environnement (sniffemacs doit "
-#~ "�tre dans le $PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff : Erreur de lecture. D�connexion"
-
-# DB - Les trois messages suivants vont ensembles.
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ est actuellement "
-
-#~ msgid "not "
-#~ msgstr "d�"
-
-#~ msgid "connected"
-#~ msgstr "connect�"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: Requ�te SNiFF+ inconnue : %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: Erreur lors de la connexion � SNiFF+"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ n'est pas connect�"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: Ce tampon n'est pas un tampon SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff : Erreur lors d'une �criture. D�connexion"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "num�ro de tampon invalide"
-
-#~ msgid "not implemented yet"
-#~ msgstr "pas encore impl�ment�"
-
-# DB - TODO : le contexte est celui d'une annulation.
-#~ msgid "cannot set line(s)"
-#~ msgstr "Impossible de remettre la/les ligne(s)"
-
-#~ msgid "invalid mark name"
-#~ msgstr "nom de marque invalide"
-
-#~ msgid "mark not set"
-#~ msgstr "marque non positionn�e"
-
-#~ msgid "row %d column %d"
-#~ msgstr "ligne %d colonne %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "Impossible d'ins�rer/ajouter de lignes"
-
-#~ msgid "line number out of range"
-#~ msgstr "num�ro de ligne hors limites"
-
-#~ msgid "unknown flag: "
-#~ msgstr "drapeau inconnu : "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "vimOption inconnue"
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: Le fichier \"%s\" est introuvable dans 'path'"
 
-#~ msgid "keyboard interrupt"
-#~ msgstr "interruption clavier"
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: ID invalide : %ld (doit �tre plus grand ou �gal � 1)"
 
-#~ msgid "vim error"
-#~ msgstr "erreur Vim"
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID d�j� pris: %ld"
 
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "Impossible de cr�er commande de tampon/fen�tre : objet en cours "
-#~ "d'effacement"
+msgid "List or number required"
+msgstr "Liste ou nombre requis"
 
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "Impossible d'inscrire la commande de rappel : tampon/fen�tre en effacement"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: ID invalide : %ld (doit �tre plus grand ou �gal � 1)"
 
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: ERREUR FATALE TCL: reflist corrompue ?! Contactez vim-dev@vim.org, "
-#~ "SVP."
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID introuvable : %ld"
 
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "Impossible d'inscrire la commande de rappel : r�f. tampon/fen�tre "
-#~ "introuvable"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: Impossible de charger la biblioth�que %s"
 
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: D�sol�, commande d�sactiv�e: la biblioth�que Tcl n'a pas pu �tre "
-#~ "charg�e."
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"D�sol�, commande d�sactiv�e : la biblioth�que Perl n'a pas pu �tre charg�e."
 
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: code de sortie %d"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr "E299: �valuation Perl interdite dans bac � sable sans le module Safe"
 
-#~ msgid "cannot get line"
-#~ msgstr "Impossible d'obtenir la ligne"
+msgid "Edit with &multiple Vims"
+msgstr "�diter dans &plusieurs Vims"
 
-#~ msgid "Unable to register a command server name"
-#~ msgstr "Impossible d'inscrire un nom de serveur de commande"
+msgid "Edit with single &Vim"
+msgstr "�diter dans un seul &Vim"
 
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: �chec de l'envoi de la commande au programme cible"
+msgid "Diff with Vim"
+msgstr "&Comparer avec Vim"
 
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: Id utilis� pour le serveur invalide : %s"
+msgid "Edit with &Vim"
+msgstr "�diter dans &Vim"
 
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: Entr�e registre de l'instance de Vim mal format�e. Suppression !"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "�diter dans le Vim existant - "
 
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans n'est pas support� avec cette interface graphique\n"
+msgid "Edits the selected file(s) with Vim"
+msgstr "�dites le(s) fichier(s) s�lectionn�(s) avec Vim"
 
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "Ce Vim n'a pas �t� compil� avec la fonctionnalit� diff"
+# DB - MessageBox win32, la longueur n'est pas un probl�me !
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr ""
+"Erreur de cr�ation du processus : v�rifiez que gvim est bien dans votre "
+"chemin !"
 
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' ne peut pas �tre utilis� : d�sactiv� � la compilation\n"
+msgid "gvimext.dll error"
+msgstr "Erreur de gvimext.dll"
 
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim : Erreur : Impossible de d�marrer gvim depuis NetBeans\n"
+msgid "Path length too long!"
+msgstr "Le chemin est trop long !"
 
-# DB - todo (VMS uniquement).
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "pour lesquels la casse est indiff�rente (/ pour que le drapeau soit "
-#~ "majuscule)"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\tInscrire ce gvim pour OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\tD�sinscrire gvim de OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\tLancer l'interface graphique (comme \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr ""
-#~ "-f, --nofork\tPremier-plan : ne pas d�tacher l'interface graphique du "
-#~ "terminal"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\tNe pas utiliser newcli pour l'ouverture des fen�tres"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <p�riph>\tUtiliser <p�riph�rique> pour les E/S"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\tUtiliser <gvimrc> au lieu du gvimrc habituel"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�diter des fichiers chiffr�s"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tConnecter Vim au serveur X sp�cifi�"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tNe pas se connecter � un serveur X"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr ""
-#~ "--remote <fich>\t�diter les <fichiers> dans un serveur Vim si possible"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-silent ...\tPareil, mais pas d'erreur s'il n'y a aucun serveur"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <fich>\tComme --remote mais ne quitter qu'� la fin de "
-#~ "l'�dition"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent\tPareil, mais pas d'erreur s'il n'y a aucun serveur"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <fich>\tComme --remote mais ouvrir un onglet "
-#~ "pour chaque fichier"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr ""
-#~ "--remote-send <tche>\tEnvoyer <touches> � un serveur Vim puis quitter"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <expr>\t�valuer <expr> dans un serveur Vim, afficher le "
-#~ "r�sultat"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr ""
-#~ "--serverlist\t\tLister les noms des serveurs Vim disponibles et quitter"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <nom>\tEnvoyer au/devenir le serveur Vim nomm� <nom>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arguments reconnus par gvim (version Motif) :\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arguments reconnus par gvim (version neXtaw) :\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arguments reconnus par gvim (version Athena) :\n"
+# msgstr "--Pas de lignes dans le tampon--"
+# DB - todo : ou encore : msgstr "--Aucune ligne dans le tampon--"
+msgid "--No lines in buffer--"
+msgstr "--Le tampon est vide--"
 
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <�cran>\tLancer Vim sur ce <display>"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: Commande annul�e"
 
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tIconifier Vim au d�marrage"
+msgid "E471: Argument required"
+msgstr "E471: Argument requis"
 
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr ""
-#~ "-background <coul>\tUtiliser <couleur> pour l'arri�re-plan\t   (abrv : -"
-#~ "bg)"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ devrait �tre suivi de /, ? ou &"
 
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <coul>\tUtiliser <couleur> pour le texte normal\t   (abrv : -"
-#~ "fg)"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr ""
+"E11: Invalide dans la fen�tre ligne-de-commande ; <CR> ex�cute, CTRL-C quitte"
 
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr ""
-#~ "-font <fonte>\tUtiliser <fonte> pour le texte normal\t   (abrv : -fn)"
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: commande non autoris�e depuis un exrc/vimrc dans r�pertoire courant ou "
+"une recherche de marqueur"
 
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <fonte>\tUtiliser <fonte> pour le texte gras"
+msgid "E171: Missing :endif"
+msgstr "E171: :endif manquant"
 
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <fonte>\tUtiliser <fonte> pour le texte italique"
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry manquant"
 
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr ""
-#~ "-geometry <g�om>\tUtiliser cette <g�om�trie> initiale\t (abrv : -geom)"
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile manquant"
 
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr ""
-#~ "-borderwidth <�pais>\tUtiliser cette <�paisseur> de bordure\t   (abrv : -"
-#~ "bw)"
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor manquant"
 
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <lg>\tUtiliser cette <largeur> de barre de d�fil. (abrv: -"
-#~ "sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <haut>\tUtiliser cette <hauteur> de menu\t   (abrv : -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tUtiliser la vid�o inverse\t\t   (abrv : -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tNe pas utiliser de vid�o inverse\t   (abrv : +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <ressource>\tConfigurer la <ressource> sp�cifi�e"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arguments reconnus par gvim (version GTK+) :\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr ""
-#~ "-display <display>\tLancer Vim sur ce <display>\t(�galement : --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <r�le>\tDonner un r�le pour identifier la fen�tre principale"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tOuvrir Vim dans un autre widget GTK"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\tGvim affiche l'ID de la fen�tre sur stdout"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <titre parent>\tOuvrir Vim dans une application parente"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tOuvrir Vim dans un autre widget win32"
-
-#~ msgid "No display"
-#~ msgstr "Aucun display"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr " : L'envoi a �chou�.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr " : L'envoi a �chou�. Tentative d'ex�cution locale\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d �dit�s sur %d"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Aucun display : L'envoi de l'expression a �chou�.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr " : L'envoi de l'expression a �chou�.\n"
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile sans :while"
 
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: Page de codes non valide"
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor sans :for"
 
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: Impossible de r�gler les valeurs IC"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: �chec de la cr�ation du contexte de saisie"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: �chec de l'ouverture de la m�thode de saisie"
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: Le fichier existe d�j� (ajoutez ! pour passer outre)"
 
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr ""
-#~ "E287: Alerte : Impossible d'inscrire la callback de destruction dans la MS"
+msgid "E472: Command failed"
+msgstr "E472: La commande a �chou�"
 
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: la m�thode de saisie ne supporte aucun style"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Jeu de police inconnu : %s"
 
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr ""
-#~ "E289: le type de pr��dition de Vim n'est pas support� par la m�thode de "
-#~ "saisie"
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Police inconnue : %s"
 
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: Erreur lors de la mise � jour du fichier d'�change crypt�"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: La police \"%s\" n'a pas une chasse (largeur) fixe"
 
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr ""
-#~ "E833: %s est chiffr� et cette version de Vim ne supporte pas le "
-#~ "chiffrement"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "Fichier d'�change chiffr� : \"%s\""
+msgid "E473: Internal error"
+msgstr "E473: Erreur interne"
 
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "Si vous avez tap� une nouvelle cl� de chiffrement mais n'avez pas "
-#~ "enregistr� le fichier texte,"
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Erreur interne : %s"
 
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "tapez la nouvelle cl� de chiffrement."
+msgid "Interrupted"
+msgstr "Interrompu"
 
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "Si vous avez �crit le fichier texte apr�s avoir chang� la cl� de "
-#~ "chiffrement, appuyez sur entr�e"
+msgid "E14: Invalid address"
+msgstr "E14: Adresse invalide"
 
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "afin d'utiliser la m�me cl� pour le fichier texte et le fichier d'�change"
+msgid "E474: Invalid argument"
+msgstr "E474: Argument invalide"
 
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr ""
-#~ "Utilisation de la cl� de chiffrement du fichier d'�change pour le fichier "
-#~ "texte.\n"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Argument invalide : %s"
 
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [inutilisable avec cette version de Vim]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "D�tacher ce menu"
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: Expression invalide : %s"
 
-# DB : Les trois messages qui suivent sont des titres de bo�tes
-#      de dialogue par d�faut.
-#~ msgid "Select Directory dialog"
-#~ msgstr "S�lecteur de r�pertoire"
+msgid "E16: Invalid range"
+msgstr "E16: Plage invalide"
 
-#~ msgid "Save File dialog"
-#~ msgstr "Enregistrer un fichier"
+msgid "E476: Invalid command"
+msgstr "E476: Commande invalide"
 
-#~ msgid "Open File dialog"
-#~ msgstr "Ouvrir un fichier"
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" est un r�pertoire"
 
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: D�sol�, pas de s�lecteur de fichiers en mode console"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: L'appel � la biblioth�que a �chou� pour \"%s()\""
 
-#~ msgid "ERROR: "
-#~ msgstr "ERREUR : "
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Impossible de charger la fonction %s de la biblioth�que"
 
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[octets] total allou�-lib�r� %<PRIu64>-%<PRIu64>, utilis� %<PRIu64>, pic "
-#~ "%<PRIu64>\n"
+msgid "E19: Mark has invalid line number"
+msgstr "E19: La marque a un num�ro de ligne invalide"
 
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[appels] total re/malloc() %<PRIu64>, total free() %<PRIu64>\n"
-#~ "\n"
+msgid "E20: Mark not set"
+msgstr "E20: Marque non positionn�e"
 
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: La ligne devient trop longue"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: Impossible de modifier, 'modifiable' est d�sactiv�"
 
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Erreur interne : lalloc(%<PRId64>, )"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: Trop de r�cursion dans les scripts"
 
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Forme de curseur invalide"
+msgid "E23: No alternate file"
+msgstr "E23: Pas de fichier alternatif"
 
-#~ msgid "Warning: Using a weak encryption method; see :help 'cm'"
-#~ msgstr ""
-#~ "Alerte : utilisation d'une m�thode de chiffrage faible ; consultez :help 'cm'"
+msgid "E24: No such abbreviation"
+msgstr "E24: Cette abr�viation n'existe pas"
 
-#~ msgid "Enter encryption key: "
-#~ msgstr "Tapez la cl� de chiffrement : "
+msgid "E477: No ! allowed"
+msgstr "E477: Le ! n'est pas autoris�"
 
-#~ msgid "Enter same key again: "
-#~ msgstr "Tapez la cl� � nouveau : "
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: L'interface graphique n'a pas �t� compil�e dans cette version"
 
-#~ msgid "Keys don't match!"
-#~ msgstr "Les cl�s ne correspondent pas !"
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: Le support de l'h�breu n'a pas �t� compil� dans cette version\n"
 
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Impossible de se connecter � Netbeans n�2"
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: Le support du farsi n'a pas �t� compil� dans cette version\n"
 
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Impossible de se connecter � Netbeans"
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: Le support de l'arabe n'a pas �t� compil� dans cette version\n"
 
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: Mode d'acc�s incorrect au fichier d'infos de connexion NetBeans : "
-#~ "\"%s\""
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: Aucun nom de groupe de surbrillance %s"
 
-# DB : message d'un appel � perror().
-#~ msgid "read from Netbeans socket"
-#~ msgstr "read sur la socket Netbeans"
+msgid "E29: No inserted text yet"
+msgstr "E29: Pas encore de texte ins�r�"
 
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: Connexion NetBeans perdue pour le tampon %<PRId64>"
+msgid "E30: No previous command line"
+msgstr "E30: Aucune ligne de commande pr�c�dente"
 
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: netbeans n'est pas support� avec cette interface graphique"
+msgid "E31: No such mapping"
+msgstr "E31: Mappage inexistant"
 
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: netbeans d�j� connect�"
+msgid "E479: No match"
+msgstr "E479: Aucune correspondance"
 
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s est en lecture seule (ajoutez ! pour passer outre)"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: Aucune correspondance : %s"
 
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: La fonctionnalit� d'�valuation n'est pas disponible"
+msgid "E32: No file name"
+msgstr "E32: Aucun nom de fichier"
 
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "lib�ration de %<PRId64> lignes"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: Aucune expression r�guli�re de substitution pr�c�dente"
 
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: Impossible de modifier term dans l'interface graphique"
+msgid "E34: No previous command"
+msgstr "E34: Aucune commande pr�c�dente"
 
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: Utilisez \":gui\" pour d�marrer l'interface graphique"
+msgid "E35: No previous regular expression"
+msgstr "E35: Aucune expression r�guli�re pr�c�dente"
 
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: Non modifiable dans l'interface graphique GTK+ 2"
+msgid "E481: No range allowed"
+msgstr "E481: Les plages ne sont pas autoris�es"
 
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Police(s) invalide(s)"
+msgid "E36: Not enough room"
+msgstr "E36: Pas assez de place"
 
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: Impossible de s�lectionner un jeu de polices"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: aucun serveur nomm� \"%s\" n'est enregistr�"
 
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Jeu de polices invalide"
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: Impossible de cr�er le fichier %s"
 
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: Impossible de s�lectionner une police � largeur double"
+msgid "E483: Can't get temp file name"
+msgstr "E483: Impossible d'obtenir un nom de fichier temporaire"
 
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Police � largeur double invalide"
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: Impossible d'ouvrir le fichier \"%s\""
 
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: La souris n'est pas support�e"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Impossible de lire le fichier %s"
 
-#~ msgid "cannot open "
-#~ msgstr "impossible d'ouvrir "
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Modifications non enregistr�es (ajoutez ! pour passer outre)"
 
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM : Impossible d'ouvrir la fen�tre !\n"
+msgid "E37: No write since last change"
+msgstr "E37: Modifications non enregistr�es"
 
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Amigados version 2.04 ou ult�rieure est n�cessaire\n"
+msgid "E38: Null argument"
+msgstr "E38: Argument null"
 
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "%s version %<PRId64> est n�cessaire\n"
+msgid "E39: Number expected"
+msgstr "E39: Nombre attendu"
 
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "Impossible d'ouvrir NIL :\n"
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: Impossible d'ouvrir le fichier d'erreurs %s"
 
-#~ msgid "Cannot create "
-#~ msgstr "Impossible de cr�er "
+msgid "E233: cannot open display"
+msgstr "E233: ouverture du display impossible"
 
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim quitte avec %d\n"
+msgid "E41: Out of memory!"
+msgstr "E41: M�moire �puis�e"
 
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "Impossible de modifier le mode de la console ?!\n"
+msgid "Pattern not found"
+msgstr "Motif introuvable"
 
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize : pas une console ?!\n"
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Motif introuvable : %s"
 
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: Impossible d'ex�cuter un shell avec l'option -f"
+msgid "E487: Argument must be positive"
+msgstr "E487: L'argument doit �tre positif"
 
-#~ msgid "Cannot execute "
-#~ msgstr "Impossible d'ex�cuter "
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: Impossible de retourner au r�pertoire pr�c�dent"
 
-#~ msgid "shell "
-#~ msgstr "le shell "
+msgid "E42: No Errors"
+msgstr "E42: Aucune erreur"
 
-#~ msgid " returned\n"
-#~ msgstr " a �t� retourn�\n"
+# DB - TODO : trouver une traduction valable et attest�e pour "location".
+msgid "E776: No location list"
+msgstr "E776: Aucune liste d'emplacements"
 
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE trop petit."
+msgid "E43: Damaged match string"
+msgstr "E43: La cha�ne de recherche est endommag�e"
 
-#~ msgid "I/O ERROR"
-#~ msgstr "ERREUR d'E/S"
+msgid "E44: Corrupted regexp program"
+msgstr "E44: L'automate de regexp est corrompu"
 
-#~ msgid "Message"
-#~ msgstr "Message"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: L'option 'readonly' est activ�e (ajoutez ! pour passer outre)"
 
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr ""
-#~ "'columns' ne vaut pas 80, impossible d'ex�cuter des commandes externes"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: La variable \"%s\" est en lecture seule"
 
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: La s�lection de l'imprimante a �chou�"
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr ""
+"E794: Impossible de modifier une variable depuis le bac � sable : \"%s\""
 
-# DB - Contenu des c-formats : Imprimante puis Port.
-#~ msgid "to %s on %s"
-#~ msgstr "vers %s sur %s"
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Impossible d'utiliser une cl� vide dans un Dictionnaire"
 
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Police d'imprimante inconnue : %s"
+msgid "E715: Dictionary required"
+msgstr "E715: Dictionnaire requis"
 
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: Erreur d'impression : %s"
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: index de Liste hors limites : %ld au-del� de la fin"
 
-#~ msgid "Printing '%s'"
-#~ msgstr "Impression de '%s'"
+# DB : Suggestion
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: La fonction %s a re�u trop d'arguments"
 
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: Jeu de caract�res \"%s\" invalide dans le nom de fonte \"%s\""
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: La cl� %s n'existe pas dans le Dictionnaire"
 
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Caract�re '%c' invalide dans le nom de fonte \"%s\""
+msgid "E714: List required"
+msgstr "E714: Liste requise"
 
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "L'ouverture du display X a pris %<PRId64> ms"
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: L'argument de %s doit �tre une Liste ou un Dictionnaire"
 
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim : R�ception d'une erreur X\n"
+msgid "E47: Error while reading errorfile"
+msgstr "E47: Erreur lors de la lecture du fichier d'erreurs"
 
-#~ msgid "Testing the X display failed"
-#~ msgstr "Le test du display X a �chou�"
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: Op�ration interdite dans le bac � sable"
 
-#~ msgid "Opening the X display timed out"
-#~ msgstr "L'ouverture du display X a d�pass� le d�lai d'attente"
+msgid "E523: Not allowed here"
+msgstr "E523: Interdit � cet endroit"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Impossible d'ex�cuter le shell sh\n"
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Choix du mode d'�cran non support�"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Impossible de cr�er des tuyaux (pipes)\n"
+msgid "E49: Invalid scroll size"
+msgstr "E49: Valeur de d�filement invalide"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Impossible de forker\n"
+msgid "E91: 'shell' option is empty"
+msgstr "E91: L'option 'shell' est vide"
 
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Commande interrompue\n"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Impossible de lire les donn�es du symbole !"
 
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP a perdu la connexion ICE"
+msgid "E72: Close error on swap file"
+msgstr "E72: Erreur lors de la fermeture du fichier d'�change"
 
-#~ msgid "Opening the X display failed"
-#~ msgstr "L'ouverture du display X a �chou�"
+msgid "E73: tag stack empty"
+msgstr "E73: La pile des marqueurs est vide"
 
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP : prise en charge d'une requ�te save-yourself"
+msgid "E74: Command too complex"
+msgstr "E74: Commande trop complexe"
 
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP : ouverture de la connexion"
+msgid "E75: Name too long"
+msgstr "E75: Nom trop long"
 
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP : �chec de la surveillance de connexion ICE"
+msgid "E76: Too many ["
+msgstr "E76: Trop de ["
 
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP : SmcOpenConnection a �chou� : %s"
+msgid "E77: Too many file names"
+msgstr "E77: Trop de noms de fichiers"
 
-#~ msgid "At line"
-#~ msgstr "� la ligne"
+msgid "E488: Trailing characters"
+msgstr "E488: Caract�res surnum�raires"
 
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "Impossible de charger vim32.dll !"
+msgid "E78: Unknown mark"
+msgstr "E78: Marque inconnue"
 
-#~ msgid "VIM Error"
-#~ msgstr "Erreur VIM"
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: Impossible de d�velopper les m�tacaract�res"
 
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "Impossible d'initialiser les pointeurs de fonction vers la DLL !"
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ne peut pas �tre plus petit que 'winminheight'"
 
-#~ msgid "shell returned %d"
-#~ msgstr "le shell a retourn� %d"
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ne peut pas �tre plus petit que 'winminwidth'"
 
-# DB - Les �v�nements en question sont ceux des messages qui suivent.
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim : �v�nement %s intercept�\n"
+msgid "E80: Error while writing"
+msgstr "E80: Erreur lors de l'�criture"
 
-#~ msgid "close"
-#~ msgstr "de fermeture"
+msgid "Zero count"
+msgstr "Le quantificateur est nul"
 
-#~ msgid "logoff"
-#~ msgstr "de d�connexion"
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: <SID> utilis� en dehors d'un script"
 
-#~ msgid "shutdown"
-#~ msgstr "d'arr�t"
+msgid "E449: Invalid expression received"
+msgstr "E449: Expression invalide re�ue"
 
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: Commande introuvable"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Cette zone est verrouill�e et ne peut pas �tre modifi�e"
 
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE est introuvable votre $PATH.\n"
-#~ "Les commandes externes ne feront pas de pause une fois termin�es.\n"
-#~ "Consultez  :help win32-vimrun  pour plus d'informations."
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr ""
+"E744: NetBeans n'autorise pas la modification des fichiers en lecture seule"
 
-#~ msgid "Vim Warning"
-#~ msgstr "Alerte Vim"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: le motif utilise plus de m�moire que 'maxmempattern'"
 
-#~ msgid "Error file"
-#~ msgstr "Fichier d'erreurs"
+msgid "E749: empty buffer"
+msgstr "E749: tampon vide"
 
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr ""
-#~ "E868: Erreur lors de la construction du NFA avec classe d'�quivalence"
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: Le tampon %ld n'existe pas"
 
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr ""
-#~ "E878: (NFA) Impossible d'allouer la m�moire pour parcourir les branches!"
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: D�limiteur ou motif de recherche invalide"
 
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "Alerte : Liste de mots \"%s_%s.spl\" ou \"%s_ascii.spl\" introuvable"
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Le fichier est charg� dans un autre tampon"
 
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "La conversion dans %s non support�e"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: L'option '%s' n'est pas activ�e"
 
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: m�moire insuffisante, liste de mots peut-�tre incompl�te"
+msgid "E850: Invalid register name"
+msgstr "E850: Nom de registre invalide"
 
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Chemin de fichiers de marqueurs tronqu� pour %s\n"
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: R�pertoire introuvable dans '%s' : \"%s\""
 
-#~ msgid "new shell started\n"
-#~ msgstr "nouveau shell d�marr�\n"
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "La recherche a atteint le HAUT, et continue en BAS"
 
-# DB - Message de d�bogage.
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "CUT_BUFFER0 utilis� plut�t qu'une s�lection vide"
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "La recherche a atteint le BAS, et continue en HAUT"
 
-# DB - Question O/N.
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "Annulation impossible ; continuer"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: Fichier non-chiffr� a un fichier d'annulations chiffr� : %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: D�chiffrage du fichier d'annulation a �chou� : %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Le fichier d'annulations est chiffr� : %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version graphique MS-Windows 16/32 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version graphique MS-Windows 64 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version graphique MS-Windows 32 bits"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " lanc�e en mode Win32s"
-
-#~ msgid " with OLE support"
-#~ msgstr " supportant l'OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version console MS-Windows 64 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version console MS-Windows 32 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MS-Windows 16 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MS-DOS 32 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MS-DOS 16 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MaxOS X (unix)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MacOS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MacOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Grosse version "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Version normale "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Petite version "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Version minuscule "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "avec interface graphique GTK2-GNOME."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "avec interface graphique GTK2."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "avec interface graphique X11-Motif."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "avec interface graphique X11-neXtaw."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "avec interface graphique X11-Athena."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "avec interface graphique Photon."
-
-#~ msgid "with GUI."
-#~ msgstr "avec une interface graphique."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "avec interface graphique Carbon."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "avec interface graphique Cocoa."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "avec interface graphique (classic)."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "        fichier gvimrc syst�me : \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "    fichier gvimrc utilisateur : \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "2me fichier gvimrc utilisateur : \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "3me fichier gvimrc utilisateur : \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "          fichier menu syst�me : \""
-
-#~ msgid "Compiler: "
-#~ msgstr "Compilateur : "
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "Besoin de la cl� de chiffrement pour \"%s\""
 
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "menu  Aide->Orphelins            pour plus d'info"
+msgid "empty keys are not allowed"
+msgstr "les cl�s vides ne sont pas autoris�es"
 
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "Les modes sont d�sactiv�s, le texte saisi est ins�r�"
+msgid "dictionary is locked"
+msgstr "dictionnaire est verrouill�"
 
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "menu  �dition->R�glages Globaux->Insertion Permanente"
+msgid "list is locked"
+msgstr "liste verrouill�e"
 
-# DB - todo
-#~ msgid "                              for two modes      "
-#~ msgstr "                                  pour les modes     "
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "l'ajout de cl� '%s' au dictionnaire a �chou�"
 
-# DB - todo
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "menu  �dition->R�glages Globaux->Compatibilit� Vi"
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "index doit �tre int ou slice, et non %s"
 
-# DB - todo
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                                pour d�f. de Vim "
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "attendu instance de str() ou unicode(), mais re�u %s"
 
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "ALERTE: Windows 95/98/ME d�tect�"
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "attendu instance de bytes() ou str(), mais re�u %s"
 
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "tapez  :help windows95<Entr�e>  pour plus d'information"
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr ""
+"attendu int(), long() ou quelque chose qui peut �tre transform� en long(), "
+"mais re�u %s"
 
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: Impossible de charger la biblioth�que %s"
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr ""
+"attendu int() ou quelque chose qui peut �tre transform� en int(), mais re�u "
+"%s"
 
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "D�sol�, commande d�sactiv�e : la biblioth�que Perl n'a pas pu �tre "
-#~ "charg�e."
+msgid "value is too large to fit into C int type"
+msgstr "valeur trop grande pour �tre stock�e dans le type C int"
 
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: �valuation Perl interdite dans bac � sable sans le module Safe"
+msgid "value is too small to fit into C int type"
+msgstr "valeur trop petite pour �tre stock�e dans le type C int"
 
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "�diter dans &plusieurs Vims"
+msgid "number must be greater than zero"
+msgstr "le nombre doit �tre plus grand que z�ro"
 
-#~ msgid "Edit with single &Vim"
-#~ msgstr "�diter dans un seul &Vim"
+msgid "number must be greater or equal to zero"
+msgstr "le nombre doit �tre plus grand ou �gal � z�ro"
 
-#~ msgid "Diff with Vim"
-#~ msgstr "&Comparer avec Vim"
+msgid "can't delete OutputObject attributes"
+msgstr "impossible d'effacer les attributs d'OutputObject"
 
-#~ msgid "Edit with &Vim"
-#~ msgstr "�diter dans &Vim"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "attribut invalide : %s"
 
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "�diter dans le Vim existant - "
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python : Erreur d'initialisation des objets d'E/S"
 
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "�dites le(s) fichier(s) s�lectionn�(s) avec Vim"
+msgid "failed to change directory"
+msgstr "changement de r�pertoire a �chou�"
 
-# DB - MessageBox win32, la longueur n'est pas un probl�me !
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr ""
-#~ "Erreur de cr�ation du processus : v�rifiez que gvim est bien dans votre "
-#~ "chemin !"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "attendu un 3-tuple comme r�sultat de imp.find_module(), mais re�u %s"
 
-#~ msgid "gvimext.dll error"
-#~ msgstr "Erreur de gvimext.dll"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr ""
+"attendu un 3-tuple comme r�sultat de imp.find_module(), mais re�u un tuple "
+"de taille %d"
 
-#~ msgid "Path length too long!"
-#~ msgstr "Le chemin est trop long !"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "erreur interne : imp.find_module a retourn� un tuple contenant NULL"
 
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Jeu de police inconnu : %s"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "impossible d'effacer les attributs de vim.Dictionary"
 
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Police inconnue : %s"
+msgid "cannot modify fixed dictionary"
+msgstr "impossible de modifier un dictionnaire fixe"
 
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: La police \"%s\" n'a pas une chasse (largeur) fixe"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "impossible d'initialiser l'attribut %s"
 
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: Impossible de charger la fonction %s de la biblioth�que"
+msgid "hashtab changed during iteration"
+msgstr "la table de hachage a �t� chang�e pendant une it�ration"
 
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E26: Le support de l'h�breu n'a pas �t� compil� dans cette version\n"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr ""
+"attendu une s�quence d'�l�ments de taille 2, mais re�u une s�quence de "
+"taille %d"
 
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: Le support du farsi n'a pas �t� compil� dans cette version\n"
+msgid "list constructor does not accept keyword arguments"
+msgstr "le constructeur de liste n'accepte pas les arguments nomm�s"
 
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: Le support de l'arabe n'a pas �t� compil� dans cette version\n"
+msgid "list index out of range"
+msgstr "index de liste hors limites"
 
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: aucun serveur nomm� \"%s\" n'est enregistr�"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "erreur interne : acc�s � un �l�ment %d de liste a �chou�"
 
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: ouverture du display impossible"
+msgid "slice step cannot be zero"
+msgstr "le pas du d�coupage en tranche ne peut pas �tre z�ro"
 
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Expression invalide re�ue"
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr ""
+"tentative d'assigner une s�quence de taille plus grande que %d � un "
+"d�coupage en tranche �tendu "
 
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: Cette zone est verrouill�e et ne peut pas �tre modifi�e"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "erreur interne : pas d'�l�ment %d de liste vim"
 
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr ""
-#~ "E744: NetBeans n'autorise pas la modification des fichiers en lecture "
-#~ "seule"
+msgid "internal error: not enough list items"
+msgstr "erreur interne : pas assez d'�l�ments de liste"
 
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "Besoin de la cl� de chiffrement pour \"%s\""
+msgid "internal error: failed to add item to list"
+msgstr "erreur interne : ajout d'�l�ment � la liste a �chou�"
 
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "impossible d'effacer les attributs d'OutputObject"
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr ""
+"tentative d'assigner une s�quence de taille %d � un d�coupage en tranche "
+"�tendu de taille %d"
 
-#~ msgid "invalid attribute"
-#~ msgstr "attribut invalide"
+msgid "failed to add item to list"
+msgstr "ajout � la liste a �chou�"
 
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python : Erreur d'initialisation des objets d'E/S"
+msgid "cannot delete vim.List attributes"
+msgstr "impossible d'effacer les attributs de vim.List"
 
-#~ msgid "empty keys are not allowed"
-#~ msgstr "les cl�s vides ne sont pas autoris�es"
+msgid "cannot modify fixed list"
+msgstr "impossible de modifier une liste fixe"
 
-#~ msgid "Cannot modify fixed dictionary"
-#~ msgstr "Impossible de modifier un dictionnaire fixe"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "la fonction sans nom %s n'existe pas"
 
-#~ msgid "dict is locked"
-#~ msgstr "dictionnaire est verrouill�"
+#, c-format
+msgid "function %s does not exist"
+msgstr "la fonction %s n'existe pas"
 
-#~ msgid "failed to add key to dictionary"
-#~ msgstr "l'ajout de cl� au dictionnaire a �chou�"
+#, c-format
+msgid "failed to run function %s"
+msgstr "ex�cution de la fonction %s a �chou�"
 
-#~ msgid "list index out of range"
-#~ msgstr "index de liste hors limites"
+msgid "unable to get option value"
+msgstr "impossible d'obtenir la valeur d'une option"
 
-#~ msgid "internal error: failed to get vim list item"
-#~ msgstr "erreur interne : acc�s � un �l�ment de liste a �chou�"
+msgid "internal error: unknown option type"
+msgstr "erreur interne : type d'option inconnu"
 
-#~ msgid "list is locked"
-#~ msgstr "liste verrouill�e"
+msgid "problem while switching windows"
+msgstr "probl�me lors du changement de fen�tres"
 
-#~ msgid "Failed to add item to list"
-#~ msgstr "Ajout � la liste a �chou�"
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "impossible de d�sactiver une option globale %s"
 
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "erreur interne : ajout d'�l�ment � la liste a �chou�"
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "impossible de d�sactiver l'option %s qui n'a pas de valeur globale"
 
-#~ msgid "cannot delete vim.dictionary attributes"
-#~ msgstr "impossible d'effacer les attributs de vim.dictionary"
+msgid "attempt to refer to deleted tab page"
+msgstr "tentative de r�f�rencer un onglet effac�"
 
-#~ msgid "cannot modify fixed list"
-#~ msgstr "impossible de modifier une liste fixe"
+msgid "no such tab page"
+msgstr "cet onglet n'existe pas"
 
-#~ msgid "cannot set this attribute"
-#~ msgstr "impossible d'initialiser cet attribut"
+msgid "attempt to refer to deleted window"
+msgstr "tentative de r�f�rencer une fen�tre effac�e"
 
-#~ msgid "failed to run function"
-#~ msgstr "ex�cution de la fonction a �chou�"
+msgid "readonly attribute: buffer"
+msgstr "attribut en lecture seule : tampon"
 
-#~ msgid "unable to unset global option"
-#~ msgstr "impossible de d�sactiver une option globale"
+msgid "cursor position outside buffer"
+msgstr "curseur positionn� en dehors du tampon"
 
-#~ msgid "unable to unset option without global value"
-#~ msgstr "impossible de d�sactiver une option sans une valeur globale"
+msgid "no such window"
+msgstr "Cette fen�tre n'existe pas"
 
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "tentative de r�f�rencer un onglet effac�"
+msgid "attempt to refer to deleted buffer"
+msgstr "tentative de r�f�rencer un tampon effac�"
 
-#~ msgid "no such tab page"
-#~ msgstr "cet onglet n'existe pas"
+msgid "failed to rename buffer"
+msgstr "impossible de renommer le tampon"
 
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "tentative de r�f�rencer une fen�tre effac�e"
+msgid "mark name must be a single character"
+msgstr "le nom de marque doit �tre un seul caract�re"
 
-#~ msgid "readonly attribute"
-#~ msgstr "attribut en lecture seule"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "attendu un objet vim.Buffer, mais re�u %s"
 
-#~ msgid "cursor position outside buffer"
-#~ msgstr "curseur positionn� en dehors du tampon"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "impossible de se d�placer au tampon %d"
 
-#~ msgid "no such window"
-#~ msgstr "Cette fen�tre n'existe pas"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "attendu un objet vim.Window, mais re�u %s"
 
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "tentative de r�f�rencer un tampon effac�"
+msgid "failed to find window in the current tab page"
+msgstr "impossible de trouver une fen�tre dans l'onglet courant"
 
-#~ msgid "expected vim.buffer object"
-#~ msgstr "objet vim.buffer attendu"
+msgid "did not switch to the specified window"
+msgstr "ne s'est pas d�plac� � la fen�tre sp�cifi�e"
 
-#~ msgid "failed to switch to given buffer"
-#~ msgstr "impossible de se d�placer au tampon donn�"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "attendu un objet vim.TabPage, mais re�u %s"
 
-#~ msgid "expected vim.window object"
-#~ msgstr "objet vim.window attendu"
+msgid "did not switch to the specified tab page"
+msgstr "impossible de se d�placer � l'onglet sp�cifi�"
 
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "impossible de trouver une fen�tre dans l'onglet courant"
+msgid "failed to run the code"
+msgstr "ex�cution du code a �chou�"
 
-#~ msgid "did not switch to the specified window"
-#~ msgstr "ne s'est pas d�plac� � la fen�tre sp�cifi�e"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval n'a pas retourn� un objet python valide"
 
-#~ msgid "expected vim.tabpage object"
-#~ msgstr "objet vim.tabpage attendu"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: Conversion d'objet python � une valeur de vim a �chou�"
 
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "impossible de se d�placer � l'onglet sp�cifi�"
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "impossible de convertir %s � un dictionnaire vim"
 
-#~ msgid "failed to run the code"
-#~ msgstr "ex�cution du code a �chou�"
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "impossible de convertir %s � une liste de vim"
 
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: Eval n'a pas retourn� un objet python valide"
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "impossible de convertir %s � une structure de vim"
 
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: Conversion d'objet python � une valeur de vim a �chou�"
+msgid "internal error: NULL reference passed"
+msgstr "erreur interne : r�f�rence NULL pass�e"
 
-#~ msgid "unable to convert to vim structure"
-#~ msgstr "conversion � une structure vim impossible"
+msgid "internal error: invalid value type"
+msgstr "erreur interne : type de valeur invalide"
 
-#~ msgid "NULL reference passed"
-#~ msgstr "r�f�rence NULL pass�e"
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Impossible d'initialiser sys.path_hook qui n'est pas un liste\n"
+"Vous devez maintenant :\n"
+"- ajouter vim.path_hook � sys.path_hooks\n"
+"- ajouter vim.VIM_SPECIAL_PATH � sys.path\n"
 
-#~ msgid "internal error: invalid value type"
-#~ msgstr "erreur interne : type de valeur invalide"
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Impossible d'initialiser le chemin : sys.math n'est pas une liste\n"
+"Vous devez maintenant ajouter vim.VIM_SPECIAL_PATH � sys.path"
diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
index c6425324b1..4b32096f1a 100644
--- a/src/nvim/po/ja.euc-jp.po
+++ b/src/nvim/po/ja.euc-jp.po
@@ -1,3 +1,4 @@
+
 # Japanese translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -14,213 +15,176 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2016-02-01 09:08+0900\n"
+"POT-Creation-Date: 2016-09-10 21:10+0900\n"
+"PO-Revision-Date: 2016-09-10 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "���ץ������ͤϼ����Ǥ��ޤ���"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: bf_key_init() �����ѥ���ɤǸƤӽФ���ޤ���"
 
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "�������顼: ̤�ΤΥ��ץ���󷿤Ǥ�"
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Blowfish�Ź�Υӥå�/��ȥ륨��ǥ����󤬴ְ�äƤ��ޤ�"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: sha256�Υƥ��Ȥ˼��Ԥ��ޤ���"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Blowfish�Ź�Υƥ��Ȥ˼��Ԥ��ޤ���"
 
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[�����������ꥹ��]"
 
-#: ../buffer.c:93
 msgid "[Quickfix List]"
 msgstr "[Quickfix�ꥹ��]"
 
-#: ../buffer.c:94
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: autocommand�����ޥ�ɤ���ߤ�����������ޤ���"
 
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: �Хåե���1�Ĥ�����Ǥ��ʤ��Τ�, ��λ���ޤ�..."
 
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: �Хåե�������Ǥ��ʤ��Τ�, ¾�Τ���Ѥ��ޤ�..."
 
-#: ../buffer.c:763
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: �Хåե�����Ͽ�Ǥ��ޤ���"
+
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: ������ΥХåե��������褦�Ȼ�ߤޤ���"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: �������줿�Хåե��Ϥ���ޤ���"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: ������줿�Хåե��Ϥ���ޤ���"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: �˴����줿�Хåե��Ϥ���ޤ���"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "1 �ĤΥХåե�����������ޤ���"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d �ĤΥХåե�����������ޤ���"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "1 �ĤΥХåե����������ޤ���"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d �ĤΥХåե����������ޤ���"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "1 �ĤΥХåե����˴�����ޤ���"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d �ĤΥХåե����˴�����ޤ���"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: �Ǹ�ΥХåե��ϲ����Ǥ��ޤ���"
 
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: �ѹ����줿�Хåե��Ϥ���ޤ���"
 
 #. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: �ꥹ��ɽ�������Хåե��Ϥ���ޤ���"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: �Хåե� %<PRId64> �Ϥ���ޤ���"
-
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: �Ǹ�ΥХåե���ۤ��ư�ư�ϤǤ��ޤ���"
 
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: �ǽ�ΥХåե�������ؤϰ�ư�Ǥ��ޤ���"
 
-#: ../buffer.c:945
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: �Хåե� %<PRId64> ���ѹ�����¸����Ƥ��ޤ��� (! ���ѹ����˴�)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: �Хåե� %ld ���ѹ�����¸����Ƥ��ޤ��� (! ���ѹ����˴�)"
 
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: �ٹ�: �ե�����̾�Υꥹ�Ȥ�Ĺ�᤮�ޤ�"
 
-#: ../buffer.c:1555 ../quickfix.c:3361
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: �Хåե� %<PRId64> �����Ĥ���ޤ���"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: �Хåե� %ld �����Ĥ���ޤ���"
 
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s ��ʣ���γ���������ޤ���"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s �˳�������Хåե��Ϥ���ޤ���Ǥ���"
 
-#: ../buffer.c:2161
 #, c-format
-msgid "line %<PRId64>"
-msgstr "�� %<PRId64>"
+msgid "line %ld"
+msgstr "�� %ld"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: ����̾���ΥХåե��ϴ��ˤ���ޤ�"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr " [�ѹ�����]"
 
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[̤�Խ�]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[���ե�����]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
 msgstr "[�ɹ����顼]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[����]"
 
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[�ɹ�����]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 �� --%d%%--"
 
-#: ../buffer.c:2526
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> �� --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld �� --%d%%--"
 
-#: ../buffer.c:2530
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "�� %<PRId64> (���� %<PRId64>) --%d%%-- col "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "�� %ld (���� %ld) --%d%%-- col "
 
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
 msgstr "[̵̾]"
 
 #. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "�إ��"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[�إ��]"
 
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[�ץ�ӥ塼]"
 
-#: ../buffer.c:3528
 msgid "All"
 msgstr "����"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "����"
 
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "��Ƭ"
 
-#: ../buffer.c:4244
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -228,11 +192,9 @@ msgstr ""
 "\n"
 "# �Хåե��ꥹ��:\n"
 
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[����]"
 
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -240,200 +202,235 @@ msgstr ""
 "\n"
 "--- ������ ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s ������:"
 
-#: ../buffer.c:4543
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ��=%<PRId64>  ���̻�=%d  ̾��=%s"
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    ��=%ld  ���̻�=%d  ̾��=%s"
 
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: �����󤬤���ޤ���"
+msgid "E902: Cannot connect to port"
+msgstr "E902: �ݡ��Ȥ���³�Ǥ��ޤ���"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: �����ʥ⡼�ɤǤ�"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() ��� gethostbyname() �����Ԥ��ޤ���"
 
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: ���ͤ�ɬ�פǤ�"
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() ��� socket() �����Ԥ��ޤ���"
 
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: �����ʥѡ�����ơ����Ǥ�"
+msgid "E903: received command with non-string argument"
+msgstr "E903: ��ʸ����ΰ����Υ��ޥ�ɤ�������ޤ���"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call �κǸ�ΰ����Ͽ����Ǥʤ���Фʤ�ޤ���"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call ��3���ܤΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: ̤�ΤΥ��ޥ�ɤ�������ޤ���: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): ����³���֤ǽ񤭹��ߤޤ���"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): �񤭹��ߤ˼��Ԥ��ޤ���"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() �˥�����Хå��ϻȤ��ޤ���"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: ���� 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 �����꤬ɬ�פǤ�"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io �Хåե��� in_buf �� in_name �����꤬ɬ�פǤ�"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: �Хåե��������ɤ���Ƥʤ���Фʤ�ޤ���: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: �ե����뤬̤�Τ���ˡ�ǰŹ沽����Ƥ��ޤ�"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "�ٹ�: �夤�Ź���ˡ��ȤäƤ��ޤ�; :help 'cm' �򻲾Ȥ��Ƥ�������"
+
+msgid "Enter encryption key: "
+msgstr "�Ź沽�ѤΥ��������Ϥ��Ƥ�������: "
+
+msgid "Enter same key again: "
+msgstr "�⤦����Ʊ�����������Ϥ��Ƥ�������: "
+
+msgid "Keys don't match!"
+msgstr "���������פ��ޤ���"
+
+msgid "[crypted]"
+msgstr "[�Ź沽]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: ���񷿤˥����󤬤���ޤ���: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: ���񷿤˽�ʣ����������ޤ�: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: ���񷿤˥���ޤ�����ޤ���: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: ���񷿤κǸ�� '}' ������ޤ���: %s"
+
+msgid "extend() argument"
+msgstr "extend() ���"
 
-#: ../diff.c:146
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: %<PRId64> �ʾ�ΥХåե���diff�Ǥ��ޤ���"
+msgid "E737: Key already exists: %s"
+msgstr "E737: �����ϴ���¸�ߤ��ޤ�: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: %ld �ʾ�ΥХåե���diff�Ǥ��ޤ���"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: ����ե�������ɹ��⤷���Ͻ�����Ǥ��ޤ���"
 
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
 msgstr "E97: ��ʬ������Ǥ��ޤ���"
 
-#: ../diff.c:966
+msgid "Patch file"
+msgstr "�ѥå��ե�����"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: patch�ν��Ϥ��ɹ���ޤ���"
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: diff�ν��Ϥ��ɹ���ޤ���"
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: ���ߤΥХåե��Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: ��ʬ�⡼�ɤǤ���¾�ΥХåե����ѹ��Ǥ��ޤ���"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: ��ʬ�⡼�ɤǤ���¾�ΥХåե��Ϥ���ޤ���"
 
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: ��ʬ�⡼�ɤΥХåե���2�İʾ夢��Τǡ��ɤ��Ȥ�������Ǥ��ޤ���"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: �Хåե� \"%s\" �����Ĥ���ޤ���"
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: �Хåե� \"%s\" �Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: ͽ�������Хåե����ѹ��ѹ�����ޤ���"
 
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: �����Escape�ϻ��ѤǤ��ޤ���"
 
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
 msgstr "E544: �����ޥåץե����뤬���Ĥ���ޤ���"
 
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source �Ǽ����ե�����ʳ��Ǥ� :loadkeymap ��Ȥ��ޤ���"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
 msgstr "E791: ���Υ����ޥåץ���ȥ�"
 
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
 msgstr " ��������䴰 (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 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)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
 msgstr " ��(����)�䴰 (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
 msgstr " �ե�����̾�䴰 (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
 msgstr " �����䴰 (^]^N^P)"
 
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
 msgstr " �ѥ��ѥ������䴰 (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
 msgstr " ����䴰 (^D^N^P)"
 
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
 msgstr " �����䴰 (^K^N^P)"
 
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " �������饹�䴰 (^T^N^P)"
 
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
 msgstr " ���ޥ�ɥ饤���䴰 (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
 msgstr " �桼��������䴰 (^U^N^P)"
 
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
 msgstr " ������䴰 (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " �֤꽤������ (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
 msgstr " �ɽꥭ������䴰 (^N^P)"
 
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "����κǸ�˥ҥå�"
 
-#: ../edit.c:101
 msgid "E839: Completion function changed window"
 msgstr "E839: ��ִؿ���������ɥ����ѹ����ޤ���"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
 msgstr "E840: �䴰�ؿ����ƥ����Ȥ������ޤ���"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' ���ץ���󤬶��Ǥ�"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' ���ץ���󤬶��Ǥ�"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "����򥹥������: %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (����) ����������(^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (�ִ�) ���������� (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "���������: %s"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
 msgstr "�����򥹥������."
 
-#: ../edit.c:4519
 msgid " Adding"
 msgstr " �ɲ���"
 
@@ -441,431 +438,161 @@ msgstr " �ɲ���"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- ������..."
 
-#: ../edit.c:4618
 msgid "Back at original"
 msgstr "�Ϥ�����"
 
-#: ../edit.c:4621
 msgid "Word from other line"
 msgstr "¾�ιԤ�ñ��"
 
-#: ../edit.c:4624
 msgid "The only match"
 msgstr "ͣ��γ���"
 
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
 msgstr "%d ���ܤγ��� (������ %d ����)"
 
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
 msgstr "%d ���ܤγ���"
 
-#: ../eval.c:137
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ͽ������ʸ���� :let �ˤ���ޤ���"
 
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: �ꥹ�ȤΥ���ǥå������ϰϳ��Ǥ�: %<PRId64>"
-
-#: ../eval.c:139
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: ̤������ѿ��Ǥ�: %s"
 
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: ']' �����Ĥ���ޤ���"
 
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s �ΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s �ΰ����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: ���񷿤˶��Υ�����Ȥ����ȤϤǤ��ޤ���"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: �ꥹ�ȷ���ɬ�פǤ�"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: ���񷿤�ɬ�פǤ�"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: ���񷿤˥�����¸�ߤ��ޤ���: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �ؿ� %s ������ѤǤ�, ���������ˤ� ! ���ɲä��Ƥ�������"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: ������˥���ȥ꤬����¸�ߤ��ޤ�"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: �ؿ����ȷ����׵ᤵ��ޤ�"
-
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] �򼭽񷿤��Ȥ߹�碌�ƤϻȤ��ޤ���"
 
-#: ../eval.c:154
 #, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: �ۤʤä������ѿ��Ǥ� %s="
 
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ̤�Τδؿ��Ǥ�: %s"
-
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: �������ѿ�̾�Ǥ�: %s"
 
-#: ../eval.c:157
 msgid "E806: using Float as a String"
 msgstr "E806: ��ư����������ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
 msgstr "E687: �������åȤ��ꥹ�ȷ�������Ǥ��⾯�ʤ��Ǥ�"
 
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
 msgstr "E688: �������åȤ��ꥹ�ȷ�������Ǥ���¿���Ǥ�"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
 msgstr "�ꥹ�ȷ����ͤ�2�İʾ�� ; �����Ф���ޤ���"
 
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s ���ͤ����ɽ���Ǥ��ޤ���"
 
-#: ../eval.c:2391
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: �ꥹ�ȷ��ȼ��񷿰ʳ��ϥ���ǥå�������Ǥ��ޤ���"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
 msgstr "E708: [:] �ϺǸ�Ǥʤ���Ф����ޤ���"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
 msgstr "E709: [:] �ˤϥꥹ�ȷ����ͤ�ɬ�פǤ�"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
 msgstr "E710: �ꥹ�ȷ��ѿ��˥������åȤ���¿�����Ǥ�����ޤ�"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: �ꥹ�ȷ��ѿ��˽�ʬ�ʿ������Ǥ�����ޤ���"
 
 #
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for �θ�� \"in\" ������ޤ���"
 
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ���å� '(' ������ޤ���: %s"
-
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �����ѿ��Ϥ���ޤ���: \"%s\""
 
-#: ../eval.c:3333
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: (����)���å�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' �θ�� ':' ������ޤ���"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: �ꥹ�ȷ��ϥꥹ�ȷ��Ȥ�����ӤǤ��ޤ���"
 
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: �ꥹ�ȷ��ˤ�̵�������Ǥ�"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: ���񷿤ϼ��񷿤Ȥ�����ӤǤ��ޤ���"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: ���񷿤ˤ�̵�������Ǥ�"
 
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: �ؿ����ȷ��ϴؿ����ȷ��Ȥ�����ӤǤ��ޤ���"
-
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: �ؿ����ȷ��ˤ�̵�������Ǥ�"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' ����ư�����������Ȥ߹�碌�ƤϻȤ��ޤ���"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: ')' �����Ĥ���ޤ���"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: �ؿ����ȷ��ϥ���ǥå����Ǥ��ޤ���"
 
-#: ../eval.c:4839
+msgid "E909: Cannot index a special variable"
+msgstr "E909: �ü��ѿ��ϥ���ǥå����Ǥ��ޤ���"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: ���ץ����̾������ޤ���: %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: ̤�ΤΥ��ץ����Ǥ�: %s"
 
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: ������ (\") ������ޤ���: %s"
 
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: ������ (') ������ޤ���: %s"
 
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: �ꥹ�ȷ��κǸ�� ']' ������ޤ���: %s"
-
-#: ../eval.c:5807
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "�����٥å����쥯��������ߤ��ޤ���! ���Ȥ��������Τ˥��꤬��­���ޤ���"
 
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: ���񷿤˥����󤬤���ޤ���: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: ���񷿤˽�ʣ����������ޤ�: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: ���񷿤˥���ޤ�����ޤ���: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: ���񷿤κǸ�� '}' ������ޤ���: %s"
-
-#: ../eval.c:6555
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: ɽ������ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �ؿ���̵���ʰ����Ǥ�: %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �ؿ��ΰ�����­��ޤ���: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ������ץȰʳ���<SID>���Ȥ��ޤ���: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: �����Ѵؿ����ƤФ�ޤ��������񤬤���ޤ���: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: ���ͤ���ư����������ɬ�פǤ�"
-
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "add() ���"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: ������¿�᤮�ޤ�"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() �������⡼�ɤǤ������ѤǤ��ޤ���"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: �����ϴ���¸�ߤ��ޤ�: %s"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "extend() ���"
-
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "map() ���"
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "filter() ���"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ��: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: ̤�Τδؿ��Ǥ�: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore() �� inputsave() ����¿���ƤФ�ޤ���"
-
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "insert() ���"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: len() �ˤ�̵���ʷ��Ǥ�"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: ���ȥ饤��(������)�� 0 �Ǥ�"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: ���ϰ��֤���λ���֤�ۤ��ޤ���"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<��>"
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "remove() ���"
-
-# Added at 10-Mar-2004.
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: ����ܥ�å���󥯤�¿�᤮�ޤ� (�۴Ĥ��Ƥ����ǽ��������ޤ�)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "reverse() ���"
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "sort() ���"
-
-#: ../eval.c:13721
-msgid "uniq() argument"
-msgstr "uniq() ���"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: �����Ȥ���Ӵؿ������Ԥ��ޤ���"
-
-#: ../eval.c:13806
-msgid "E882: Uniq compare function failed"
-msgstr "E882: Uniq ����Ӵؿ������Ԥ��ޤ���"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(̵��)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: ����ե���������˥��顼��ȯ�����ޤ���"
-
-#: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
 msgstr "E805: ��ư������������ͤȤ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: �ؿ����ȷ�����ͤȤ��ư��äƤ��ޤ���"
 
-#: ../eval.c:16170
 msgid "E745: Using a List as a Number"
 msgstr "E745: �ꥹ�ȷ�����ͤȤ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16173
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: ���񷿤���ͤȤ��ư��äƤ��ޤ�"
 
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ����֤���ͤȤ��ư��äƤ��ޤ�"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: �����ͥ����ͤȤ��ư��äƤ��ޤ���"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: �ؿ����ȷ�����ư���������Ȥ��ư��äƤ��ޤ���"
 
@@ -878,265 +605,280 @@ msgstr "E893: �ꥹ�ȷ�����ư���������Ȥ��ư��äƤ��ޤ�"
 msgid "E894: Using a Dictionary as a Float"
 msgstr "E894: ���񷿤���ư���������Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16259
+msgid "E907: Using a special value as a Float"
+msgstr "E907: �ü��ͤ���ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ����֤���ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: �����ͥ����ư���������Ȥ��ư��äƤ��ޤ���"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: �ؿ����ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16262
 msgid "E730: using List as a String"
 msgstr "E730: �ꥹ�ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16265
 msgid "E731: using Dictionary as a String"
 msgstr "E731: ���񷿤�ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: �ѿ��η������פ��ޤ���: %s"
+msgid "E908: using an invalid value as a String"
+msgstr "E908: ̵�����ͤ�ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16705
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: �ѿ� %s �����Ǥ��ޤ���"
 
-#: ../eval.c:16724
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: �ؿ����ȷ��ѿ�̾����ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
 
-#: ../eval.c:16732
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: �ѿ�̾����¸�δؿ�̾�Ⱦ��ͤ��ޤ�: %s"
 
-#: ../eval.c:16763
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: �ͤ����å�����Ƥ��ޤ�: %s"
 
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
 msgid "Unknown"
 msgstr "����"
 
-#: ../eval.c:16768
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: %s ���ͤ��ѹ��Ǥ��ޤ���"
 
-#: ../eval.c:16838
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: ���ԡ�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ̤����δؿ��Ǥ�: %s"
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# �������Х��ѿ�:\n"
 
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ������ޤ���: %s"
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t�Ǹ�˥��åȤ���������ץ�: "
 
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: �����Ǥ� g: �ϻȤ��ޤ���"
+msgid "map() argument"
+msgstr "map() ���"
 
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: �����ʰ����Ǥ�: %s"
+msgid "filter() argument"
+msgstr "filter() ���"
 
-#: ../eval.c:17323
 #, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: ����̾����ʣ���Ƥ��ޤ�: %s"
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �ΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
 
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ������ޤ���"
+msgid "E928: String required"
+msgstr "E928: ʸ����ɬ�פǤ�"
 
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: �ؿ�̾���ѿ�̾�Ⱦ��ͤ��ޤ�: %s"
+msgid "E808: Number or Float required"
+msgstr "E808: ���ͤ���ư����������ɬ�פǤ�"
 
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �ؿ� %s �������Ǥ��ޤ���: ������Ǥ�"
+msgid "add() argument"
+msgstr "add() ���"
 
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: �ؿ�̾��������ץȤΥե�����̾�Ȱ��פ��ޤ���: %s"
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() �������⡼�ɤǤ������ѤǤ��ޤ���"
 
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: �ؿ�̾���׵ᤵ��ޤ�"
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "&Ok"
 
-#: ../eval.c:17824
 #, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �ؿ�̾����ʸ���� \"s:\" �ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld ��: "
 
-#: ../eval.c:17833
 #, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: �ؿ�̾�ˤϥ�����ϴޤ���ޤ���: %s"
+msgid "E700: Unknown function: %s"
+msgstr "E700: ̤�Τδؿ��Ǥ�: %s"
 
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �ؿ� %s �����Ǥ��ޤ���: ������Ǥ�"
+msgid "E922: expected a dict"
+msgstr "E922: ���񤬴��Ԥ���Ƥ��ޤ�"
 
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �ؿ��ƽФ�����ҿ��� 'maxfuncdepth' ��Ķ���ޤ���"
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() ���� 2 �����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
 
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "%s ��¹���Ǥ�"
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"����(&O)\n"
+"����󥻥�(&C)"
 
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s �����Ǥ���ޤ���"
+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() �ˤ�̵���ʷ��Ǥ�"
 
-#: ../eval.c:18653
 #, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s �� #%<PRId64> ���֤��ޤ���"
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID �� \":match\" �Τ����ͽ�󤵤�Ƥ��ޤ�: %ld"
+
+msgid "E726: Stride is zero"
+msgstr "E726: ���ȥ饤��(������)�� 0 �Ǥ�"
+
+msgid "E727: Start past end"
+msgstr "E727: ���ϰ��֤���λ���֤�ۤ��ޤ���"
+
+msgid "<empty>"
+msgstr "<��>"
+
+msgid "E240: No connection to Vim server"
+msgstr "E240: Vim �����С��ؤ���³������ޤ���"
 
-#: ../eval.c:18670
 #, c-format
-msgid "%s returning %s"
-msgstr "%s �� %s ���֤��ޤ���"
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s �����뤳�Ȥ��Ǥ��ޤ���"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: �����С��α���������ޤ���"
+
+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: ���饤����Ȥ����뤳�Ȥ��Ǥ��ޤ���"
 
-#: ../eval.c:18691 ../ex_cmds2.c:2695
 #, c-format
-msgid "continuing in %s"
-msgstr "%s �μ¹Ԥ��³��Ǥ�"
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: ̵�������Ǥ�: %s"
 
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: �ؿ����� :return ������ޤ���"
+msgid "sort() argument"
+msgstr "sort() ���"
 
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# �������Х��ѿ�:\n"
+msgid "uniq() argument"
+msgstr "uniq() ���"
 
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
+msgid "E702: Sort compare function failed"
+msgstr "E702: �����Ȥ���Ӵؿ������Ԥ��ޤ���"
 
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "�Ť��ե�����Ϥ���ޤ���"
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq ����Ӵؿ������Ԥ��ޤ���"
+
+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: ̵���ʥ�����Хå������Ǥ�"
 
-#: ../ex_cmds.c:122
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16�ʿ� %02x,  8�ʿ� %03o"
 
-#: ../ex_cmds.c:145
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16�ʿ� %04x, 8�ʿ� %o"
 
-#: ../ex_cmds.c:146
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16�ʿ� %08x, 8�ʿ� %o"
 
-#: ../ex_cmds.c:684
 msgid "E134: Move lines into themselves"
 msgstr "E134: �Ԥ򤽤켫�Ȥˤϰ�ư�Ǥ��ޤ���"
 
-#: ../ex_cmds.c:747
 msgid "1 line moved"
 msgstr "1 �Ԥ���ư����ޤ���"
 
-#: ../ex_cmds.c:749
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> �Ԥ���ư����ޤ���"
+msgid "%ld lines moved"
+msgstr "%ld �Ԥ���ư����ޤ���"
 
-#: ../ex_cmds.c:1175
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> �Ԥ��ե��륿��������ޤ���"
+msgid "%ld lines filtered"
+msgstr "%ld �Ԥ��ե��륿��������ޤ���"
 
-#: ../ex_cmds.c:1194
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *�ե��륿* autocommand�ϸ��ߤΥХåե����ѹ����ƤϤ����ޤ���"
 
-#: ../ex_cmds.c:1244
 msgid "[No write since last change]\n"
 msgstr "[�Ǹ���ѹ�����¸����Ƥ��ޤ���]\n"
 
-#: ../ex_cmds.c:1424
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s ����: "
 
-#: ../ex_cmds.c:1431
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: ���顼��¿�᤮��Τ�, �ʹߤϥ����åפ��ޤ�"
 
-#: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfo�ե����� \"%s\"%s%s%s ���ɹ�����"
 
-#: ../ex_cmds.c:1460
 msgid " info"
 msgstr " ����"
 
-#: ../ex_cmds.c:1461
 msgid " marks"
 msgstr " �ޡ���"
 
-#: ../ex_cmds.c:1462
 msgid " oldfiles"
 msgstr " ��ե����뷲"
 
-#: ../ex_cmds.c:1463
 msgid " FAILED"
 msgstr " ����"
 
 #. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfo�ե����뤬����ߤǤ��ޤ���: %s"
 
-#: ../ex_cmds.c:1626
+#, 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 ����¸�Ǥ��ޤ���!"
 
-#: ../ex_cmds.c:1635
 #, 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 ��̾���ѹ��Ǥ��ޤ���!"
+
 #. Write the info:
-#: ../ex_cmds.c:1720
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# ���� viminfo �ե������ Vim %s �ˤ�ä���������ޤ���.\n"
 
-#: ../ex_cmds.c:1722
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -1144,47 +886,47 @@ msgstr ""
 "# �ѹ�����ݤˤϽ�ʬ���դ��Ƥ�������!\n"
 "\n"
 
-#: ../ex_cmds.c:1723
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# ���Υե����뤬�񤫤줿���� 'encoding' ����\n"
 
-#: ../ex_cmds.c:1800
 msgid "Illegal starting char"
 msgstr "��������Ƭʸ���Ǥ�"
 
-#: ../ex_cmds.c:2162
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' �ǻϤޤ�ԤΡ�ʸ���̤�Υ��ԡ�:\n"
+
+msgid "Save As"
+msgstr "��̾����¸"
+
 msgid "Write partial file?"
 msgstr "�ե��������ʬŪ����¸���ޤ���?"
 
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: �Хåե�����ʬŪ����¸����ˤ� ! ��ȤäƤ�������"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "��¸�Υե����� \"%s\" ���񤭤��ޤ���?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "����åץե����� \"%s\" ��¸�ߤ��ޤ�. ��񤭤������ޤ���?"
 
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: ����åץե����뤬¸�ߤ��ޤ�: %s (:silent! ���ɲäǾ��)"
 
-#: ../ex_cmds.c:2381
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: �Хåե� %<PRId64> �ˤ�̾��������ޤ���"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: �Хåե� %ld �ˤ�̾��������ޤ���"
 
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: �ե��������¸����ޤ���Ǥ���: 'write' ���ץ����ˤ��̵���Ǥ�"
 
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1193,7 +935,6 @@ msgstr ""
 "\"%s\" �ˤ� 'readonly' ���ץ�������ꤵ��Ƥ��ޤ�.\n"
 "��񤭶����򤷤ޤ���?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1204,83 +945,68 @@ msgstr ""
 "����Ǥⶲ�餯�񤭹��ळ�Ȥϲ�ǽ�Ǥ�.\n"
 "��³���ޤ���?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" ���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
 
-#: ../ex_cmds.c:3120
+msgid "Edit File"
+msgstr "�ե�������Խ�"
+
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommand��ͽ�������������Хåե� %s �������ޤ���"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: ���ǤϤʤ������� :z ���Ϥ���ޤ���"
 
-#: ../ex_cmds.c:3404
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim�Ǥϥ����륳�ޥ�ɤ�Ȥ��ޤ���"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: ����ɽ����ʸ���Ƕ��ڤ뤳�Ȥ��Ǥ��ޤ���"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s ���ִ����ޤ���? (y/n/a/q/l/^E/^Y)"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(����ޤ�ޤ���) "
 
-#: ../ex_cmds.c:4384
 msgid "1 match"
 msgstr "1 �ս곺�����ޤ���"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "1 �ս��ִ����ޤ���"
 
-#: ../ex_cmds.c:4387
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> �ս곺�����ޤ���"
+msgid "%ld matches"
+msgstr "%ld �ս곺�����ޤ���"
 
-#: ../ex_cmds.c:4388
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> �ս��ִ����ޤ���"
+msgid "%ld substitutions"
+msgstr "%ld �ս��ִ����ޤ���"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
 msgstr " (�� 1 ����)"
 
-#: ../ex_cmds.c:4395
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " (�� %<PRId64> ����)"
+msgid " on %ld lines"
+msgstr " (�� %ld ����)"
 
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global ��Ƶ�Ū�ˤϻȤ��ޤ���"
 
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
 msgstr "E148: global���ޥ�ɤ�����ɽ�������ꤵ��Ƥ��ޤ���"
 
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "�ѥ��������ƤιԤǸ��Ĥ���ޤ���: %s"
 
-#: ../ex_cmds.c:4510
 #, c-format
 msgid "Pattern not found: %s"
 msgstr "�ѥ�����ϸ��Ĥ���ޤ���Ǥ���: %s"
 
-#: ../ex_cmds.c:4587
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1290,110 +1016,102 @@ msgstr ""
 "# �Ǹ���ִ����줿ʸ����:\n"
 "$"
 
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
 msgstr "E478: ���Ƥʤ��Ǥ�������"
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: ��ǰ�Ǥ��� '%s' �Υإ�פ� %s �ˤϤ���ޤ���"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: ��ǰ�Ǥ��� %s �ˤϥإ�פ�����ޤ���"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "��ǰ�Ǥ����إ�ץե����� \"%s\" �����Ĥ���ޤ���"
 
-#: ../ex_cmds.c:5323
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: �ǥ��쥯�ȥ�ǤϤ���ޤ���: %s"
+msgid "E151: No match: %s"
+msgstr "E151: �ޥå��Ϥ���ޤ���: %s"
 
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: ������Ѥ� %s �򳫤��ޤ���"
 
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: �ɹ��Ѥ� %s �򳫤��ޤ���"
 
 # Added at 29-Apr-2004.
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1�Ĥθ���Υإ�ץե������ʣ���Υ��󥳡��ɤ����ߤ��Ƥ��ޤ�: %s"
 
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: ���� \"%s\" ���ե����� %s/%s �˽�ʣ���Ƥ��ޤ�"
 
-#: ../ex_cmds.c:5687
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: �ǥ��쥯�ȥ�ǤϤ���ޤ���: %s"
+
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ̤�Τ�sign���ޥ�ɤǤ�: %s"
 
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: sign̾������ޤ���"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
 msgstr "E612: sign�������¿�����Ĥ���ޤ���"
 
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: ̵����sign�Υƥ����ȤǤ�: %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: ̤�Τ�sign�Ǥ�: %s"
 
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: sign���ֹ椬����ޤ���"
 
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵���ʥХåե�̾�Ǥ�: %s"
 
-#: ../ex_cmds.c:6008
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: ̾����̵���Хåե��ؤϥ����פǤ��ޤ���"
+
 #, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: ̵����sign���̻ҤǤ�: %<PRId64>"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: ̵����sign���̻ҤǤ�: %ld"
 
 #, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: �ѹ��Ǥ��ʤ� sign �Ǥ�: %s"
 
-#: ../ex_cmds.c:6066
+# Added at 27-Jan-2004.
+msgid " (NOT FOUND)"
+msgstr " (���Ĥ���ޤ���)"
+
 msgid " (not supported)"
 msgstr " (�󥵥ݡ���)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[�����]"
 
-#: ../ex_cmds2.c:139
+msgid "No old files"
+msgstr "�Ť��ե�����Ϥ���ޤ���"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "�ǥХå��⡼�ɤ�����ޤ�. ³����ˤ� \"cont\" �����Ϥ��Ƥ�������."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "�� %<PRId64>: %s"
+msgid "line %ld: %s"
+msgstr "�� %ld: %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "���ޥ��: %s"
@@ -1405,232 +1123,184 @@ msgstr "�ե졼�ब 0 �Ǥ�"
 msgid "frame at highest level: %d"
 msgstr "�ǹ��٥�Υե졼��: %d"
 
-#: ../ex_cmds2.c:322
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "�֥졼���ݥ���� \"%s%s\" �� %<PRId64>"
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "�֥졼���ݥ���� \"%s%s\" �� %ld"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: �֥졼���ݥ���Ȥ����Ĥ���ޤ���: %s"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "�֥졼���ݥ���Ȥ��������Ƥ��ޤ���"
 
-#: ../ex_cmds2.c:617
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  �� %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  �� %ld"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: ���� \":profile start {fname}\" ��¹Ԥ��Ƥ�������"
 
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "�ѹ��� \"%s\" ����¸���ޤ���?"
 
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
 msgstr "̵��"
 
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: �Хåե� \"%s\" ���ѹ�����¸����Ƥ��ޤ���"
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "�ٹ�: ͽ������¾�Хåե��ذ�ư���ޤ��� (autocommands ��Ĵ�٤Ƥ�������)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: �Խ�����ե������1�Ĥ�������ޤ���"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
 msgstr "E164: �ǽ�Υե����������ˤϹԤ��ޤ���"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: �Ǹ�Υե������ۤ��Ƹ�ˤϹԤ��ޤ���"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: ���Υ���ѥ���ˤ��б����Ƥ��ޤ���: %s"
 
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" �� \"%s\" ���鸡����"
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" �򸡺���"
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' ����ˤϸ��Ĥ���ޤ���: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' ����ˤϤ���ޤ���: \"%s\""
+
+msgid "Source Vim script"
+msgstr "Vim������ץȤμ����"
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "�ǥ��쥯�ȥ�ϼ����ޤ���: \"%s\""
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" ������ޤ���"
 
-#: ../ex_cmds2.c:2520
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "�� %<PRId64>: \"%s\" ������ޤ���"
+msgid "line %ld: could not source \"%s\""
+msgstr "�� %ld: \"%s\" ������ޤ���"
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" ������"
 
-#: ../ex_cmds2.c:2537
 #, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "�� %<PRId64>: %s ������"
+msgid "line %ld: sourcing \"%s\""
+msgstr "�� %ld: %s ������"
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s �μ����λ"
 
-#: ../ex_cmds2.c:2765
+#, c-format
+msgid "continuing in %s"
+msgstr "%s �μ¹Ԥ��³��Ǥ�"
+
 msgid "modeline"
 msgstr "�⡼�ɹ�"
 
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "--cmd ����"
 
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "-c ����"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
 msgstr "�Ķ��ѿ�"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
 msgstr "���顼�ϥ�ɥ�"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: �ٹ�: �Զ��ڤ������Ǥ�. ^M ���ʤ��ΤǤ��礦"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding �����������ץȰʳ��ǻ��Ѥ���ޤ���"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish �����������ץȰʳ��ǻ��Ѥ���ޤ���"
 
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "���ߤ� %s����: \"%s\""
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: ����� \"%s\" ������Ǥ��ޤ���"
 
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr ""
 "Ex�⡼�ɤ�����ޤ�. �Ρ��ޥ�⡼�ɤ����ˤ�\"visual\"�����Ϥ��Ƥ�������."
 
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: �ե�����ν�λ����"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: ���ޥ�ɤ��Ƶ�Ū�᤮�ޤ�"
 
-#: ../ex_docmd.c:1006
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: �㳰����ª����ޤ���Ǥ���: %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "����ե�����κǸ�Ǥ�"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "�ؿ��κǸ�Ǥ�"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: �桼����������ޥ�ɤΤ����ޤ��ʻ��ѤǤ�"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: ���ǥ����Υ��ޥ�ɤǤϤ���ޤ���"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: �դ��ޤ��ϰϤ����ꤵ��ޤ���"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
 msgstr "�դ��ޤ��ϰϤ����ꤵ��ޤ���, ���ؤ��ޤ���?"
 
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
 msgstr "E494: w �⤷���� w>> ����Ѥ��Ƥ�������"
 
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ���ΥС������ǤϤ��Υ��ޥ�ɤ����ѤǤ��ޤ���, �����ʤ���"
 
-#: ../ex_docmd.c:3752
 msgid "E172: Only one file name allowed"
 msgstr "E172: �ե�����̾�� 1 �Ĥˤ��Ƥ�������"
 
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "�Խ����٤��ե����뤬 1 �Ĥ���ޤ���, ��λ���ޤ���?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "�Խ����٤��ե����뤬���� %d �Ĥ���ޤ���, ��λ���ޤ���?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
 msgstr "E173: �Խ����٤��ե����뤬 1 �Ĥ���ޤ�"
 
-#: ../ex_docmd.c:4250
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: �Խ����٤��ե����뤬���� %<PRId64> �Ĥ���ޤ�"
+msgid "E173: %ld more files to edit"
+msgstr "E173: �Խ����٤��ե����뤬���� %ld �Ĥ���ޤ�"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: ���ޥ�ɤ����ˤ���ޤ�: ���������ˤ� ! ���ɲä��Ƥ�������"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
 "    Name        Args       Address   Complete  Definition"
@@ -1638,51 +1308,40 @@ msgstr ""
 "\n"
 "    ̾��        ����       ���ɥ쥹  �䴰      ���"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
 msgstr "�桼����������ޥ�ɤ����Ĥ���ޤ���Ǥ���"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
 msgstr "E175: °�����������Ƥ��ޤ���"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
 msgstr "E176: �����ο���̵���Ǥ�"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: ������Ȥ�2�Ż��ꤹ�뤳�ȤϤǤ��ޤ���"
 
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
 msgstr "E178: ������Ȥξ�ά�ͤ�̵���Ǥ�"
 
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: -complete �ˤϰ�����ɬ�פǤ�"
 
 msgid "E179: argument required for -addr"
 msgstr "E179: -addr �ˤϰ�����ɬ�פǤ�"
 
-#: ../ex_docmd.c:4635
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: ̵����°���Ǥ�: %s"
 
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: ̵���ʥ��ޥ��̾�Ǥ�"
 
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: �桼��������ޥ�ɤϱ���ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���"
+msgstr "E183: �桼����������ޥ�ɤϱ���ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���"
 
-#: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr "E841: ͽ��̾�ʤΤ�, �桼����������ޥ�ɤ����ѤǤ��ޤ���"
 
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: ���Υ桼����������ޥ�ɤϤ���ޤ���: %s"
@@ -1691,293 +1350,261 @@ msgstr "E184: ���Υ桼����������ޥ�ɤϤ���ޤ���: %s"
 msgid "E180: Invalid address type value: %s"
 msgstr "E180: ̵���ʥ��ɥ쥹�������ͤǤ�: %s"
 
-#: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: ̵�����䴰����Ǥ�: %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: �䴰�����ϥ��������䴰�Ǥ������ѤǤ��ޤ���"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: ���������䴰�ˤϰ����Ȥ��ƴؿ���ɬ�פǤ�"
 
-#: ../ex_docmd.c:5257
+msgid "unknown"
+msgstr "����"
+
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: ���顼�������� '%s' �����Ĥ���ޤ���"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
 msgstr "Vim �Ȥ����󡢤䤢!"
 
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
 msgstr "E784: �Ǹ�Υ��֥ڡ������Ĥ��뤳�ȤϤǤ��ޤ���"
 
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
 msgstr "���˥��֥ڡ�����1�Ĥ�������ޤ���"
 
-#: ../ex_docmd.c:6004
+msgid "Edit File in new window"
+msgstr "������������ɥ��ǥե�������Խ����ޤ�"
+
 #, c-format
 msgid "Tab page %d"
 msgstr "���֥ڡ��� %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "����åץե����뤬����ޤ���"
 
-#: ../ex_docmd.c:6478
+msgid "Append File"
+msgstr "�ɲåե�����"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: �Хåե�����������Ƥ���Τ�, �ǥ��쥯�ȥ���ѹ��Ǥ��ޤ��� (! ���ɲä�"
 "���)"
 
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
 msgstr "E186: ���Υǥ��쥯�ȥ�Ϥ���ޤ���"
 
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: ̤��"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize �ˤ�2�Ĥο��ͤΰ�����ɬ�פǤ�"
 
-#: ../ex_docmd.c:6655
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "������ɥ�����: X %d, Y %d"
+
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: ���Υץ�åȥۡ���ˤϥ�����ɥ����֤μ�����ǽ�ϼ�������Ƥ��ޤ���"
 
-#: ../ex_docmd.c:6662
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos �ˤ�2�Ĥο��ͤΰ�����ɬ�פǤ�"
 
-#: ../ex_docmd.c:7241
+msgid "E930: Cannot use :redir inside execute()"
+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"
 
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" ��¸�ߤ��ޤ� (��񤹤�ˤ� ! ���ɲä��Ƥ�������)"
 
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: \"%s\" �������ѤȤ��Ƴ����ޤ���"
 
 #. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: ������1ʸ���αѻ��������� (' �� `) �Ǥʤ���Ф����ޤ���"
 
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal �κƵ����Ѥ������ʤ�᤮�ޤ���"
 
-#: ../ex_docmd.c:7807
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: #< �� +eval ��ǽ��̵�������ѤǤ��ޤ���"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: '#'���֤����������ե������̾��������ޤ���"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: \"<afile>\"���֤�������autocommand�Υե�����̾������ޤ���"
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: \"<abuf>\"���֤�������autocommand�Хåե��ֹ椬����ޤ���"
 
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: \"<amatch>\"���֤�������autocommand�γ���̾������ޤ���"
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: \"<sfile>\"���֤������� :source �оݥե�����̾������ޤ���"
 
-#: ../ex_docmd.c:7876
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: \"<slnum>\"���֤���������ֹ椬����ޤ���"
 
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
+#, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: '%' �� '#' ��̵̾�ե�����ʤΤ� \":p:h\" ��ȼ��ʤ��Ȥ����ϤǤ��ޤ���"
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: ��ʸ����Ȥ���ɾ������ޤ���"
 
-#: ../ex_docmd.c:8838
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfo�ե�������ɹ��ѤȤ��Ƴ����ޤ���"
 
-#: ../ex_eval.c:464
+msgid "E196: No digraphs in this version"
+msgstr "E196: ���ΥС������˹���Ϥ���ޤ���"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' �ǻϤޤ��㳰�� :throw �Ǥ��ޤ���"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "�㳰��ȯ�����ޤ���: %s"
 
-#: ../ex_eval.c:545
 #, c-format
 msgid "Exception finished: %s"
 msgstr "�㳰����«���ޤ���: %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "�㳰���˴�����ޤ���: %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, �� %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, �� %ld"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "�㳰����ª����ޤ���: %s"
 
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "%s �ˤ��̤������֤������ޤ���"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "%s ���Ƴ����ޤ���"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "%s ���˴�����ޤ���"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "�㳰"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "���顼�ȳ����"
 
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "���顼"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "�����"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if ������Ҥ����᤮�ޤ�"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: :if �Τʤ� :endif ������ޤ�"
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: :if �Τʤ� :else ������ޤ�"
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: :if �Τʤ� :elseif ������ޤ�"
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: ʣ���� :else ������ޤ�"
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
 msgstr "E584: :else �θ�� :elseif ������ޤ�"
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: :while �� :for ������Ҥ����᤮�ޤ�"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :while �� :for �Τʤ� :continue ������ޤ�"
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: :while �� :for �Τʤ� :break ������ޤ�"
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: :endfor �� :while ���Ȥ߹�碌�Ƥ��ޤ�"
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: :endwhile �� :for ���Ȥ߹�碌�Ƥ��ޤ�"
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try ������Ҥ����᤮�ޤ�"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: :try �Τʤ� :catch ������ޤ�"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally �θ�� :catch ������ޤ�"
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: :try �Τʤ� :finally ������ޤ�"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: ʣ���� :finally ������ޤ�"
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: :try �Τʤ� :endtry �Ǥ�"
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: �ؿ��γ��� :endfunction ������ޤ���"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: ���ߤ�¾�ΥХåե����Խ����뤳�Ȥϵ�����ޤ���"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: ���ߤϥХåե�������ѹ����뤳�Ȥϵ�����ޤ���"
 
-#: ../ex_getln.c:3178
 msgid "tagname"
 msgstr "����̾"
 
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " �ե��������\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "���ץ���� 'history' �������Ǥ�"
 
-#: ../ex_getln.c:5046
 #, c-format
 msgid ""
 "\n"
@@ -1986,303 +1613,224 @@ msgstr ""
 "\n"
 "# %s ���ܤ����� (��������Τ���Ť���Τ�):\n"
 
-#: ../ex_getln.c:5047
 msgid "Command Line"
 msgstr "���ޥ�ɥ饤��"
 
-#: ../ex_getln.c:5048
 msgid "Search String"
 msgstr "����ʸ����"
 
-#: ../ex_getln.c:5049
 msgid "Expression"
 msgstr "��"
 
-#: ../ex_getln.c:5050
 msgid "Input Line"
 msgstr "���Ϲ�"
 
-#: ../ex_getln.c:5117
+msgid "Debug Line"
+msgstr "�ǥХå���"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar �����ޥ��Ĺ��Ķ���ޤ���"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: �����ƥ��֤ʥ�����ɥ����Хåե����������ޤ���"
 
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: �ѥ���Ĺ�᤮���䴰�Ǥ��ޤ���"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: ̵���ʥѥ��Ǥ�: '**[����]' ��path�κǸ夫 '%s' ��³���Ƥʤ��Ȥ����ޤ�"
-"��."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpath�ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: �ѥ��ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
-
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: autocommand���Хåե����Хåե�̾���ѹ����ޤ���"
 
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "�����ʥե�����̾"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "�ϥǥ��쥯�ȥ�Ǥ�"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "�ϥե�����ǤϤ���ޤ���"
 
-#: ../fileio.c:508 ../fileio.c:3522
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "�ϥǥХ����Ǥ� ('opendevice' ���ץ����Dz���Ǥ��ޤ�)"
+
 msgid "[New File]"
 msgstr "[���ե�����]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[�����ǥ��쥯�ȥ�]"
 
-#: ../fileio.c:529 ../fileio.c:532
 msgid "[File too big]"
 msgstr "[�ե��������]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[���¤�����ޤ���]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre autocommand ���ե�������ɹ��ԲĤˤ��ޤ���"
 
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre autocommand �ϸ��ߤΥХåե����Ѥ����ޤ���"
 
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: ɸ�����Ϥ����ɹ���...\n"
 
+msgid "Reading from stdin..."
+msgstr "ɸ�����Ϥ����ɹ�����..."
+
 #. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: �Ѵ����ե�������ɹ��ԲĤˤ��ޤ���"
 
-#. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[FIFO/�����å�]"
 
-#. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[FIFO]"
 
-#. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[�����å�]"
 
-#. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[����饯�����ǥХ���]"
 
-#: ../fileio.c:1815
 msgid "[CR missing]"
 msgstr "[CR̵]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
 msgstr "[Ĺ��ʬ��]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[̤�Ѵ�]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[�Ѵ���]"
 
-#: ../fileio.c:1831
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[%<PRId64> ���ܤ��Ѵ����顼]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[%ld ���ܤ��Ѵ����顼]"
 
-#: ../fileio.c:1835
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[%<PRId64> ���ܤ������ʥХ���]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[%ld ���ܤ������ʥХ���]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
 msgstr "[�ɹ����顼]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
 msgstr "�Ѵ���ɬ�פʰ���ե����뤬���Ĥ���ޤ���"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' �ˤ���Ѵ������Ԥ��ޤ���"
 
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' �ν��Ϥ��ɹ���ޤ���Ǥ���"
 
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: acwrite�Хåե��γ�������autocommand��¸�ߤ��ޤ���"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: ��¸����Хåե���autocommand��������������ޤ���"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: autocommand��ͽ��������ˡ�ǹԿ����ѹ����ޤ���"
 
-#: ../fileio.c:2548 ../fileio.c:2565
+# 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 "�ϥե�����Ǥ����߲�ǽ�ǥХ����Ǥ⤢��ޤ���"
 
-#: ../fileio.c:2601
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "'opendevice' ���ץ����ˤ��ǥХ����ؤν񤭹��ߤϤǤ��ޤ���"
+
 msgid "is read-only (add ! to override)"
 msgstr "���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: �Хå����åץե��������¸�Ǥ��ޤ��� (! ���ɲäǶ�����¸)"
 
-#: ../fileio.c:2898
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: �Хå����åץե�������Ĥ���ݤ˥��顼��ȯ�����ޤ��� (! ���ɲäǶ���)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: �Хå����å��ѥե�������ɹ���ޤ��� (! ���ɲäǶ����ɹ�)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: �Хå����åץե��������ޤ��� (! ���ɲäǶ�������)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: �Хå����åץե��������ޤ��� (! ���ɲäǶ�������)"
 
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: �꥽�����ե������������뤫�⤷��ޤ��� (! ���ɲäǶ���)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: ��¸�Ѱ���ե����뤬���Ĥ���ޤ���"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: �Ѵ��Ǥ��ޤ��� (! ���ɲä��Ѵ���������¸)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: ��󥯤��줿�ե�����˽����ޤ���"
 
-#: ../fileio.c:3173
 msgid "E212: Can't open file for writing"
 msgstr "E212: ������Ѥ˥ե�����򳫤��ޤ���"
 
-#: ../fileio.c:3363
 msgid "E667: Fsync failed"
 msgstr "E667: fsync �˼��Ԥ��ޤ���"
 
-#: ../fileio.c:3398
 msgid "E512: Close failed"
 msgstr "E512: �Ĥ��뤳�Ȥ˼���"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr "E513: ����ߥ��顼, �Ѵ����� (��񤹤�ˤ� 'fenc' ����ˤ��Ƥ�������)"
 
-#: ../fileio.c:3441
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: ����ߥ��顼, �Ѵ�����, �Կ� %<PRId64> (��񤹤�ˤ� 'fenc' ����ˤ���"
-"��������)"
+"E513: ����ߥ��顼, �Ѵ�����, �Կ� %ld (��񤹤�ˤ� 'fenc' ����ˤ��Ƥ�����"
+"��)"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
 msgstr "E514: ����ߥ��顼, (�ե����륷���ƥब����?)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " �Ѵ����顼"
 
-#: ../fileio.c:3509
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " �� %<PRId64>;"
+msgid " in line %ld;"
+msgstr " �� %ld;"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[�ǥХ���]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[��]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr " [a]"
 
-#: ../fileio.c:3535
 msgid " appended"
 msgstr " �ɲ�"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr " [w]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " �����"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: patchmode: ���ܥե��������¸�Ǥ��ޤ���"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: ���θ��ܥե������touch�Ǥ��ޤ���"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: �Хå����åץե������ä��ޤ���"
 
-#: ../fileio.c:3672
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2290,134 +1838,105 @@ msgstr ""
 "\n"
 "�ٹ�: ���ܥե����뤬����줿���ѹ�����ޤ���\n"
 
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "�ե��������¸����������ޤǥ��ǥ�����λ���ʤ��Ǥ�������!"
 
-#: ../fileio.c:3795
 msgid "[dos]"
 msgstr "[dos]"
 
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[dos�ե����ޥå�]"
 
-#: ../fileio.c:3801
 msgid "[mac]"
 msgstr "[mac]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[mac�ե����ޥå�]"
 
-#: ../fileio.c:3807
 msgid "[unix]"
 msgstr "[unix]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[unix�ե����ޥå�]"
 
-#: ../fileio.c:3831
 msgid "1 line, "
 msgstr "1 ��, "
 
-#: ../fileio.c:3833
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> ��, "
+msgid "%ld lines, "
+msgstr "%ld ��, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "1 ʸ��"
 
-#: ../fileio.c:3838
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> ʸ��"
+msgid "%lld characters"
+msgstr "%lld ʸ��"
 
-#: ../fileio.c:3849
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[�ǽ��Ԥ��Դ���]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "�ٹ�: �ɹ������˥ե�������ѹ�������ޤ���!!!"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "�����˾�񤭤��ޤ���"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" ��������Υ��顼�Ǥ�"
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: \"%s\" ���Ĥ�����˥��顼�Ǥ�"
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: \"%s\" ���ɹ���Υ��顼�Ǥ�"
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: autocommand �� FileChangedShell ���Хåե��������ޤ���"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: �ե����� \"%s\" �ϴ���¸�ߤ��ޤ���"
 
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: �ٹ�: �ե����� \"%s\" ���ѹ�����Vim�ΥХåե����ѹ�����ޤ���"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
 msgstr "�ܺ٤� \":help W12\" �򻲾Ȥ��Ƥ�������"
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: �ٹ�: �ե����� \"%s\" ���Խ����ϸ���ѹ�����ޤ���"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
 msgstr "�ܺ٤� \":help W11\" �򻲾Ȥ��Ƥ�������"
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: �ٹ�: �ե����� \"%s\" �Υ⡼�ɤ��Խ����ϸ���ѹ�����ޤ���"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
 msgstr "�ܺ٤� \":help W16\" �򻲾Ȥ��Ƥ�������"
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: �ٹ�: �ե����� \"%s\" ���Խ����ϸ�˺�������ޤ���"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "�ٹ�"
 
-#: ../fileio.c:4948
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2425,48 +1944,45 @@ msgstr ""
 "&OK\n"
 "�ե������ɹ�(&L)"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: \"%s\" �������ɤ���������Ǥ��ޤ���Ǥ���"
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" �ϥ�����ɤǤ��ޤ���Ǥ���"
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--�����--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <�Хåե�=%d> ����ưŪ�˺������ޤ�"
 
 #. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ���Υ��롼�פϤ���ޤ���: \"%s\""
 
-#: ../fileio.c:5897
+msgid "E936: Cannot delete the current group"
+msgstr "E936: ���ߤΥ��롼�פϺ���Ǥ��ޤ���"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: ������� augroup ��ä����Ȥ��Ƥ��ޤ�"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * �θ��������ʸ��������ޤ���: %s"
 
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: ���Τ褦�ʥ��٥�ȤϤ���ޤ���: %s"
 
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: ���Τ褦�ʥ��롼�פ⤷���ϥ��٥�ȤϤ���ޤ���: %s"
 
 #. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2474,756 +1990,555 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <�Хåե�=%d>: ̵���ʥХåե��ֹ�Ǥ� "
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: ���ƤΥ��٥�Ȥ��Ф��Ƥ�autocommand�ϼ¹ԤǤ��ޤ���"
 
-#: ../fileio.c:6393
 msgid "No matching autocommands"
 msgstr "��������autocommand��¸�ߤ��ޤ���"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommand������Ҥ����᤮�ޤ�"
 
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands for \"%s\""
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "%s ��¹Ԥ��Ƥ��ޤ�"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: { ������ޤ���."
 
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: } ������ޤ���."
 
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: �޾��ߤ�����ޤ���"
 
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ�����Ǥ��ޤ���"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ����Ǥ��ޤ���"
 
-#: ../fold.c:1784
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
 
-#. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
 msgstr "E222: �ɹ��Хåե����ɲ�"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: �Ƶ�Ū�ޥåԥ�"
 
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s �Ȥ����������Х�û�����Ϥϴ���¸�ߤ��ޤ�"
 
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s �Ȥ����������Х�ޥåԥ󥰤ϴ���¸�ߤ��ޤ�"
 
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s �Ȥ���û�����Ϥϴ���¸�ߤ��ޤ�"
 
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s �Ȥ����ޥåԥ󥰤ϴ���¸�ߤ��ޤ�"
 
-#: ../getchar.c:3008
 msgid "No abbreviation found"
 msgstr "û�����Ϥϸ��Ĥ���ޤ���Ǥ���"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
 msgstr "�ޥåԥ󥰤ϸ��Ĥ���ޤ���Ǥ���"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: �����ʥ⡼��"
 
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--�Хåե��˹Ԥ�����ޤ���--"
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: GUI�ѤΥץ������ε�ư�˼��Ԥ��ޤ���"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: ���ޥ�ɤ����Ǥ���ޤ���"
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: �ҥץ�������GUI�ε�ư�˼��Ԥ��ޤ���"
 
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: ������ɬ�פǤ�"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: GUI�򳫻ϤǤ��ޤ���"
 
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ �θ�� / �� ? �� & �Ǥʤ���Фʤ�ޤ���"
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: \"%s\"�����ɹ��ळ�Ȥ��Ǥ��ޤ���"
 
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ���ޥ�ɥ饤��Ǥ�̵���Ǥ�; <CR>�Ǽ¹�, CTRL-C�Ǥ���"
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: ͭ���ʥե���Ȥ����Ĥ���ʤ��Τ�, GUI�򳫻ϤǤ��ޤ���"
 
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: ���ߤΥǥ��쥯�ȥ�䥿�������Ǥ�exrc/vimrc�Υ��ޥ�ɤϵ��Ĥ���ޤ���"
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' ��̵���Ǥ�"
 
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: :endif ������ޤ���"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' �����ꤵ�줿�ͤ�̵���Ǥ�"
 
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry ������ޤ���"
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: %s �ο��������Ƥ��ޤ���"
 
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile ������ޤ���"
+msgid "No match at cursor, finding next"
+msgstr "��������ΰ��֤˥ޥå��Ϥ���ޤ���, ���򸡺����Ƥ��ޤ�"
 
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor ������ޤ���"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while �Τʤ� :endwhile ������ޤ�"
+msgid "<cannot open> "
+msgstr "<�����ޤ���> "
 
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor �Τʤ� :for ������ޤ�"
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: �ե���� %s ������Ǥ��ޤ���"
 
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: �ե����뤬¸�ߤ��ޤ� (! ���ɲäǾ��)"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: ���ߤΥǥ��쥯�ȥ�����ޤ���"
 
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: ���ޥ�ɤ����Ԥ��ޤ���"
+msgid "Pathname:"
+msgstr "�ѥ�̾:"
 
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: �������顼�Ǥ�"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: ���ߤΥǥ��쥯�ȥ������Ǥ��ޤ���"
 
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "����ޤ�ޤ���"
+msgid "OK"
+msgstr "OK"
 
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: ̵���ʥ��ɥ쥹�Ǥ�"
+msgid "Cancel"
+msgstr "����󥻥�"
 
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: ̵���ʰ����Ǥ�"
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "����������С�: ����������Ǥ��ޤ���Ǥ���."
 
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: ̵���ʰ����Ǥ�: %s"
+msgid "Vim dialog"
+msgstr "Vim ����������"
 
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ̵���ʼ��Ǥ�: %s"
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: ��å������ȥ�����Хå��Τ��� BalloonEval ������Ǥ��ޤ���"
 
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: ̵�����ϰϤǤ�"
+msgid "_Cancel"
+msgstr "����󥻥�(_C)"
 
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: ̵���ʥ��ޥ�ɤǤ�"
+msgid "_Save"
+msgstr "��¸(_S)"
 
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" �ϥǥ��쥯�ȥ�Ǥ�"
+msgid "_Open"
+msgstr "����(_O)"
 
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: ̵���ʥ����������̤Ǥ�"
+msgid "_OK"
+msgstr "_OK"
 
-#: ../globals.h:1021
-msgid "E901: Job table is full"
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
 msgstr ""
+"�Ϥ�(&Y)\n"
+"������(&N)\n"
+"����󥻥�(&C)"
 
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() �Υ饤�֥��ƽФ˼��Ԥ��ޤ���"
+msgid "Yes"
+msgstr "�Ϥ�"
 
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: �ޡ�����̵���ʹ��ֹ椬���ꤵ��Ƥ��ޤ���"
+msgid "No"
+msgstr "������"
 
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: �ޡ��������ꤵ��Ƥ��ޤ���"
+msgid "Input _Methods"
+msgstr "����ץåȥ᥽�å�"
 
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' �����դʤΤ�, �ѹ��Ǥ��ޤ���"
+msgid "VIM - Search and Replace..."
+msgstr "VIM - �������ִ�..."
 
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: ������ץȤ�����Ҥ����᤮�ޤ�"
+msgid "VIM - Search..."
+msgstr "VIM - ����..."
 
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: ���ե�����Ϥ���ޤ���"
+msgid "Find what:"
+msgstr "����ʸ����:"
 
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: ���Τ褦��û�����ϤϤ���ޤ���"
+msgid "Replace with:"
+msgstr "�ִ�ʸ����:"
 
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ! �ϵ��Ĥ���Ƥ��ޤ���"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "���Τ˳��������Τ���"
 
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUI�ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�"
+#. match case button
+msgid "Match case"
+msgstr "��ʸ��/��ʸ������̤���"
 
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: ���Τ褦��̾�Υϥ��饤�ȥ��롼�פϤ���ޤ���: %s"
+msgid "Direction"
+msgstr "����"
 
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: �ޤ��ƥ����Ȥ���������Ƥ��ޤ���"
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "��"
 
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: �����˥��ޥ�ɹԤ�����ޤ���"
+msgid "Down"
+msgstr "��"
 
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: ���Τ褦�ʥޥåԥ󥰤Ϥ���ޤ���"
+msgid "Find Next"
+msgstr "���򸡺�"
 
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: �����Ϥ���ޤ���"
+msgid "Replace"
+msgstr "�ִ�"
 
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: �����Ϥ���ޤ���: %s"
+msgid "Replace All"
+msgstr "�����ִ�"
 
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: �ե�����̾������ޤ���"
+msgid "_Close"
+msgstr "�Ĥ���(_C)"
 
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: ����ɽ���ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: ���å����ޥ͡����㤫�� \"die\" �׵��������ޤ���\n"
 
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: ���ޥ�ɤ��ޤ��¹Ԥ���Ƥ��ޤ���"
+msgid "Close tab"
+msgstr "���֥ڡ������Ĥ���"
 
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: ����ɽ�����ޤ��¹Ԥ���Ƥ��ޤ���"
+msgid "New tab"
+msgstr "�������֥ڡ���"
 
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
+msgid "Open Tab..."
+msgstr "���֥ڡ����򳫤�..."
 
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: ������ɥ��˽�ʬ�ʹ⤵�⤷������������ޤ���"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: �ᥤ�󥦥���ɥ����԰դ��˲�����ޤ���\n"
 
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: �ե����� %s ������Ǥ��ޤ���"
+msgid "&Filter"
+msgstr "�ե��륿(&F)"
 
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: ����ե������̾��������Ǥ��ޤ���"
+msgid "&Cancel"
+msgstr "����󥻥�(&C)"
 
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: �ե����� \"%s\" �򳫤��ޤ���"
+msgid "Directories"
+msgstr "�ǥ��쥯�ȥ�"
 
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: �ե����� %s ���ɹ���ޤ���"
+msgid "Filter"
+msgstr "�ե��륿"
 
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ��� (! ���ɲä��ѹ����˴�)"
+msgid "&Help"
+msgstr "�إ��(&H)"
 
-#: ../globals.h:1055
-msgid "E37: No write since last change"
-msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ���"
+msgid "Files"
+msgstr "�ե�����"
 
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: ���������Ǥ�"
+msgid "&OK"
+msgstr "&OK"
 
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: ���ͤ��׵ᤵ��Ƥ��ޤ�"
+msgid "Selection"
+msgstr "����"
 
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: ���顼�ե����� %s �򳫤��ޤ���"
+msgid "Find &Next"
+msgstr "���򸡺�(&N)"
 
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: ���꤬�Ԥ��̤Ƥޤ���!"
+msgid "&Replace"
+msgstr "�ִ�(&R)"
 
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "�ѥ�����ϸ��Ĥ���ޤ���Ǥ���"
+msgid "Replace &All"
+msgstr "�����ִ�(&A)"
 
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: �ѥ�����ϸ��Ĥ���ޤ���Ǥ���: %s"
+msgid "&Undo"
+msgstr "����ɥ�(&U)"
 
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: �����������ͤǤʤ���Фʤ�ޤ���"
+msgid "Open tab..."
+msgstr "���֥ڡ����򳫤�"
 
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: ���Υǥ��쥯�ȥ�����ޤ���"
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "����ʸ���� ('\\' �򸡺�����ˤ� '\\\\')"
 
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: ���顼�Ϥ���ޤ���"
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "�������ִ� ('\\' �򸡺�����ˤ� '\\\\')"
 
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: �����������ꥹ�ȤϤ���ޤ���"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: ����ʸ������»���Ƥ��ޤ�"
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "�Ȥ��ޤ���"
 
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: ����������ɽ���ץ������Ǥ�"
+msgid "Directory\t*.nothing\n"
+msgstr "�ǥ��쥯�ȥ�\t*.nothing\n"
 
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' ���ץ�������ꤵ��Ƥ��ޤ� (! ���ɲäǾ��)"
-
-#: ../globals.h:1073
 #, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: �ɼ������ѿ� \"%s\" �ˤ��ͤ�����Ǥ��ޤ���"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϸ��Ĥ���ޤ���"
 
-#: ../globals.h:1075
 #, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: ����ɥܥå����Ǥ��ѿ� \"%s\" ���ͤ�����Ǥ��ޤ���"
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ���顼�ե�������ɹ���˥��顼��ȯ�����ޤ���"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: ����ɥܥå����Ǥϵ�����ޤ���"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: �����Ǥϵ��Ĥ���ޤ���"
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: �����ϥ��ݡ��Ȥ���ޤ���: \"-%s\"; OLE�Ǥ���Ѥ��Ƥ�������."
 
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: �����꡼��⡼�ɤ�����ˤ��б����Ƥ��ޤ���"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI���ץ����Ǥϥ�����ɥ��򳫤��ޤ���"
 
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: ̵���ʥ����������̤Ǥ�"
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr "Vim E458: �����꤬�������ʤ��Τǥ���ȥ�������Ƥ��ޤ���"
 
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' ���ץ���󤬶��Ǥ�"
+#, c-format
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr "E250: �ʲ���ʸ�����åȤΥե���Ȥ�����ޤ��� %s:"
 
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign �Υǡ������ɹ���ޤ���Ǥ���"
+#, c-format
+msgid "E252: Fontset name: %s"
+msgstr "E252: �ե���ȥ��å�̾: %s"
 
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: ����åץե�����Υ������������顼�Ǥ�"
+#, c-format
+msgid "Font '%s' is not fixed-width"
+msgstr "�ե���� '%s' �ϸ������ǤϤ���ޤ���"
 
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: ���������å������Ǥ�"
+#, c-format
+msgid "E253: Fontset name: %s"
+msgstr "E253: �ե���ȥ��å�̾: %s"
 
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: ���ޥ�ɤ�ʣ���᤮�ޤ�"
+#, c-format
+msgid "Font0: %s"
+msgstr "�ե����0: %s"
 
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: ̾����Ĺ�᤮�ޤ�"
+#, c-format
+msgid "Font1: %s"
+msgstr "�ե����1: %s"
 
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: [ ��¿�᤮�ޤ�"
+#, c-format
+msgid "Font%ld width is not twice that of font0"
+msgstr "�ե����%ld �������ե����0��2�ܤǤϤ���ޤ���"
 
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: �ե�����̾��¿�᤮�ޤ�"
+#, c-format
+msgid "Font0 width: %ld"
+msgstr "�ե����0����: %ld"
 
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: ;ʬ��ʸ��������ˤ���ޤ�"
+#, c-format
+msgid "Font1 width: %ld"
+msgstr "�ե����1����: %ld"
 
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: ̤�ΤΥޡ���"
+msgid "Invalid font specification"
+msgstr "̵���ʥե���Ȼ���Ǥ�"
 
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: �磻��ɥ����ɤ�Ÿ���Ǥ��ޤ���"
+msgid "&Dismiss"
+msgstr "�Ѳ�����(&D)"
 
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' �� 'winminheight' ��꾮�����Ǥ��ޤ���"
+msgid "no specific match"
+msgstr "�ޥå������Τ�����ޤ���"
 
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' �� 'winminwidth' ��꾮�����Ǥ��ޤ���"
+msgid "Vim - Font Selector"
+msgstr "Vim - �ե��������"
 
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: �������Υ��顼"
+msgid "Name:"
+msgstr "̾��:"
 
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "�����������"
+#. create toggle button
+msgid "Show size in Points"
+msgstr "��������ݥ���Ȥ�ɽ������"
 
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: ������ץȰʳ���<SID>���Ȥ��ޤ���"
+msgid "Encoding:"
+msgstr "���󥳡���:"
 
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: �������顼�Ǥ�: %s"
+msgid "Font:"
+msgstr "�ե����:"
 
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: �ѥ����� 'maxmempattern' �ʾ�Υ������Ѥ��ޤ�"
+msgid "Style:"
+msgstr "��������:"
 
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: �Хåե������Ǥ�"
+msgid "Size:"
+msgstr "������:"
 
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: �����ѥ����󤫶��ڤ국�椬�����Ǥ�"
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: �ϥ󥰥륪���ȥޥȥ󥨥顼"
 
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Ʊ��̾���Υե����뤬¾�ΥХåե����ɹ��ޤ�Ƥ��ޤ�"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: ���ץ���� '%s' �����ꤵ��Ƥ��ޤ���"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: ̵���ʥ쥸����̾�Ǥ�"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "��ޤǸ��������ΤDz������ޤ�"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "���ޤǸ��������ΤǾ�����ޤ�"
-
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: �����󤬤���ޤ���"
 
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: �����ʹ�ʸ���ǤǤ�"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
 msgstr "E552: ���ͤ�ɬ�פǤ�"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "%d �ڡ���"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
 msgstr "��������ƥ����Ȥ�����ޤ���"
 
-#: ../hardcopy.c:668
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "������: �ڡ��� %d (%d%%)"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " ���ԡ� %d (�� %d ��)"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "�������ޤ���: %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "��������ߤ���ޤ���"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript���ϥե�����ν���ߥ��顼�Ǥ�"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: �ե����� \"%s\" �򳫤��ޤ���"
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScript�Υ꥽�����ե����� \"%s\" ���ɹ���ޤ���"
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: �ե����� \"%s\" �� PostScript �꥽�����ե�����ǤϤ���ޤ���"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: �ե����� \"%s\" ���б����Ƥ��ʤ� PostScript �꥽�����ե�����Ǥ�"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: �꥽�����ե����� \"%s\" �ϥС�����󤬰ۤʤ�ޤ�"
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: �ߴ�����̵���ޥ���Х��ȥ��󥳡��ǥ��󥰤�ʸ�����åȤǤ�"
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr "E674: �ޥ���Х��ȥ��󥳡��ǥ��󥰤Ǥ� printmbcharset ����ˤǤ��ޤ���"
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr ""
 "E675: �ޥ���Х���ʸ����������뤿��Υǥե���ȥե���Ȥ����ꤵ��Ƥ��ޤ���"
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript�����ѤΥե�����򳫤��ޤ���"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: �ե����� \"%s\" �򳫤��ޤ���"
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScript�Υ꥽�����ե����� \"prolog.ps\" �����Ĥ���ޤ���"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr "E456: PostScript�Υ꥽�����ե����� \"cidfont.ps\" �����Ĥ���ޤ���"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScript�Υ꥽�����ե����� \"%s.ps\" �����Ĥ���ޤ���"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: �������󥳡��� \"%s\" ���Ѵ��Ǥ��ޤ���"
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
 msgstr "�ץ�󥿤�������..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScript�ե�����ΰ����˼��Ԥ��ޤ���"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
 msgstr "��������֤��������ޤ���."
 
-#: ../if_cscope.c:85
 msgid "Add a new database"
 msgstr "���ǡ����١������ɲ�"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "�ѥ�����Υ����꡼���ɲ�"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
 msgstr "���Υ�å�������ɽ������"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "��³��λ����"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "���Ƥ���³��ƽ��������"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
 msgstr "��³��ɽ������"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: ������ˡ: cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "����cscope���ޥ�ɤ�ʬ�䥦����ɥ��Ǥϥ��ݡ��Ȥ���ޤ���.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: ����ˡ: cstag <ident>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: ���������Ĥ���ޤ���"
 
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) ���顼: %d"
 
-#: ../if_cscope.c:551
+msgid "E563: stat error"
+msgstr "E563: stat ���顼"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s �ϥǥ��쥯�ȥ�ڤ�ͭ����cscope�Υǡ����١����ǤϤ���ޤ���"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
 msgstr "cscope�ǡ����١��� %s ���ɲ�"
 
-#: ../if_cscope.c:616
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: cscope����³ %<PRId64> ���ɹ�����Υ��顼�Ǥ�"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: cscope����³ %ld ���ɹ�����Υ��顼�Ǥ�"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: ̤�Τ�cscope�������Ǥ�"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: cscope�ѥ��פ�����Ǥ��ޤ���Ǥ���"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope�ε�ư����(fork)�˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:849
 msgid "cs_create_connection setpgid failed"
 msgstr "cs_create_connection �ؤ� setpgid �˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection �μ¹Ԥ˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: to_fp �� fdopen �˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fr_fp �� fdopen �˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: cscope�ץ�������ư�Ǥ��ޤ���Ǥ���"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
 msgstr "E567: cscope��³�˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: ̵���� cscopequickfix �ե饰 %c �� %c �Ǥ�"
 
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: cscope�����꡼ %s of %s �˳���������ޤ���Ǥ���"
 
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "cscope���ޥ��:\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (����ˡ: %s)"
 
-#: ../if_cscope.c:1155
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -3234,6 +2549,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: ���Υ���ܥ���Ф���������õ��\n"
 "       c: ���δؿ���Ƥ�Ǥ���ؿ���õ��\n"
 "       d: ���δؿ�����Ƥ�Ǥ���ؿ���õ��\n"
 "       e: ����egrep�ѥ������õ��\n"
@@ -3243,31 +2559,32 @@ msgstr ""
 "       s: ����C����ܥ��õ��\n"
 "       t: ���Υƥ�����ʸ�����õ��\n"
 
-#: ../if_cscope.c:1226
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: cscope�ǡ����١���: %s �򳫤����Ȥ��Ǥ��ޤ���"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: cscope�ǡ����١����ξ��������Ǥ��ޤ���"
+
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ��ʣ����cscope�ǡ����١������ɲä���ޤ���Ǥ���"
 
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope��³ %s �����Ĥ���ޤ���Ǥ���"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope��³ %s ���Ĥ����ޤ���"
 
 #. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches ����̿Ū�ʥ��顼�Ǥ�"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope ����: %s"
 
-#: ../if_cscope.c:1711
 msgid ""
 "\n"
 "   #   line"
@@ -3275,87 +2592,300 @@ msgstr ""
 "\n"
 "   #   ���ֹ�"
 
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "�ե�����̾ / ʸ̮ / ��\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: cscope���顼: %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "���Ƥ�cscope�ǡ����١�����ꥻ�åȤ��ޤ�"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
 msgstr "cscope��³������ޤ���\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    �ǡ����١���̾                      prepend �ѥ�\n"
 
-#: ../main.c:144
+msgid "Lua library cannot be loaded."
+msgstr "Lua�饤�֥�������ɤǤ��ޤ���."
+
+msgid "cannot save undo information"
+msgstr "����ɥ�������¸�Ǥ��ޤ���"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+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 �⥸�塼��"
+"�������ɤǤ��ޤ���Ǥ���."
+
+msgid "invalid expression"
+msgstr "̵���ʼ��Ǥ�"
+
+msgid "expressions disabled at compile time"
+msgstr "���ϥ���ѥ������̵���ˤ���Ƥ��ޤ�"
+
+msgid "hidden option"
+msgstr "�������ץ����"
+
+msgid "unknown option"
+msgstr "̤�ΤΥ��ץ����Ǥ�"
+
+msgid "window index is out of range"
+msgstr "�ϰϳ��Υ�����ɥ��ֹ�Ǥ�"
+
+msgid "couldn't open buffer"
+msgstr "�Хåե��򳫤��ޤ���"
+
+msgid "cannot delete line"
+msgstr "�Ԥ�ä��ޤ���"
+
+msgid "cannot replace line"
+msgstr "�Ԥ��ִ��Ǥ��ޤ���"
+
+msgid "cannot insert line"
+msgstr "�Ԥ������Ǥ��ޤ���"
+
+msgid "string cannot contain newlines"
+msgstr "ʸ����ˤϲ���ʸ����ޤ���ޤ���"
+
+msgid "error converting Scheme values to Vim"
+msgstr "Scheme�ͤ�Vim�ؤ��Ѵ����顼"
+
+msgid "Vim error: ~a"
+msgstr "Vim ���顼: ~a"
+
+msgid "Vim error"
+msgstr "Vim ���顼"
+
+msgid "buffer is invalid"
+msgstr "�Хåե���̵���Ǥ�"
+
+msgid "window is invalid"
+msgstr "������ɥ���̵���Ǥ�"
+
+msgid "linenr out of range"
+msgstr "�ϰϳ��ι��ֹ�Ǥ�"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "����ɥܥå����Ǥϵ�����ޤ���"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: ����Vim�Ǥ� :py3 ��Ȥä���� :python ��Ȥ��ޤ���"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Python�饤�֥�������ɤǤ��ޤ���"
+"�Ǥ���."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���. Python �� site �⥸�塼��������"
+"�Ǥ��ޤ���Ǥ���."
+
+# Added at 07-Feb-2004.
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Python ��Ƶ�Ū�˼¹Ԥ��뤳�ȤϤǤ��ޤ���"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: ����Vim�Ǥ� :python ��Ȥä���� :py3 ��Ȥ��ޤ���"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ ��ʸ����Υ��󥹥��󥹤Ǥʤ���Фʤ�ޤ���"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Ruby�饤�֥�������ɤǤ��ޤ����"
+"����."
+
+msgid "E267: unexpected return"
+msgstr "E267: ͽ������ return �Ǥ�"
+
+msgid "E268: unexpected next"
+msgstr "E268: ͽ������ next �Ǥ�"
+
+msgid "E269: unexpected break"
+msgstr "E269: ͽ������ break �Ǥ�"
+
+msgid "E270: unexpected redo"
+msgstr "E270: ͽ������ redo �Ǥ�"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue �γ��� retry �Ǥ�"
+
+msgid "E272: unhandled exception"
+msgstr "E272: ��갷���ʤ��ä��㳰������ޤ�"
+
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: ̤�Τ�longjmp����: %d"
+
+msgid "invalid buffer number"
+msgstr "̵���ʥХåե��ֹ�Ǥ�"
+
+msgid "not implemented yet"
+msgstr "�ޤ���������Ƥ��ޤ���"
+
+#. ???
+msgid "cannot set line(s)"
+msgstr "�Ԥ�����Ǥ��ޤ���"
+
+msgid "invalid mark name"
+msgstr "̵���ʥޡ���̾�Ǥ�"
+
+msgid "mark not set"
+msgstr "�ޡ��������ꤵ��Ƥ��ޤ���"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "�� %d �� %d"
+
+msgid "cannot insert/append line"
+msgstr "�Ԥ�����/�ɲä�Ǥ��ޤ���"
+
+msgid "line number out of range"
+msgstr "�ϰϳ��ι��ֹ�Ǥ�"
+
+msgid "unknown flag: "
+msgstr "̤�ΤΥե饰: "
+
+msgid "unknown vimOption"
+msgstr "̤�Τ� vimOption �Ǥ�"
+
+msgid "keyboard interrupt"
+msgstr "�����ܡ��ɳ����"
+
+msgid "vim error"
+msgstr "vim ���顼"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr ""
+"�Хåե�/������ɥ��������ޥ�ɤ�����Ǥ��ޤ���: ���֥������Ȥ��õ��Ƥ���"
+"����"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ������˾õ��ޤ���"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: TCL ��̿Ū���顼: reflist ����!? vim-dev@vim.org ����𤷤Ƥ�������"
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ��λ��Ȥ����Ĥ���ޤ�"
+"��"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Tcl�饤�֥�������ɤǤ��ޤ����"
+"����."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: ������� %d"
+
+msgid "cannot get line"
+msgstr "�Ԥ�����Ǥ��ޤ���"
+
+msgid "Unable to register a command server name"
+msgstr "̿�᥵���С���̾������Ͽ�Ǥ��ޤ���"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: ��Ū�Υץ������ؤΥ��ޥ�������˼��Ԥ��ޤ���"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: ̵���ʥ����С�ID���Ȥ��ޤ���: %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr "E251: VIM ���Τ���Ͽ�ץ��ѥƥ��������Ǥ�. �õ�ޤ���!"
+
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: �ꥹ�ȷ��κǸ�� ']' ������ޤ���: %s"
+
 msgid "Unknown option argument"
 msgstr "̤�ΤΥ��ץ��������Ǥ�"
 
-#: ../main.c:146
 msgid "Too many edit arguments"
 msgstr "�Խ�������¿�᤮�ޤ�"
 
-#: ../main.c:148
 msgid "Argument missing after"
 msgstr "����������ޤ���"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
 msgstr "���ץ��������θ�˥��ߤ�����ޤ�"
 
-#: ../main.c:152
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "\"+command\", \"-c command\", \"--cmd command\" �ΰ�����¿�᤮�ޤ�"
 
-#: ../main.c:154
 msgid "Invalid argument for"
 msgstr "̵���ʰ����Ǥ�: "
 
-#: ../main.c:294
 #, c-format
 msgid "%d files to edit\n"
 msgstr "%d �ĤΥե����뤬�Խ��򹵤��Ƥ��ޤ�\n"
 
-#: ../main.c:1342
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans �Ϥ���GUI�Ǥ����ѤǤ��ޤ���\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' �����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "����Vim�ˤ�diff��ǽ������ޤ���(����ѥ��������)."
+
 msgid "Attempt to open script file again: \""
 msgstr "������ץȥե������Ƥӳ����Ƥߤޤ�: \""
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "�ɹ��ѤȤ��Ƴ����ޤ���"
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "������ץȽ����Ѥ򳫤��ޤ���"
 
-#: ../main.c:1622
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ���顼: NetBeans����gvim�򥹥����ȤǤ��ޤ���\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: ���顼: ���ΥС�������Vim��Cygwinü���Ǥ�ư��ޤ���\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: �ٹ�: ü���ؤν��ϤǤϤ���ޤ���\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: �ٹ�: ü����������ϤǤϤ���ޤ���\n"
 
 #. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "vimrc���Υ��ޥ�ɥ饤��"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: \"%s\"�����ɹ��ळ�Ȥ��Ǥ��ޤ���"
 
-#: ../main.c:2149
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -3363,23 +2893,18 @@ msgstr ""
 "\n"
 "���ܺ٤ʾ����: \"vim -h\"\n"
 
-#: ../main.c:2178
 msgid "[file ..]       edit specified file(s)"
 msgstr "[�ե�����..]    ����ե�������Խ�����"
 
-#: ../main.c:2179
 msgid "-               read text from stdin"
 msgstr "-               ɸ�����Ϥ���ƥ����Ȥ��ɹ���"
 
-#: ../main.c:2180
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t ����         ������������줿�Ȥ��������Խ�����"
 
-#: ../main.c:2181
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  �ǽ�Υ��顼���Խ�����"
 
-#: ../main.c:2187
 msgid ""
 "\n"
 "\n"
@@ -3389,11 +2914,9 @@ msgstr ""
 "\n"
 "����ˡ:"
 
-#: ../main.c:2189
 msgid " vim [arguments] "
 msgstr " vim [����] "
 
-#: ../main.c:2193
 msgid ""
 "\n"
 "   or:"
@@ -3401,7 +2924,13 @@ msgstr ""
 "\n"
 "   �⤷����:"
 
-#: ../main.c:2196
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"�羮ʸ����̵�뤵��������ʸ���ˤ��뤿��� / �����֤��Ƥ�������"
+
 msgid ""
 "\n"
 "\n"
@@ -3411,189 +2940,319 @@ msgstr ""
 "\n"
 "����:\n"
 
-#: ../main.c:2197
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\t���Τ��Ȥˤϥե�����̾����"
 
-#: ../main.c:2199
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\t�磻��ɥ����ɤ�Ÿ�����ʤ�"
 
-#: ../main.c:2201
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\t\t����gvim��OLE�Ȥ�����Ͽ����"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\t\tgvim��OLE��Ͽ��������"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\t\tGUI�ǵ�ư���� (\"gvim\" ��Ʊ��)"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f or  --nofork\t�ե������饦���: GUI��Ϥ��Ȥ���fork���ʤ�"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi�⡼�� (\"vi\" ��Ʊ��)"
 
-#: ../main.c:2202
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx�⡼�� (\"ex\" ��Ʊ��)"
 
-#: ../main.c:2203
 msgid "-E\t\t\tImproved Ex mode"
 msgstr "-E\t\t\t����Ex�⡼��"
 
-#: ../main.c:2204
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\t��������(�Хå�)�⡼�� (\"ex\" ����)"
 
-#: ../main.c:2205
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\t��ʬ�⡼�� (\"vidiff\" ��Ʊ��)"
 
-#: ../main.c:2206
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\t���������⡼�� (\"evim\" ��Ʊ��, �⡼��̵)"
 
-#: ../main.c:2207
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t�ɹ����ѥ⡼�� (\"view\" ��Ʊ��)"
 
-#: ../main.c:2208
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t���¥⡼�� (\"rvim\" ��Ʊ��)"
 
-#: ../main.c:2209
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t�ѹ� (�ե�������¸��) ��Ǥ��ʤ��褦�ˤ���"
 
-#: ../main.c:2210
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t�ƥ����Ȥ��Խ���Ԥʤ��ʤ��褦�ˤ���"
 
-#: ../main.c:2211
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\t�Х��ʥ�⡼��"
 
-#: ../main.c:2212
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp�⡼��"
 
-#: ../main.c:2213
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tVi�ߴ��⡼��: 'compatible'"
 
-#: ../main.c:2214
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi��ߴ��⡼��: 'nocompatible"
 
-#: ../main.c:2215
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
 msgstr "-V[N][fname]\t\t������������ [��٥� N] [�����ե�����̾ fname]"
 
-#: ../main.c:2216
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t�ǥХå��⡼��"
 
-#: ../main.c:2217
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t����åץե��������Ѥ����������"
 
-#: ../main.c:2218
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\t����åץե��������󤷽�λ"
 
-#: ../main.c:2219
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (�ե�����̾)\t����å��夷�����å���������"
 
-#: ../main.c:2220
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t-r��Ʊ��"
 
-#: ../main.c:2221
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\t\t������ɥ��򳫤��Τ� newcli ����Ѥ��ʤ�"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <device>\t\tI/O�� <device> ����Ѥ���"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\t����ӥ���⡼�ɤǵ�ư����"
 
-#: ../main.c:2222
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t�إ֥饤��⡼�ɤǵ�ư����"
 
-#: ../main.c:2223
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t�ڥ륷����⡼�ɤǵ�ư����"
 
-#: ../main.c:2224
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\tü���� <terminal> �����ꤹ��"
 
-#: ../main.c:2225
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t�����Ϥ�ü���Ǥʤ��Ȥηٹ�򥹥��åפ���"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc������� <vimrc> ��Ȥ�"
 
-#: ../main.c:2226
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\t\t.gvimrc������� <gvimrc> ��Ȥ�"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\t�ץ饰���󥹥���ץȤ�����ɤ��ʤ�"
 
-#: ../main.c:2227
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
 msgstr "-p[N]\t\tN �ĥ��֥ڡ����򳫤�(��ά��: �ե�����ˤĤ�1��)"
 
-#: ../main.c:2228
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN �ĥ�����ɥ��򳫤�(��ά��: �ե�����ˤĤ�1��)"
 
-#: ../main.c:2229
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t-o��Ʊ��������ľʬ��"
 
-#: ../main.c:2230
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\t�ե�����κǸ夫��Ϥ����"
 
-#: ../main.c:2231
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t<lnum> �Ԥ���Ϥ����"
 
-#: ../main.c:2232
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\tvimrc������ɤ������� <command> ��¹Ԥ���"
 
-#: ../main.c:2233
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t�ǽ�Υե����������ɸ� <command> ��¹Ԥ���"
 
-#: ../main.c:2235
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t�ǽ�Υե����������ɸ�ե����� <session> ������"
 
-#: ../main.c:2236
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\t�ե����� <scriptin> ����Ρ��ޥ륳�ޥ�ɤ��ɹ���"
 
-#: ../main.c:2237
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t���Ϥ��������ޥ�ɤ�ե����� <scriptout> ���ɲä���"
 
-#: ../main.c:2238
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t���Ϥ��������ޥ�ɤ�ե����� <scriptout> ����¸����"
 
-#: ../main.c:2240
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\t�Ź沽���줿�ե�������Խ�����"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <display>\tvim����ꤷ�� X �����С�����³����"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tX�����С�����³���ʤ�"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t��ǽ�ʤ��Vim�����С��� <files> ���Խ�����"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <files>  Ʊ��, �����С���̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr "--remote-wait <files>\t--remote�� �ե�������Խ��������Τ��Ԥ�"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent <files>  Ʊ��, �����С���̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <files>  --remote�ǥե�����1�ĤˤĤ�1�ĤΥ���"
+"�ڡ����򳫤�"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <keys>\tVim�����С��� <keys> ���������ƽ�λ����"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr "--remote-expr <expr>\t�����С��� <expr> ��¹Ԥ��Ʒ�̤�ɽ������"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr "--serverlist\t\tVim�����С�̾�ΰ�����ɽ�����ƽ�λ����"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <name>\tVim�����С� <name> ������/̾�����ꤹ��"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr "--startuptime <file>\t��ư�ˤ����ä����֤ξܺ٤� <file> �ؽ��Ϥ���"
 
-#: ../main.c:2242
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfo������� <viminfo> ��Ȥ�"
 
-#: ../main.c:2243
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h or  --help\t�إ��(���Υ�å�����)��ɽ������λ����"
 
-#: ../main.c:2244
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\t�С����������ɽ������λ����"
 
-#: ../mark.c:676
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"gvim�ˤ�äƲ�ᤵ������(Motif�С������):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim�ˤ�äƲ�ᤵ������(neXtaw�С������):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"gvim�ˤ�äƲ�ᤵ������(Athena�С������):\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <display>\t<display> ��vim��¹Ԥ���"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\t�Ǿ����������֤�vim��ư����"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr "-background <color>\t�طʿ��� <color> ��Ȥ�(Ʊ��: -bg)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr "-foreground <color>\t���ʿ��� <color> ��Ȥ�(Ʊ��: -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <font>\t\t�ƥ�����ɽ���� <font> ��Ȥ�(Ʊ��: -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <font>\t������ <font> ��Ȥ�"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <for>\t���λ��� <font> ��Ȥ�"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr "-geometry <geom>\t������֤� <geom> ��Ȥ�(Ʊ��: -geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr "-borderwidth <width>\t���������� <width> �ˤ���(Ʊ��: -bw)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <width>  ����������С������� <width> �ˤ���(Ʊ��: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr "-menuheight <height>\t��˥塼�С��ι⤵�� <height> �ˤ���(Ʊ��: -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\tȿž��������Ѥ���(Ʊ��: -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\tȿž��������Ѥ��ʤ�(Ʊ��: +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <resource>\t����Υ꥽��������Ѥ���"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"gvim�ˤ�äƲ�ᤵ������(GTK+�С������):\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr "-display <display>\t<display> ��vim��¹Ԥ���(Ʊ��: --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\t�ᥤ�󥦥���ɥ����̤����դ����(role)�����ꤹ��"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\t�ۤʤ�GTK widget��Vim�򳫤�"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\t������ɥ�ID��ɸ����Ϥ˽��Ϥ���"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <�ƤΥ����ȥ�>\tVim��ƥ��ץꥱ����������ǵ�ư����"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\t�ۤʤ�Win32 widget��������Vim�򳫤�"
+
+msgid "No display"
+msgstr "�ǥ����ץ쥤�����Ĥ���ޤ���"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr ": �����˼��Ԥ��ޤ���.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": �����˼��Ԥ��ޤ���. ��������Ǥμ¹Ԥ��ߤƤ��ޤ�\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d �� (%d ����) �Υե�������Խ����ޤ���"
+
+msgid "No display: Send expression failed.\n"
+msgstr "�ǥ����ץ쥤������ޤ���: ���������˼��Ԥ��ޤ���.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": ���������˼��Ԥ��ޤ���.\n"
+
 msgid "No marks set"
 msgstr "�ޡ��������ꤵ��Ƥ��ޤ���"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" �˳�������ޡ���������ޤ���"
 
 #. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3602,7 +3261,6 @@ msgstr ""
 "mark   ��   �� �ե�����/�ƥ�����"
 
 #. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3611,7 +3269,6 @@ msgstr ""
 " jump   ��   �� �ե�����/�ƥ�����"
 
 #. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3619,7 +3276,6 @@ msgstr ""
 "\n"
 "�ѹ�   ��    ��  �ƥ�����"
 
-#: ../mark.c:1238
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3628,7 +3284,6 @@ msgstr ""
 "# �ե�����ޡ���:\n"
 
 #. Write the jumplist with -'
-#: ../mark.c:1271
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3636,7 +3291,6 @@ msgstr ""
 "\n"
 "# �����ץꥹ�� (��������Τ���):\n"
 
-#: ../mark.c:1352
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3644,84 +3298,88 @@ msgstr ""
 "\n"
 "# �ե�������ޡ��������� (��������Τ���Ť����):\n"
 
-#: ../mark.c:1431
 msgid "Missing '>'"
 msgstr "'>' �����Ĥ���ޤ���"
 
-#: ../memfile.c:426
+msgid "E543: Not a valid codepage"
+msgstr "E543: ̵���ʥ����ɥڡ����Ǥ�"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: IC���ͤ�����Ǥ��ޤ���"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: ����ץåȥ���ƥ����Ȥκ����˼��Ԥ��ޤ���"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: ����ץåȥ᥽�åɤΥ����ץ�˼��Ԥ��ޤ���"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr "E287: �ٹ�: IM���˲�������Хå�������Ǥ��ޤ���Ǥ���"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: ����ץåȥ᥽�åɤϤɤ�ʥ�������⥵�ݡ��Ȥ��ޤ���"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr "E289: ����ץåȥ᥽�åɤ� my preedit type �򥵥ݡ��Ȥ��ޤ���"
+
 msgid "E293: block was not locked"
 msgstr "E293: �֥��å������å�����Ƥ��ޤ���"
 
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: ����åץե������ɹ����˥��������顼�Ǥ�"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: ����åץե�������ɹ��ߥ��顼�Ǥ�"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: ����åץե��������߻��˥��������顼�Ǥ�"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: ����åץե�����ν���ߥ��顼�Ǥ�"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: ����åץե����뤬����¸�ߤ��ޤ� (symlink�ˤ�빶��?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: �֥��å� 0 ������Ǥ��ޤ���?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: �֥��å� 1 ������Ǥ��ޤ���?"
 
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: �֥��å� 2 ������Ǥ��ޤ���?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: ����åץե�����ΰŹ�򹹿���˥��顼��ȯ�����ޤ���"
+
 #. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ���ä�, ����åץե����뤬�����ޤ���!!!"
 
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: ����åץե������̾�����Ѥ����ޤ���"
 
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: \"%s\" �Υ���åץե�����򳫤��ʤ��Τǥꥫ�Х���Բ�ǽ�Ǥ�"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): �֥��å� 0 ������Ǥ��ޤ���Ǥ���??"
 
-#. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: %s �ˤϥ���åץե����뤬���Ĥ���ޤ���"
 
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "���Ѥ��륹��åץե�������ֹ�����Ϥ��Ƥ�������(0 �ǽ�λ): "
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: %s �򳫤��ޤ���"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "�֥��å� 0 ���ɹ���ޤ��� "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3729,28 +3387,22 @@ msgstr ""
 "\n"
 "���餯�ѹ�������Ƥ��ʤ���Vim������åץե�����򹹿����Ƥ��ޤ���."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vim�Τ��ΥС������Ǥϻ��ѤǤ��ޤ���.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
 msgstr "Vim�ΥС������3.0����Ѥ��Ƥ�������.\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ��Vim�Υ���åץե�����ǤϤʤ��褦�Ǥ�"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
 msgstr " ���Υ���ԥ塼���Ǥϻ��ѤǤ��ޤ���.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "���Υե�����ϼ��ξ��Ǻ���ޤ��� "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3758,85 +3410,104 @@ msgstr ""
 ",\n"
 "�⤷���ϥե����뤬»�����Ƥ��ޤ�."
 
-#: ../memline.c:945
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: %s �Ϥ��ΥС�������Vim�ǥ��ݡ��Ȥ��Ƥ��ʤ������ǰŹ沽����Ƥ��ޤ�"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " ��»�����Ƥ��ޤ� (�ڡ������������Ǿ��ͤ򲼲�äƤ��ޤ�).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "����åץե����� \"%s\" �������"
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
 msgstr "���ܥե����� \"%s\""
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: �ٹ�: ���ܥե����뤬�ѹ�����Ƥ��ޤ�"
 
-#: ../memline.c:1061
+#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "����åץե�����ϰŹ沽����Ƥ��ޤ�: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"�������Ź業�������Ϥ������Ȥ˥ƥ����ȥե��������¸���Ƥ��ʤ�����,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"�������Ź業�������Ϥ��Ƥ�������."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"�Ź業�����Ѥ������Ȥ˥ƥ����ȥե��������¸��������, �ƥ����ȥե������"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"����åץե������Ʊ���Ź業����Ȥ������enter�����򲡤��Ƥ�������."
+
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: %s ����֥��å� 1 ���ɹ���ޤ���"
 
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
 msgstr "???¿���ιԤ������Ƥ��ޤ�"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
 msgstr "???�Կ����ְ�äƤ��ޤ�"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
 msgstr "???�֥��å������Ǥ�"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
 msgstr "???�Ԥ������Ƥ��ޤ�"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: �֥��å� 1 ��ID���ְ�äƤ��ޤ�(%s ��.swp�ե�����Ǥʤ�?)"
 
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "???�֥��å�������ޤ���"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? �������� ???END �ޤǤιԤ��˲�����Ƥ���褦�Ǥ�"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? �������� ???END �ޤǤιԤ�������������줿�褦�Ǥ�"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "???END"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: �ꥫ�Х꤬����ޤ�ޤ���"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: �ꥫ�Х�κ���˥��顼�����Ф���ޤ���; ???�ǻϤޤ�Ԥ򻲾Ȥ��Ƥ�������"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
 msgstr "�ܺ٤� \":help E312\" �򻲾Ȥ��Ƥ�������"
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "�ꥫ�Х꤬��λ���ޤ���. ���Ƥ��������������å����Ƥ�������."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3844,15 +3515,12 @@ msgstr ""
 "\n"
 "(�ѹ�������å����뤿���, ���Υե�������̤�̾������¸�������\n"
 
-#: ../memline.c:1252
 msgid "and run diff with the original file to check for changes)"
 msgstr "���ܥե�����Ȥ� diff ��¹Ԥ�����ɤ��Ǥ��礦)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr "������λ. �Хåե������Ƥϥե������Ʊ���ˤʤ�ޤ���."
 
-#: ../memline.c:1255
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
@@ -3862,52 +3530,43 @@ msgstr ""
 "����.swp�ե�����Ϻ�����Ƥ⹽���ޤ���\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr "����åץե����뤫����������Ź業����ƥ����ȥե�����˻Ȥ��ޤ�.\n"
+
 #. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
 msgstr "����åץե����뤬ʣ�����Ĥ���ޤ���:"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
 msgstr "   ���ߤΥǥ��쥯�ȥ�:\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
 msgstr "   �ʲ���̾���������:\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   �ǥ��쥯�ȥ� "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
 msgstr "      -- �ʤ� --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "            ��ͭ��: "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "   ����: "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "             ����: "
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [from Vim version 3.0]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [Vim�Υ���åץե�����ǤϤʤ��褦�Ǥ�]"
 
-#: ../memline.c:1552
 msgid "         file name: "
 msgstr "        �ե�����̾: "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -3915,15 +3574,12 @@ msgstr ""
 "\n"
 "          �ѹ�����: "
 
-#: ../memline.c:1559
 msgid "YES"
 msgstr "����"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "�ʤ�"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
@@ -3931,11 +3587,9 @@ msgstr ""
 "\n"
 "        �桼����̾: "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr "   �ۥ���̾: "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -3943,7 +3597,6 @@ msgstr ""
 "\n"
 "          �ۥ���̾: "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -3951,11 +3604,16 @@ msgstr ""
 "\n"
 "        �ץ�����ID: "
 
-#: ../memline.c:1579
 msgid " (still running)"
 msgstr " (�ޤ��¹���)"
 
-#: ../memline.c:1586
+msgid ""
+"\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [����Vim�С������Ǥϻ��ѤǤ��ޤ���]"
+
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3963,97 +3621,75 @@ msgstr ""
 "\n"
 "         [���Υ���ԥ塼���Ǥϻ��ѤǤ��ޤ���]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [�ɹ���ޤ���]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [�����ޤ���]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: ����åץե����뤬̵���Τǰݻ��Ǥ��ޤ���"
 
-#: ../memline.c:1747
 msgid "File preserved"
 msgstr "�ե����뤬�ݻ�����ޤ�"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
 msgstr "E314: �ݻ��˼��Ԥ��ޤ���"
 
-#: ../memline.c:1819
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: ̵����lnum�Ǥ�: %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get: ̵����lnum�Ǥ�: %ld"
 
-#: ../memline.c:1851
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: �� %<PRId64> �򸫤Ĥ����ޤ���"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get: �� %ld �򸫤Ĥ����ޤ���"
 
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 3"
 
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
 msgstr "stack_idx �� 0 �Ǥ���٤��Ǥ�"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
 msgstr "E318: �������줿�֥��å���¿�᤮�뤫��?"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "�֥��å� 1 �Ͼä��줿?"
 
-#: ../memline.c:2707
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: �� %<PRId64> �����Ĥ���ޤ���"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: �� %ld �����Ĥ���ޤ���"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ�"
 
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "pe_line_count �������Ǥ�"
 
-#: ../memline.c:2955
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: ���ֹ椬�ϰϳ��Ǥ�: %<PRId64> Ķ���Ƥ��ޤ�"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: ���ֹ椬�ϰϳ��Ǥ�: %ld Ķ���Ƥ��ޤ�"
 
-#: ../memline.c:2959
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: �֥��å� %<PRId64> �ιԥ�����Ȥ��ְ�äƤ��ޤ�"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: �֥��å� %ld �ιԥ�����Ȥ��ְ�äƤ��ޤ�"
 
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "�����å��������������ޤ�"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: \"%s\" �Υ���ܥ�å���󥯤��롼�פˤʤäƤ��ޤ�"
 
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: ����"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4061,39 +3697,32 @@ msgstr ""
 "\n"
 "����̾���ǥ���åץե�����򸫤Ĥ��ޤ��� \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "���Υե�����򳫤��Ƥ������ \""
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "      ����åץե�������⿷�����Ǥ�!\n"
 
-#: ../memline.c:3244
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) �̤Υץ�����बƱ���ե�������Խ����Ƥ��뤫�⤷��ޤ���.\n"
 "    ���ξ��ˤ�, �ѹ��򤷤Ƥ��ޤ���1�ĤΥե�������Ф��ưۤʤ�2�Ĥ�\n"
-"    ���󥹥��󥹤��Ǥ��Ƥ��ޤ��Τ�, �������ʤ��褦�˵���Ĥ��Ƥ�������."
-
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "    ��λ���뤫, ���դ��ʤ���³���Ƥ�������.\n"
+"    ���󥹥��󥹤��Ǥ��Ƥ��ޤ��Τ�, �������ʤ��褦�˵���Ĥ��Ƥ�������.\n"
+"    ��λ���뤫, ���դ��ʤ���³���Ƥ�������.\n"
 
-#: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ���Υե�������Խ����å���󤬥���å��夷��.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    ���ξ��ˤ� \":recover\" �� \"vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4101,11 +3730,9 @@ msgstr ""
 "\"\n"
 "    ����Ѥ����ѹ���ꥫ�С����ޤ�(\":help recovery\" �򻲾�).\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
 msgstr "    ���ˤ����Ԥʤä��Τʤ��, ����åץե����� \""
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4113,23 +3740,18 @@ msgstr ""
 "\"\n"
 "    ��ä��Ф��Υ�å����������Ǥ��ޤ�.\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "����åץե����� \""
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr "\" �����ˤ���ޤ�!"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM - ����"
 
-#: ../memline.c:3459
 msgid "Swap file already exists!"
 msgstr "����åץե����뤬����¸�ߤ��ޤ�!"
 
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4143,7 +3765,6 @@ msgstr ""
 "�����(&Q)\n"
 "��ߤ���(&A)"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4159,56 +3780,34 @@ msgstr ""
 "�����(&Q)\n"
 "��ߤ���(&A)"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: ����åץե����뤬¿�����Ĥ���ޤ���"
 
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: ���꤬­��ޤ���!  (%<PRIu64> �Х��Ȥ�����׵�)"
-
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: ��˥塼�����ƥ�Υѥ�����ʬ�����֥�˥塼�ǤϤ���ޤ���"
 
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: ��˥塼��¾�Υ⡼�ɤˤ�������ޤ�"
 
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" �Ȥ�����˥塼�Ϥ���ޤ���"
 
 #. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
 msgstr "E792: ��˥塼̾�����Ǥ�"
 
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: ��˥塼�ѥ��ϥ��֥�˥塼��������٤��ǤϤ���ޤ���"
 
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: ��˥塼�С��ˤ�ľ�ܥ�˥塼�����ƥ���ɲäǤ��ޤ���"
 
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: ���ڤ�ϥ�˥塼�ѥ��ΰ����ǤϤ���ޤ���"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4216,69 +3815,60 @@ msgstr ""
 "\n"
 "--- ��˥塼 ---"
 
-#: ../menu.c:1313
+msgid "Tear off this menu"
+msgstr "���Υ�˥塼���ڤ���"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: ��˥塼�ѥ��ϥ�˥塼�����ƥ�������ʤ���Ф����ޤ���"
 
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: ��˥塼�����Ĥ���ޤ���: %s"
 
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s �ˤϥ�˥塼���������Ƥ��ޤ���"
 
-#: ../menu.c:1426
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: ��˥塼�ѥ��ϥ��֥�˥塼�������ʤ���Ф����ޤ���"
 
-#: ../menu.c:1447
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: ��˥塼�����Ĥ���ޤ��� - ��˥塼̾���ǧ���Ƥ�������"
 
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s �ν�����˥��顼�����Ф���ޤ���:"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "�� %4ld:"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: ̵���ʥ쥸����̾: '%s'"
 
-#: ../message.c:986
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr "���ܸ��å���������/�ƽ�: ¼�� ��Ϻ <koron.kaoriya@gmail.com>"
+
 msgid "Interrupt: "
 msgstr "�����: "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
 msgstr "³����ˤ�ENTER�򲡤������ޥ�ɤ����Ϥ��Ƥ�������"
 
-#: ../message.c:1843
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s �� %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s �� %ld"
 
-#: ../message.c:2392
 msgid "-- More --"
 msgstr "-- ��³ --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr " SPACE/d/j: ����/�ڡ���/�� ��, b/u/k: ��, q: ��λ "
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "����"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
@@ -4286,17 +3876,6 @@ msgstr ""
 "�Ϥ�(&Y)\n"
 "������(&N)"
 
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"�Ϥ�(&Y)\n"
-"������(&N)\n"
-"����󥻥�(&C)"
-
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4310,175 +3889,247 @@ msgstr ""
 "��������(&D)\n"
 "����󥻥�(&C)"
 
-#: ../message.c:3058
+msgid "Select Directory dialog"
+msgstr "�ǥ��쥯�ȥ��������������"
+
+msgid "Save File dialog"
+msgstr "�ե�������¸����������"
+
+msgid "Open File dialog"
+msgstr "�ե������ɹ�����������"
+
+#. TODO: non-GUI file selector here
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: ���󥽡���⡼�ɤǤϥե�����֥饦����Ȥ��ޤ���, �����ʤ���"
+
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() �ΰ������Խ�ʬ�Ǥ�"
 
-#: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: printf() �ΰ����ˤ���ư�������������Ԥ���Ƥ��ޤ�"
 
-#: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() �ΰ�����¿�᤮�ޤ�"
 
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: �ٹ�: �ɹ����ѥե�������ѹ����ޤ�"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "�ֹ��<Enter>�����Ϥ��뤫�ޥ����ǥ���å����Ƥ������� (���ǥ���󥻥�): "
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "�ֹ��<Enter>�����Ϥ��Ƥ������� (���ǥ���󥻥�): "
 
-#: ../misc1.c:2585
 msgid "1 more line"
 msgstr "1 �� �ɲä��ޤ���"
 
-#: ../misc1.c:2588
 msgid "1 line less"
 msgstr "1 �� ������ޤ���"
 
-#: ../misc1.c:2593
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> �� �ɲä��ޤ���"
+msgid "%ld more lines"
+msgstr "%ld �� �ɲä��ޤ���"
 
-#: ../misc1.c:2596
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> �� ������ޤ���"
+msgid "%ld fewer lines"
+msgstr "%ld �� ������ޤ���"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (����ޤ�ޤ���)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "�ӡ���!"
 
-#: ../misc2.c:738
+msgid "ERROR: "
+msgstr "���顼: "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[����(�Х���)] ������-������ %lu-%lu, ������ %lu, �ԡ����� %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+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,)"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: ���꤬­��ޤ���!  (%lu �Х��Ȥ�����׵�)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "�¹ԤΤ���˥������ƽФ���: \"%s\""
 
-#: ../normal.c:183
+msgid "E545: Missing colon"
+msgstr "E545: �����󤬤���ޤ���"
+
+msgid "E546: Illegal mode"
+msgstr "E546: �����ʥ⡼�ɤǤ�"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: ������ 'mouseshape' �Ǥ�"
+
+msgid "E548: digit expected"
+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: ̵���ʥѥ��Ǥ�: '**[����]' ��path�κǸ夫 '%s' ��³���Ƥʤ��Ȥ����ޤ�"
+"��."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: cdpath�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: cdpath�ˤϤ���ʾ� \"%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: �Хåե� %ld �� NetBeans ��³�������ޤ���"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: NetBeans�Ϥ���GUI�ˤ��б����Ƥ��ޤ���"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: NetBeans�ϴ�����³���Ƥ��ޤ�"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s ���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: ��������ΰ��֤ˤϼ��̻Ҥ�����ޤ���"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' ���ץ���󤬶��Ǥ�"
 
-#: ../normal.c:2637
+msgid "E775: Eval feature not available"
+msgstr "E775: ��ɾ����ǽ��̵���ˤʤäƤ��ޤ�"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "�ٹ�: ���Ѥ��Ƥ���ü���ϥϥ��饤�ȤǤ��ޤ���"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: ��������ΰ��֤ˤ�ʸ���󤬤���ޤ���"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ�õ�Ǥ��ޤ���"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
 msgstr "E664: �ѹ��ꥹ�Ȥ����Ǥ�"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: �ѹ��ꥹ�Ȥ���Ƭ"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: �ѹ��ꥹ�Ȥ�����"
 
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Vim��λ����ˤ� :quit<Enter> �����Ϥ��Ƥ�������"
 
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 �Ԥ� %s �� 1 ���������ޤ���"
 
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 �Ԥ� %s �� %d ���������ޤ���"
 
-#: ../ops.c:253
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> �Ԥ� %s �� 1 ���������ޤ���"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld �Ԥ� %s �� 1 ���������ޤ���"
 
-#: ../ops.c:256
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> �Ԥ� %s �� %d ���������ޤ���"
+msgid "%ld lines %sed %d times"
+msgstr "%ld �Ԥ� %s �� %d ���������ޤ���"
 
-#: ../ops.c:592
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> �Ԥ�����ǥ�Ȥ���ޤ�... "
+msgid "%ld lines to indent... "
+msgstr "%ld �Ԥ�����ǥ�Ȥ���ޤ�... "
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "1 �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
 
-#: ../ops.c:636
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
+msgid "%ld lines indented "
+msgstr "%ld �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
 msgstr "E748: �ޤ��쥸��������Ѥ��Ƥ��ޤ���"
 
 #. must display the prompt
-#: ../ops.c:1433
 msgid "cannot yank; delete anyway"
 msgstr "��󥯤Ǥ��ޤ���; �Ȥˤ����õ�"
 
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "1 �Ԥ��ѹ�����ޤ���"
 
-#: ../ops.c:1931
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> �Ԥ��ѹ�����ޤ���"
+msgid "%ld lines changed"
+msgstr "%ld �Ԥ��ѹ�����ޤ���"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "%ld �Ԥ������"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "1 �ԤΥ֥��å�����󥯤���ޤ���"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "1 �Ԥ���󥯤���ޤ���"
 
-#: ../ops.c:2525
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "%<PRId64> �ԤΥ֥��å�����󥯤���ޤ���"
+msgid "block of %ld lines yanked"
+msgstr "%ld �ԤΥ֥��å�����󥯤���ޤ���"
 
-#: ../ops.c:2528
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> �Ԥ���󥯤���ޤ���"
+msgid "%ld lines yanked"
+msgstr "%ld �Ԥ���󥯤���ޤ���"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: �쥸���� %s �ˤϲ��⤢��ޤ���"
 
 #. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4486,11 +4137,9 @@ msgstr ""
 "\n"
 "--- �쥸���� ---"
 
-#: ../ops.c:4455
 msgid "Illegal register name"
 msgstr "�����ʥ쥸����̾"
 
-#: ../ops.c:4533
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4498,7 +4147,6 @@ msgstr ""
 "\n"
 "# �쥸����:\n"
 
-#: ../ops.c:4575
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: ̤�ΤΥ쥸������ %d �Ǥ�"
@@ -4508,86 +4156,61 @@ msgid ""
 "lines"
 msgstr "E883: �����ѥ�����ȼ��쥸�����ˤ�2�԰ʾ��ޤ���ޤ���"
 
-#: ../ops.c:5089
 #, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> ��; "
+msgid "%ld Cols; "
+msgstr "%ld ��; "
 
-#: ../ops.c:5097
 #, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"���� %s%<PRId64> / %<PRId64> ��; %<PRId64> / %<PRId64> ñ��; %<PRId64> / "
-"%<PRId64> ����"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "���� %s%ld / %ld ��; %lld / %lld ñ��; %lld / %lld �Х���"
 
-#: ../ops.c:5105
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"���� %s%<PRId64> / %<PRId64> ��; %<PRId64> / %<PRId64> ñ��; %<PRId64> / "
-"%<PRId64> ʸ��; %<PRId64> / %<PRId64> �Х���"
+"���� %s%ld / %ld ��; %lld / %lld ñ��; %lld / %lld ʸ��; %lld / %lld �Х���"
 
-#: ../ops.c:5123
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s / %s; �� %<PRId64> of %<PRId64>; ñ�� %<PRId64> / %<PRId64>; �Х��� "
-"%<PRId64> / %<PRId64>"
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "�� %s / %s; �� %ld of %ld; ñ�� %lld / %lld; �Х��� %lld / %lld"
 
-#: ../ops.c:5133
 #, c-format
 msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"�� %s / %s; �� %<PRId64> / %<PRId64>; ñ�� %<PRId64> / %<PRId64>; ʸ�� "
-"%<PRId64> / %<PRId64>; ���� %<PRId64> of %<PRId64>"
+"�� %s / %s; �� %ld / %ld; ñ�� %lld / %lld; ʸ�� %lld / %lld; �Х��� %lld of "
+"%lld"
 
-#: ../ops.c:5146
 #, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> for BOM)"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld for BOM)"
 
-#: ../option.c:1238
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N �ڡ���"
 
-#: ../option.c:1574
 msgid "Thanks for flying Vim"
 msgstr "Vim ��ȤäƤ���Ƥ��꤬�Ȥ�"
 
-#. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: ̤�ΤΥ��ץ����Ǥ�"
 
-#: ../option.c:2709
 msgid "E519: Option not supported"
 msgstr "E519: ���ץ����ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline �Ǥϵ��Ĥ���ޤ���"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
 msgstr "E846: ���������ɤ����ꤵ��Ƥ��ޤ���"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
 msgstr "E521: = �θ�ˤϿ�����ɬ�פǤ�"
 
-#: ../option.c:3226 ../option.c:3864
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap ��˸��Ĥ���ޤ���"
 
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: ������ʸ���Ǥ� <%s>"
@@ -4596,93 +4219,99 @@ msgstr "E539: ������ʸ���Ǥ� <%s>"
 msgid "For option %s"
 msgstr "���ץ����: %s"
 
-#: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' �ˤ϶�ʸ���������Ǥ��ޤ���"
 
-#: ../option.c:3885
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: GUI�Ǥ� 'term' ���ѹ��Ǥ��ޤ���"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: GUI�򥹥����Ȥ���ˤ� \":gui\" ����Ѥ��Ƥ�������"
+
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' �� 'patchmode' ��Ʊ���Ǥ�"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr "E834: 'listchars'���ͤ�̷�⤬����ޤ�"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: 'fillchars'���ͤ�̷�⤬����ޤ�"
 
-#: ../option.c:4163
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: GTK+2 GUI�Ǥ��ѹ��Ǥ��ޤ���"
+
 msgid "E524: Missing colon"
 msgstr "E524: �����󤬤���ޤ���"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: ʸ�����Ĺ���������Ǥ�"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> �θ�˿���������ޤ���"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: ����ޤ�����ޤ���"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
 msgstr "E528: ' ���ͤ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: ɽ���Ǥ��ʤ�ʸ�����磻��ʸ����ޤ�Ǥ��ޤ�"
 
-#: ../option.c:4469
+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> �θ��������ʸ��������ޤ�"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: ����ޤ�ɬ�פǤ�"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' �϶��Ǥ��뤫 %s ��ޤ�ɬ�פ�����ޤ�"
 
-#: ../option.c:4928
+msgid "E538: No mouse support"
+msgstr "E538: �ޥ����ϥ��ݡ��Ȥ���ޤ���"
+
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: ������λ���Ƥ��ޤ���"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: ���Ǥ�¿�᤮�ޤ�"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
 msgstr "E542: ���롼�פ���礤�ޤ���"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: �ץ�ӥ塼������ɥ�������¸�ߤ��ޤ�"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: ����ӥ�ʸ���ˤ�UTF-8��ɬ�פʤΤ�, ':set encoding=utf-8' ���Ƥ�������"
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: ���� %d �ιԿ���ɬ�פǤ�"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: ���� %d �Υ��������ɬ�פǤ�"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: ̤�ΤΥ��ץ����Ǥ�: %s"
@@ -4690,12 +4319,10 @@ msgstr "E355: ̤�ΤΥ��ץ����Ǥ�: %s"
 #. There's another character after zeros or the string
 #. * is empty.  In both cases, we are trying to set a
 #. * num option using a string.
-#: ../option.c:6037
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: ������ɬ�פǤ�: &%s = '%s'"
 
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4703,7 +4330,6 @@ msgstr ""
 "\n"
 "--- ü�������� ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4711,7 +4337,6 @@ msgstr ""
 "\n"
 "--- �������Х륪�ץ������ ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4719,7 +4344,6 @@ msgstr ""
 "\n"
 "--- �������륪�ץ������ ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4727,37 +4351,119 @@ msgstr ""
 "\n"
 "--- ���ץ���� ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp ���顼"
 
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': %s ���б�����ʸ��������ޤ���"
 
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': ���ߥ�����θ��;ʬ��ʸ��������ޤ�: %s"
 
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"�������¹ԤǤ��ޤ��� "
+msgid "cannot open "
+msgstr "�����ޤ��� "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM: ������ɥ��򳫤��ޤ���!\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "Amigados�ΥС������ 2.04������ʹߤ�ɬ�פǤ�\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "%s �ΥС������ %ld ��ɬ�פǤ�\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "NIL�򳫤��ޤ���:\n"
+
+msgid "Cannot create "
+msgstr "�����Ǥ��ޤ��� "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vim�� %d �ǽ�λ���ޤ�\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "���󥽡���⡼�ɤ��ѹ��Ǥ��ޤ���?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize: ���󥽡���ǤϤʤ�??\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: -f ���ץ����ǥ������¹ԤǤ��ޤ���"
+
+msgid "Cannot execute "
+msgstr "�¹ԤǤ��ޤ��� "
+
+msgid "shell "
+msgstr "������ "
+
+msgid " returned\n"
+msgstr " ���ޤ���\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE �������᤮�ޤ�."
+
+msgid "I/O ERROR"
+msgstr "�����ϥ��顼"
+
+msgid "Message"
+msgstr "������"
+
+msgid "'columns' is not 80, cannot execute external commands"
+msgstr "'columns' �� 80 �ǤϤʤ����ᡢ�������ޥ�ɤ�¹ԤǤ��ޤ���"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: �ץ�󥿤�����˼��Ԥ��ޤ���"
+
+#, c-format
+msgid "to %s on %s"
+msgstr "%s �� (%s ���)"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: ̤�ΤΥץ�󥿥��ץ����Ǥ�: %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: �������顼: %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "�������Ƥ��ޤ�: '%s'"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr "E244: ʸ�����å�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: �ʼ�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: '%c' ��������ʸ���Ǥ� (�ե����̾ \"%s\")"
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "X�����С��ؤ���³�� %ld �ߥ��ä�����ޤ���"
 
-#: ../os/shell.c:439
 msgid ""
 "\n"
-"shell returned "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"�����뤬�ͤ��֤��ޤ��� "
+"Vim: X �Υ��顼�򸡽Ф��ޤ���r\n"
+
+msgid "Testing the X display failed"
+msgstr "X display �Υ����å��˼��Ԥ��ޤ���"
+
+msgid "Opening the X display timed out"
+msgstr "X display �� open �������ॢ���Ȥ��ޤ���"
 
-#: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4765,7 +4471,6 @@ msgstr ""
 "\n"
 "�������ƥ�����ƥ����Ȥ�����Ǥ��ޤ��� "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -4781,223 +4486,293 @@ msgstr "�������ƥ�����ƥ����� %s �� %s ������Ǥ��ޤ���"
 msgid "Could not get security context %s for %s. Removing it!"
 msgstr "�������ƥ�����ƥ����� %s �� %s ��������Ǥ��ޤ���. ������ޤ�!"
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"sh �������¹ԤǤ��ޤ���\n"
+
+msgid ""
+"\n"
+"shell returned "
+msgstr ""
+"\n"
+"�����뤬�ͤ��֤��ޤ��� "
+
+msgid ""
+"\n"
+"Cannot create pipes\n"
+msgstr ""
+"\n"
+"�ѥ��פ�����Ǥ��ޤ���\n"
+
+msgid ""
+"\n"
+"Cannot fork\n"
+msgstr ""
+"\n"
+"fork �Ǥ��ޤ���\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"�������¹ԤǤ��ޤ��� "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"���ޥ�ɤ����Ǥ��ޤ���\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "XSMP ��ICE��³�򼺤��ޤ���"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
-#: ../path.c:1449
+msgid "Opening the X display failed"
+msgstr "X display �� open �˼��Ԥ��ޤ���"
+
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP ��save-yourself�׵��������Ƥ��ޤ�"
+
+msgid "XSMP opening connection"
+msgstr "XSMP ����³�򳫻Ϥ��Ƥ��ޤ�"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE��³�����Ԥ����褦�Ǥ�"
+
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+msgid "XSMP SmcOpenConnection failed: %s"
+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"
+
+msgid "close"
+msgstr "�Ĥ���"
+
+msgid "logoff"
+msgstr "��������"
+
+msgid "shutdown"
+msgstr "����åȥ�����"
+
+msgid "E371: Command not found"
+msgstr "E371: ���ޥ�ɤ�����ޤ���"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"VIMRUN.EXE�� $PATH ����˸��Ĥ���ޤ���.\n"
+"�������ޥ�ɤν�λ��˰����ߤ򤷤ޤ���.\n"
+"�ܺ٤�  :help win32-vimrun  �򻲾Ȥ��Ƥ�������."
+
+msgid "Vim Warning"
+msgstr "Vim�ηٹ�"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "�����뤬������ %d �ǽ�λ���ޤ���"
 
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: �ե����ޥå�ʸ����� %%%c ��¿�᤮�ޤ�"
 
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: �ե����ޥå�ʸ�����ͽ������ %%%c ������ޤ���"
 
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: �ե����ޥå�ʸ����� ] ������ޤ���"
 
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: �ե����ޥå�ʸ����Ǥ� %%%c �ϥ��ݡ��Ȥ���ޤ���"
 
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: �ե����ޥå�ʸ��������֤�̵���� %%%c ������ޤ�"
 
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: �ե����ޥå�ʸ�����̵���� %%%c ������ޤ�"
 
 #. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' �˥ѥ����󤬻��ꤵ��Ƥ��ޤ���"
 
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �ǥ��쥯�ȥ�̾��̵�������Ǥ�"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
 msgstr "E553: ���Ǥ��⤦����ޤ���"
 
-#: ../quickfix.c:1674
+msgid "E924: Current window was closed"
+msgstr "E924: ���ߤΥ�����ɥ����Ĥ����ޤ���"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: ���ߤ� quickfix ���ѹ�����ޤ���"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: ���ߤΥ����������ꥹ�Ȥ��ѹ�����ޤ���"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (�Ԥ��������ޤ���)"
 
-#: ../quickfix.c:1863
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s ���顼���� %d of %d; %d �ĥ��顼"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix �����å��������Ǥ�"
 
-#: ../quickfix.c:1869
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix �����å�����Ƭ�Ǥ�"
 
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "���顼���� %d of %d; %d �ĥ��顼"
+msgid "No entries"
+msgstr "����ȥ꤬����ޤ���"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' ���ץ�������ꤵ��Ƥ���Τǽ���ߤޤ���"
 
-#: ../quickfix.c:2812
+msgid "Error file"
+msgstr "���顼�ե�����"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: �ե�����̾��̵����̵���ʥѥ�����Ǥ�"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "�ե����� \"%s\" �򳫤��ޤ���"
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: �Хåե����ɤ߹��ޤ�ޤ���Ǥ���"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
 msgstr "E777: ʸ���󤫥ꥹ�Ȥ�ɬ�פǤ�"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ̵���ʹ��ܤǤ�: %s%%[]"
 
 #
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: %s[ �θ�� ] ������ޤ���"
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( ������äƤ��ޤ���"
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( ������äƤ��ޤ���"
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) ������äƤ��ޤ���"
 
 #
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( �ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
 #
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 ����¾�ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
 #
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ �θ�� ] ������ޤ���"
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] �����Ǥ�"
 
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
 msgstr "E339: �ѥ�����Ĺ�᤮�ޤ�"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
 msgstr "E50: \\z( ��¿�᤮�ޤ�"
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: %s( ��¿�᤮�ޤ�"
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( ������äƤ��ޤ���"
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ �θ��������ʸ��������ޤ���"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: ʣ���� %s{...} ��¿�᤮�ޤ�"
 
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61:%s* ������ҤˤʤäƤ��ޤ�"
 
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62:%s%c ������ҤˤʤäƤ��ޤ�"
 
 #
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ ��̵���ʻ�����ˡ�Ǥ�"
 
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c �θ�ˤʤˤ⤢��ޤ���"
 
 #
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
 msgstr "E65: �����ʸ������ȤǤ�"
 
 #
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z �θ��������ʸ��������ޤ���"
 
 #
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: %s%%[dxouU] �θ��������ʸ��������ޤ���"
 
 #
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% �θ��������ʸ��������ޤ���"
 
-#: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} ���ʸˡ���顼������ޤ�"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
 msgstr "��������ʬ����:\n"
 
@@ -5005,7 +4780,6 @@ msgstr "��������ʬ����:\n"
 msgid "E888: (NFA regexp) cannot repeat %s"
 msgstr "E888: (NFA ����ɽ��) �����֤��ޤ��� %s"
 
-#: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -5016,62 +4790,54 @@ msgstr ""
 msgid "Switching to backtracking RE engine for pattern: "
 msgstr "���Υѥ�����˥Хå��ȥ�å��� RE ���󥸥��Ŭ�Ѥ��ޤ�: "
 
-#: ../regexp_nfa.c:239
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) ���Ԥ���᤯����ɽ���ν�ü����ã���ޤ���"
 
-#: ../regexp_nfa.c:240
 #, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA ����ɽ��) ���֤����äƤ��ޤ�: %c"
 
-#: ../regexp_nfa.c:242
+#
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr "E877: (NFA ����ɽ��) ̵����ʸ�����饹: %<PRId64>"
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (NFA ����ɽ��) ̵����ʸ�����饹: %ld"
 
-#: ../regexp_nfa.c:1261
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) ̤�ΤΥ��ڥ졼���Ǥ�: '\\z%c'"
 
-#: ../regexp_nfa.c:1387
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) ̤�ΤΥ��ڥ졼���Ǥ�: '\\%%%c'"
 
-#: ../regexp_nfa.c:1802
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: �������饹��ޤ�NFA���ۤ˼��Ԥ��ޤ���!"
+
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
 msgstr "E869: (NFA) ̤�ΤΥ��ڥ졼���Ǥ�: '\\@%c'"
 
-#: ../regexp_nfa.c:1831
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA ����ɽ��) �����֤������²�����ɹ���˥��顼"
 
 #. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
 msgstr "E871: (NFA ����ɽ��) �����֤� �θ�� �����֤� �ϤǤ��ޤ���!"
 
 #. Too many `('
-#: ../regexp_nfa.c:2037
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA ����ɽ��) '(' ��¿�᤮�ޤ�"
 
-#: ../regexp_nfa.c:2042
 msgid "E879: (NFA regexp) Too many \\z("
 msgstr "E879: (NFA ����ɽ��) \\z( ��¿�᤮�ޤ�"
 
-#: ../regexp_nfa.c:2066
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA ����ɽ��) ��ü���椬����ޤ���"
 
-#: ../regexp_nfa.c:2599
 msgid "E874: (NFA) Could not pop the stack !"
 msgstr "E874: (NFA) �����å���ݥåפǤ��ޤ���!"
 
-#: ../regexp_nfa.c:3298
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
@@ -5079,177 +4845,136 @@ msgstr ""
 "E875: (NFA ����ɽ��) (����ʸ�����NFA���Ѵ����) �����å��˻Ĥ��줿���ơ��Ȥ�"
 "¿�᤮�ޤ�"
 
-#: ../regexp_nfa.c:3302
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (NFA ����ɽ��) NFA���Τ���¸����ˤ϶������ڡ�����­��ޤ���"
 
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) ���߲�����Υ֥����˽�ʬ�ʥ���������Ƥ��ޤ���!"
+
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
 "NFA����ɽ�����󥸥��ѤΥ����ե���������ѤȤ��Ƴ����ޤ��󡣥�����ɸ����Ϥ�"
 "���Ϥ��ޤ���"
 
-#: ../regexp_nfa.c:4840
 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA) �����ե����� %s �򳫤��ޤ���!"
 
-#: ../regexp_nfa.c:6049
 msgid "Could not open temporary log file for writing "
 msgstr "NFA����ɽ�����󥸥��ѤΥ����ե���������ѤȤ��Ƴ����ޤ���"
 
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " �����ִ�"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " �ִ�"
 
-#: ../screen.c:7440
 msgid " REVERSE"
 msgstr " ȿž"
 
-#: ../screen.c:7441
 msgid " INSERT"
 msgstr " ����"
 
-#: ../screen.c:7443
 msgid " (insert)"
 msgstr " (����)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (�ִ�)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (�����ִ�)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " �إ֥饤"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " ����ӥ�"
 
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (����)"
-
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (Ž���դ�)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " �ӥ��奢��"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " �ӥ��奢�� ��"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " �ӥ��奢�� ���"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " ���쥯��"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " �Իظ�����"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " �������"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "��Ͽ��"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: ̵���ʸ���ʸ����Ǥ�: %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: ��ޤǸ������ޤ����������ս�Ϥ���ޤ���: %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: ���ޤǸ������ޤ����������ս�Ϥ���ޤ���: %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' �Τ��Ȥˤ� '?' �� '/' �����Ԥ���Ƥ���"
 
-#: ../search.c:4085
 msgid " (includes previously listed match)"
 msgstr " (������󤷤������ս��ޤ�)"
 
 #. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
 msgstr "--- ���󥯥롼�ɤ��줿�ե����� "
 
-#: ../search.c:4106
 msgid "not found "
 msgstr "���Ĥ���ޤ��� "
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "�ѥ��� ----\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (�������)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
 msgstr "  ���Ĥ���ޤ���"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "���󥯥롼�ɤ��줿�ե�����򥹥������: %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
 msgstr "���󥯥롼�ɤ��줿�ե�����򥹥������ %s"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
 msgstr "E387: ���߹Ԥ˳���������ޤ�"
 
-#: ../search.c:4517
 msgid "All included files were found"
 msgstr "���ƤΥ��󥯥롼�ɤ��줿�ե����뤬���Ĥ���ޤ���"
 
-#: ../search.c:4519
 msgid "No included files"
 msgstr "���󥯥롼�ɥե�����Ϥ���ޤ���"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
 msgstr "E388: ����򸫤Ĥ����ޤ���"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �ѥ�����򸫤Ĥ����ޤ���"
 
-#: ../search.c:4668
 msgid "Substitute "
 msgstr "Substitute "
 
-#: ../search.c:4681
 #, c-format
 msgid ""
 "\n"
@@ -5260,99 +4985,131 @@ msgstr ""
 "# �Ǹ�� %s�����ѥ�����:\n"
 "~"
 
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: ���ڥ�ե�����ν񼰥��顼�Ǥ�"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: ���ڥ�����å���̵��������Ƥ��ޤ�"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"�ٹ�: ñ��ꥹ�� \"%s_%s.spl\" ����� \"%s_ascii.spl\" �ϸ��Ĥ���ޤ���"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"�ٹ�: ñ��ꥹ�� \"%s.%s.spl\" ����� \"%s.ascii.spl\" �ϸ��Ĥ���ޤ���"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand �� SpellFileMissing ���Хåե��������ޤ���"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "�ٹ�9: %s �Ȥ����ϰϤϥ��ݡ��Ȥ���Ƥ��ޤ���"
+
+msgid "Sorry, no suggestions"
+msgstr "��ǰ�Ǥ���, ��������Ϥ���ޤ���"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "��ǰ�Ǥ���, ��������� %ld �Ĥ�������ޤ���"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" �򼡤��Ѵ�:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: ���ڥ��ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: ���Ĥ���ޤ���: %s"
 
-#: ../spell.c:952
 msgid "E758: Truncated spell file"
 msgstr "E758: ���ڥ�ե����뤬�ڼ���Ƥ���褦�Ǥ�"
 
-#: ../spell.c:953
 #, c-format
 msgid "Trailing text in %s line %d: %s"
 msgstr "%s (%d ����) ��³���ƥ�����: %s"
 
-#: ../spell.c:954
 #, c-format
 msgid "Affix name too long in %s line %d: %s"
 msgstr "%s (%d ����) �� affix ̾��Ĺ�᤮�ޤ�: %s"
 
-#: ../spell.c:955
 msgid "E761: Format error in affix file FOL, LOW or UPP"
 msgstr ""
 "E761: affix�ե������ FOL, LOW �⤷���� UPP �Υե����ޥåȤ˥��顼������ޤ�"
 
-#: ../spell.c:957
 msgid "E762: Character in FOL, LOW or UPP is out of range"
 msgstr "E762: FOL, LOW �⤷���� UPP ��ʸ�����ϰϳ��Ǥ�"
 
-#: ../spell.c:958
 msgid "Compressing word tree..."
 msgstr "ñ��ĥ꡼�򰵽̤��Ƥ��ޤ�..."
 
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: ���ڥ�����å���̵��������Ƥ��ޤ�"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"�ٹ�: ñ��ꥹ�� \"%s.%s.spl\" ����� \"%s.ascii.spl\" �ϸ��Ĥ���ޤ���"
-
-#: ../spell.c:2473
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "���ڥ�ե����� \"%s\" ���ɹ���"
 
-#: ../spell.c:2496
 msgid "E757: This does not look like a spell file"
 msgstr "E757: ���ڥ�ե�����ǤϤʤ��褦�Ǥ�"
 
-#: ../spell.c:2501
 msgid "E771: Old spell file, needs to be updated"
 msgstr "E771: �Ť����ڥ�ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������"
 
-#: ../spell.c:2504
 msgid "E772: Spell file is for newer version of Vim"
 msgstr "E772: ��꿷�����С������� Vim �ѤΥ��ڥ�ե�����Ǥ�"
 
-#: ../spell.c:2602
 msgid "E770: Unsupported section in spell file"
 msgstr "E770: ���ڥ�ե�����˥��ݡ��Ȥ��Ƥ��ʤ���������󤬤���ޤ�"
 
-#: ../spell.c:3762
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "�ٹ�9: %s �Ȥ����ϰϤϥ��ݡ��Ȥ���Ƥ��ޤ���"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug �ե�����ǤϤʤ��褦�Ǥ�: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: �Ť� .sug �ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: ��꿷�����С������� Vim �Ѥ� .sug �ե�����Ǥ�: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug �ե����뤬 .spl �ե�����Ȱ��פ��ޤ���: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug �ե�������ɹ���˥��顼��ȯ�����ޤ���: %s"
 
-#: ../spell.c:4550
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "affix �ե����� %s ���ɹ���..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "%s (%d ����) ��ñ����Ѵ��Ǥ��ޤ���Ǥ���: %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "%s ��μ����Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���: %s ���� %s ��"
 
-#: ../spell.c:4642
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "%s ����Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���"
+
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s ��� %d ���ܤ� FLAG ��̵�����ͤ�����ޤ�: %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s ��� %d ���ܤ˥ե饰����Ż��Ѥ�����ޤ�: %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
@@ -5361,7 +5118,6 @@ msgstr ""
 "%s �� %d ���ܤ� PFX ���ܤθ�� COMPOUNDFORBIDFLAG ������ϸ��ä���̤�������"
 "���Ȥ�����ޤ�"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
@@ -5370,43 +5126,35 @@ msgstr ""
 "%s �� %d ���ܤ� PFX ���ܤθ�� COMPOUNDPERMITFLAG ������ϸ��ä���̤�������"
 "���Ȥ�����ޤ�"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "COMPOUNDRULES ���ͤ˸��꤬����ޤ�. �ե����� %s �� %d ����: %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� COMPOUNDWORDMAX ���ͤ˸��꤬����ޤ�: %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� COMPOUNDMIN ���ͤ˸��꤬����ޤ�: %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� COMPOUNDSYLMAX ���ͤ˸��꤬����ޤ�: %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� CHECKCOMPOUNDPATTERN ���ͤ˸��꤬����ޤ�: %s"
 
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
 "%s �� %d ���ܤ� Ϣ³ affix �֥��å��Υե饰���ȹ礻�˰㤤������ޤ�: %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣ���� affix �򸡽Ф��ޤ���: %s"
 
-#: ../spell.c:4871
 #, c-format
 msgid ""
 "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
@@ -5415,308 +5163,206 @@ msgstr ""
 "%s �� %d ���ܤ� affix �� BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST "
 "�˻��Ѥ��Ƥ�������: %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "%s �� %d ���ܤǤ� Y �� N ��ɬ�פǤ�: %s"
 
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ���ϲ���Ƥ��ޤ�: %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s �� %d ���ܤˤ� REP(SAL) �β����ɬ�פǤ�"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "%s �� %d ���ܤˤ� MAP �β����ɬ�פǤ�"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "%s �� %d ���ܤ� MAP �˽�ʣ����ʸ��������ޤ�"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ǧ���Ǥ��ʤ�����ʣ�������ܤ�����ޤ�: %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "%s ���ܤ� FOL/LOW/UPP ������ޤ���"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "SYLLABLE �����ꤵ��ʤ� COMPOUNDSYLMAX"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
 msgstr "�ٱ���ֻҤ�¿�᤮�ޤ�"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "ʣ��ե饰��¿�᤮�ޤ�"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "�ٱ���ֻ� ��/�⤷���� ʣ��ե饰��¿�᤮�ޤ�"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "SOFO%s �Ԥ� %s �ˤ���ޤ���"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "SAL�� �� SOFO�� �� %s ��ξ�����ꤵ��Ƥ��ޤ�"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "%s �� %d �Ԥ� �ե饰�����ͤǤϤ���ޤ���: %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� �ե饰�������Ǥ�: %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "�� %s ��¾�� .aff �ե�����ǻ��Ѥ��줿�ΤȰۤʤ�ޤ�"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "����ե����� %s �򥹥������..."
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: %s �ˤ�ñ���������ޤ���"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "�� %6d, ñ�� %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣñ�줬���Ĥ���ޤ���: %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "��ʣ�Τ����ǽ��ñ��� %s �� %d ���ܤǤ�: %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d �Ĥ�ñ�줬���Ĥ���ޤ��� (%s ��)"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "��ASCIIʸ����ޤ� %d �Ĥ�ñ���̵�뤷�ޤ��� (%s ��)"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "ɸ�����Ϥ����ɹ����� %s ..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣ���� /encoding= �Ԥ�̵�뤷�ޤ���: %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ñ��θ�� /encoding= �Ԥ�̵�뤷�ޤ���: %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣ���� /regions= �Ԥ�̵�뤷�ޤ���: %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "%s �� %d ����, �ϰϻ��꤬¿�᤮�ޤ�: %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣ���� / �Ԥ�̵�뤷�ޤ���: %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "%s �� %d ���� ̵���� nr �ΰ�Ǥ�: %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "%s �� %d ���� ǧ����ǽ�ʥե饰�Ǥ�: %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "��ASCIIʸ����ޤ� %d �Ĥ�ñ���̵�뤷�ޤ���"
 
-#: ../spell.c:6656
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: ���꤬­��ʤ��Τǡ�ñ��ꥹ�Ȥ��Դ����Ǥ�"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "�Ρ��� %d ��(�� %d ����) �򰵽̤��ޤ���; �Ĥ� %d (%d%%)"
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "���ڥ�ե��������ɹ���"
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "���������ߤ�¹���..."
 
-#: ../spell.c:7368
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "���������߸����ñ���: %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "���������߸����ñ���: %ld"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
 msgstr "���: %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "��������ե����� \"%s\" ��������..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "������������: %d ����"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
 msgstr "E751: ���ϥե�����̾�ˤ��ϰ�̾��ޤ���ޤ���"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: �ϰϤ� 8 �ĤޤǤ������ݡ��Ȥ���Ƥ��ޤ���"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: ̵�����ϰϤǤ�: %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "�ٹ�: ʣ��ե饰�� NOBREAK ��ξ���Ȥ���ꤵ��ޤ���"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "���ڥ�ե����� %s ��������..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "�¹Ԥ��ޤ���!"
 
-#: ../spell.c:8034
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' �ˤ� %<PRId64> �ĤΥ���ȥ�Ϥ���ޤ���"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' �ˤ� %ld �ĤΥ���ȥ�Ϥ���ޤ���"
 
-#: ../spell.c:8074
 #, c-format
 msgid "Word '%.*s' removed from %s"
 msgstr "ñ�� '%.*s' �� %s ����������ޤ���"
 
-#: ../spell.c:8117
 #, c-format
 msgid "Word '%.*s' added to %s"
 msgstr "ñ�� '%.*s' �� %s ���ɲä���ޤ���"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: ñ���ʸ�������ڥ�ե�����Ȱۤʤ�ޤ�"
 
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "��ǰ�Ǥ���, ��������Ϥ���ޤ���"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "��ǰ�Ǥ���, ��������� %<PRId64> �Ĥ�������ޤ���"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" �򼡤��Ѵ�:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: ���ڥ��ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: ���Ĥ���ޤ���: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug �ե�����ǤϤʤ��褦�Ǥ�: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: �Ť� .sug �ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ��꿷�����С������� Vim �Ѥ� .sug �ե�����Ǥ�: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug �ե����뤬 .spl �ե�����Ȱ��פ��ޤ���: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug �ե�������ɹ���˥��顼��ȯ�����ޤ���: %s"
-
 #. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
+#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP ����ȥ�˽�ʣʸ����¸�ߤ��ޤ�"
 
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
 msgstr "���ΥХåե���������줿��ʸ���ǤϤ���ޤ���"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: �����ʰ����Ǥ�: %s"
@@ -5724,28 +5370,22 @@ msgstr "E390: �����ʰ����Ǥ�: %s"
 msgid "syntax iskeyword "
 msgstr "���󥿥å����� iskeyword "
 
-#: ../syntax.c:3299
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ���Τ褦�ʹ�ʸ���饹���Ϥ���ޤ���: %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "C�����������Ȥ���Ʊ����"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "��Ʊ��"
 
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "Ʊ������ "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
 msgstr " ����(�ȥå׹Ԥ���)"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5753,7 +5393,6 @@ msgstr ""
 "\n"
 "--- ��ʸƱ������ ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5761,7 +5400,6 @@ msgstr ""
 "\n"
 "���Ǿ��Ʊ����"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5769,53 +5407,41 @@ msgstr ""
 "\n"
 "--- ��ʸ���� ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: ���Τ褦�ʹ�ʸ���饹���Ϥ���ޤ���: %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimal "
 
-#: ../syntax.c:3503
 msgid "maximal "
 msgstr "maximal "
 
-#: ../syntax.c:3513
 msgid "; match "
 msgstr "; ���� "
 
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " �Ĥβ���"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
 msgstr "E395: ���ξ��Ǥϰ���contains�ϵ��Ĥ���Ƥ��ޤ���"
 
-#: ../syntax.c:4096
 msgid "E844: invalid cchar value"
 msgstr "E844: ̵����cchar���ͤǤ�"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: �����Ǥϥ��롼�פϵ��Ĥ���ޤ���"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: %s ���ϰ����Ǥ����Ĥ���ޤ���"
 
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: �ե�����̾��ɬ�פǤ�"
 
-#: ../syntax.c:4221
 msgid "E847: Too many syntax includes"
 msgstr "E847: ��ʸ�μ�����(include)��¿�᤮�ޤ�"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' ������ޤ���: %s"
@@ -5824,221 +5450,173 @@ msgstr "E789: ']' ������ޤ���: %s"
 msgid "E890: trailing char after ']': %s]%s"
 msgstr "E890: ']' �θ����;ʬ��ʸ��������ޤ�: %s]%s"
 
-#: ../syntax.c:4531
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' ������ޤ���: %s"
 
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: ������­��ޤ���: ��ʸ�ϰ� %s"
 
-#: ../syntax.c:4870
 msgid "E848: Too many syntax clusters"
 msgstr "E848: ��ʸ���饹����¿�᤮�ޤ�"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
 msgstr "E400: ���饹�������ꤵ��Ƥ��ޤ���"
 
-#. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: �ѥ�������ڤ꤬���Ĥ���ޤ���: %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: �ѥ�����Τ��Ȥ˥��ߤ�����ޤ�: %s"
 
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: ��ʸƱ��: Ϣ³�ԥѥ�����2�ٻ��ꤵ��ޤ���"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: �����ʰ����Ǥ�: %s"
 
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: ���椬����ޤ���: %s"
 
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: �����: %s"
 
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s �ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s �����ƥꥹ�Ȥ���Ƭ�Ǥʤ���Фʤ�ʤ�"
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: ̤�ΤΥ��롼��̾: %s"
 
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ̵���� :syntax �Υ��֥��ޥ��: %s"
 
-#: ../syntax.c:5854
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 msgstr ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim �κƵ��ƤӽФ��򸡽Ф��ޤ���"
 
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: �ϥ��饤�ȥ��롼�פ����Ĥ���ޤ���: %s"
 
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: ��������ʬ�ǤϤʤ�: \":highlight link %s\""
 
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: ������¿�᤮�ޤ�: \":highlight link %s\""
 
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: ���롼�פ����ꤵ��Ƥ���Τǥϥ��饤�ȥ�󥯤�̵�뤵��ޤ�"
 
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: ͽ����������Ǥ�: %s"
 
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: ���椬����ޤ���: %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: ����������ޤ���: %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: �������ͤǤ�: %s"
 
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
 msgstr "E419: ̤�Τ����ʿ��Ǥ�"
 
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
 msgstr "E420: ̤�Τ��طʿ��Ǥ�"
 
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: ���顼̾���ֹ��ǧ���Ǥ��ޤ���: %s"
 
-#: ../syntax.c:6714
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: ��ü�����ɤ�Ĺ�᤮�ޤ�: %s"
 
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: �����ʰ����Ǥ�: %s"
 
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: ¿���ΰۤʤ�ϥ��饤��°�����Ȥ��᤮�Ƥ��ޤ�"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
 msgstr "E669: ���롼��̾�˰����Բ�ǽ��ʸ��������ޤ�"
 
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
 msgstr "W18: ���롼��̾��������ʸ��������ޤ�"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: �ϥ��饤�Ȥȹ�ʸ���롼�פ�¿�᤮�ޤ�"
 
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ���������å��������Ǥ�"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
 msgstr "E556: ���������å�����Ƭ�Ǥ�"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: �ǽ�γ���������Ķ������뤳�ȤϤǤ��ޤ���"
 
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: ���������Ĥ���ޤ���: %s"
 
-#: ../tag.c:528
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "�ե�����\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
 msgstr "E427: ����������1�Ĥ�����������ޤ���"
 
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: �Ǹ�˳������륿����Ķ���ƿʤळ�ȤϤǤ��ޤ���"
 
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "�ե����� \"%s\" ������ޤ���"
 
 #. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "���� %d (��%d%s)"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " ������ʾ�"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
 msgstr "  ������ۤʤ�case�ǻ��Ѥ��ޤ�!"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: �ե����� \"%s\" ������ޤ���"
 
 #. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -6046,79 +5624,66 @@ msgstr ""
 "\n"
 "  # TO ����        FROM ��    in file/text"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
 msgstr "�����ե����� %s �򸡺���"
 
-#: ../tag.c:1545
+#, c-format
+msgid "E430: Tag file path truncated for %s\n"
+msgstr "E430: �����ե�����Υѥ��� %s ���ڤ�ΤƤ��ޤ���\n"
+
 msgid "Ignoring long line in tags file"
 msgstr "�����ե��������Ĺ���Ԥ�̵�뤷�ޤ�"
 
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: �����ե����� \"%s\" �Υե����ޥåȤ˥��顼������ޤ�"
 
-#: ../tag.c:1917
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "ľ���� %<PRId64> �Х���"
+msgid "Before byte %ld"
+msgstr "ľ���� %ld �Х���"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: �����ե����뤬�����Ȥ���Ƥ��ޤ���: %s"
 
 #. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
 msgstr "E433: �����ե����뤬����ޤ���"
 
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �����ѥ�����򸫤Ĥ����ޤ���"
 
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: �����򸫤Ĥ����ʤ��Τ�ñ�˿�¬���ޤ�!"
 
-#: ../tag.c:2797
 #, c-format
 msgid "Duplicate field name: %s"
 msgstr "��ʣ�����ե������̾: %s"
 
-#: ../term.c:1442
 msgid "' not known. Available builtin terminals are:"
 msgstr "' ��̤�ΤǤ�. ���Ԥ��Ȥ߹���ü���ϼ��ΤȤ���Ǥ�:"
 
-#: ../term.c:1463
 msgid "defaulting to '"
 msgstr "��ά�ͤ򼡤Τ褦�����ꤷ�ޤ� '"
 
-#: ../term.c:1731
 msgid "E557: Cannot open termcap file"
 msgstr "E557: termcap�ե�����򳫤��ޤ���"
 
-#: ../term.c:1735
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfo��ü������ȥ�򸫤Ĥ����ޤ���"
 
-#: ../term.c:1737
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcap��ü������ȥ�򸫤Ĥ����ޤ���"
 
-#: ../term.c:1878
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcap�� \"%s\" �Υ���ȥ꤬����ޤ���"
 
-#: ../term.c:2249
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: ü���� \"cm\" ��ǽ��ɬ�פǤ�"
 
 #. Highlight title
-#: ../term.c:4376
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -6126,168 +5691,347 @@ msgstr ""
 "\n"
 "--- ü������ ---"
 
-#: ../ui.c:481
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txt�򳫤��ޤ���"
+
+msgid "new shell started\n"
+msgstr "�������������ư���ޤ�\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: ���Ϥ��ɹ�����Υ��顼�ˤ�꽪λ���ޤ�...\n"
 
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "���������ΰ�Τ�����CUT_BUFFER0�����Ѥ���ޤ���"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: ../undo.c:379
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: ͽ�������ԥ�����Ȥ��Ѥ��ޤ���"
 
-#: ../undo.c:627
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "��ǽ�ʥ���ɥ��Ϥ���ޤ���: �Ȥꤢ����³���ޤ�"
+
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: ������Ѥ˥���ɥ��ե�����򳫤��ޤ���: %s"
 
-#: ../undo.c:717
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: ����ɥ��ե����뤬����Ƥ��ޤ� (%s): %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr "'undodir'�Υǥ��쥯�ȥ�˥���ɥ��ե������񤭹���ޤ���"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "����ɥ��ե�����Ȥ����ɤ߹���ʤ��ΤǾ�񤭤��ޤ���: %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr "����ɥ��ե�����ǤϤʤ��ΤǾ�񤭤��ޤ���: %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
 msgstr "�оݤ��ʤ��Τǥ���ɥ��ե�����ν񤭹��ߤ򥹥��åפ��ޤ�"
 
-#: ../undo.c:1121
 #, c-format
 msgid "Writing undo file: %s"
 msgstr "����ɥ��ե�����񤭹�����: %s"
 
-#: ../undo.c:1213
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: ����ɥ��ե�����ν񤭹��ߥ��顼�Ǥ�: %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "�����ʡ����ۤʤ�Τǥ���ɥ��ե�������ɤ߹��ߤޤ���: %s"
 
-#: ../undo.c:1292
 #, c-format
 msgid "Reading undo file: %s"
 msgstr "����ɥ��ե������ɹ���: %s"
 
-#: ../undo.c:1299
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: ����ɥ��ե�������ɹ��ѤȤ��Ƴ����ޤ���: %s"
 
-#: ../undo.c:1308
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: ����ɥ��ե�����ǤϤ���ޤ���: %s"
 
-#: ../undo.c:1313
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: ��Ź沽�ե����뤬�Ź沽���줿����ɥ��ե������ȤäƤޤ�: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: �Ź沽���줿����ɥ��ե�����β��ɤ˼��Ԥ��ޤ���: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: ����ɥ��ե����뤬�Ź沽����Ƥ��ޤ�: %s"
+
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: �ߴ�����̵������ɥ��ե�����Ǥ�: %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
 msgstr "�ե���������Ƥ��Ѥ�äƤ��뤿�ᡢ����ɥ���������ѤǤ��ޤ���"
 
-#: ../undo.c:1497
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr "����ɥ��ե����� %s �μ����λ"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "���˰��ָŤ��ѹ��Ǥ�"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "���˰��ֿ������ѹ��Ǥ�"
 
-#: ../undo.c:1806
 #, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: ����ɥ��ֹ� %<PRId64> �ϸ��Ĥ���ޤ���"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: ����ɥ��ֹ� %ld �ϸ��Ĥ���ޤ���"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: ���ֹ椬�ְ�äƤ��ޤ�"
 
-#: ../undo.c:2183
 msgid "more line"
 msgstr "�� �ɲä��ޤ���"
 
-#: ../undo.c:2185
 msgid "more lines"
 msgstr "�� �ɲä��ޤ���"
 
-#: ../undo.c:2187
 msgid "line less"
 msgstr "�� ������ޤ���"
 
-#: ../undo.c:2189
 msgid "fewer lines"
 msgstr "�� ������ޤ���"
 
-#: ../undo.c:2193
 msgid "change"
 msgstr "�ս��ѹ����ޤ���"
 
-#: ../undo.c:2195
 msgid "changes"
 msgstr "�ս��ѹ����ޤ���"
 
-#: ../undo.c:2225
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
 
-#: ../undo.c:2228
 msgid "before"
 msgstr "����"
 
-#: ../undo.c:2228
 msgid "after"
 msgstr "����"
 
-#: ../undo.c:2325
 msgid "Nothing to undo"
 msgstr "����ɥ��оݤ�����ޤ���"
 
-#: ../undo.c:2330
 msgid "number changes  when               saved"
 msgstr "����   �ѹ���   �ѹ�����           ��¸��"
 
-#: ../undo.c:2360
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> �÷вᤷ�Ƥ��ޤ�"
+msgid "%ld seconds ago"
+msgstr "%ld �÷вᤷ�Ƥ��ޤ�"
 
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo ��ľ��� undojoin �ϤǤ��ޤ���"
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: ����ɥ��ꥹ�Ȥ�����Ƥ��ޤ�"
 
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: ����ɥ��Ԥ�����ޤ���"
 
-#: ../version.c:600
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: �ؿ� %s ������ѤǤ�, ���������ˤ� ! ���ɲä��Ƥ�������"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: ������˥���ȥ꤬����¸�ߤ��ޤ�"
+
+msgid "E718: Funcref required"
+msgstr "E718: �ؿ����ȷ����׵ᤵ��ޤ�"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ̤�Τδؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: �����ʰ����Ǥ�: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: ����̾����ʣ���Ƥ��ޤ�: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: �ؿ���̵���ʰ����Ǥ�: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: �ؿ��ƽФ�����ҿ��� 'maxfuncdepth' ��Ķ���ޤ���"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s ��¹���Ǥ�"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s �����Ǥ���ޤ���"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s �� #%ld ���֤��ޤ���"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s �� %s ���֤��ޤ���"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ������¿�᤮�ޤ�"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: �ؿ��Ϻ������ޤ���: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: �ؿ��ΰ�����­��ޤ���: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: ������ץȰʳ���<SID>���Ȥ��ޤ���: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: �����Ѵؿ����ƤФ�ޤ��������񤬤���ޤ���: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: �ؿ�̾���׵ᤵ��ޤ�"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: �ؿ�̾����ʸ���� \"s:\" �ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: �ؿ�̾�ˤϥ�����ϴޤ���ޤ���: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: ̤����δؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' ������ޤ���: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: �����Ǥ� g: �ϻȤ��ޤ���"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: ���������㡼�ؿ��ϥȥåץ�٥�˵��ҤǤ��ޤ���: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction ������ޤ���"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: �ؿ�̾���ѿ�̾�Ⱦ��ͤ��ޤ�: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: �ؿ� %s �������Ǥ��ޤ���: ������Ǥ�"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: �ؿ�̾��������ץȤΥե�����̾�Ȱ��פ��ޤ���: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: �ؿ� %s �����Ǥ��ޤ���: ������Ǥ�"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: �ؿ����� :return ������ޤ���"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: ���å� '(' ������ޤ���: %s"
+
+#. Only MS VC 4.1 and earlier can do Win32s
+msgid ""
+"\n"
+"MS-Windows 16/32-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 16/32 �ӥå� GUI ��"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 64 �ӥå� GUI ��"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 32 �ӥå� GUI ��"
+
+msgid " with OLE support"
+msgstr " with OLE ���ݡ���"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"MS-Windows 64 �ӥå� ���󥽡��� ��"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"MS-Windows 32 �ӥå� ���󥽡��� ��"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"MacOS X (unix) ��"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"MacOS X ��"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"MacOS ��"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"OpenVMS ��"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -6295,7 +6039,6 @@ msgstr ""
 "\n"
 "Ŭ�Ѻѥѥå�: "
 
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
@@ -6303,11 +6046,9 @@ msgstr ""
 "\n"
 "�ɲó�ĥ�ѥå�: "
 
-#: ../version.c:639 ../version.c:864
 msgid "Modified by "
 msgstr "Modified by "
 
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
@@ -6315,11 +6056,9 @@ msgstr ""
 "\n"
 "Compiled "
 
-#: ../version.c:649
 msgid "by "
 msgstr "by "
 
-#: ../version.c:660
 msgid ""
 "\n"
 "Huge version "
@@ -6327,1886 +6066,926 @@ msgstr ""
 "\n"
 "Huge �� "
 
-#: ../version.c:661
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Big �� "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"�̾� �� "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Small �� "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Tiny �� "
+
 msgid "without GUI."
 msgstr "without GUI."
 
-#: ../version.c:662
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "with GTK2-GNOME GUI."
+
+msgid "with GTK2 GUI."
+msgstr "with GTK2 GUI."
+
+msgid "with X11-Motif GUI."
+msgstr "with X11-Motif GUI."
+
+msgid "with X11-neXtaw GUI."
+msgstr "with X11-neXtaw GUI."
+
+msgid "with X11-Athena GUI."
+msgstr "with X11-Athena GUI."
+
+msgid "with Photon GUI."
+msgstr "with Photon GUI."
+
+msgid "with GUI."
+msgstr "with GUI."
+
+msgid "with Carbon GUI."
+msgstr "with Carbon GUI."
+
+msgid "with Cocoa GUI."
+msgstr "with Cocoa GUI."
+
+msgid "with (classic) GUI."
+msgstr "with (���饷�å�) GUI."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  ��ǽ�ΰ��� ͭ��(+)/̵��(-)\n"
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
 msgstr "      �����ƥ� vimrc: \""
 
-#: ../version.c:672
 msgid "     user vimrc file: \""
 msgstr "      �桼���� vimrc: \""
 
-#: ../version.c:677
 msgid " 2nd user vimrc file: \""
 msgstr "   ��2�桼���� vimrc: \""
 
-#: ../version.c:682
 msgid " 3rd user vimrc file: \""
 msgstr "   ��3�桼���� vimrc: \""
 
-#: ../version.c:687
 msgid "      user exrc file: \""
 msgstr "       �桼���� exrc: \""
 
-#: ../version.c:692
 msgid "  2nd user exrc file: \""
 msgstr "    ��2�桼���� exrc: \""
 
-#: ../version.c:699
+msgid "  system gvimrc file: \""
+msgstr "     �����ƥ� gvimrc: \""
+
+msgid "    user gvimrc file: \""
+msgstr "     �桼���� gvimrc: \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "  ��2�桼���� gvimrc: \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "  ��3�桼���� gvimrc: \""
+
+msgid "       defaults file: \""
+msgstr "  �ǥե���ȥե�����: \""
+
+msgid "    system menu file: \""
+msgstr "    �����ƥ��˥塼: \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "       ������ $VIM: \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "������ $VIMRUNTIME: \""
 
-#: ../version.c:709
 msgid "Compilation: "
 msgstr "����ѥ���: "
 
-#: ../version.c:712
+msgid "Compiler: "
+msgstr "����ѥ���: "
+
 msgid "Linking: "
 msgstr "���: "
 
-#: ../version.c:717
 msgid "  DEBUG BUILD"
 msgstr "�ǥХå��ӥ��"
 
-#: ../version.c:767
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: ../version.c:769
 msgid "version "
 msgstr "version "
 
-#: ../version.c:770
 msgid "by Bram Moolenaar et al."
 msgstr "by Bram Moolenaar ¾."
 
-#: ../version.c:774
 msgid "Vim is open source and freely distributable"
 msgstr "Vim �ϥ����ץ󥽡����Ǥ��꼫ͳ�����۲�ǽ�Ǥ�"
 
-#: ../version.c:776
 msgid "Help poor children in Uganda!"
 msgstr "��������ηäޤ�ʤ��Ҷ������˱����!"
 
-#: ../version.c:777
 msgid "type  :help iccf<Enter>       for information "
 msgstr "�ܺ٤ʾ����           :help iccf<Enter>      "
 
-#: ../version.c:779
 msgid "type  :q<Enter>               to exit         "
 msgstr "��λ����ˤ�           :q<Enter>              "
 
-#: ../version.c:780
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "����饤��إ�פ�     :help<Enter> �� <F1>   "
 
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "�����������       :help version7<Enter>  "
+msgid "type  :help version8<Enter>   for version info"
+msgstr "�����������       :help version8<Enter>  "
 
-#: ../version.c:784
 msgid "Running in Vi compatible mode"
 msgstr "Vi�ߴ��⡼�ɤ�ư����"
 
-#: ../version.c:785
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "Vim�侩�ͤˤ���ˤ�    :set nocp<Enter>       "
 
-#: ../version.c:786
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "�ܺ٤ʾ����           :help cp-default<Enter>"
 
-#: ../version.c:827
+msgid "menu  Help->Orphans           for information    "
+msgstr "�ܺ٤ϥ�˥塼�� �إ��->�ɻ� �򻲾Ȥ��Ʋ�����   "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "�⡼��̵�Ǽ¹���, �����פ���ʸ������������ޤ�"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "��˥塼�� �Խ�->��������->����(�鿴��)�⡼������ "
+
+msgid "                              for two modes      "
+msgstr "                              �ǥ⡼��ͭ��       "
+
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "��˥塼�� �Խ�->��������->Vi�ߴ��⡼������      "
+
+msgid "                              for Vim defaults   "
+msgstr "                              ��Vim�Ȥ���ư��    "
+
 msgid "Sponsor Vim development!"
 msgstr "Vim�γ�ȯ����礷�Ƥ�������!"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
 msgstr "Vim����Ͽ�桼�����ˤʤäƤ�������!"
 
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "�ܺ٤ʾ����           :help sponsor<Enter>   "
 
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
 msgstr "�ܺ٤ʾ����           :help register<Enter>  "
 
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "�ܺ٤ϥ�˥塼�� �إ��->���ݥ󥵡�/��Ͽ �򻲾Ȥ��Ʋ�����"
 
-#: ../window.c:119
+msgid "WARNING: Windows 95/98/ME detected"
+msgstr "�ٹ�: Windows 95/98/ME �򸡽Ф��ޤ���"
+
+msgid "type  :help windows95<Enter>  for info on this"
+msgstr "�ܺ٤ʾ����            :help windows95<Enter>"
+
 msgid "Already only one window"
 msgstr "���˥�����ɥ���1�Ĥ�������ޤ���"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: �ץ�ӥ塼������ɥ�������ޤ���"
 
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: ����ȱ�����Ʊ����ʬ�䤹�뤳�ȤϤǤ��ޤ���"
 
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: ¾�Υ�����ɥ���ʬ�䤵��Ƥ�����ˤϽ��Ǥ��ޤ���"
 
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
 msgstr "E444: �Ǹ�Υ�����ɥ����Ĥ��뤳�ȤϤǤ��ޤ���"
 
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: autocmd������ɥ����Ĥ����ޤ���"
 
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: autocmd������ɥ������Ĥ�ʤ����ᡢ������ɥ����Ĥ����ޤ���"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
 msgstr "E445: ¾�Υ�����ɥ��ˤ��ѹ�������ޤ�"
 
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
 msgstr "E446: ��������β��˥ե�����̾������ޤ���"
 
-msgid "List or number required"
-msgstr "�ꥹ�Ȥ����ͤ�ɬ�פǤ�"
-
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() �����ѥ���ɤǸƤӽФ���ޤ���"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfish�Ź�Υӥå�/��ȥ륨��ǥ����󤬴ְ�äƤ��ޤ�"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: sha256�Υƥ��Ȥ˼��Ԥ��ޤ���"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Blowfish�Ź�Υƥ��Ȥ˼��Ԥ��ޤ���"
-
-#~ msgid "Patch file"
-#~ msgstr "�ѥå��ե�����"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "����(&O)\n"
-#~ "����󥻥�(&C)"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Vim �����Фؤ���³������ޤ���"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: %s �����뤳�Ȥ��Ǥ��ޤ���"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: �����Фα���������ޤ���"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: ���饤����Ȥ����뤳�Ȥ��Ǥ��ޤ���"
-
-#~ msgid "Save As"
-#~ msgstr "��̾����¸"
-
-#~ msgid "Edit File"
-#~ msgstr "�ե�������Խ�"
-
-# Added at 27-Jan-2004.
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (���Ĥ���ޤ���)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Vim������ץȤμ����"
-
-#~ msgid "unknown"
-#~ msgstr "����"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "������������ɥ��ǥե�������Խ����ޤ�"
-
-#~ msgid "Append File"
-#~ msgstr "�ɲåե�����"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "������ɥ�����: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "������쥯�Ȥ���¸���ޤ�"
-
-#~ msgid "Save View"
-#~ msgstr "�ӥ塼����¸���ޤ�"
-
-#~ msgid "Save Session"
-#~ msgstr "���å����������¸���ޤ�"
-
-#~ msgid "Save Setup"
-#~ msgstr "�������¸���ޤ�"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< �� +eval ��ǽ��̵�������ѤǤ��ޤ���"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: ���ΥС������˹���Ϥ���ޤ���"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr " �ϥǥХ����Ǥ� ('opendevice' ���ץ����Dz���Ǥ��ޤ�)"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "ɸ�����Ϥ����ɹ�����..."
-
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish�Ź沽]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[�Ź沽]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: �ե����뤬̤�Τ���ˡ�ǰŹ沽����Ƥ��ޤ�"
-
-# Added at 19-Jan-2004.
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans��̤�ѹ��ΥХåե����񤹤뤳�Ȥϵ��Ĥ��Ƥ��ޤ���"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "NetBeans�Хåե��ΰ�����񤭽Ф����ȤϤǤ��ޤ���"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "'opendevice' ���ץ����ˤ��ǥХ����ؤν񤭹��ߤϤǤ��ޤ���"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: �꥽�����ե������������뤫�⤷��ޤ��� (! ���ɲäǶ���)"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: GUI�ѤΥץ������ε�ư�˼��Ԥ��ޤ���"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: �ҥץ�������GUI�ε�ư�˼��Ԥ��ޤ���"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: GUI�򳫻ϤǤ��ޤ���"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: \"%s\"�����ɹ��ळ�Ȥ��Ǥ��ޤ���"
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: ͭ���ʥե���Ȥ����Ĥ���ʤ��Τ�, GUI�򳫻ϤǤ��ޤ���"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' ��̵���Ǥ�"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' �����ꤵ�줿�ͤ�̵���Ǥ�"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: %s �ο��������Ƥ��ޤ���"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "��������ΰ��֤˥ޥå��Ϥ���ޤ���, ���򸡺����Ƥ��ޤ�"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<�����ޤ���> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: �ե���� %s ������Ǥ��ޤ���"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: ���ߤΥǥ��쥯�ȥ�����ޤ���"
-
-#~ msgid "Pathname:"
-#~ msgstr "�ѥ�̾:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: ���ߤΥǥ��쥯�ȥ������Ǥ��ޤ���"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Cancel"
-#~ msgstr "����󥻥�"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "����������С�: ����������Ǥ��ޤ���Ǥ���."
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim ����������"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: ��å������ȥ�����Хå��Τ��� BalloonEval ������Ǥ��ޤ���"
-
-#~ msgid "Input _Methods"
-#~ msgstr "����ץåȥ᥽�å�"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - �������ִ�..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - ����..."
-
-#~ msgid "Find what:"
-#~ msgstr "����ʸ����:"
-
-#~ msgid "Replace with:"
-#~ msgstr "�ִ�ʸ����:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "���Τ˳��������Τ���"
-
-#~ msgid "Match case"
-#~ msgstr "��ʸ��/��ʸ������̤���"
-
-#~ msgid "Direction"
-#~ msgstr "����"
-
-#~ msgid "Up"
-#~ msgstr "��"
-
-#~ msgid "Down"
-#~ msgstr "��"
-
-#~ msgid "Find Next"
-#~ msgstr "���򸡺�"
-
-#~ msgid "Replace"
-#~ msgstr "�ִ�"
-
-#~ msgid "Replace All"
-#~ msgstr "�����ִ�"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: ���å����ޥ͡����㤫�� \"die\" �׵��������ޤ���\n"
-
-#~ msgid "Close"
-#~ msgstr "�Ĥ���"
-
-#~ msgid "New tab"
-#~ msgstr "�������֥ڡ���"
-
-#~ msgid "Open Tab..."
-#~ msgstr "���֥ڡ����򳫤�..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: �ᥤ�󥦥���ɥ����԰դ��˲�����ޤ���\n"
-
-#~ msgid "&Filter"
-#~ msgstr "�ե��륿(&F)"
-
-#~ msgid "&Cancel"
-#~ msgstr "����󥻥�(&C)"
-
-#~ msgid "Directories"
-#~ msgstr "�ǥ��쥯�ȥ�"
-
-#~ msgid "Filter"
-#~ msgstr "�ե��륿"
-
-#~ msgid "&Help"
-#~ msgstr "�إ��(&H)"
-
-#~ msgid "Files"
-#~ msgstr "�ե�����"
-
-#~ msgid "&OK"
-#~ msgstr "&OK"
-
-#~ msgid "Selection"
-#~ msgstr "����"
-
-#~ msgid "Find &Next"
-#~ msgstr "���򸡺�(&N)"
-
-#~ msgid "&Replace"
-#~ msgstr "�ִ�(&R)"
-
-#~ msgid "Replace &All"
-#~ msgstr "�����ִ�(&A)"
-
-#~ msgid "&Undo"
-#~ msgstr "����ɥ�(&U)"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϸ��Ĥ���ޤ���"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: �����ϥ��ݡ��Ȥ���ޤ���: \"-%s\"; OLE�Ǥ���Ѥ��Ƥ�������."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: MDI���ץ����Ǥϥ�����ɥ��򳫤��ޤ���"
-
-#~ msgid "Close tab"
-#~ msgstr "���֥ڡ������Ĥ���"
-
-#~ msgid "Open tab..."
-#~ msgstr "���֥ڡ����򳫤�"
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "����ʸ���� ('\\' �򸡺�����ˤ� '\\\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "�������ִ� ('\\' �򸡺�����ˤ� '\\\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "�Ȥ��ޤ���"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "�ǥ��쥯�ȥ�\t*.nothing\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr "Vim E458: �����꤬�������ʤ��Τǥ���ȥ�������Ƥ��ޤ���"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: �ʲ���ʸ�����åȤΥե���Ȥ�����ޤ��� %s:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: �ե���ȥ��å�̾: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "�ե���� '%s' �ϸ������ǤϤ���ޤ���"
-
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: �ե���ȥ��å�̾: %s"
-
-#~ msgid "Font0: %s"
-#~ msgstr "�ե����0: %s"
-
-#~ msgid "Font1: %s"
-#~ msgstr "�ե����1: %s"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "�ե����%<PRId64> �������ե����0��2�ܤǤϤ���ޤ���"
-
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "�ե����0����: %<PRId64>"
-
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "�ե����1����: %<PRId64>"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "̵���ʥե���Ȼ���Ǥ�"
-
-#~ msgid "&Dismiss"
-#~ msgstr "�Ѳ�����(&D)"
-
-#~ msgid "no specific match"
-#~ msgstr "�ޥå������Τ�����ޤ���"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - �ե��������"
-
-#~ msgid "Name:"
-#~ msgstr "̾��:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "��������ݥ���Ȥ�ɽ������"
-
-#~ msgid "Encoding:"
-#~ msgstr "���󥳡���:"
-
-#~ msgid "Font:"
-#~ msgstr "�ե����:"
-
-#~ msgid "Style:"
-#~ msgstr "��������:"
-
-#~ msgid "Size:"
-#~ msgstr "������:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: �ϥ󥰥륪���ȥޥȥ󥨥顼"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat ���顼"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: cscope�ǡ����١���: %s �򳫤����Ȥ��Ǥ��ޤ���"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: cscope�ǡ����١����ξ��������Ǥ��ޤ���"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Lua�饤�֥�������ɤǤ��ޤ���."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "����ɥ�������¸�Ǥ��ޤ���"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: ���Υ��ޥ�ɤ�̵���Ǥ�. MzScheme �饤�֥�������ɤǤ��ޤ���."
-
-#~ msgid "invalid expression"
-#~ msgstr "̵���ʼ��Ǥ�"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "���ϥ���ѥ������̵���ˤ���Ƥ��ޤ�"
-
-#~ msgid "hidden option"
-#~ msgstr "�������ץ����"
-
-#~ msgid "unknown option"
-#~ msgstr "̤�ΤΥ��ץ����Ǥ�"
-
-#~ msgid "window index is out of range"
-#~ msgstr "�ϰϳ��Υ�����ɥ��ֹ�Ǥ�"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "�Хåե��򳫤��ޤ���"
-
-#~ msgid "cannot delete line"
-#~ msgstr "�Ԥ�ä��ޤ���"
-
-#~ msgid "cannot replace line"
-#~ msgstr "�Ԥ��ִ��Ǥ��ޤ���"
-
-#~ msgid "cannot insert line"
-#~ msgstr "�Ԥ������Ǥ��ޤ���"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "ʸ����ˤϲ���ʸ����ޤ���ޤ���"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "Scheme�ͤ�Vim�ؤ��Ѵ����顼"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim ���顼: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Vim ���顼"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "�Хåե���̵���Ǥ�"
-
-#~ msgid "window is invalid"
-#~ msgstr "������ɥ���̵���Ǥ�"
-
-#~ msgid "linenr out of range"
-#~ msgstr "�ϰϳ��ι��ֹ�Ǥ�"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "����ɥܥå����Ǥϵ�����ޤ���"
-
-#~ 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�饤�֥�������ɤǤ��ޤ���Ǥ�"
-#~ "��."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: ����ɥܥå����Ǥ� Safe �⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ���"
-#~ "��Ƥ��ޤ�"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: ����Vim�Ǥ� :py3 ��Ȥä���� :python ��Ȥ��ޤ���"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Python�饤�֥�������ɤǤ���"
-#~ "����Ǥ���."
-
-# Added at 07-Feb-2004.
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Python ��Ƶ�Ū�˼¹Ԥ��뤳�ȤϤǤ��ޤ���"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: ����Vim�Ǥ� :python ��Ȥä���� :py3 ��Ȥ��ޤ���"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ ��ʸ����Υ��󥹥��󥹤Ǥʤ���Фʤ�ޤ���"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Ruby�饤�֥�������ɤǤ��ޤ�"
-#~ "��Ǥ���."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: ͽ������ return �Ǥ�"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: ͽ������ next �Ǥ�"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: ͽ������ break �Ǥ�"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: ͽ������ redo �Ǥ�"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: rescue �γ��� retry �Ǥ�"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: ��갷���ʤ��ä��㳰������ޤ�"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: ̤�Τ�longjmp����: %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "������������ڤ��ؤ���"
-
-#~ msgid "Show base class of"
-#~ msgstr "���Υ��饹�δ����ɽ��"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "�����С��饤�ɤ��줿���дؿ���ɽ��"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "�ե����뤫���������"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "�ץ��������Ȥ����������"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "���ƤΥץ��������Ȥ����������"
-
-#~ msgid "Retrieve"
-#~ msgstr "����"
-
-#~ msgid "Show source of"
-#~ msgstr "���Υ�������ɽ������"
-
-#~ msgid "Find symbol"
-#~ msgstr "���Ĥ�������ܥ�"
-
-#~ msgid "Browse class"
-#~ msgstr "���饹�򻲾�"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "���ؤǥ��饹��ɽ��"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "���ꤵ�줿���ؤǥ��饹��ɽ��"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref �����"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref �����Ȥ����"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref �����Τ�Τ��äƤ��ޤ�"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref �����Ѥ����"
-
-#~ msgid "Show docu of"
-#~ msgstr "����ʸ�Ϥ�ɽ��"
-
-#~ msgid "Generate docu for"
-#~ msgstr "����ʸ�Ϥ�����"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "SNiFF+����³�Ǥ��ޤ���. �Ķ�������å����Ƥ�������(sniffemacs �� $PATH ��"
-#~ "�ʤ���Фʤ�ޤ���).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: �ɹ���˥��顼��ȯ�����ޤ���. ���Ǥ��ޤ���"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "����SNiFF+ �ξ��֤ϡ�"
-
-#~ msgid "not "
-#~ msgstr "̤"
-
-#~ msgid "connected"
-#~ msgstr "��³�פǤ�"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: ̤�Τ� SNiFF+ �ꥯ�����ȤǤ�: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: SNiFF+ �ؤ���³��Υ��顼�Ǥ�"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ ����³����Ƥ��ޤ���"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: SNiFF+ �Хåե�������ޤ���"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: �������˥��顼��ȯ�������Τ����Ǥ��ޤ���"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "̵���ʥХåե��ֹ�Ǥ�"
-
-#~ msgid "not implemented yet"
-#~ msgstr "�ޤ���������Ƥ��ޤ���"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "�Ԥ�����Ǥ��ޤ���"
-
-#~ msgid "invalid mark name"
-#~ msgstr "̵���ʥޡ���̾�Ǥ�"
-
-#~ msgid "mark not set"
-#~ msgstr "�ޡ��������ꤵ��Ƥ��ޤ���"
-
-#~ msgid "row %d column %d"
-#~ msgstr "�� %d �� %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "�Ԥ�����/�ɲä�Ǥ��ޤ���"
-
-#~ msgid "line number out of range"
-#~ msgstr "�ϰϳ��ι��ֹ�Ǥ�"
-
-#~ msgid "unknown flag: "
-#~ msgstr "̤�ΤΥե饰: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "̤�Τ� vimOption �Ǥ�"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "�����ܡ��ɳ����"
-
-#~ msgid "vim error"
-#~ msgstr "vim ���顼"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "�Хåե�/������ɥ��������ޥ�ɤ�����Ǥ��ޤ���: ���֥������Ȥ��õ���"
-#~ "���ޤ���"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ������˾õ���"
-#~ "����"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: TCL ��̿Ū���顼: reflist ����!? vim-dev@vim.org ����𤷤Ƥ�������"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ��λ��Ȥ����Ĥ���"
-#~ "�ޤ���"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Tcl�饤�֥�������ɤǤ��ޤ���"
-#~ "�Ǥ���."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: ������� %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "�Ԥ�����Ǥ��ޤ���"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "̿�᥵���Ф�̾������Ͽ�Ǥ��ޤ���"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: ��Ū�Υץ������ؤΥ��ޥ�������˼��Ԥ��ޤ���"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: ̵���ʥ�����ID���Ȥ��ޤ���: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIM ���Τ���Ͽ�ץ��ѥƥ��������Ǥ�. �õ�ޤ���!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans �Ϥ���GUI�Ǥ����ѤǤ��ޤ���\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "����Vim�ˤ�diff��ǽ������ޤ���(����ѥ��������)."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' �����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: ���顼: NetBeans����gvim�򥹥����ȤǤ��ޤ���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "�羮ʸ����̵�뤵��������ʸ���ˤ��뤿��� / �����֤��Ƥ�������"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\t����gvim��OLE�Ȥ�����Ͽ����"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tgvim��OLE��Ͽ��������"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tGUI�ǵ�ư���� (\"gvim\" ��Ʊ��)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f or  --nofork\t�ե������饦���: GUI��Ϥ��Ȥ���fork���ʤ�"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t������ɥ��򳫤��Τ� newcli ����Ѥ��ʤ�"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tI/O�� <device> ����Ѥ���"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\t.gvimrc������� <gvimrc> ��Ȥ�"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�Ź沽���줿�ե�������Խ�����"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tvim����ꤷ�� X �����Ф���³����"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tX�����Ф���³���ʤ�"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t��ǽ�ʤ��Vim�����Ф� <files> ���Խ�����"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  Ʊ��, �����Ф�̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>\t--remote�� �ե�������Խ��������Τ��Ԥ�"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <files>  Ʊ��, �����Ф�̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <files>  --remote�ǥե�����1�ĤˤĤ�1�ĤΥ���"
-#~ "�ڡ����򳫤�"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\tVim�����Ф� <keys> ���������ƽ�λ����"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\t�����Ф� <expr> ��¹Ԥ��Ʒ�̤�ɽ������"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tVim������̾�ΰ�����ɽ�����ƽ�λ����"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\tVim������ <name> ������/̾�����ꤹ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ˤ�äƲ�ᤵ������(Motif�С������):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ˤ�äƲ�ᤵ������(neXtaw�С������):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ˤ�äƲ�ᤵ������(Athena�С������):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t<display> ��vim��¹Ԥ���"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t�Ǿ����������֤�vim��ư����"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\t�طʿ��� <color> ��Ȥ�(Ʊ��: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\t���ʿ��� <color> ��Ȥ�(Ʊ��: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t\t�ƥ�����ɽ���� <font> ��Ȥ�(Ʊ��: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\t������ <font> ��Ȥ�"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <for>\t���λ��� <font> ��Ȥ�"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\t������֤� <geom> ��Ȥ�(Ʊ��: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t���������� <width> �ˤ���(Ʊ��: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <width>  ����������С������� <width> �ˤ���(Ʊ��: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <height>\t��˥塼�С��ι⤵�� <height> �ˤ���(Ʊ��: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tȿž��������Ѥ���(Ʊ��: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tȿž��������Ѥ��ʤ�(Ʊ��: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t����Υ꥽��������Ѥ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ˤ�äƲ�ᤵ������(GTK+�С������):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t<display> ��vim��¹Ԥ���(Ʊ��: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\t�ᥤ�󥦥���ɥ����̤����դ����(role)�����ꤹ��"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t�ۤʤ�GTK widget��Vim�򳫤�"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\t������ɥ�ID��ɸ����Ϥ˽��Ϥ���"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <�ƤΥ����ȥ�>\tVim��ƥ��ץꥱ����������ǵ�ư����"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\t�ۤʤ�Win32 widget��������Vim�򳫤�"
-
-#~ msgid "No display"
-#~ msgstr "�ǥ����ץ쥤�����Ĥ���ޤ���"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": �����˼��Ԥ��ޤ���.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": �����˼��Ԥ��ޤ���. ��������Ǥμ¹Ԥ��ߤƤ��ޤ�\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d �� (%d ����) �Υե�������Խ����ޤ���"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "�ǥ����ץ쥤������ޤ���: ���������˼��Ԥ��ޤ���.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": ���������˼��Ԥ��ޤ���.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: ̵���ʥ����ɥڡ����Ǥ�"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: IC���ͤ�����Ǥ��ޤ���"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: ����ץåȥ���ƥ����Ȥκ����˼��Ԥ��ޤ���"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: ����ץåȥ᥽�åɤΥ����ץ�˼��Ԥ��ޤ���"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: �ٹ�: IM���˲�������Хå�������Ǥ��ޤ���Ǥ���"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: ����ץåȥ᥽�åɤϤɤ�ʥ�������⥵�ݡ��Ȥ��ޤ���"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: ����ץåȥ᥽�åɤ� my preedit type �򥵥ݡ��Ȥ��ޤ���"
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
 
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: ����åץե�����ΰŹ�򹹿���˥��顼��ȯ�����ޤ���"
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: ̵���� ID: %ld (1 �ʾ�Ǥʤ���Фʤ�ޤ���)"
 
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr ""
-#~ "E833: %s �Ϥ��ΥС�������Vim�ǥ��ݡ��Ȥ��Ƥ��ʤ������ǰŹ沽����Ƥ��ޤ�"
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID �Ϥ��Ǥ�������Ǥ�: %ld"
 
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "����åץե�����ϰŹ沽����Ƥ��ޤ�: \"%s\""
+msgid "List or number required"
+msgstr "�ꥹ�Ȥ����ͤ�ɬ�פǤ�"
 
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "�������Ź業�������Ϥ������Ȥ˥ƥ����ȥե��������¸���Ƥ��ʤ�����,"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: ̵���� ID: %ld (1 �ʾ�Ǥʤ���Фʤ�ޤ���)"
 
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "�������Ź業�������Ϥ��Ƥ�������."
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID �Ϥ���ޤ���: %ld"
 
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "�Ź業�����Ѥ������Ȥ˥ƥ����ȥե��������¸��������, �ƥ����ȥե������"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
 
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "����åץե������Ʊ���Ź業����Ȥ������enter�����򲡤��Ƥ�������."
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"���Υ��ޥ�ɤ�̵���Ǥ�, �����ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ���."
 
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "����åץե����뤫����������Ź業����ƥ����ȥե�����˻Ȥ��ޤ�.\n"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: ����ɥܥå����Ǥ� Safe �⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ����"
+"�Ƥ��ޤ�"
 
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [����Vim�С������Ǥϻ��ѤǤ��ޤ���]"
+msgid "Edit with &multiple Vims"
+msgstr "ʣ����Vim���Խ����� (&M)"
 
-#~ msgid "Tear off this menu"
-#~ msgstr "���Υ�˥塼���ڤ���"
+msgid "Edit with single &Vim"
+msgstr "1�Ĥ�Vim���Խ����� (&V)"
 
-#~ msgid "Select Directory dialog"
-#~ msgstr "�ǥ��쥯�ȥ��������������"
+msgid "Diff with Vim"
+msgstr "Vim�Ǻ�ʬ��ɽ������"
 
-#~ msgid "Save File dialog"
-#~ msgstr "�ե�������¸����������"
+msgid "Edit with &Vim"
+msgstr "Vim���Խ����� (&V)"
 
-#~ msgid "Open File dialog"
-#~ msgstr "�ե������ɹ�����������"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "��ư�Ѥ�Vim���Խ����� - "
 
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr ""
-#~ "E338: ���󥽡���⡼�ɤǤϥե�����֥饦����Ȥ��ޤ���, �����ʤ���"
+msgid "Edits the selected file(s) with Vim"
+msgstr "���򤷤��ե������Vim���Խ�����"
 
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: �ե��������¸��...\n"
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "�ץ������κ����˼���: gvim���Ķ��ѿ�PATH��ˤ��뤫��ǧ���Ƥ�������!"
 
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: ��λ���ޤ���.\n"
+msgid "gvimext.dll error"
+msgstr "gvimext.dll ���顼"
 
-#~ msgid "ERROR: "
-#~ msgstr "���顼: "
+msgid "Path length too long!"
+msgstr "�ѥ���Ĺ�᤮�ޤ�!"
 
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[����(�Х���)] ������-������ %<PRIu64>-%<PRIu64>, ������ %<PRIu64>, �ԡ�"
-#~ "���� %<PRIu64>\n"
+msgid "--No lines in buffer--"
+msgstr "--�Хåե��˹Ԥ�����ޤ���--"
 
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[�ƽ�] �� re/malloc() ��� %<PRIu64>, �� free() ��� %<PRIu64>\n"
-#~ "\n"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: ���ޥ�ɤ����Ǥ���ޤ���"
 
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: �Ԥ�Ĺ���ʤ�᤮�ޤ���"
+msgid "E471: Argument required"
+msgstr "E471: ������ɬ�פǤ�"
 
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: �������顼: lalloc(%<PRId64>,)"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ �θ�� / �� ? �� & �Ǥʤ���Фʤ�ޤ���"
 
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: ������ 'mouseshape' �Ǥ�"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: ���ޥ�ɥ饤��Ǥ�̵���Ǥ�; <CR>�Ǽ¹�, CTRL-C�Ǥ���"
 
-#~ msgid "Enter encryption key: "
-#~ msgstr "�Ź沽�ѤΥ��������Ϥ��Ƥ�������: "
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: ���ߤΥǥ��쥯�ȥ�䥿�������Ǥ�exrc/vimrc�Υ��ޥ�ɤϵ��Ĥ���ޤ���"
 
-#~ msgid "Enter same key again: "
-#~ msgstr "�⤦����Ʊ�����������Ϥ��Ƥ�������: "
+msgid "E171: Missing :endif"
+msgstr "E171: :endif ������ޤ���"
 
-#~ msgid "Keys don't match!"
-#~ msgstr "���������פ��ޤ���"
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry ������ޤ���"
 
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Netbeans #2 ����³�Ǥ��ޤ���"
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile ������ޤ���"
 
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Netbeans ����³�Ǥ��ޤ���"
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ������ޤ���"
 
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: NetBeans����³����ե�����Υ��������⡼�ɤ����꤬����ޤ�: \"%s\""
+msgid "E588: :endwhile without :while"
+msgstr "E588: :while �Τʤ� :endwhile ������ޤ�"
 
-#~ msgid "read from Netbeans socket"
-#~ msgstr "Netbeans �Υ����åȤ��ɹ���"
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor �Τʤ� :for ������ޤ�"
 
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: �Хåե� %<PRId64> �� NetBeans ��³�������ޤ���"
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: �ե����뤬¸�ߤ��ޤ� (! ���ɲäǾ��)"
 
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: NetBeans�Ϥ���GUI�ˤ��б����Ƥ��ޤ���"
+msgid "E472: Command failed"
+msgstr "E472: ���ޥ�ɤ����Ԥ��ޤ���"
 
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: NetBeans�ϴ�����³���Ƥ��ޤ�"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: ̤�ΤΥե���ȥ��å�: %s"
 
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s ���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: ̤�ΤΥե����: %s"
 
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: ��ɾ����ǽ��̵���ˤʤäƤ��ޤ�"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: �ե���� \"%s\" �ϸ������ǤϤ���ޤ���"
 
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "%<PRId64> �Ԥ������"
+msgid "E473: Internal error"
+msgstr "E473: �������顼�Ǥ�"
 
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: GUI�Ǥ� 'term' ���ѹ��Ǥ��ޤ���"
+msgid "Interrupted"
+msgstr "����ޤ�ޤ���"
 
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: GUI�򥹥����Ȥ���ˤ� \":gui\" ����Ѥ��Ƥ�������"
+msgid "E14: Invalid address"
+msgstr "E14: ̵���ʥ��ɥ쥹�Ǥ�"
 
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: GTK+2 GUI�Ǥ��ѹ��Ǥ��ޤ���"
+msgid "E474: Invalid argument"
+msgstr "E474: ̵���ʰ����Ǥ�"
 
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: ̵���ʥե���ȤǤ�"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: ̵���ʰ����Ǥ�: %s"
 
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: �ե���ȥ��åȤ�����Ǥ��ޤ���"
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: ̵���ʼ��Ǥ�: %s"
 
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: ̵���ʥե���ȥ��åȤǤ�"
+msgid "E16: Invalid range"
+msgstr "E16: ̵�����ϰϤǤ�"
 
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: �磻�ɥե���Ȥ�����Ǥ��ޤ���"
+msgid "E476: Invalid command"
+msgstr "E476: ̵���ʥ��ޥ�ɤǤ�"
 
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: ̵���ʥ磻�ɥե���ȤǤ�"
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" �ϥǥ��쥯�ȥ�Ǥ�"
 
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: �ޥ����ϥ��ݡ��Ȥ���ޤ���"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: \"%s\"() �Υ饤�֥��ƽФ˼��Ԥ��ޤ���"
 
-#~ msgid "cannot open "
-#~ msgstr "�����ޤ��� "
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: �饤�֥��δؿ� %s ������ɤǤ��ޤ���Ǥ���"
 
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: ������ɥ��򳫤��ޤ���!\n"
+msgid "E19: Mark has invalid line number"
+msgstr "E19: �ޡ�����̵���ʹ��ֹ椬���ꤵ��Ƥ��ޤ���"
 
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Amigados�ΥС������ 2.04������ʹߤ�ɬ�פǤ�\n"
+msgid "E20: Mark not set"
+msgstr "E20: �ޡ��������ꤵ��Ƥ��ޤ���"
 
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "%s �ΥС������ %<PRId64> ��ɬ�פǤ�\n"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: 'modifiable' �����դʤΤ�, �ѹ��Ǥ��ޤ���"
 
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "NIL�򳫤��ޤ���:\n"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: ������ץȤ�����Ҥ����᤮�ޤ�"
 
-#~ msgid "Cannot create "
-#~ msgstr "�����Ǥ��ޤ��� "
+msgid "E23: No alternate file"
+msgstr "E23: ���ե�����Ϥ���ޤ���"
 
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim�� %d �ǽ�λ���ޤ�\n"
+msgid "E24: No such abbreviation"
+msgstr "E24: ���Τ褦��û�����ϤϤ���ޤ���"
 
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "���󥽡���⡼�ɤ��ѹ��Ǥ��ޤ���?!\n"
+msgid "E477: No ! allowed"
+msgstr "E477: ! �ϵ��Ĥ���Ƥ��ޤ���"
 
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: ���󥽡���ǤϤʤ�??\n"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: GUI�ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�"
 
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: -f ���ץ����ǥ������¹ԤǤ��ޤ���"
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: �إ֥饤��ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#~ msgid "Cannot execute "
-#~ msgstr "�¹ԤǤ��ޤ��� "
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: �ڥ륷����ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#~ msgid "shell "
-#~ msgstr "������ "
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ����ӥ���ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#~ msgid " returned\n"
-#~ msgstr " ���ޤ���\n"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: ���Τ褦��̾�Υϥ��饤�ȥ��롼�פϤ���ޤ���: %s"
 
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE �������᤮�ޤ�."
+msgid "E29: No inserted text yet"
+msgstr "E29: �ޤ��ƥ����Ȥ���������Ƥ��ޤ���"
 
-#~ msgid "I/O ERROR"
-#~ msgstr "�����ϥ��顼"
+msgid "E30: No previous command line"
+msgstr "E30: �����˥��ޥ�ɹԤ�����ޤ���"
 
-#~ msgid "Message"
-#~ msgstr "������"
+msgid "E31: No such mapping"
+msgstr "E31: ���Τ褦�ʥޥåԥ󥰤Ϥ���ޤ���"
 
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' ��80�ǤϤʤ�����, �������ޥ�ɤ�¹ԤǤ��ޤ���"
+msgid "E479: No match"
+msgstr "E479: �����Ϥ���ޤ���"
 
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: �ץ�󥿤�����˼��Ԥ��ޤ���"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: �����Ϥ���ޤ���: %s"
 
-#~ msgid "to %s on %s"
-#~ msgstr "%s �� (%s ���)"
+msgid "E32: No file name"
+msgstr "E32: �ե�����̾������ޤ���"
 
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: ̤�ΤΥץ�󥿥��ץ����Ǥ�: %s"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: ����ɽ���ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: �������顼: %s"
+msgid "E34: No previous command"
+msgstr "E34: ���ޥ�ɤ��ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#~ msgid "Printing '%s'"
-#~ msgstr "�������Ƥ��ޤ�: '%s'"
+msgid "E35: No previous regular expression"
+msgstr "E35: ����ɽ�����ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: ʸ�����å�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
+msgid "E481: No range allowed"
+msgstr "E481: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
 
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: '%c' ��������ʸ���Ǥ� (�ե����̾ \"%s\")"
+msgid "E36: Not enough room"
+msgstr "E36: ������ɥ��˽�ʬ�ʹ⤵�⤷������������ޤ���"
 
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: 2�ŤΥ����ʥ�Τ���, ��λ���ޤ�\n"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: %s �Ȥ���̾������Ͽ���줿�����С��Ϥ���ޤ���"
 
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: ��̿Ū�����ʥ� %s ���Τ��ޤ���\n"
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: �ե����� %s ������Ǥ��ޤ���"
 
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: ��̿Ū�����ʥ���Τ��ޤ���\n"
+msgid "E483: Can't get temp file name"
+msgstr "E483: ����ե������̾��������Ǥ��ޤ���"
 
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "X�����Фؤ���³�� %<PRId64> �ߥ��ä�����ޤ���"
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: �ե����� \"%s\" �򳫤��ޤ���"
 
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X �Υ��顼�򸡽Ф��ޤ���r\n"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: �ե����� %s ���ɹ���ޤ���"
 
-#~ msgid "Testing the X display failed"
-#~ msgstr "X display �Υ����å��˼��Ԥ��ޤ���"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ��� (! ���ɲä��ѹ����˴�)"
 
-#~ msgid "Opening the X display timed out"
-#~ msgstr "X display �� open �������ॢ���Ȥ��ޤ���"
+msgid "E37: No write since last change"
+msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ���"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "sh �������¹ԤǤ��ޤ���\n"
+msgid "E38: Null argument"
+msgstr "E38: ���������Ǥ�"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�ѥ��פ�����Ǥ��ޤ���\n"
+msgid "E39: Number expected"
+msgstr "E39: ���ͤ��׵ᤵ��Ƥ��ޤ�"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "fork �Ǥ��ޤ���\n"
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: ���顼�ե����� %s �򳫤��ޤ���"
 
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "���ޥ�ɤ����Ǥ��ޤ���\n"
+msgid "E233: cannot open display"
+msgstr "E233: �ǥ����ץ쥤�򳫤��ޤ���"
 
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP ��ICE��³�򼺤��ޤ���"
+msgid "E41: Out of memory!"
+msgstr "E41: ���꤬�Ԥ��̤Ƥޤ���!"
 
-#~ msgid "Opening the X display failed"
-#~ msgstr "X display �� open �˼��Ԥ��ޤ���"
+msgid "Pattern not found"
+msgstr "�ѥ�����ϸ��Ĥ���ޤ���Ǥ���"
 
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP ��save-yourself�׵��������Ƥ��ޤ�"
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: �ѥ�����ϸ��Ĥ���ޤ���Ǥ���: %s"
 
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP ����³�򳫻Ϥ��Ƥ��ޤ�"
+msgid "E487: Argument must be positive"
+msgstr "E487: �����������ͤǤʤ���Фʤ�ޤ���"
 
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ICE��³�����Ԥ����褦�Ǥ�"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: ���Υǥ��쥯�ȥ�����ޤ���"
 
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection�����Ԥ��ޤ���: %s"
+msgid "E42: No Errors"
+msgstr "E42: ���顼�Ϥ���ޤ���"
 
-#~ msgid "At line"
-#~ msgstr "��"
+msgid "E776: No location list"
+msgstr "E776: �����������ꥹ�ȤϤ���ޤ���"
 
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "vim32.dll ������ɤǤ��ޤ���Ǥ���"
+msgid "E43: Damaged match string"
+msgstr "E43: ����ʸ������»���Ƥ��ޤ�"
 
-#~ msgid "VIM Error"
-#~ msgstr "VIM���顼"
+msgid "E44: Corrupted regexp program"
+msgstr "E44: ����������ɽ���ץ������Ǥ�"
 
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "DLL����ؿ��ݥ��󥿤�����Ǥ��ޤ���Ǥ���"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 'readonly' ���ץ�������ꤵ��Ƥ��ޤ� (! ���ɲäǾ��)"
 
-#~ msgid "shell returned %d"
-#~ msgstr "�����뤬������ %d �ǽ�λ���ޤ���"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: �ɼ������ѿ� \"%s\" �ˤ��ͤ�����Ǥ��ޤ���"
 
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: ���٥�� %s ����\n"
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: ����ɥܥå����Ǥ��ѿ� \"%s\" ���ͤ�����Ǥ��ޤ���"
 
-#~ msgid "close"
-#~ msgstr "�Ĥ���"
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: ���񷿤˶��Υ�����Ȥ����ȤϤǤ��ޤ���"
 
-#~ msgid "logoff"
-#~ msgstr "��������"
+msgid "E715: Dictionary required"
+msgstr "E715: ���񷿤�ɬ�פǤ�"
 
-#~ msgid "shutdown"
-#~ msgstr "����åȥ�����"
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: �ꥹ�ȤΥ���ǥå������ϰϳ��Ǥ�: %ld"
 
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: ���ޥ�ɤ�����ޤ���"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE�� $PATH ����˸��Ĥ���ޤ���.\n"
-#~ "�������ޥ�ɤν�λ��˰����ߤ򤷤ޤ���.\n"
-#~ "�ܺ٤�  :help win32-vimrun  �򻲾Ȥ��Ƥ�������."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim�ηٹ�"
-
-#~ msgid "Error file"
-#~ msgstr "���顼�ե�����"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: �������饹��ޤ�NFA���ۤ˼��Ԥ��ޤ���!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) ���߲�����Υ֥����˽�ʬ�ʥ���������Ƥ��ޤ���!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "�ٹ�: ñ��ꥹ�� \"%s_%s.spl\" ����� \"%s_ascii.spl\" �ϸ��Ĥ���ޤ���"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "%s ����Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: ���꤬­��ʤ��Τǡ�ñ��ꥹ�Ȥ��Դ����Ǥ�"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: �����ե�����Υѥ��� %s ���ڤ�ΤƤ��ޤ���\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "�������������ư���ޤ�\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "���������ΰ�Τ�����CUT_BUFFER0�����Ѥ���ޤ���"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "��ǽ�ʥ���ɥ��Ϥ���ޤ���: �Ȥꤢ����³���ޤ�"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr ""
-#~ "E832: ��Ź沽�ե����뤬�Ź沽���줿����ɥ��ե������ȤäƤޤ�: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: �Ź沽���줿����ɥ��ե�����β��ɤ˼��Ԥ��ޤ���: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: ����ɥ��ե����뤬�Ź沽����Ƥ��ޤ�: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 �ӥå� GUI ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 �ӥå� GUI ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 �ӥå� GUI ��"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " in Win32s �⡼��"
-
-#~ msgid " with OLE support"
-#~ msgstr " with OLE ���ݡ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 �ӥå� ���󥽡��� ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 �ӥå� ���󥽡��� ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16 �ӥå� ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 �ӥå� MS-DOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 �ӥå� MS-DOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (unix) ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "OpenVMS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Big �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "�̾� �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Small �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Tiny �� "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "with GTK2-GNOME GUI."
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
 
-#~ msgid "with GTK2 GUI."
-#~ msgstr "with GTK2 GUI."
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: ���񷿤˥�����¸�ߤ��ޤ���: %s"
 
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "with X11-Motif GUI."
+msgid "E714: List required"
+msgstr "E714: �ꥹ�ȷ���ɬ�פǤ�"
 
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "with X11-neXtaw GUI."
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s �ΰ����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
 
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "with X11-Athena GUI."
+msgid "E47: Error while reading errorfile"
+msgstr "E47: ���顼�ե�������ɹ���˥��顼��ȯ�����ޤ���"
 
-#~ msgid "with Photon GUI."
-#~ msgstr "with Photon GUI."
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: ����ɥܥå����Ǥϵ�����ޤ���"
 
-#~ msgid "with GUI."
-#~ msgstr "with GUI."
+msgid "E523: Not allowed here"
+msgstr "E523: �����Ǥϵ��Ĥ���ޤ���"
 
-#~ msgid "with Carbon GUI."
-#~ msgstr "with Carbon GUI."
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: �����꡼��⡼�ɤ�����ˤ��б����Ƥ��ޤ���"
 
-#~ msgid "with Cocoa GUI."
-#~ msgstr "with Cocoa GUI."
+msgid "E49: Invalid scroll size"
+msgstr "E49: ̵���ʥ����������̤Ǥ�"
 
-#~ msgid "with (classic) GUI."
-#~ msgstr "with (���饷�å�) GUI."
+msgid "E91: 'shell' option is empty"
+msgstr "E91: 'shell' ���ץ���󤬶��Ǥ�"
 
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "     �����ƥ� gvimrc: \""
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: sign �Υǡ������ɹ���ޤ���Ǥ���"
 
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "       �桼�� gvimrc: \""
+msgid "E72: Close error on swap file"
+msgstr "E72: ����åץե�����Υ������������顼�Ǥ�"
 
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "    ��2�桼�� gvimrc: \""
+msgid "E73: tag stack empty"
+msgstr "E73: ���������å������Ǥ�"
 
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "    ��3�桼�� gvimrc: \""
+msgid "E74: Command too complex"
+msgstr "E74: ���ޥ�ɤ�ʣ���᤮�ޤ�"
 
-#~ msgid "    system menu file: \""
-#~ msgstr "    �����ƥ��˥塼: \""
+msgid "E75: Name too long"
+msgstr "E75: ̾����Ĺ�᤮�ޤ�"
 
-#~ msgid "Compiler: "
-#~ msgstr "����ѥ���: "
+msgid "E76: Too many ["
+msgstr "E76: [ ��¿�᤮�ޤ�"
 
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "�ܺ٤ϥ�˥塼�� �إ�ע��ɻ� �򻲾Ȥ��Ʋ�����   "
+msgid "E77: Too many file names"
+msgstr "E77: �ե�����̾��¿�᤮�ޤ�"
 
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "�⡼��̵�Ǽ¹���, �����פ���ʸ������������ޤ�"
+msgid "E488: Trailing characters"
+msgstr "E488: ;ʬ��ʸ��������ˤ���ޤ�"
 
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "��˥塼�� �Խ����������ꢪ����(�鿴��)�⡼������ "
+msgid "E78: Unknown mark"
+msgstr "E78: ̤�ΤΥޡ���"
 
-#~ msgid "                              for two modes      "
-#~ msgstr "                              �ǥ⡼��ͭ��       "
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: �磻��ɥ����ɤ�Ÿ���Ǥ��ޤ���"
 
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "��˥塼�� �Խ����������ꢪVi�ߴ��⡼������      "
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' �� 'winminheight' ��꾮�����Ǥ��ޤ���"
 
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                              ��Vim�Ȥ���ư��    "
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' �� 'winminwidth' ��꾮�����Ǥ��ޤ���"
 
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "   �ٹ�: Windows 95/98/Me �򸡽�  "
+msgid "E80: Error while writing"
+msgstr "E80: �������Υ��顼"
 
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr " �ܺ٤ʾ����          :help windows95<Enter> "
+msgid "Zero count"
+msgstr "�����������"
 
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "ʣ����Vim���Խ����� (&M)"
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: ������ץȰʳ���<SID>���Ȥ��ޤ���"
 
-#~ msgid "Edit with single &Vim"
-#~ msgstr "1�Ĥ�Vim���Խ����� (&V)"
+msgid "E449: Invalid expression received"
+msgstr "E449: ̵���ʼ���������ޤ���"
 
-#~ msgid "Diff with Vim"
-#~ msgstr "Vim�Ǻ�ʬ��ɽ������"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: �ΰ褬�ݸ��Ƥ���Τ�, �ѹ��Ǥ��ޤ���"
 
-#~ msgid "Edit with &Vim"
-#~ msgstr "Vim���Խ����� (&V)"
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ���ɹ����ѥե�������ѹ����뤳�Ȥ�����ޤ���"
 
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "��ư�Ѥ�Vim���Խ����� - "
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: �������顼�Ǥ�: %s"
 
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "���򤷤��ե������Vim���Խ�����"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: �ѥ����� 'maxmempattern' �ʾ�Υ������Ѥ��ޤ�"
 
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "�ץ������κ����˼���: gvim���Ķ��ѿ�PATH��ˤ��뤫��ǧ���Ƥ�������!"
+msgid "E749: empty buffer"
+msgstr "E749: �Хåե������Ǥ�"
 
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll ���顼"
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: �Хåե� %ld �Ϥ���ޤ���"
 
-#~ msgid "Path length too long!"
-#~ msgstr "�ѥ���Ĺ�����ޤ�!"
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: �����ѥ����󤫶��ڤ국�椬�����Ǥ�"
 
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: ̤�ΤΥե���ȥ��å�: %s"
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Ʊ��̾���Υե����뤬¾�ΥХåե����ɹ��ޤ�Ƥ��ޤ�"
 
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: ̤�ΤΥե����: %s"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: ���ץ���� '%s' �����ꤵ��Ƥ��ޤ���"
 
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: �ե���� \"%s\" �ϸ������ǤϤ���ޤ���"
+msgid "E850: Invalid register name"
+msgstr "E850: ̵���ʥ쥸����̾�Ǥ�"
 
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: �饤�֥��δؿ� %s ������ɤǤ��ޤ���Ǥ���"
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: �ǥ��쥯�ȥ꤬ '%s' ����ˤ���ޤ���: \"%s\""
 
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: �إ֥饤��ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "��ޤǸ��������ΤDz������ޤ�"
 
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: �ڥ륷����ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "���ޤǸ��������ΤǾ�����ޤ�"
 
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: ����ӥ���ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "�Ź業����ɬ�פǤ�: \"%s\""
 
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: %s �Ȥ���̾������Ͽ���줿�����ФϤ���ޤ���"
+msgid "empty keys are not allowed"
+msgstr "���Υ����ϵ��Ĥ���Ƥ��ޤ���"
 
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: �ǥ����ץ쥤�򳫤��ޤ���"
+msgid "dictionary is locked"
+msgstr "����ϥ��å�����Ƥ��ޤ�"
 
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: ̵���ʼ���������ޤ���"
+msgid "list is locked"
+msgstr "�ꥹ�Ȥϥ��å�����Ƥ��ޤ�"
 
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: �ΰ褬�ݸ��Ƥ���Τ�, �ѹ��Ǥ��ޤ���"
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "����˥��� '%s' ���ɲä���Τ˼��Ԥ��ޤ���"
 
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans ���ɹ����ѥե�������ѹ����뤳�Ȥ�����ޤ���"
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "����ǥå����� %s �ǤϤʤ����������饤���ˤ��Ƥ�������"
 
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "�Ź業����ɬ�פǤ�: \"%s\""
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "str() �⤷���� unicode() �Υ��󥹥��󥹤����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "empty keys are not allowed"
-#~ msgstr "���Υ����ϵ��Ĥ���Ƥ��ޤ���"
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bytes() �⤷���� str() �Υ��󥹥��󥹤����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "dictionary is locked"
-#~ msgstr "����ϥ��å�����Ƥ��ޤ�"
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "long() ��������Ѵ���ǽ�ʤ�Τ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "list is locked"
-#~ msgstr "�ꥹ�Ȥϥ��å�����Ƥ��ޤ�"
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "int() ��������Ѵ���ǽ�ʤ�Τ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "����˥��� '%s' ���ɲä���Τ˼��Ԥ��ޤ���"
+msgid "value is too large to fit into C int type"
+msgstr "C����� int ���Ȥ��Ƥ��ͤ��礭�᤮�ޤ�"
 
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "����ǥå����� %s �ǤϤʤ����������饤���ˤ��Ƥ�������"
+msgid "value is too small to fit into C int type"
+msgstr "C����� int ���Ȥ��Ƥ��ͤ������᤮�ޤ�"
 
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr ""
-#~ "str() �⤷���� unicode() �Υ��󥹥��󥹤����Ԥ���Ƥ���Τ� %s �Ǥ���"
+msgid "number must be greater than zero"
+msgstr "���ͤ� 0 ����礭���ʤ���Фʤ�ޤ���"
 
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "bytes() �⤷���� str() �Υ��󥹥��󥹤����Ԥ���Ƥ���Τ� %s �Ǥ���"
+msgid "number must be greater or equal to zero"
+msgstr "���ͤ� 0 ������ʾ�Ǥʤ���Фʤ�ޤ���"
 
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr "long() ��������Ѵ���ǽ�ʤ�Τ����Ԥ���Ƥ���Τ� %s �Ǥ���"
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject°����ä��ޤ���"
 
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr "int() ��������Ѵ���ǽ�ʤ�Τ����Ԥ���Ƥ���Τ� %s �Ǥ���"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "̵����°���Ǥ�: %s"
 
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "C����� int ���Ȥ��Ƥ��ͤ��礭�᤮�ޤ�"
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: I/O���֥������Ȥν�������顼"
 
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "C����� int ���Ȥ��Ƥ��ͤ������᤮�ޤ�"
+msgid "failed to change directory"
+msgstr "������ѹ��˼��Ԥ��ޤ���"
 
-#~ msgid "number must be greater then zero"
-#~ msgstr "���ͤ� 0 ����礭���ʤ���Фʤ�ޤ���"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "imp.find_module() �� %s ���֤��ޤ��� (������: 3 ���ǤΥ��ץ�)"
 
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "���ͤ� 0 ������ʾ�Ǥʤ���Фʤ�ޤ���"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "imp.find_module() �� %d ���ǤΥ��ץ���֤��ޤ��� (������: 3)"
 
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "OutputObject°����ä��ޤ���"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "�������顼: imp.find_module �� NULL ��ޤॿ�ץ���֤��ޤ���"
 
-#~ msgid "invalid attribute: %s"
-#~ msgstr "̵����°���Ǥ�: %s"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary°���Ͼä��ޤ���"
 
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: I/O���֥������Ȥν�������顼"
+msgid "cannot modify fixed dictionary"
+msgstr "���ꤵ�줿������ѹ��Ǥ��ޤ���"
 
-#~ msgid "failed to change directory"
-#~ msgstr "������ѹ��˼��Ԥ��ޤ���"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "°�� %s ������Ǥ��ޤ���"
 
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "imp.find_module() �� %s ���֤��ޤ��� (������: 2 ���ǤΥ��ץ�)"
+msgid "hashtab changed during iteration"
+msgstr "���ƥ졼�������� hashtab ���ѹ�����ޤ���"
 
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr "impl.find_module() �� %d ���ǤΥ��ץ���֤��ޤ��� (������: 2)"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "�������󥹤����ǿ��ˤ� 2 �����Ԥ���Ƥ��ޤ����� %d �Ǥ���"
 
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "�������顼: imp.find_module �� NULL ��ޤॿ�ץ���֤��ޤ���"
+msgid "list constructor does not accept keyword arguments"
+msgstr "�ꥹ�ȤΥ��󥹥ȥ饯���ϥ�����ɰ���������դ��ޤ���"
 
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "vim.Dictionary°���Ͼä��ޤ���"
+msgid "list index out of range"
+msgstr "�ꥹ���ϰϳ��Υ���ǥå����Ǥ�"
 
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "���ꤵ�줿������ѹ��Ǥ��ޤ���"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "�������顼: vim�Υꥹ������ %d �μ����˼��Ԥ��ޤ���"
 
-#~ msgid "cannot set attribute %s"
-#~ msgstr "°�� %s ������Ǥ��ޤ���"
+msgid "slice step cannot be zero"
+msgstr "���饤���Υ��ƥåפ� 0 �ϻ���Ǥ��ޤ���"
 
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "���ƥ졼�������� hashtab ���ѹ�����ޤ���"
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr "Ĺ�� %d �γ�ĥ���饤���ˡ����Ĺ�����饤���������Ƥ褦�Ȥ��ޤ���"
 
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr "�������󥹤����ǿ��ˤ� 2 �����Ԥ���Ƥ��ޤ����� %d �Ǥ���"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "�������顼: vim�Υꥹ������ %d �Ϥ���ޤ���"
 
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "�ꥹ�ȤΥ��󥹥ȥ饯���ϥ�����ɰ���������դ��ޤ���"
+msgid "internal error: not enough list items"
+msgstr "�������顼: �ꥹ�Ȥ˽�ʬ�����Ǥ�����ޤ���"
 
-#~ msgid "list index out of range"
-#~ msgstr "�ꥹ���ϰϳ��Υ���ǥå����Ǥ�"
+msgid "internal error: failed to add item to list"
+msgstr "�������顼: �ꥹ�Ȥؤ������ɲä˼��Ԥ��ޤ���"
 
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "�������顼: vim�Υꥹ������ %d �μ����˼��Ԥ��ޤ���"
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr "Ĺ�� %d �Υ��饤���� %d �γ�ĥ���饤���˳�����Ƥ褦�Ȥ��ޤ���"
 
-#~ msgid "failed to add item to list"
-#~ msgstr "�ꥹ�Ȥؤ������ɲä˼��Ԥ��ޤ���"
+msgid "failed to add item to list"
+msgstr "�ꥹ�Ȥؤ������ɲä˼��Ԥ��ޤ���"
 
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "�������顼: vim�Υꥹ������ %d �Ϥ���ޤ���"
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List °���Ͼä��ޤ���"
 
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "�������顼: �ꥹ�Ȥؤ������ɲä˼��Ԥ��ޤ���"
+msgid "cannot modify fixed list"
+msgstr "���ꤵ�줿�ꥹ�Ȥ��ѹ��Ǥ��ޤ���"
 
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "vim.List °���Ͼä��ޤ���"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "̵̾�ؿ� %s ��¸�ߤ��ޤ���"
 
-#~ msgid "cannot modify fixed list"
-#~ msgstr "���ꤵ�줿�ꥹ�Ȥ��ѹ��Ǥ��ޤ���"
+#, c-format
+msgid "function %s does not exist"
+msgstr "�ؿ� %s ������ޤ���"
 
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "̵̾�ؿ� %s ��¸�ߤ��ޤ���"
+#, c-format
+msgid "failed to run function %s"
+msgstr "�ؿ� %s �μ¹Ԥ˼��Ԥ��ޤ���"
 
-#~ msgid "function %s does not exist"
-#~ msgstr "�ؿ� %s ������ޤ���"
+msgid "unable to get option value"
+msgstr "���ץ������ͤϼ����Ǥ��ޤ���"
 
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "�ؿ��Υ��󥹥ȥ饯���ϥ�����ɰ���������դ��ޤ���"
+msgid "internal error: unknown option type"
+msgstr "�������顼: ̤�ΤΥ��ץ���󷿤Ǥ�"
 
-#~ msgid "failed to run function %s"
-#~ msgstr "�ؿ� %s �μ¹Ԥ˼��Ԥ��ޤ���"
+msgid "problem while switching windows"
+msgstr "������ɥ����ڴ�������꤬ȯ�����ޤ���"
 
-#~ msgid "problem while switching windows"
-#~ msgstr "������ɥ����ڴ�������꤬ȯ�����ޤ���"
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "�������Х륪�ץ���� %s ���������ϤǤ��ޤ���"
 
-#~ msgid "unable to unset global option %s"
-#~ msgstr "�������Х륪�ץ���� %s ���������ϤǤ��ޤ���"
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "�������Х���ͤ�̵�����ץ���� %s ���������ϤǤ��ޤ���"
 
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "�������Х���ͤ�̵�����ץ���� %s ���������ϤǤ��ޤ���"
+msgid "attempt to refer to deleted tab page"
+msgstr "������줿���֤򻲾Ȥ��褦�Ȥ��ޤ���"
 
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "������줿���֤򻲾Ȥ��褦�Ȥ��ޤ���"
+msgid "no such tab page"
+msgstr "���Τ褦�ʥ��֥ڡ����Ϥ���ޤ���"
 
-#~ msgid "no such tab page"
-#~ msgstr "���Τ褦�ʥ��֥ڡ����Ϥ���ޤ���"
+msgid "attempt to refer to deleted window"
+msgstr "������줿������ɥ��򻲾Ȥ��褦�Ȥ��ޤ���"
 
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "������줿������ɥ��򻲾Ȥ��褦�Ȥ��ޤ���"
+msgid "readonly attribute: buffer"
+msgstr "�ɹ�����°��: �Хåե���"
 
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "�ɹ�����°��: �Хåե���"
+msgid "cursor position outside buffer"
+msgstr "����������֤��Хåե��γ�¦�Ǥ�"
 
-#~ msgid "cursor position outside buffer"
-#~ msgstr "����������֤��Хåե��γ�¦�Ǥ�"
+msgid "no such window"
+msgstr "���Τ褦�ʥ�����ɥ��Ϥ���ޤ���"
 
-#~ msgid "no such window"
-#~ msgstr "���Τ褦�ʥ�����ɥ��Ϥ���ޤ���"
+msgid "attempt to refer to deleted buffer"
+msgstr "������줿�Хåե��򻲾Ȥ��褦�Ȥ��ޤ���"
 
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "������줿�Хåե��򻲾Ȥ��褦�Ȥ��ޤ���"
+msgid "failed to rename buffer"
+msgstr "�Хåե�̾���ѹ��˼��Ԥ��ޤ���"
 
-#~ msgid "failed to rename buffer"
-#~ msgstr "�Хåե�̾���ѹ��˼��Ԥ��ޤ���"
+msgid "mark name must be a single character"
+msgstr "�ޡ���̾��1ʸ���Υ���ե��٥åȤǤʤ���Фʤ�ޤ���"
 
-#~ msgid "mark name must be a single character"
-#~ msgstr "�ޡ���̾��1ʸ���Υ���ե��٥åȤǤʤ���Фʤ�ޤ���"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "vim.Buffer���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "vim.Buffer���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "���ꤵ�줿�Хåե� %d �ؤ��ڤ��ؤ��˼��Ԥ��ޤ���"
 
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "���ꤵ�줿�Хåե� %d �ؤ��ڤ��ؤ��˼��Ԥ��ޤ���"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "vim.Window���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "vim.Window���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
+msgid "failed to find window in the current tab page"
+msgstr "���ߤΥ��֤ˤϻ��ꤵ�줿������ɥ�������ޤ���Ǥ���"
 
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "���ߤΥ��֤ˤϻ��ꤵ�줿������ɥ�������ޤ���Ǥ���"
+msgid "did not switch to the specified window"
+msgstr "���ꤵ�줿������ɥ����ڤ��ؤ��ޤ���Ǥ���"
 
-#~ msgid "did not switch to the specified window"
-#~ msgstr "���ꤵ�줿������ɥ����ڤ��ؤ��ޤ���Ǥ���"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "vim.TabPage���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "vim.TabPage���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
+msgid "did not switch to the specified tab page"
+msgstr "���ꤵ�줿���֥ڡ������ڤ��ؤ��ޤ���Ǥ���"
 
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "���ꤵ�줿���֥ڡ������ڤ��ؤ��ޤ���Ǥ���"
+msgid "failed to run the code"
+msgstr "�����ɤμ¹Ԥ˼��Ԥ��ޤ���"
 
-#~ msgid "failed to run the code"
-#~ msgstr "�����ɤμ¹Ԥ˼��Ԥ��ޤ���"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: ��ɾ����ͭ����python���֥������Ȥ��֤��ޤ���Ǥ���"
 
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: ��ɾ����ͭ����python���֥������Ȥ��֤��ޤ���Ǥ���"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: �֤��줿python���֥������Ȥ�vim���ͤ��Ѵ��Ǥ��ޤ���Ǥ���"
 
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: �֤��줿python���֥������Ȥ�vim���ͤ��Ѵ��Ǥ��ޤ���Ǥ���"
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "%s vim�μ��񷿤��Ѵ��Ǥ��ޤ���"
 
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "%s vim�μ��񷿤��Ѵ��Ǥ��ޤ���"
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s ��vim�Υꥹ�Ȥ��Ѵ��Ǥ��ޤ���"
 
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "%s ��vim�ι�¤�Τ��Ѵ��Ǥ��ޤ���"
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "%s ��vim�ι�¤�Τ��Ѵ��Ǥ��ޤ���"
 
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "�������顼: NULL���Ȥ��Ϥ���ޤ���"
+msgid "internal error: NULL reference passed"
+msgstr "�������顼: NULL���Ȥ��Ϥ���ޤ���"
 
-#~ msgid "internal error: invalid value type"
-#~ msgstr "�������顼: ̵�����ͷ��Ǥ�"
+msgid "internal error: invalid value type"
+msgstr "�������顼: ̵�����ͷ��Ǥ�"
 
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "�ѥ��եå�������˼��Ԥ��ޤ���: sys.path_hooks ���ꥹ�ȤǤϤ���ޤ���\n"
-#~ "�����˲�����»ܤ��Ƥ�������:\n"
-#~ "- vim.path_hooks �� sys.path_hooks ���ɲ�\n"
-#~ "- vim.VIM_SPECIAL_PATH �� sys.path ���ɲ�\n"
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"�ѥ��եå�������˼��Ԥ��ޤ���: sys.path_hooks ���ꥹ�ȤǤϤ���ޤ���\n"
+"�����˲�����»ܤ��Ƥ�������:\n"
+"- vim.path_hooks �� sys.path_hooks ���ɲ�\n"
+"- vim.VIM_SPECIAL_PATH �� sys.path ���ɲ�\n"
 
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "�ѥ�������˼��Ԥ��ޤ���: sys.path ���ꥹ�ȤǤϤ���ޤ���\n"
-#~ "������ vim.VIM_SPECIAL_PATH �� sys.path ���ɲä��Ƥ�������"
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"�ѥ�������˼��Ԥ��ޤ���: sys.path ���ꥹ�ȤǤϤ���ޤ���\n"
+"������ vim.VIM_SPECIAL_PATH �� sys.path ���ɲä��Ƥ�������"
diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po
index e12cfb7e70..5cb789c93e 100644
--- a/src/nvim/po/ja.po
+++ b/src/nvim/po/ja.po
@@ -1,3 +1,4 @@
+
 # Japanese translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -14,213 +15,176 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2013-06-02-01 09:08+09n"
+"POT-Creation-Date: 2016-09-10 21:10+0900\n"
+"PO-Revision-Date: 2016-09-10 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "オプションの値は取得できません"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: bf_key_init() が空パスワードで呼び出されました"
 
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "内部エラー: 未知のオプション型です"
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Blowfish暗号のビッグ/リトルエンディアンが間違っています"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: sha256のテストに失敗しました"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Blowfish暗号のテストに失敗しました"
 
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[ロケーションリスト]"
 
-#: ../buffer.c:93
 msgid "[Quickfix List]"
 msgstr "[Quickfixリスト]"
 
-#: ../buffer.c:94
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: autocommandがコマンドの停止を引き起こしました"
 
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: バッファを1つも作成できないので, 終了します..."
 
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: バッファを作成できないので, 他のを使用します..."
 
-#: ../buffer.c:763
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: バッファを登録できません"
+
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: 使用中のバッファを削除しようと試みました"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 解放されたバッファはありません"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: 削除されたバッファはありません"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: 破棄されたバッファはありません"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "1 個のバッファが解放されました"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d 個のバッファが解放されました"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "1 個のバッファが削除されました"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d 個のバッファが削除されました"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "1 個のバッファが破棄されました"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d 個のバッファが破棄されました"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: 最後のバッファは解放できません"
 
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: 変更されたバッファはありません"
 
 #. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: リスト表示されるバッファはありません"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: バッファ %<PRId64> はありません"
-
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 最後のバッファを越えて移動はできません"
 
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: 最初のバッファより前へは移動できません"
 
-#: ../buffer.c:945
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: バッファ %<PRId64> の変更は保存されていません (! で変更を破棄)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)"
 
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 警告: ファイル名のリストが長過ぎます"
 
-#: ../buffer.c:1555 ../quickfix.c:3361
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: バッファ %<PRId64> が見つかりません"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: バッファ %ld が見つかりません"
 
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s に複数の該当がありました"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s に該当するバッファはありませんでした"
 
-#: ../buffer.c:2161
 #, c-format
-msgid "line %<PRId64>"
-msgstr "行 %<PRId64>"
+msgid "line %ld"
+msgstr "行 %ld"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: この名前のバッファは既にあります"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr " [変更あり]"
 
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[未編集]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[新ファイル]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
 msgstr "[読込エラー]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[読専]"
 
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[読込専用]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 行 --%d%%--"
 
-#: ../buffer.c:2526
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> 行 --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld 行 --%d%%--"
 
-#: ../buffer.c:2530
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "行 %<PRId64> (全体 %<PRId64>) --%d%%-- col "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "行 %ld (全体 %ld) --%d%%-- col "
 
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
 msgstr "[無名]"
 
 #. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "ヘルプ"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[ヘルプ]"
 
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[プレビュー]"
 
-#: ../buffer.c:3528
 msgid "All"
 msgstr "全て"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "末尾"
 
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "先頭"
 
-#: ../buffer.c:4244
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -228,11 +192,9 @@ msgstr ""
 "\n"
 "# バッファリスト:\n"
 
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[下書き]"
 
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -240,200 +202,235 @@ msgstr ""
 "\n"
 "--- サイン ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s のサイン:"
 
-#: ../buffer.c:4543
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    行=%<PRId64>  識別子=%d  名前=%s"
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    行=%ld  識別子=%d  名前=%s"
 
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: コロンがありません"
+msgid "E902: Cannot connect to port"
+msgstr "E902: ポートに接続できません"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: 不正なモードです"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() 内の gethostbyname() が失敗しました"
 
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: 数値が必要です"
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() 内の socket() が失敗しました"
 
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: 不正なパーセンテージです"
+msgid "E903: received command with non-string argument"
+msgstr "E903: 非文字列の引数のコマンドを受信しました"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call の最後の引数は数字でなければなりません"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call の3番目の引数はリスト型でなければなりません"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: 未知のコマンドを受信しました: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): 非接続状態で書き込みました"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): 書き込みに失敗しました"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() にコールバックは使えません"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: 生や 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 の設定が必要です"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io バッファは in_buf か in_name の設定が必要です"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: バッファがロードされてなければなりません: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: ファイルが未知の方法で暗号化されています"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "警告: 弱い暗号方法を使っています; :help 'cm' を参照してください"
+
+msgid "Enter encryption key: "
+msgstr "暗号化用のキーを入力してください: "
+
+msgid "Enter same key again: "
+msgstr "もう一度同じキーを入力してください: "
+
+msgid "Keys don't match!"
+msgstr "キーが一致しません"
+
+msgid "[crypted]"
+msgstr "[暗号化]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: 辞書型にコロンがありません: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: 辞書型に重複キーがあります: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: 辞書型にカンマがありません: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: 辞書型の最後に '}' がありません: %s"
+
+msgid "extend() argument"
+msgstr "extend() の引数"
 
-#: ../diff.c:146
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: %<PRId64> 以上のバッファはdiffできません"
+msgid "E737: Key already exists: %s"
+msgstr "E737: キーは既に存在します: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: %ld 以上のバッファはdiffできません"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: 一時ファイルの読込もしくは書込ができません"
 
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
 msgstr "E97: 差分を作成できません"
 
-#: ../diff.c:966
+msgid "Patch file"
+msgstr "パッチファイル"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: patchの出力を読込めません"
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: diffの出力を読込めません"
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: 現在のバッファは差分モードではありません"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: 差分モードである他のバッファは変更できません"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: 差分モードである他のバッファはありません"
 
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: 差分モードのバッファが2個以上あるので、どれを使うか特定できません"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: バッファ \"%s\" が見つかりません"
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: バッファ \"%s\" は差分モードではありません"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: 予期せずバッファが変更変更されました"
 
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 合字にEscapeは使用できません"
 
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
 msgstr "E544: キーマップファイルが見つかりません"
 
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source で取込むファイル以外では :loadkeymap を使えません"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
 msgstr "E791: 空のキーマップエントリ"
 
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
 msgstr " キーワード補完 (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 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)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
 msgstr " 行(全体)補完 (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
 msgstr " ファイル名補完 (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
 msgstr " タグ補完 (^]^N^P)"
 
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
 msgstr " パスパターン補完 (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
 msgstr " 定義補完 (^D^N^P)"
 
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
 msgstr " 辞書補完 (^K^N^P)"
 
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " シソーラス補完 (^T^N^P)"
 
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
 msgstr " コマンドライン補完 (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
 msgstr " ユーザー定義補完 (^U^N^P)"
 
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
 msgstr " オムニ補完 (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " 綴り修正候補 (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
 msgstr " 局所キーワード補完 (^N^P)"
 
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "段落の最後にヒット"
 
-#: ../edit.c:101
 msgid "E839: Completion function changed window"
 msgstr "E839: 補間関数がウィンドウを変更しました"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
 msgstr "E840: 補完関数がテキストを削除しました"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' オプションが空です"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' オプションが空です"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "辞書をスキャン中: %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (挿入) スクロール(^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (置換) スクロール (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "スキャン中: %s"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
 msgstr "タグをスキャン中."
 
-#: ../edit.c:4519
 msgid " Adding"
 msgstr " 追加中"
 
@@ -441,430 +438,161 @@ msgstr " 追加中"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- 検索中..."
 
-#: ../edit.c:4618
 msgid "Back at original"
 msgstr "始めに戻る"
 
-#: ../edit.c:4621
 msgid "Word from other line"
 msgstr "他の行の単語"
 
-#: ../edit.c:4624
 msgid "The only match"
 msgstr "唯一の該当"
 
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
 msgstr "%d 番目の該当 (全該当 %d 個中)"
 
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
 msgstr "%d 番目の該当"
 
-#: ../eval.c:137
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: 予期せぬ文字が :let にありました"
 
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: リストのインデックスが範囲外です: %<PRId64>"
-
-#: ../eval.c:139
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: 未定義の変数です: %s"
 
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: ']' が見つかりません"
 
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s の引数はリスト型でなければなりません"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: 辞書型に空のキーを使うことはできません"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: リスト型が必要です"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: 辞書型が必要です"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 関数の引数が多過ぎます: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: 辞書型にキーが存在しません: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: 辞書型内にエントリが既に存在します"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: 関数参照型が要求されます"
-
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] を辞書型と組み合わせては使えません"
 
-#: ../eval.c:154
 #, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: 異なった型の変数です %s="
 
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: 未知の関数です: %s"
-
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 不正な変数名です: %s"
 
-#: ../eval.c:157
 msgid "E806: using Float as a String"
 msgstr "E806: 浮動小数点数を文字列として扱っています"
 
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
 msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"
 
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
 msgstr "E688: ターゲットがリスト型内の要素よりも多いです"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
 msgstr "リスト型の値に2つ以上の ; が検出されました"
 
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s の値を一覧表示できません"
 
-#: ../eval.c:2391
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: リスト型と辞書型以外はインデックス指定できません"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
 msgstr "E708: [:] は最後でなければいけません"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
 msgstr "E709: [:] にはリスト型の値が必要です"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
 msgstr "E710: リスト型変数にターゲットよりも多い要素があります"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: リスト型変数に十分な数の要素がありません"
 
 #
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for の後に \"in\" がありません"
 
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: カッコ '(' がありません: %s"
-
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: その変数はありません: \"%s\""
 
-#: ../eval.c:3333
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: (アン)ロックするには変数の入れ子が深過ぎます"
 
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' の後に ':' がありません"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: リスト型はリスト型としか比較できません"
 
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: リスト型には無効な操作です"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: 辞書型は辞書型としか比較できません"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: 辞書型には無効な操作です"
 
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: 関数参照型は関数参照型としか比較できません"
-
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: 関数参照型には無効な操作です"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' を浮動小数点数と組み合わせては使えません"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: ')' が見つかりません"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: 関数参照型はインデックスできません"
 
-#: ../eval.c:4839
+msgid "E909: Cannot index a special variable"
+msgstr "E909: 特殊変数はインデックスできません"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: オプション名がありません: %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: 未知のオプションです: %s"
 
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: 引用符 (\") がありません: %s"
 
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: 引用符 (') がありません: %s"
 
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: リスト型にカンマがありません: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: リスト型の最後に ']' がありません: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました"
 
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: 辞書型にコロンがありません: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: 辞書型に重複キーがあります: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: 辞書型にカンマがありません: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: 辞書型の最後に '}' がありません: %s"
-
-#: ../eval.c:6555
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: 表示するには変数の入れ子が深過ぎます"
 
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: 関数の引数が多過ぎます: %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 関数の無効な引数です: %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未知の関数です: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 関数の引数が足りません: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: スクリプト以外で<SID>が使われました: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: 辞書用関数が呼ばれましたが辞書がありません: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: 数値か浮動小数点数が必要です"
-
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "add() の引数"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: 引数が多過ぎます"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() は挿入モードでしか利用できません"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: キーは既に存在します: %s"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "extend() の引数"
-
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "map() の引数"
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "filter() の引数"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld 行: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: 未知の関数です: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore() が inputsave() よりも多く呼ばれました"
-
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "insert() の引数"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: 範囲指定は許可されていません"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: len() には無効な型です"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: ストライド(前進量)が 0 です"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: 開始位置が終了位置を越えました"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<空>"
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "remove() の引数"
-
-# Added at 10-Mar-2004.
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "reverse() の引数"
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "sort() の引数"
-
-#: ../eval.c:13721
-msgid "uniq() argument"
-msgstr "uniq() の引数"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: ソートの比較関数が失敗しました"
-
-#: ../eval.c:13806
-msgid "E882: Uniq compare function failed"
-msgstr "E882: Uniq の比較関数が失敗しました"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(無効)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: 一時ファイル書込中にエラーが発生しました"
-
-#: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
 msgstr "E805: 浮動小数点数を数値として扱っています"
 
-#: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: 関数参照型を数値として扱っています。"
 
-#: ../eval.c:16170
 msgid "E745: Using a List as a Number"
 msgstr "E745: リスト型を数値として扱っています"
 
-#: ../eval.c:16173
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: 辞書型を数値として扱っています"
 
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ジョブを数値として扱っています"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: チャンネルを数値として扱っています。"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
 
@@ -877,265 +605,280 @@ msgstr "E893: リスト型を浮動小数点数として扱っています"
 msgid "E894: Using a Dictionary as a Float"
 msgstr "E894: 辞書型を浮動小数点数として扱っています"
 
-#: ../eval.c:16259
+msgid "E907: Using a special value as a Float"
+msgstr "E907: 特殊値を浮動小数点数として扱っています"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ジョブを浮動小数点数として扱っています"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: チャンネルを浮動小数点数として扱っています。"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: 関数参照型を文字列として扱っています"
 
-#: ../eval.c:16262
 msgid "E730: using List as a String"
 msgstr "E730: リスト型を文字列として扱っています"
 
-#: ../eval.c:16265
 msgid "E731: using Dictionary as a String"
 msgstr "E731: 辞書型を文字列として扱っています"
 
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: 変数の型が一致しません: %s"
+msgid "E908: using an invalid value as a String"
+msgstr "E908: 無効な値を文字列として扱っています"
 
-#: ../eval.c:16705
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: 変数 %s を削除できません"
 
-#: ../eval.c:16724
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: 関数参照型変数名は大文字で始まらなければなりません: %s"
 
-#: ../eval.c:16732
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: 変数名が既存の関数名と衝突します: %s"
 
-#: ../eval.c:16763
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: 値がロックされています: %s"
 
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
 msgid "Unknown"
 msgstr "不明"
 
-#: ../eval.c:16768
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: %s の値を変更できません"
 
-#: ../eval.c:16838
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
 
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 未定義の関数です: %s"
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# グローバル変数:\n"
 
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' がありません: %s"
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\t最後にセットしたスクリプト: "
 
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: ここでは g: は使えません"
+msgid "map() argument"
+msgstr "map() の引数"
 
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: 不正な引数です: %s"
+msgid "filter() argument"
+msgstr "filter() の引数"
 
-#: ../eval.c:17323
 #, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: 引数名が重複しています: %s"
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s の引数はリスト型でなければなりません"
 
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction がありません"
+msgid "E928: String required"
+msgstr "E928: 文字列が必要です"
 
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: 関数名が変数名と衝突します: %s"
+msgid "E808: Number or Float required"
+msgstr "E808: 数値か浮動小数点数が必要です"
 
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 関数 %s を再定義できません: 使用中です"
+msgid "add() argument"
+msgstr "add() の引数"
 
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() は挿入モードでしか利用できません"
 
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: 関数名が要求されます"
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "&Ok"
 
-#: ../eval.c:17824
 #, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld 行: "
 
-#: ../eval.c:17833
 #, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: 関数名にはコロンは含められません: %s"
+msgid "E700: Unknown function: %s"
+msgstr "E700: 未知の関数です: %s"
 
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: 関数 %s を削除できません: 使用中です"
+msgid "E922: expected a dict"
+msgstr "E922: 辞書が期待されています"
 
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() の第 2 引数はリスト型または辞書型でなければなりません"
 
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "%s を実行中です"
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"決定(&O)\n"
+"キャンセル(&C)"
 
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s が中断されました"
+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() には無効な型です"
 
-#: ../eval.c:18653
 #, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s が #%<PRId64> を返しました"
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID は \":match\" のために予約されています: %ld"
+
+msgid "E726: Stride is zero"
+msgstr "E726: ストライド(前進量)が 0 です"
+
+msgid "E727: Start past end"
+msgstr "E727: 開始位置が終了位置を越えました"
+
+msgid "<empty>"
+msgstr "<空>"
+
+msgid "E240: No connection to Vim server"
+msgstr "E240: Vim サーバーへの接続がありません"
 
-#: ../eval.c:18670
 #, c-format
-msgid "%s returning %s"
-msgstr "%s が %s を返しました"
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s へ送ることができません"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: サーバーの応答がありません"
+
+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: クライアントへ送ることができません"
 
-#: ../eval.c:18691 ../ex_cmds2.c:2695
 #, c-format
-msgid "continuing in %s"
-msgstr "%s の実行を継続中です"
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: 無効な操作です: %s"
 
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: 関数外に :return がありました"
+msgid "sort() argument"
+msgstr "sort() の引数"
 
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# グローバル変数:\n"
+msgid "uniq() argument"
+msgstr "uniq() の引数"
 
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
+msgid "E702: Sort compare function failed"
+msgstr "E702: ソートの比較関数が失敗しました"
 
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "古いファイルはありません"
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq の比較関数が失敗しました"
+
+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: 無効なコールバック引数です"
 
-#: ../ex_cmds.c:122
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16進数 %02x,  8進数 %03o"
 
-#: ../ex_cmds.c:145
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16進数 %04x, 8進数 %o"
 
-#: ../ex_cmds.c:146
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16進数 %08x, 8進数 %o"
 
-#: ../ex_cmds.c:684
 msgid "E134: Move lines into themselves"
 msgstr "E134: 行をそれ自身には移動できません"
 
-#: ../ex_cmds.c:747
 msgid "1 line moved"
 msgstr "1 行が移動されました"
 
-#: ../ex_cmds.c:749
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> 行が移動されました"
+msgid "%ld lines moved"
+msgstr "%ld 行が移動されました"
 
-#: ../ex_cmds.c:1175
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> 行がフィルタ処理されました"
+msgid "%ld lines filtered"
+msgstr "%ld 行がフィルタ処理されました"
 
-#: ../ex_cmds.c:1194
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *フィルタ* autocommandは現在のバッファを変更してはいけません"
 
-#: ../ex_cmds.c:1244
 msgid "[No write since last change]\n"
 msgstr "[最後の変更が保存されていません]\n"
 
-#: ../ex_cmds.c:1424
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s 行目: "
 
-#: ../ex_cmds.c:1431
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: エラーが多過ぎるので, 以降はスキップします"
 
-#: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfoファイル \"%s\"%s%s%s を読込み中"
 
-#: ../ex_cmds.c:1460
 msgid " info"
 msgstr " 情報"
 
-#: ../ex_cmds.c:1461
 msgid " marks"
 msgstr " マーク"
 
-#: ../ex_cmds.c:1462
 msgid " oldfiles"
 msgstr " 旧ファイル群"
 
-#: ../ex_cmds.c:1463
 msgid " FAILED"
 msgstr " 失敗"
 
 #. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfoファイルが書込みできません: %s"
 
-#: ../ex_cmds.c:1626
+#, 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 を保存できません!"
 
-#: ../ex_cmds.c:1635
 #, 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 へ名前変更できません!"
+
 #. Write the info:
-#: ../ex_cmds.c:1720
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# この viminfo ファイルは Vim %s によって生成されました.\n"
 
-#: ../ex_cmds.c:1722
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -1143,47 +886,47 @@ msgstr ""
 "# 変更する際には十分注意してください!\n"
 "\n"
 
-#: ../ex_cmds.c:1723
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# このファイルが書かれた時の 'encoding' の値\n"
 
-#: ../ex_cmds.c:1800
 msgid "Illegal starting char"
 msgstr "不正な先頭文字です"
 
-#: ../ex_cmds.c:2162
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' で始まる行の、文字通りのコピー:\n"
+
+msgid "Save As"
+msgstr "別名で保存"
+
 msgid "Write partial file?"
 msgstr "ファイルを部分的に保存しますか?"
 
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: バッファを部分的に保存するには ! を使ってください"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "既存のファイル \"%s\" を上書きしますか?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "スワップファイル \"%s\" が存在します. 上書きを強制しますか?"
 
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: スワップファイルが存在します: %s (:silent! を追加で上書)"
 
-#: ../ex_cmds.c:2381
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: バッファ %<PRId64> には名前がありません"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: バッファ %ld には名前がありません"
 
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: ファイルは保存されませんでした: 'write' オプションにより無効です"
 
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1192,7 +935,6 @@ msgstr ""
 "\"%s\" には 'readonly' オプションが設定されています.\n"
 "上書き強制をしますか?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1203,83 +945,68 @@ msgstr ""
 "それでも恐らく書き込むことは可能です.\n"
 "継続しますか?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" は読込専用です (強制書込には ! を追加)"
 
-#: ../ex_cmds.c:3120
+msgid "Edit File"
+msgstr "ファイルを編集"
+
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommandが予期せず新しいバッファ %s を削除しました"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: 数ではない引数が :z に渡されました"
 
-#: ../ex_cmds.c:3404
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvimではシェルコマンドを使えません"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: 正規表現は文字で区切ることができません"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s に置換しますか? (y/n/a/q/l/^E/^Y)"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(割込まれました) "
 
-#: ../ex_cmds.c:4384
 msgid "1 match"
 msgstr "1 箇所該当しました"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "1 箇所置換しました"
 
-#: ../ex_cmds.c:4387
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> 箇所該当しました"
+msgid "%ld matches"
+msgstr "%ld 箇所該当しました"
 
-#: ../ex_cmds.c:4388
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> 箇所置換しました"
+msgid "%ld substitutions"
+msgstr "%ld 箇所置換しました"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
 msgstr " (計 1 行内)"
 
-#: ../ex_cmds.c:4395
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " (計 %<PRId64> 行内)"
+msgid " on %ld lines"
+msgstr " (計 %ld 行内)"
 
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global を再帰的には使えません"
 
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
 msgstr "E148: globalコマンドに正規表現が指定されていません"
 
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "パターンが全ての行で見つかりました: %s"
 
-#: ../ex_cmds.c:4510
 #, c-format
 msgid "Pattern not found: %s"
 msgstr "パターンは見つかりませんでした: %s"
 
-#: ../ex_cmds.c:4587
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1289,110 +1016,102 @@ msgstr ""
 "# 最後に置換された文字列:\n"
 "$"
 
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
 msgstr "E478: 慌てないでください"
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: 残念ですが '%s' のヘルプが %s にはありません"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: 残念ですが %s にはヘルプがありません"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "残念ですがヘルプファイル \"%s\" が見つかりません"
 
-#: ../ex_cmds.c:5323
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ディレクトリではありません: %s"
+msgid "E151: No match: %s"
+msgstr "E151: マッチはありません: %s"
 
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: 書込み用に %s を開けません"
 
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: 読込用に %s を開けません"
 
 # Added at 29-Apr-2004.
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1つの言語のヘルプファイルに複数のエンコードが混在しています: %s"
 
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: タグ \"%s\" がファイル %s/%s に重複しています"
 
-#: ../ex_cmds.c:5687
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: ディレクトリではありません: %s"
+
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: 未知のsignコマンドです: %s"
 
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: sign名がありません"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
 msgstr "E612: signの定義が多数見つかりました"
 
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: 無効なsignのテキストです: %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: 未知のsignです: %s"
 
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: signの番号がありません"
 
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 無効なバッファ名です: %s"
 
-#: ../ex_cmds.c:6008
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: 名前の無いバッファへはジャンプできません"
+
 #, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: 無効なsign識別子です: %<PRId64>"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: 無効なsign識別子です: %ld"
 
 #, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: 変更できない sign です: %s"
 
-#: ../ex_cmds.c:6066
+# Added at 27-Jan-2004.
+msgid " (NOT FOUND)"
+msgstr " (見つかりません)"
+
 msgid " (not supported)"
 msgstr " (非サポート)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[削除済]"
 
-#: ../ex_cmds2.c:139
+msgid "No old files"
+msgstr "古いファイルはありません"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "行 %<PRId64>: %s"
+msgid "line %ld: %s"
+msgstr "行 %ld: %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "コマンド: %s"
@@ -1404,232 +1123,184 @@ msgstr "フレームが 0 です"
 msgid "frame at highest level: %d"
 msgstr "最高レベルのフレーム: %d"
 
-#: ../ex_cmds2.c:322
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "ブレークポイント \"%s%s\" 行 %<PRId64>"
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "ブレークポイント \"%s%s\" 行 %ld"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: ブレークポイントが見つかりません: %s"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "ブレークポイントが定義されていません"
 
-#: ../ex_cmds2.c:617
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  行 %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  行 %ld"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: 初めに \":profile start {fname}\" を実行してください"
 
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "変更を \"%s\" に保存しますか?"
 
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
 msgstr "無題"
 
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: バッファ \"%s\" の変更は保存されていません"
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "警告: 予期せず他バッファへ移動しました (autocommands を調べてください)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: 編集するファイルは1つしかありません"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
 msgstr "E164: 最初のファイルより前には行けません"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: 最後のファイルを越えて後には行けません"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: そのコンパイラには対応していません: %s"
 
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" を \"%s\" から検索中"
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" を検索中"
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' の中には見つかりません: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' の中にはありません: \"%s\""
+
+msgid "Source Vim script"
+msgstr "Vimスクリプトの取込み"
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "ディレクトリは取込めません: \"%s\""
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" を取込めません"
 
-#: ../ex_cmds2.c:2520
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "行 %<PRId64>: \"%s\" を取込めません"
+msgid "line %ld: could not source \"%s\""
+msgstr "行 %ld: \"%s\" を取込めません"
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" を取込中"
 
-#: ../ex_cmds2.c:2537
 #, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "行 %<PRId64>: %s を取込中"
+msgid "line %ld: sourcing \"%s\""
+msgstr "行 %ld: %s を取込中"
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s の取込を完了"
 
-#: ../ex_cmds2.c:2765
+#, c-format
+msgid "continuing in %s"
+msgstr "%s の実行を継続中です"
+
 msgid "modeline"
 msgstr "モード行"
 
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "--cmd 引数"
 
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "-c 引数"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
 msgstr "環境変数"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
 msgstr "エラーハンドラ"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: 警告: 行区切が不正です. ^M がないのでしょう"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding が取込スクリプト以外で使用されました"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish が取込スクリプト以外で使用されました"
 
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "現在の %s言語: \"%s\""
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: 言語を \"%s\" に設定できません"
 
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr ""
 "Exモードに入ります. ノーマルモードに戻るには\"visual\"と入力してください."
 
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: ファイルの終了位置"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: コマンドが再帰的過ぎます"
 
-#: ../ex_docmd.c:1006
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: 例外が捕捉されませんでした: %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "取込ファイルの最後です"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "関数の最後です"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: ユーザー定義コマンドのあいまいな使用です"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: エディタのコマンドではありません"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: 逆さまの範囲が指定されました"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
 msgstr "逆さまの範囲が指定されました, 入替えますか?"
 
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
 msgstr "E494: w もしくは w>> を使用してください"
 
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: このバージョンではこのコマンドは利用できません, ごめんなさい"
 
-#: ../ex_docmd.c:3752
 msgid "E172: Only one file name allowed"
 msgstr "E172: ファイル名は 1 つにしてください"
 
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "編集すべきファイルが 1 個ありますが, 終了しますか?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "編集すべきファイルがあと %d 個ありますが, 終了しますか?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
 msgstr "E173: 編集すべきファイルが 1 個あります"
 
-#: ../ex_docmd.c:4250
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: 編集すべきファイルがあと %<PRId64> 個あります"
+msgid "E173: %ld more files to edit"
+msgstr "E173: 編集すべきファイルがあと %ld 個あります"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
 "    Name        Args       Address   Complete  Definition"
@@ -1637,51 +1308,40 @@ msgstr ""
 "\n"
 "    名前        引数       アドレス  補完      定義"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
 msgstr "ユーザー定義コマンドが見つかりませんでした"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
 msgstr "E175: 属性は定義されていません"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
 msgstr "E176: 引数の数が無効です"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: カウントを2重指定することはできません"
 
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
 msgstr "E178: カウントの省略値が無効です"
 
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: -complete には引数が必要です"
 
 msgid "E179: argument required for -addr"
 msgstr "E179: -addr には引数が必要です"
 
-#: ../ex_docmd.c:4635
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: 無効な属性です: %s"
 
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: 無効なコマンド名です"
 
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
 
-#: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr "E841: 予約名なので, ユーザー定義コマンドに利用できません"
 
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: そのユーザー定義コマンドはありません: %s"
@@ -1690,293 +1350,261 @@ msgstr "E184: そのユーザー定義コマンドはありません: %s"
 msgid "E180: Invalid address type value: %s"
 msgstr "E180: 無効なアドレスタイプ値です: %s"
 
-#: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: 無効な補完指定です: %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: 補完引数はカスタム補完でしか使用できません"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: カスタム補完には引数として関数が必要です"
 
-#: ../ex_docmd.c:5257
+msgid "unknown"
+msgstr "不明"
+
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: カラースキーム '%s' が見つかりません"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
 msgstr "Vim 使いさん、やあ!"
 
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
 msgstr "E784: 最後のタブページを閉じることはできません"
 
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
 msgstr "既にタブページは1つしかありません"
 
-#: ../ex_docmd.c:6004
+msgid "Edit File in new window"
+msgstr "新しいウィンドウでファイルを編集します"
+
 #, c-format
 msgid "Tab page %d"
 msgstr "タブページ %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "スワップファイルがありません"
 
-#: ../ex_docmd.c:6478
+msgid "Append File"
+msgstr "追加ファイル"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: バッファが修正されているので, ディレクトリを変更できません (! を追加で"
 "上書)"
 
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
 msgstr "E186: 前のディレクトリはありません"
 
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: 未知"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize には2つの数値の引数が必要です"
 
-#: ../ex_docmd.c:6655
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "ウィンドウ位置: X %d, Y %d"
+
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: このプラットホームにはウィンドウ位置の取得機能は実装されていません"
 
-#: ../ex_docmd.c:6662
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos には2つの数値の引数が必要です"
 
-#: ../ex_docmd.c:7241
+msgid "E930: Cannot use :redir inside execute()"
+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"
 
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" が存在します (上書するには ! を追加してください)"
 
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: \"%s\" を書込み用として開けません"
 
 #. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: 引数は1文字の英字か引用符 (' か `) でなければいけません"
 
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal の再帰利用が深くなり過ぎました"
 
-#: ../ex_docmd.c:7807
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: #< は +eval 機能が無いと利用できません"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: '#'を置き換える副ファイルの名前がありません"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: \"<afile>\"を置き換えるautocommandのファイル名がありません"
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: \"<abuf>\"を置き換えるautocommandバッファ番号がありません"
 
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: \"<amatch>\"を置き換えるautocommandの該当名がありません"
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: \"<sfile>\"を置き換える :source 対象ファイル名がありません"
 
-#: ../ex_docmd.c:7876
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: \"<slnum>\"を置き換える行番号がありません"
 
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
+#, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: '%' や '#' が無名ファイルなので \":p:h\" を伴わない使い方はできません"
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: 空文字列として評価されました"
 
-#: ../ex_docmd.c:8838
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfoファイルを読込用として開けません"
 
-#: ../ex_eval.c:464
+msgid "E196: No digraphs in this version"
+msgstr "E196: このバージョンに合字はありません"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' で始まる例外は :throw できません"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "例外が発生しました: %s"
 
-#: ../ex_eval.c:545
 #, c-format
 msgid "Exception finished: %s"
 msgstr "例外が収束しました: %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "例外が破棄されました: %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, 行 %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, 行 %ld"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "例外が捕捉されました: %s"
 
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "%s により未決定状態が生じました"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "%s が再開しました"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "%s が破棄されました"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "例外"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "エラーと割込み"
 
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "エラー"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "割込み"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if の入れ子が深過ぎます"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: :if のない :endif があります"
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: :if のない :else があります"
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: :if のない :elseif があります"
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: 複数の :else があります"
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
 msgstr "E584: :else の後に :elseif があります"
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: :while や :for の入れ子が深過ぎます"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :while や :for のない :continue があります"
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: :while や :for のない :break があります"
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: :endfor を :while と組み合わせています"
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: :endwhile を :for と組み合わせています"
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try の入れ子が深過ぎます"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: :try のない :catch があります"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally の後に :catch があります"
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: :try のない :finally があります"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: 複数の :finally があります"
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: :try のない :endtry です"
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: 関数の外に :endfunction がありました"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: 現在は他のバッファを編集することは許されません"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: 現在はバッファ情報を変更することは許されません"
 
-#: ../ex_getln.c:3178
 msgid "tagname"
 msgstr "タグ名"
 
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " ファイル種類\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "オプション 'history' がゼロです"
 
-#: ../ex_getln.c:5046
 #, c-format
 msgid ""
 "\n"
@@ -1985,303 +1613,224 @@ msgstr ""
 "\n"
 "# %s 項目の履歴 (新しいものから古いものへ):\n"
 
-#: ../ex_getln.c:5047
 msgid "Command Line"
 msgstr "コマンドライン"
 
-#: ../ex_getln.c:5048
 msgid "Search String"
 msgstr "検索文字列"
 
-#: ../ex_getln.c:5049
 msgid "Expression"
 msgstr "式"
 
-#: ../ex_getln.c:5050
 msgid "Input Line"
 msgstr "入力行"
 
-#: ../ex_getln.c:5117
+msgid "Debug Line"
+msgstr "デバッグ行"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar がコマンド長を超えました"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: アクティブなウィンドウかバッファが削除されました"
 
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: パスが長過ぎて補完できません"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: 無効なパスです: '**[数値]' はpathの最後か '%s' が続いてないといけませ"
-"ん."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpathには \"%s\" というファイルがありません"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: pathには \"%s\" というファイルがありません"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpathにはこれ以上 \"%s\" というファイルがありません"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: パスにはこれ以上 \"%s\" というファイルがありません"
-
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: autocommandがバッファかバッファ名を変更しました"
 
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "不正なファイル名"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "はディレクトリです"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "はファイルではありません"
 
-#: ../fileio.c:508 ../fileio.c:3522
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "はデバイスです ('opendevice' オプションで回避できます)"
+
 msgid "[New File]"
 msgstr "[新ファイル]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[新規ディレクトリ]"
 
-#: ../fileio.c:529 ../fileio.c:532
 msgid "[File too big]"
 msgstr "[ファイル過大]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[権限がありません]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre autocommand がファイルを読込不可にしました"
 
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre autocommand は現在のバッファを変えられません"
 
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: 標準入力から読込中...\n"
 
+msgid "Reading from stdin..."
+msgstr "標準入力から読込み中..."
+
 #. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: 変換がファイルを読込不可にしました"
 
-#. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[FIFO/ソケット]"
 
-#. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[FIFO]"
 
-#. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[ソケット]"
 
-#. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[キャラクタ・デバイス]"
 
-#: ../fileio.c:1815
 msgid "[CR missing]"
 msgstr "[CR無]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
 msgstr "[長行分割]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[未変換]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[変換済]"
 
-#: ../fileio.c:1831
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[%<PRId64> 行目で変換エラー]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[%ld 行目で変換エラー]"
 
-#: ../fileio.c:1835
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[%<PRId64> 行目の不正なバイト]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[%ld 行目の不正なバイト]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
 msgstr "[読込エラー]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
 msgstr "変換に必要な一時ファイルが見つかりません"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' による変換が失敗しました"
 
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' の出力を読込めませんでした"
 
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: acwriteバッファの該当するautocommandは存在しません"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: 保存するバッファをautocommandが削除か解放しました"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: autocommandが予期せぬ方法で行数を変更しました"
 
-#: ../fileio.c:2548 ../fileio.c:2565
+# 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 "はファイルでも書込み可能デバイスでもありません"
 
-#: ../fileio.c:2601
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "'opendevice' オプションによりデバイスへの書き込みはできません"
+
 msgid "is read-only (add ! to override)"
 msgstr "は読込専用です (強制書込には ! を追加)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: バックアップファイルを保存できません (! を追加で強制保存)"
 
-#: ../fileio.c:2898
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制読込)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: バックアップファイルを作れません (! を追加で強制作成)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: バックアップファイルを作れません (! を追加で強制作成)"
 
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: リソースフォークが失われるかもしれません (! を追加で強制)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: 保存用一時ファイルが見つかりません"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: 変換できません (! を追加で変換せずに保存)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: リンクされたファイルに書込めません"
 
-#: ../fileio.c:3173
 msgid "E212: Can't open file for writing"
 msgstr "E212: 書込み用にファイルを開けません"
 
-#: ../fileio.c:3363
 msgid "E667: Fsync failed"
 msgstr "E667: fsync に失敗しました"
 
-#: ../fileio.c:3398
 msgid "E512: Close failed"
 msgstr "E512: 閉じることに失敗"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr "E513: 書込みエラー, 変換失敗 (上書するには 'fenc' を空にしてください)"
 
-#: ../fileio.c:3441
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: 書込みエラー, 変換失敗, 行数 %<PRId64> (上書するには 'fenc' を空にして"
-"ください)"
+"E513: 書込みエラー, 変換失敗, 行数 %ld (上書するには 'fenc' を空にしてくださ"
+"い)"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
 msgstr "E514: 書込みエラー, (ファイルシステムが満杯?)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " 変換エラー"
 
-#: ../fileio.c:3509
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " 行 %<PRId64>;"
+msgid " in line %ld;"
+msgstr " 行 %ld;"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[デバイス]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[新]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr " [a]"
 
-#: ../fileio.c:3535
 msgid " appended"
 msgstr " 追加"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr " [w]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " 書込み"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: patchmode: 原本ファイルを保存できません"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: 空の原本ファイルをtouchできません"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: バックアップファイルを消せません"
 
-#: ../fileio.c:3672
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2289,134 +1838,105 @@ msgstr ""
 "\n"
 "警告: 原本ファイルが失われたか変更されました\n"
 
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "ファイルの保存に成功するまでエディタを終了しないでください!"
 
-#: ../fileio.c:3795
 msgid "[dos]"
 msgstr "[dos]"
 
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[dosフォーマット]"
 
-#: ../fileio.c:3801
 msgid "[mac]"
 msgstr "[mac]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[macフォーマット]"
 
-#: ../fileio.c:3807
 msgid "[unix]"
 msgstr "[unix]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[unixフォーマット]"
 
-#: ../fileio.c:3831
 msgid "1 line, "
 msgstr "1 行, "
 
-#: ../fileio.c:3833
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> 行, "
+msgid "%ld lines, "
+msgstr "%ld 行, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "1 文字"
 
-#: ../fileio.c:3838
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> 文字"
+msgid "%lld characters"
+msgstr "%lld 文字"
 
-#: ../fileio.c:3849
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[最終行が不完全]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "警告: 読込んだ後にファイルに変更がありました!!!"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "本当に上書きしますか"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" を書込み中のエラーです"
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: \"%s\" を閉じる時にエラーです"
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: \"%s\" を読込中のエラーです"
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: autocommand の FileChangedShell がバッファを削除しました"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: ファイル \"%s\" は既に存在しません"
 
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: 警告: ファイル \"%s\" が変更されVimのバッファも変更されました"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
 msgstr "詳細は \":help W12\" を参照してください"
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: 警告: ファイル \"%s\" は編集開始後に変更されました"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
 msgstr "詳細は \":help W11\" を参照してください"
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: 警告: ファイル \"%s\" のモードが編集開始後に変更されました"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
 msgstr "詳細は \":help W16\" を参照してください"
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: 警告: ファイル \"%s\" は編集開始後に作成されました"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "警告"
 
-#: ../fileio.c:4948
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2424,48 +1944,45 @@ msgstr ""
 "&OK\n"
 "ファイル読込(&L)"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: \"%s\" をリロードする準備ができませんでした"
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" はリロードできませんでした"
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--削除済--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
 
 #. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: そのグループはありません: \"%s\""
 
-#: ../fileio.c:5897
+msgid "E936: Cannot delete the current group"
+msgstr "E936: 現在のグループは削除できません"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: 使用中の augroup を消そうとしています"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * の後に不正な文字がありました: %s"
 
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: そのようなイベントはありません: %s"
 
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: そのようなグループもしくはイベントはありません: %s"
 
 #. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2473,756 +1990,555 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <バッファ=%d>: 無効なバッファ番号です "
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: 全てのイベントに対してのautocommandは実行できません"
 
-#: ../fileio.c:6393
 msgid "No matching autocommands"
 msgstr "該当するautocommandは存在しません"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommandの入れ子が深過ぎます"
 
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands for \"%s\""
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "%s を実行しています"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: { がありません."
 
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: } がありません."
 
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: 折畳みがありません"
 
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: 現在の 'foldmethod' では折畳みを作成できません"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません"
 
-#: ../fold.c:1784
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld 行が折畳まれました "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld 行が折畳まれました "
 
-#. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
 msgstr "E222: 読込バッファへ追加"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: 再帰的マッピング"
 
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s というグローバル短縮入力は既に存在します"
 
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s というグローバルマッピングは既に存在します"
 
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s という短縮入力は既に存在します"
 
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s というマッピングは既に存在します"
 
-#: ../getchar.c:3008
 msgid "No abbreviation found"
 msgstr "短縮入力は見つかりませんでした"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
 msgstr "マッピングは見つかりませんでした"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: 不正なモード"
 
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--バッファに行がありません--"
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: GUI用のプロセスの起動に失敗しました"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: コマンドが中断されました"
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: 子プロセスがGUIの起動に失敗しました"
 
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: 引数が必要です"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: GUIを開始できません"
 
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ の後は / か ? か & でなければなりません"
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: \"%s\"から読込むことができません"
 
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: コマンドラインでは無効です; <CR>で実行, CTRL-Cでやめる"
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: 有効なフォントが見つからないので, GUIを開始できません"
 
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: 現在のディレクトリやタグ検索ではexrc/vimrcのコマンドは許可されません"
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' が無効です"
 
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: :endif がありません"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' に設定された値が無効です"
 
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry がありません"
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: %s の色を割り当てられません"
 
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile がありません"
+msgid "No match at cursor, finding next"
+msgstr "カーソルの位置にマッチはありません, 次を検索しています"
 
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor がありません"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while のない :endwhile があります"
+msgid "<cannot open> "
+msgstr "<開けません> "
 
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor のない :for があります"
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: フォント %s を取得できません"
 
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: ファイルが存在します (! を追加で上書)"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: 現在のディレクトリに戻れません"
 
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: コマンドが失敗しました"
+msgid "Pathname:"
+msgstr "パス名:"
 
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: 内部エラーです"
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: 現在のディレクトリを取得できません"
 
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "割込まれました"
+msgid "OK"
+msgstr "OK"
 
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: 無効なアドレスです"
+msgid "Cancel"
+msgstr "キャンセル"
 
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: 無効な引数です"
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "スクロールバー: 画像を取得できませんでした."
 
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: 無効な引数です: %s"
+msgid "Vim dialog"
+msgstr "Vim ダイアログ"
 
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: 無効な式です: %s"
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: メッセージとコールバックのある BalloonEval を作成できません"
 
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: 無効な範囲です"
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
 
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: 無効なコマンドです"
+msgid "_Save"
+msgstr "保存(_S)"
 
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" はディレクトリです"
+msgid "_Open"
+msgstr "開く(_O)"
 
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: 無効なスクロール量です"
+msgid "_OK"
+msgstr "_OK"
 
-#: ../globals.h:1021
-msgid "E901: Job table is full"
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
 msgstr ""
+"はい(&Y)\n"
+"いいえ(&N)\n"
+"キャンセル(&C)"
 
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() のライブラリ呼出に失敗しました"
+msgid "Yes"
+msgstr "はい"
 
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: マークに無効な行番号が指定されていました"
+msgid "No"
+msgstr "いいえ"
 
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: マークは設定されていません"
+msgid "Input _Methods"
+msgstr "インプットメソッド"
 
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' がオフなので, 変更できません"
+msgid "VIM - Search and Replace..."
+msgstr "VIM - 検索と置換..."
 
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: スクリプトの入れ子が深過ぎます"
+msgid "VIM - Search..."
+msgstr "VIM - 検索..."
 
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: 副ファイルはありません"
+msgid "Find what:"
+msgstr "検索文字列:"
 
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: そのような短縮入力はありません"
+msgid "Replace with:"
+msgstr "置換文字列:"
 
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ! は許可されていません"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "正確に該当するものだけ"
 
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUIは使用不可能です: コンパイル時に無効にされています"
+#. match case button
+msgid "Match case"
+msgstr "大文字/小文字を区別する"
 
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: そのような名のハイライトグループはありません: %s"
+msgid "Direction"
+msgstr "方向"
 
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: まだテキストが挿入されていません"
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "上"
 
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: 以前にコマンド行がありません"
+msgid "Down"
+msgstr "下"
 
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: そのようなマッピングはありません"
+msgid "Find Next"
+msgstr "次を検索"
 
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: 該当はありません"
+msgid "Replace"
+msgstr "置換"
 
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: 該当はありません: %s"
+msgid "Replace All"
+msgstr "全て置換"
 
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: ファイル名がありません"
+msgid "_Close"
+msgstr "閉じる(_C)"
 
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: 正規表現置換がまだ実行されていません"
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n"
 
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: コマンドがまだ実行されていません"
+msgid "Close tab"
+msgstr "タブページを閉じる"
 
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: 正規表現がまだ実行されていません"
+msgid "New tab"
+msgstr "新規タブページ"
 
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: 範囲指定は許可されていません"
+msgid "Open Tab..."
+msgstr "タブページを開く..."
 
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: ウィンドウに十分な高さもしくは幅がありません"
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: メインウィンドウが不意に破壊されました\n"
 
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: ファイル %s を作成できません"
+msgid "&Filter"
+msgstr "フィルタ(&F)"
 
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: 一時ファイルの名前を取得できません"
+msgid "&Cancel"
+msgstr "キャンセル(&C)"
 
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: ファイル \"%s\" を開けません"
+msgid "Directories"
+msgstr "ディレクトリ"
 
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: ファイル %s を読込めません"
+msgid "Filter"
+msgstr "フィルタ"
 
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
+msgid "&Help"
+msgstr "ヘルプ(&H)"
 
-#: ../globals.h:1055
-msgid "E37: No write since last change"
-msgstr "E37: 最後の変更が保存されていません"
+msgid "Files"
+msgstr "ファイル"
 
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: 引数が空です"
+msgid "&OK"
+msgstr "&OK"
 
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: 数値が要求されています"
+msgid "Selection"
+msgstr "選択"
 
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: エラーファイル %s を開けません"
+msgid "Find &Next"
+msgstr "次を検索(&N)"
 
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: メモリが尽き果てました!"
+msgid "&Replace"
+msgstr "置換(&R)"
 
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "パターンは見つかりませんでした"
+msgid "Replace &All"
+msgstr "全て置換(&A)"
 
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: パターンは見つかりませんでした: %s"
+msgid "&Undo"
+msgstr "アンドゥ(&U)"
 
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: 引数は正の値でなければなりません"
+msgid "Open tab..."
+msgstr "タブページを開く"
 
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: 前のディレクトリに戻れません"
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "検索文字列 ('\\' を検索するには '\\\\')"
 
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: エラーはありません"
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "検索・置換 ('\\' を検索するには '\\\\')"
 
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: ロケーションリストはありません"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: 該当文字列が破損しています"
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "使われません"
 
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: 不正な正規表現プログラムです"
+msgid "Directory\t*.nothing\n"
+msgstr "ディレクトリ\t*.nothing\n"
 
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' オプションが設定されています (! を追加で上書き)"
-
-#: ../globals.h:1073
 #, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
 
-#: ../globals.h:1075
 #, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません"
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: エラーファイルの読込中にエラーが発生しました"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: サンドボックスでは許されません"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: ここでは許可されません"
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
 
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: スクリーンモードの設定には対応していません"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDIアプリの中ではウィンドウを開けません"
 
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: 無効なスクロール量です"
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr "Vim E458: 色指定が正しくないのでエントリを割り当てられません"
 
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' オプションが空です"
+#, c-format
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr "E250: 以下の文字セットのフォントがありません %s:"
 
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign のデータを読込めませんでした"
+#, c-format
+msgid "E252: Fontset name: %s"
+msgstr "E252: フォントセット名: %s"
 
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: スワップファイルのクローズ時エラーです"
+#, c-format
+msgid "Font '%s' is not fixed-width"
+msgstr "フォント '%s' は固定幅ではありません"
 
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: タグスタックが空です"
+#, c-format
+msgid "E253: Fontset name: %s"
+msgstr "E253: フォントセット名: %s"
 
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: コマンドが複雑過ぎます"
+#, c-format
+msgid "Font0: %s"
+msgstr "フォント0: %s"
 
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: 名前が長過ぎます"
+#, c-format
+msgid "Font1: %s"
+msgstr "フォント1: %s"
 
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: [ が多過ぎます"
+#, c-format
+msgid "Font%ld width is not twice that of font0"
+msgstr "フォント%ld の幅がフォント0の2倍ではありません"
 
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: ファイル名が多過ぎます"
+#, c-format
+msgid "Font0 width: %ld"
+msgstr "フォント0の幅: %ld"
 
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: 余分な文字が後ろにあります"
+#, c-format
+msgid "Font1 width: %ld"
+msgstr "フォント1の幅: %ld"
 
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: 未知のマーク"
+msgid "Invalid font specification"
+msgstr "無効なフォント指定です"
 
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ワイルドカードを展開できません"
+msgid "&Dismiss"
+msgstr "却下する(&D)"
 
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' は 'winminheight' より小さくできません"
+msgid "no specific match"
+msgstr "マッチするものがありません"
 
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' は 'winminwidth' より小さくできません"
+msgid "Vim - Font Selector"
+msgstr "Vim - フォント選択"
 
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: 書込み中のエラー"
+msgid "Name:"
+msgstr "名前:"
 
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "ゼロカウント"
+#. create toggle button
+msgid "Show size in Points"
+msgstr "サイズをポイントで表示する"
 
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: スクリプト以外で<SID>が使われました"
+msgid "Encoding:"
+msgstr "エンコード:"
 
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: 内部エラーです: %s"
+msgid "Font:"
+msgstr "フォント:"
 
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: パターンが 'maxmempattern' 以上のメモリを使用します"
+msgid "Style:"
+msgstr "スタイル:"
 
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: バッファが空です"
+msgid "Size:"
+msgstr "サイズ:"
 
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: 検索パターンか区切り記号が不正です"
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: ハングルオートマトンエラー"
 
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: 同じ名前のファイルが他のバッファで読込まれています"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: オプション '%s' は設定されていません"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: 無効なレジスタ名です"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "上まで検索したので下に戻ります"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "下まで検索したので上に戻ります"
-
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: コロンがありません"
 
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: 不正な構文要素です"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
 msgstr "E552: 数値が必要です"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "%d ページ"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
 msgstr "印刷するテキストがありません"
 
-#: ../hardcopy.c:668
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "印刷中: ページ %d (%d%%)"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " コピー %d (全 %d 中)"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "印刷しました: %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "印刷が中止されました"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript出力ファイルの書込みエラーです"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: ファイル \"%s\" を開けません"
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScriptのリソースファイル \"%s\" を読込めません"
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: ファイル \"%s\" は PostScript リソースファイルではありません"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: ファイル \"%s\" は対応していない PostScript リソースファイルです"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: リソースファイル \"%s\" はバージョンが異なります"
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: 互換性の無いマルチバイトエンコーディングと文字セットです"
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr "E674: マルチバイトエンコーディングでは printmbcharset を空にできません"
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr ""
 "E675: マルチバイト文字を印刷するためのデフォルトフォントが指定されていません"
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript出力用のファイルを開けません"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: ファイル \"%s\" を開けません"
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScriptのリソースファイル \"prolog.ps\" が見つかりません"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr "E456: PostScriptのリソースファイル \"cidfont.ps\" が見つかりません"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScriptのリソースファイル \"%s.ps\" が見つかりません"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: 印刷エンコード \"%s\" へ変換できません"
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
 msgstr "プリンタに送信中..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScriptファイルの印刷に失敗しました"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
 msgstr "印刷ジョブを送信しました."
 
-#: ../if_cscope.c:85
 msgid "Add a new database"
 msgstr "新データベースを追加"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "パターンのクエリーを追加"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
 msgstr "このメッセージを表示する"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "接続を終了する"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "全ての接続を再初期化する"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
 msgstr "接続を表示する"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: 使用方法: cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "このcscopeコマンドは分割ウィンドウではサポートされません.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: 使用法: cstag <ident>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: タグが見つかりません"
 
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) エラー: %d"
 
-#: ../if_cscope.c:551
+msgid "E563: stat error"
+msgstr "E563: stat エラー"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s はディレクトリ及び有効なcscopeのデータベースではありません"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
 msgstr "cscopeデータベース %s を追加"
 
-#: ../if_cscope.c:616
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: cscopeの接続 %<PRId64> を読込み中のエラーです"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: cscopeの接続 %ld を読込み中のエラーです"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: 未知のcscope検索型です"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: cscopeパイプを作成できませんでした"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscopeの起動準備(fork)に失敗しました"
 
-#: ../if_cscope.c:849
 msgid "cs_create_connection setpgid failed"
 msgstr "cs_create_connection への setpgid に失敗しました"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection の実行に失敗しました"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: to_fp の fdopen に失敗しました"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fr_fp の fdopen に失敗しました"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: cscopeプロセスを起動できませんでした"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
 msgstr "E567: cscope接続に失敗しました"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: 無効な cscopequickfix フラグ %c の %c です"
 
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: cscopeクエリー %s of %s に該当がありませんでした"
 
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "cscopeコマンド:\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (使用法: %s)"
 
-#: ../if_cscope.c:1155
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -3233,6 +2549,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: このシンボルに対する代入を探す\n"
 "       c: この関数を呼んでいる関数を探す\n"
 "       d: この関数から呼んでいる関数を探す\n"
 "       e: このegrepパターンを探す\n"
@@ -3242,31 +2559,32 @@ msgstr ""
 "       s: このCシンボルを探す\n"
 "       t: このテキスト文字列を探す\n"
 
-#: ../if_cscope.c:1226
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: cscopeデータベース: %s を開くことができません"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: cscopeデータベースの情報を取得できません"
+
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: 重複するcscopeデータベースは追加されませんでした"
 
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope接続 %s が見つかりませんでした"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope接続 %s が閉じられました"
 
 #. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches で致命的なエラーです"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope タグ: %s"
 
-#: ../if_cscope.c:1711
 msgid ""
 "\n"
 "   #   line"
@@ -3274,87 +2592,300 @@ msgstr ""
 "\n"
 "   #   行番号"
 
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "ファイル名 / 文脈 / 行\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: cscopeエラー: %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "全てのcscopeデータベースをリセットします"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
 msgstr "cscope接続がありません\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    データベース名                      prepend パス\n"
 
-#: ../main.c:144
+msgid "Lua library cannot be loaded."
+msgstr "Luaライブラリをロードできません."
+
+msgid "cannot save undo information"
+msgstr "アンドゥ情報が保存できません"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+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 モジュール"
+"がロードできませんでした."
+
+msgid "invalid expression"
+msgstr "無効な式です"
+
+msgid "expressions disabled at compile time"
+msgstr "式はコンパイル時に無効にされています"
+
+msgid "hidden option"
+msgstr "隠しオプション"
+
+msgid "unknown option"
+msgstr "未知のオプションです"
+
+msgid "window index is out of range"
+msgstr "範囲外のウィンドウ番号です"
+
+msgid "couldn't open buffer"
+msgstr "バッファを開けません"
+
+msgid "cannot delete line"
+msgstr "行を消せません"
+
+msgid "cannot replace line"
+msgstr "行を置換できません"
+
+msgid "cannot insert line"
+msgstr "行を挿入できません"
+
+msgid "string cannot contain newlines"
+msgstr "文字列には改行文字を含められません"
+
+msgid "error converting Scheme values to Vim"
+msgstr "Scheme値のVimへの変換エラー"
+
+msgid "Vim error: ~a"
+msgstr "Vim エラー: ~a"
+
+msgid "Vim error"
+msgstr "Vim エラー"
+
+msgid "buffer is invalid"
+msgstr "バッファは無効です"
+
+msgid "window is invalid"
+msgstr "ウィンドウは無効です"
+
+msgid "linenr out of range"
+msgstr "範囲外の行番号です"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "サンドボックスでは許されません"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: このコマンドは無効です,ごめんなさい: Pythonライブラリをロードできません"
+"でした."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: このコマンドは無効です,ごめんなさい. Python の site モジュールをロード"
+"できませんでした."
+
+# Added at 07-Feb-2004.
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Python を再帰的に実行することはできません"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: このVimでは :python を使った後に :py3 を使えません"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ は文字列のインスタンスでなければなりません"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: このコマンドは無効です,ごめんなさい: Rubyライブラリをロードできませんで"
+"した."
+
+msgid "E267: unexpected return"
+msgstr "E267: 予期せぬ return です"
+
+msgid "E268: unexpected next"
+msgstr "E268: 予期せぬ next です"
+
+msgid "E269: unexpected break"
+msgstr "E269: 予期せぬ break です"
+
+msgid "E270: unexpected redo"
+msgstr "E270: 予期せぬ redo です"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue の外の retry です"
+
+msgid "E272: unhandled exception"
+msgstr "E272: 取り扱われなかった例外があります"
+
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: 未知のlongjmp状態: %d"
+
+msgid "invalid buffer number"
+msgstr "無効なバッファ番号です"
+
+msgid "not implemented yet"
+msgstr "まだ実装されていません"
+
+#. ???
+msgid "cannot set line(s)"
+msgstr "行を設定できません"
+
+msgid "invalid mark name"
+msgstr "無効なマーク名です"
+
+msgid "mark not set"
+msgstr "マークは設定されていません"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "行 %d 列 %d"
+
+msgid "cannot insert/append line"
+msgstr "行の挿入/追加をできません"
+
+msgid "line number out of range"
+msgstr "範囲外の行番号です"
+
+msgid "unknown flag: "
+msgstr "未知のフラグ: "
+
+msgid "unknown vimOption"
+msgstr "未知の vimOption です"
+
+msgid "keyboard interrupt"
+msgstr "キーボード割込み"
+
+msgid "vim error"
+msgstr "vim エラー"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr ""
+"バッファ/ウィンドウ作成コマンドを作成できません: オブジェクトが消去されていま"
+"した"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"コールバックコマンドを登録できません: バッファ/ウィンドウが既に消去されました"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: TCL 致命的エラー: reflist 汚染!? vim-dev@vim.org に報告してください"
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"コールバックコマンドを登録できません: バッファ/ウィンドウの参照が見つかりませ"
+"ん"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: このコマンドは無効です,ごめんなさい: Tclライブラリをロードできませんで"
+"した."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: 終了コード %d"
+
+msgid "cannot get line"
+msgstr "行を取得できません"
+
+msgid "Unable to register a command server name"
+msgstr "命令サーバーの名前を登録できません"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: 目的のプログラムへのコマンド送信に失敗しました"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: 無効なサーバーIDが使われました: %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
+
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: リスト型にカンマがありません: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: リスト型の最後に ']' がありません: %s"
+
 msgid "Unknown option argument"
 msgstr "未知のオプション引数です"
 
-#: ../main.c:146
 msgid "Too many edit arguments"
 msgstr "編集引数が多過ぎます"
 
-#: ../main.c:148
 msgid "Argument missing after"
 msgstr "引数がありません"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
 msgstr "オプション引数の後にゴミがあります"
 
-#: ../main.c:152
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "\"+command\", \"-c command\", \"--cmd command\" の引数が多過ぎます"
 
-#: ../main.c:154
 msgid "Invalid argument for"
 msgstr "無効な引数です: "
 
-#: ../main.c:294
 #, c-format
 msgid "%d files to edit\n"
 msgstr "%d 個のファイルが編集を控えています\n"
 
-#: ../main.c:1342
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans はこのGUIでは利用できません\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' 使用不可能です: コンパイル時に無効にされています\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
+
 msgid "Attempt to open script file again: \""
 msgstr "スクリプトファイルを再び開いてみます: \""
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "読込用として開けません"
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "スクリプト出力用を開けません"
 
-#: ../main.c:1622
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: エラー: NetBeansからgvimをスタートできません\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: エラー: このバージョンのVimはCygwin端末では動作しません\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: 警告: 端末への出力ではありません\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: 警告: 端末からの入力ではありません\n"
 
 #. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "vimrc前のコマンドライン"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: \"%s\"から読込むことができません"
 
-#: ../main.c:2149
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -3362,23 +2893,18 @@ msgstr ""
 "\n"
 "より詳細な情報は: \"vim -h\"\n"
 
-#: ../main.c:2178
 msgid "[file ..]       edit specified file(s)"
 msgstr "[ファイル..]    あるファイルを編集する"
 
-#: ../main.c:2179
 msgid "-               read text from stdin"
 msgstr "-               標準入力からテキストを読込む"
 
-#: ../main.c:2180
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t タグ         タグが定義されたところから編集する"
 
-#: ../main.c:2181
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  最初のエラーで編集する"
 
-#: ../main.c:2187
 msgid ""
 "\n"
 "\n"
@@ -3388,11 +2914,9 @@ msgstr ""
 "\n"
 "使用法:"
 
-#: ../main.c:2189
 msgid " vim [arguments] "
 msgstr " vim [引数] "
 
-#: ../main.c:2193
 msgid ""
 "\n"
 "   or:"
@@ -3400,7 +2924,13 @@ msgstr ""
 "\n"
 "   もしくは:"
 
-#: ../main.c:2196
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"大小文字が無視される場合は大文字にするために / を前置してください"
+
 msgid ""
 "\n"
 "\n"
@@ -3410,189 +2940,319 @@ msgstr ""
 "\n"
 "引数:\n"
 
-#: ../main.c:2197
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\tこのあとにはファイル名だけ"
 
-#: ../main.c:2199
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tワイルドカードを展開しない"
 
-#: ../main.c:2201
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\t\tこのgvimをOLEとして登録する"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\t\tgvimのOLE登録を解除する"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\t\tGUIで起動する (\"gvim\" と同じ)"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f or  --nofork\tフォアグラウンド: GUIを始めるときにforkしない"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tViモード (\"vi\" と同じ)"
 
-#: ../main.c:2202
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tExモード (\"ex\" と同じ)"
 
-#: ../main.c:2203
 msgid "-E\t\t\tImproved Ex mode"
 msgstr "-E\t\t\t改良Exモード"
 
-#: ../main.c:2204
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\tサイレント(バッチ)モード (\"ex\" 専用)"
 
-#: ../main.c:2205
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\t差分モード (\"vidiff\" と同じ)"
 
-#: ../main.c:2206
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\tイージーモード (\"evim\" と同じ, モード無)"
 
-#: ../main.c:2207
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t読込専用モード (\"view\" と同じ)"
 
-#: ../main.c:2208
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t制限モード (\"rvim\" と同じ)"
 
-#: ../main.c:2209
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t変更 (ファイル保存時) をできないようにする"
 
-#: ../main.c:2210
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\tテキストの編集を行なえないようにする"
 
-#: ../main.c:2211
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tバイナリモード"
 
-#: ../main.c:2212
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLispモード"
 
-#: ../main.c:2213
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tVi互換モード: 'compatible'"
 
-#: ../main.c:2214
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi非互換モード: 'nocompatible"
 
-#: ../main.c:2215
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
 msgstr "-V[N][fname]\t\tログ出力設定 [レベル N] [ログファイル名 fname]"
 
-#: ../main.c:2216
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\tデバッグモード"
 
-#: ../main.c:2217
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\tスワップファイルを使用せずメモリだけ"
 
-#: ../main.c:2218
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\tスワップファイルを列挙し終了"
 
-#: ../main.c:2219
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (ファイル名)\tクラッシュしたセッションを復帰"
 
-#: ../main.c:2220
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t-rと同じ"
 
-#: ../main.c:2221
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\t\tウィンドウを開くのに newcli を使用しない"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <device>\t\tI/Oに <device> を使用する"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\tアラビア語モードで起動する"
 
-#: ../main.c:2222
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tヘブライ語モードで起動する"
 
-#: ../main.c:2223
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\tペルシア語モードで起動する"
 
-#: ../main.c:2224
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t端末を <terminal> に設定する"
 
-#: ../main.c:2225
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t入出力が端末でないとの警告をスキップする"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrcの代わりに <vimrc> を使う"
 
-#: ../main.c:2226
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\t\t.gvimrcの代わりに <gvimrc> を使う"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tプラグインスクリプトをロードしない"
 
-#: ../main.c:2227
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
 msgstr "-p[N]\t\tN 個タブページを開く(省略値: ファイルにつき1個)"
 
-#: ../main.c:2228
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN 個ウィンドウを開く(省略値: ファイルにつき1個)"
 
-#: ../main.c:2229
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t-oと同じだが垂直分割"
 
-#: ../main.c:2230
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\tファイルの最後からはじめる"
 
-#: ../main.c:2231
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t<lnum> 行からはじめる"
 
-#: ../main.c:2232
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\tvimrcをロードする前に <command> を実行する"
 
-#: ../main.c:2233
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t最初のファイルをロード後 <command> を実行する"
 
-#: ../main.c:2235
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t最初のファイルをロード後ファイル <session> を取込む"
 
-#: ../main.c:2236
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\tファイル <scriptin> からノーマルコマンドを読込む"
 
-#: ../main.c:2237
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t入力した全コマンドをファイル <scriptout> に追加する"
 
-#: ../main.c:2238
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t入力した全コマンドをファイル <scriptout> に保存する"
 
-#: ../main.c:2240
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\t暗号化されたファイルを編集する"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <display>\tvimを指定した X サーバーに接続する"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tXサーバーに接続しない"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t可能ならばVimサーバーで <files> を編集する"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <files>  同上, サーバーが無くても警告文を出力しない"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr "--remote-wait <files>\t--remote後 ファイルの編集が終わるのを待つ"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent <files>  同上, サーバーが無くても警告文を出力しない"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <files>  --remoteでファイル1つにつき1つのタブ"
+"ページを開く"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <keys>\tVimサーバーに <keys> を送信して終了する"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr "--remote-expr <expr>\tサーバーで <expr> を実行して結果を表示する"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr "--serverlist\t\tVimサーバー名の一覧を表示して終了する"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <name>\tVimサーバー <name> に送信/名前設定する"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr "--startuptime <file>\t起動にかかった時間の詳細を <file> へ出力する"
 
-#: ../main.c:2242
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfoの代わりに <viminfo> を使う"
 
-#: ../main.c:2243
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h or  --help\tヘルプ(このメッセージ)を表示し終了する"
 
-#: ../main.c:2244
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tバージョン情報を表示し終了する"
 
-#: ../mark.c:676
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"gvimによって解釈される引数(Motifバージョン):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvimによって解釈される引数(neXtawバージョン):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"gvimによって解釈される引数(Athenaバージョン):\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <display>\t<display> でvimを実行する"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\t最小化した状態でvimを起動する"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr "-background <color>\t背景色に <color> を使う(同義: -bg)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr "-foreground <color>\t前景色に <color> を使う(同義: -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <font>\t\tテキスト表示に <font> を使う(同義: -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <font>\t太字に <font> を使う"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <for>\t斜体字に <font> を使う"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr "-geometry <geom>\t初期配置に <geom> を使う(同義: -geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr "-borderwidth <width>\t境界の幅を <width> にする(同義: -bw)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <width>  スクロールバーの幅を <width> にする(同義: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr "-menuheight <height>\tメニューバーの高さを <height> にする(同義: -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\t反転映像を使用する(同義: -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\t反転映像を使用しない(同義: +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <resource>\t特定のリソースを使用する"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"gvimによって解釈される引数(GTK+バージョン):\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr "-display <display>\t<display> でvimを実行する(同義: --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\tメインウィンドウを識別する一意な役割(role)を設定する"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\t異なるGTK widgetでVimを開く"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tウィンドウIDを標準出力に出力する"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <親のタイトル>\tVimを親アプリケーションの中で起動する"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\t異なるWin32 widgetの内部にVimを開く"
+
+msgid "No display"
+msgstr "ディスプレイが見つかりません"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr ": 送信に失敗しました.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": 送信に失敗しました. ローカルでの実行を試みています\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d 個 (%d 個中) のファイルを編集しました"
+
+msgid "No display: Send expression failed.\n"
+msgstr "ディスプレイがありません: 式の送信に失敗しました.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": 式の送信に失敗しました.\n"
+
 msgid "No marks set"
 msgstr "マークが設定されていません"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" に該当するマークがありません"
 
 #. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3601,7 +3261,6 @@ msgstr ""
 "mark   行   列 ファイル/テキスト"
 
 #. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3610,7 +3269,6 @@ msgstr ""
 " jump   行   列 ファイル/テキスト"
 
 #. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3618,7 +3276,6 @@ msgstr ""
 "\n"
 "変更   行    列  テキスト"
 
-#: ../mark.c:1238
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3627,7 +3284,6 @@ msgstr ""
 "# ファイルマーク:\n"
 
 #. Write the jumplist with -'
-#: ../mark.c:1271
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3635,7 +3291,6 @@ msgstr ""
 "\n"
 "# ジャンプリスト (新しいものが先):\n"
 
-#: ../mark.c:1352
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3643,84 +3298,88 @@ msgstr ""
 "\n"
 "# ファイル内マークの履歴 (新しいものから古いもの):\n"
 
-#: ../mark.c:1431
 msgid "Missing '>'"
 msgstr "'>' が見つかりません"
 
-#: ../memfile.c:426
+msgid "E543: Not a valid codepage"
+msgstr "E543: 無効なコードページです"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: ICの値を設定できません"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: インプットコンテキストの作成に失敗しました"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: インプットメソッドのオープンに失敗しました"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr "E287: 警告: IMの破壊コールバックを設定できませんでした"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: インプットメソッドはどんなスタイルもサポートしません"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr "E289: インプットメソッドは my preedit type をサポートしません"
+
 msgid "E293: block was not locked"
 msgstr "E293: ブロックがロックされていません"
 
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: スワップファイル読込時にシークエラーです"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: スワップファイルの読込みエラーです"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: スワップファイル書込み時にシークエラーです"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: スワップファイルの書込みエラーです"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: スワップファイルが既に存在します (symlinkによる攻撃?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: ブロック 0 を取得できません?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: ブロック 1 を取得できません?"
 
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: ブロック 2 を取得できません?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: スワップファイルの暗号を更新中にエラーが発生しました"
+
 #. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: おっと, スワップファイルが失われました!!!"
 
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: スワップファイルの名前を変えられません"
 
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: \"%s\" のスワップファイルを開けないのでリカバリは不可能です"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): ブロック 0 を取得できませんでした??"
 
-#. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: %s にはスワップファイルが見つかりません"
 
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "使用するスワップファイルの番号を入力してください(0 で終了): "
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: %s を開けません"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "ブロック 0 を読込めません "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3728,28 +3387,22 @@ msgstr ""
 "\n"
 "恐らく変更がされていないかVimがスワップファイルを更新していません."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vimのこのバージョンでは使用できません.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
 msgstr "Vimのバージョン3.0を使用してください.\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s はVimのスワップファイルではないようです"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
 msgstr " このコンピュータでは使用できません.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "このファイルは次の場所で作られました "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3757,85 +3410,104 @@ msgstr ""
 ",\n"
 "もしくはファイルが損傷しています."
 
-#: ../memline.c:945
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: %s はこのバージョンのVimでサポートしていない形式で暗号化されています"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " は損傷しています (ページサイズが最小値を下回っています).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "スワップファイル \"%s\" を使用中"
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
 msgstr "原本ファイル \"%s\""
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: 警告: 原本ファイルが変更されています"
 
-#: ../memline.c:1061
+#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "スワップファイルは暗号化されています: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"新しい暗号キーを入力したあとにテキストファイルを保存していない場合は,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"新しい暗号キーを入力してください."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"暗号キーを変えたあとにテキストファイルを保存した場合は, テキストファイルと"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"スワップファイルに同じ暗号キーを使うためにenterだけを押してください."
+
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: %s からブロック 1 を読込めません"
 
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
 msgstr "???多くの行が失われています"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
 msgstr "???行数が間違っています"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
 msgstr "???ブロックが空です"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
 msgstr "???行が失われています"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ブロック 1 のIDが間違っています(%s が.swpファイルでない?)"
 
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "???ブロックがありません"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? ここから ???END までの行が破壊されているようです"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? ここから ???END までの行が挿入か削除されたようです"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "???END"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: リカバリが割込まれました"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: リカバリの最中にエラーが検出されました; ???で始まる行を参照してください"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
 msgstr "詳細は \":help E312\" を参照してください"
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "リカバリが終了しました. 全てが正しいかチェックしてください."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3843,15 +3515,12 @@ msgstr ""
 "\n"
 "(変更をチェックするために, このファイルを別の名前で保存した上で\n"
 
-#: ../memline.c:1252
 msgid "and run diff with the original file to check for changes)"
 msgstr "原本ファイルとの diff を実行すると良いでしょう)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr "復元完了. バッファの内容はファイルと同じになりました."
 
-#: ../memline.c:1255
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
@@ -3861,52 +3530,43 @@ msgstr ""
 "元の.swpファイルは削除しても構いません\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr "スワップファイルから取得した暗号キーをテキストファイルに使います.\n"
+
 #. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
 msgstr "スワップファイルが複数見つかりました:"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
 msgstr "   現在のディレクトリ:\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
 msgstr "   以下の名前を使用中:\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   ディレクトリ "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
 msgstr "      -- なし --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "            所有者: "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "   日付: "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "             日付: "
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [from Vim version 3.0]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [Vimのスワップファイルではないようです]"
 
-#: ../memline.c:1552
 msgid "         file name: "
 msgstr "        ファイル名: "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -3914,15 +3574,12 @@ msgstr ""
 "\n"
 "          変更状態: "
 
-#: ../memline.c:1559
 msgid "YES"
 msgstr "あり"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "なし"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
@@ -3930,11 +3587,9 @@ msgstr ""
 "\n"
 "        ユーザー名: "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr "   ホスト名: "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -3942,7 +3597,6 @@ msgstr ""
 "\n"
 "          ホスト名: "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -3950,11 +3604,16 @@ msgstr ""
 "\n"
 "        プロセスID: "
 
-#: ../memline.c:1579
 msgid " (still running)"
 msgstr " (まだ実行中)"
 
-#: ../memline.c:1586
+msgid ""
+"\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [このVimバージョンでは使用できません]"
+
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3962,97 +3621,75 @@ msgstr ""
 "\n"
 "         [このコンピュータでは使用できません]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [読込めません]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [開けません]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: スワップファイルが無いので維持できません"
 
-#: ../memline.c:1747
 msgid "File preserved"
 msgstr "ファイルが維持されます"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
 msgstr "E314: 維持に失敗しました"
 
-#: ../memline.c:1819
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: 無効なlnumです: %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get: 無効なlnumです: %ld"
 
-#: ../memline.c:1851
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: 行 %<PRId64> を見つけられません"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get: 行 %ld を見つけられません"
 
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ポインタブロックのIDが間違っています 3"
 
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
 msgstr "stack_idx は 0 であるべきです"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
 msgstr "E318: 更新されたブロックが多過ぎるかも?"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: ポインタブロックのIDが間違っています 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "ブロック 1 は消された?"
 
-#: ../memline.c:2707
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: 行 %<PRId64> が見つかりません"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: 行 %ld が見つかりません"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
 msgstr "E317: ポインタブロックのIDが間違っています"
 
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "pe_line_count がゼロです"
 
-#: ../memline.c:2955
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: 行番号が範囲外です: %<PRId64> 超えています"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: 行番号が範囲外です: %ld 超えています"
 
-#: ../memline.c:2959
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: ブロック %<PRId64> の行カウントが間違っています"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: ブロック %ld の行カウントが間違っています"
 
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "スタックサイズが増えます"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: ポインタブロックのIDが間違っています 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: \"%s\" のシンボリックリンクがループになっています"
 
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: 注意"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4060,39 +3697,32 @@ msgstr ""
 "\n"
 "次の名前でスワップファイルを見つけました \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "次のファイルを開いている最中 \""
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "      スワップファイルよりも新しいです!\n"
 
-#: ../memline.c:3244
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
 "    この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
-"    インスタンスができてしまうので, そうしないように気をつけてください."
-
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "    終了するか, 注意しながら続けてください.\n"
+"    インスタンスができてしまうので, そうしないように気をつけてください.\n"
+"    終了するか, 注意しながら続けてください.\n"
 
-#: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) このファイルの編集セッションがクラッシュした.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    この場合には \":recover\" か \"vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4100,11 +3730,9 @@ msgstr ""
 "\"\n"
 "    を使用して変更をリカバーします(\":help recovery\" を参照).\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
 msgstr "    既にこれを行なったのならば, スワップファイル \""
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4112,23 +3740,18 @@ msgstr ""
 "\"\n"
 "    を消せばこのメッセージを回避できます.\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "スワップファイル \""
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr "\" が既にあります!"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM - 注意"
 
-#: ../memline.c:3459
 msgid "Swap file already exists!"
 msgstr "スワップファイルが既に存在します!"
 
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4142,7 +3765,6 @@ msgstr ""
 "終了する(&Q)\n"
 "中止する(&A)"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4158,56 +3780,34 @@ msgstr ""
 "終了する(&Q)\n"
 "中止する(&A)"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: スワップファイルが多数見つかりました"
 
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: メモリが足りません!  (%<PRIu64> バイトを割当要求)"
-
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: メニューアイテムのパスの部分がサブメニューではありません"
 
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: メニューは他のモードにだけあります"
 
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" というメニューはありません"
 
 #. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
 msgstr "E792: メニュー名が空です"
 
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: メニューパスはサブメニューを生じるべきではありません"
 
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: メニューバーには直接メニューアイテムを追加できません"
 
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: 区切りはメニューパスの一部ではありません"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4215,69 +3815,60 @@ msgstr ""
 "\n"
 "--- メニュー ---"
 
-#: ../menu.c:1313
+msgid "Tear off this menu"
+msgstr "このメニューを切り取る"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: メニューパスはメニューアイテムを生じなければいけません"
 
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: メニューが見つかりません: %s"
 
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s にはメニューが定義されていません"
 
-#: ../menu.c:1426
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: メニューパスはサブメニューを生じなければいけません"
 
-#: ../menu.c:1447
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: メニューが見つかりません - メニュー名を確認してください"
 
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s の処理中にエラーが検出されました:"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "行 %4ld:"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: 無効なレジスタ名: '%s'"
 
-#: ../message.c:986
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr "日本語メッセージ翻訳/監修: 村岡 太郎 <koron.kaoriya@gmail.com>"
+
 msgid "Interrupt: "
 msgstr "割込み: "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
 msgstr "続けるにはENTERを押すかコマンドを入力してください"
 
-#: ../message.c:1843
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s 行 %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s 行 %ld"
 
-#: ../message.c:2392
 msgid "-- More --"
 msgstr "-- 継続 --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr " SPACE/d/j: 画面/ページ/行 下, b/u/k: 上, q: 終了 "
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "質問"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
@@ -4285,17 +3876,6 @@ msgstr ""
 "はい(&Y)\n"
 "いいえ(&N)"
 
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"はい(&Y)\n"
-"いいえ(&N)\n"
-"キャンセル(&C)"
-
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4309,175 +3889,247 @@ msgstr ""
 "全て放棄(&D)\n"
 "キャンセル(&C)"
 
-#: ../message.c:3058
+msgid "Select Directory dialog"
+msgstr "ディレクトリ選択ダイアログ"
+
+msgid "Save File dialog"
+msgstr "ファイル保存ダイアログ"
+
+msgid "Open File dialog"
+msgstr "ファイル読込ダイアログ"
+
+#. TODO: non-GUI file selector here
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: コンソールモードではファイルブラウザを使えません, ごめんなさい"
+
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() の引数が不十分です"
 
-#: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: printf() の引数には浮動少数点数が期待されています"
 
-#: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() の引数が多過ぎます"
 
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: 警告: 読込専用ファイルを変更します"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "番号と<Enter>を入力するかマウスでクリックしてください (空でキャンセル): "
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "番号と<Enter>を入力してください (空でキャンセル): "
 
-#: ../misc1.c:2585
 msgid "1 more line"
 msgstr "1 行 追加しました"
 
-#: ../misc1.c:2588
 msgid "1 line less"
 msgstr "1 行 削除しました"
 
-#: ../misc1.c:2593
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> 行 追加しました"
+msgid "%ld more lines"
+msgstr "%ld 行 追加しました"
 
-#: ../misc1.c:2596
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> 行 削除しました"
+msgid "%ld fewer lines"
+msgstr "%ld 行 削除しました"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (割込まれました)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "ビーッ!"
 
-#: ../misc2.c:738
+msgid "ERROR: "
+msgstr "エラー: "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[メモリ(バイト)] 総割当-解放量 %lu-%lu, 使用量 %lu, ピーク時 %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+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,)"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: メモリが足りません!  (%lu バイトを割当要求)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "実行のためにシェルを呼出し中: \"%s\""
 
-#: ../normal.c:183
+msgid "E545: Missing colon"
+msgstr "E545: コロンがありません"
+
+msgid "E546: Illegal mode"
+msgstr "E546: 不正なモードです"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: 不正な 'mouseshape' です"
+
+msgid "E548: digit expected"
+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: 無効なパスです: '**[数値]' はpathの最後か '%s' が続いてないといけませ"
+"ん."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: cdpathには \"%s\" というファイルがありません"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: pathには \"%s\" というファイルがありません"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: cdpathにはこれ以上 \"%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: バッファ %ld の NetBeans 接続が失われました"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: NetBeansはこのGUIには対応していません"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: NetBeansは既に接続しています"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s は読込専用です (強制書込には ! を追加)"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: カーソルの位置には識別子がありません"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' オプションが空です"
 
-#: ../normal.c:2637
+msgid "E775: Eval feature not available"
+msgstr "E775: 式評価機能が無効になっています"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "警告: 使用している端末はハイライトできません"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: カーソルの位置には文字列がありません"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: 現在の 'foldmethod' では折畳みを消去できません"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
 msgstr "E664: 変更リストが空です"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: 変更リストの先頭"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: 変更リストの末尾"
 
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Vimを終了するには :quit<Enter> と入力してください"
 
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 行が %s で 1 回処理されました"
 
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 行が %s で %d 回処理されました"
 
-#: ../ops.c:253
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> 行が %s で 1 回処理されました"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld 行が %s で 1 回処理されました"
 
-#: ../ops.c:256
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> 行が %s で %d 回処理されました"
+msgid "%ld lines %sed %d times"
+msgstr "%ld 行が %s で %d 回処理されました"
 
-#: ../ops.c:592
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> 行がインデントされます... "
+msgid "%ld lines to indent... "
+msgstr "%ld 行がインデントされます... "
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "1 行をインデントしました "
 
-#: ../ops.c:636
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> 行をインデントしました "
+msgid "%ld lines indented "
+msgstr "%ld 行をインデントしました "
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
 msgstr "E748: まだレジスタを使用していません"
 
 #. must display the prompt
-#: ../ops.c:1433
 msgid "cannot yank; delete anyway"
 msgstr "ヤンクできません; とにかく消去"
 
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "1 行が変更されました"
 
-#: ../ops.c:1931
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> 行が変更されました"
+msgid "%ld lines changed"
+msgstr "%ld 行が変更されました"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "%ld 行を解放中"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "1 行のブロックがヤンクされました"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "1 行がヤンクされました"
 
-#: ../ops.c:2525
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "%<PRId64> 行のブロックがヤンクされました"
+msgid "block of %ld lines yanked"
+msgstr "%ld 行のブロックがヤンクされました"
 
-#: ../ops.c:2528
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> 行がヤンクされました"
+msgid "%ld lines yanked"
+msgstr "%ld 行がヤンクされました"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: レジスタ %s には何もありません"
 
 #. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4485,11 +4137,9 @@ msgstr ""
 "\n"
 "--- レジスタ ---"
 
-#: ../ops.c:4455
 msgid "Illegal register name"
 msgstr "不正なレジスタ名"
 
-#: ../ops.c:4533
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4497,7 +4147,6 @@ msgstr ""
 "\n"
 "# レジスタ:\n"
 
-#: ../ops.c:4575
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: 未知のレジスタ型 %d です"
@@ -4507,86 +4156,61 @@ msgid ""
 "lines"
 msgstr "E883: 検索パターンと式レジスタには2行以上を含められません"
 
-#: ../ops.c:5089
 #, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> 列; "
+msgid "%ld Cols; "
+msgstr "%ld 列; "
 
-#: ../ops.c:5097
 #, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"選択 %s%<PRId64> / %<PRId64> 行; %<PRId64> / %<PRId64> 単語; %<PRId64> / "
-"%<PRId64> バイト"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "選択 %s%ld / %ld 行; %lld / %lld 単語; %lld / %lld バイト"
 
-#: ../ops.c:5105
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"選択 %s%<PRId64> / %<PRId64> 行; %<PRId64> / %<PRId64> 単語; %<PRId64> / "
-"%<PRId64> 文字; %<PRId64> / %<PRId64> バイト"
+"選択 %s%ld / %ld 行; %lld / %lld 単語; %lld / %lld 文字; %lld / %lld バイト"
 
-#: ../ops.c:5123
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"列 %s / %s; 行 %<PRId64> of %<PRId64>; 単語 %<PRId64> / %<PRId64>; バイト "
-"%<PRId64> / %<PRId64>"
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "列 %s / %s; 行 %ld of %ld; 単語 %lld / %lld; バイト %lld / %lld"
 
-#: ../ops.c:5133
 #, c-format
 msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"列 %s / %s; 行 %<PRId64> / %<PRId64>; 単語 %<PRId64> / %<PRId64>; 文字 "
-"%<PRId64> / %<PRId64>; バイト %<PRId64> of %<PRId64>"
+"列 %s / %s; 行 %ld / %ld; 単語 %lld / %lld; 文字 %lld / %lld; バイト %lld of "
+"%lld"
 
-#: ../ops.c:5146
 #, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> for BOM)"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld for BOM)"
 
-#: ../option.c:1238
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N ページ"
 
-#: ../option.c:1574
 msgid "Thanks for flying Vim"
 msgstr "Vim を使ってくれてありがとう"
 
-#. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: 未知のオプションです"
 
-#: ../option.c:2709
 msgid "E519: Option not supported"
 msgstr "E519: オプションはサポートされていません"
 
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline では許可されません"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
 msgstr "E846: キーコードが設定されていません"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
 msgstr "E521: = の後には数字が必要です"
 
-#: ../option.c:3226 ../option.c:3864
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap 内に見つかりません"
 
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: 不正な文字です <%s>"
@@ -4595,93 +4219,99 @@ msgstr "E539: 不正な文字です <%s>"
 msgid "For option %s"
 msgstr "オプション: %s"
 
-#: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' には空文字列を設定できません"
 
-#: ../option.c:3885
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: GUIでは 'term' を変更できません"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: GUIをスタートするには \":gui\" を使用してください"
+
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' と 'patchmode' が同じです"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr "E834: 'listchars'の値に矛盾があります"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: 'fillchars'の値に矛盾があります"
 
-#: ../option.c:4163
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: GTK+2 GUIでは変更できません"
+
 msgid "E524: Missing colon"
 msgstr "E524: コロンがありません"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: 文字列の長さがゼロです"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> の後に数字がありません"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: カンマがありません"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
 msgstr "E528: ' の値を指定しなければなりません"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: 表示できない文字かワイド文字を含んでいます"
 
-#: ../option.c:4469
+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> の後に不正な文字があります"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: カンマが必要です"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' は空であるか %s を含む必要があります"
 
-#: ../option.c:4928
+msgid "E538: No mouse support"
+msgstr "E538: マウスはサポートされません"
+
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: 式が終了していません"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: 要素が多過ぎます"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
 msgstr "E542: グループが釣合いません"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: プレビューウィンドウが既に存在します"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: アラビア文字にはUTF-8が必要なので, ':set encoding=utf-8' してください"
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: 最低 %d の行数が必要です"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: 最低 %d のカラム幅が必要です"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: 未知のオプションです: %s"
@@ -4689,12 +4319,10 @@ msgstr "E355: 未知のオプションです: %s"
 #. There's another character after zeros or the string
 #. * is empty.  In both cases, we are trying to set a
 #. * num option using a string.
-#: ../option.c:6037
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: 数字が必要です: &%s = '%s'"
 
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4702,7 +4330,6 @@ msgstr ""
 "\n"
 "--- 端末コード ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4710,7 +4337,6 @@ msgstr ""
 "\n"
 "--- グローバルオプション値 ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4718,7 +4344,6 @@ msgstr ""
 "\n"
 "--- ローカルオプション値 ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4726,37 +4351,119 @@ msgstr ""
 "\n"
 "--- オプション ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp エラー"
 
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': %s に対応する文字がありません"
 
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': セミコロンの後に余分な文字があります: %s"
 
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"シェルを実行できません "
+msgid "cannot open "
+msgstr "開けません "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM: ウィンドウを開けません!\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "Amigadosのバージョン 2.04かそれ以降が必要です\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "%s のバージョン %ld が必要です\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "NILを開けません:\n"
+
+msgid "Cannot create "
+msgstr "作成できません "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vimは %d で終了します\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "コンソールモードを変更できません?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize: コンソールではない??\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: -f オプションでシェルを実行できません"
+
+msgid "Cannot execute "
+msgstr "実行できません "
+
+msgid "shell "
+msgstr "シェル "
+
+msgid " returned\n"
+msgstr " 戻りました\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE が小さ過ぎます."
+
+msgid "I/O ERROR"
+msgstr "入出力エラー"
+
+msgid "Message"
+msgstr "メッセージ"
+
+msgid "'columns' is not 80, cannot execute external commands"
+msgstr "'columns' が 80 ではないため、外部コマンドを実行できません"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: プリンタの選択に失敗しました"
+
+#, c-format
+msgid "to %s on %s"
+msgstr "%s へ (%s 上の)"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: 未知のプリンタオプションです: %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: 印刷エラー: %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "印刷しています: '%s'"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr "E244: 文字セット名 \"%s\" は不正です (フォント名 \"%s\")"
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: 品質名 \"%s\" は不正です (フォント名 \"%s\")"
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "Xサーバーへの接続に %ld ミリ秒かかりました"
 
-#: ../os/shell.c:439
 msgid ""
 "\n"
-"shell returned "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"シェルが値を返しました "
+"Vim: X のエラーを検出しましたr\n"
+
+msgid "Testing the X display failed"
+msgstr "X display のチェックに失敗しました"
+
+msgid "Opening the X display timed out"
+msgstr "X display の open がタイムアウトしました"
 
-#: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4764,7 +4471,6 @@ msgstr ""
 "\n"
 "セキュリティコンテキストを取得できません "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -4780,223 +4486,293 @@ msgstr "セキュリティコンテキスト %s を %s に設定できません"
 msgid "Could not get security context %s for %s. Removing it!"
 msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!"
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"sh シェルを実行できません\n"
+
+msgid ""
+"\n"
+"shell returned "
+msgstr ""
+"\n"
+"シェルが値を返しました "
+
+msgid ""
+"\n"
+"Cannot create pipes\n"
+msgstr ""
+"\n"
+"パイプを作成できません\n"
+
+msgid ""
+"\n"
+"Cannot fork\n"
+msgstr ""
+"\n"
+"fork できません\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"シェルを実行できません "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"コマンドを中断しました\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "XSMP がICE接続を失いました"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
-#: ../path.c:1449
+msgid "Opening the X display failed"
+msgstr "X display の open に失敗しました"
+
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP がsave-yourself要求を処理しています"
+
+msgid "XSMP opening connection"
+msgstr "XSMP が接続を開始しています"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE接続が失敗したようです"
+
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: pathには \"%s\" というファイルがありません"
+msgid "XSMP SmcOpenConnection failed: %s"
+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"
+
+msgid "close"
+msgstr "閉じる"
+
+msgid "logoff"
+msgstr "ログオフ"
+
+msgid "shutdown"
+msgstr "シャットダウン"
+
+msgid "E371: Command not found"
+msgstr "E371: コマンドがありません"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"VIMRUN.EXEが $PATH の中に見つかりません.\n"
+"外部コマンドの終了後に一時停止をしません.\n"
+"詳細は  :help win32-vimrun  を参照してください."
+
+msgid "Vim Warning"
+msgstr "Vimの警告"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "シェルがコード %d で終了しました"
 
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: フォーマット文字列に %%%c が多過ぎます"
 
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: フォーマット文字列に予期せぬ %%%c がありました"
 
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: フォーマット文字列に ] がありません"
 
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: フォーマット文字列では %%%c はサポートされません"
 
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: フォーマット文字列の前置に無効な %%%c があります"
 
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: フォーマット文字列に無効な %%%c があります"
 
 #. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' にパターンが指定されていません"
 
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
 msgstr "E379: ディレクトリ名が無いか空です"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
 msgstr "E553: 要素がもうありません"
 
-#: ../quickfix.c:1674
+msgid "E924: Current window was closed"
+msgstr "E924: 現在のウィンドウが閉じられました"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: 現在の quickfix が変更されました"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: 現在のロケーションリストが変更されました"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (行が削除されました)"
 
-#: ../quickfix.c:1863
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s エラー一覧 %d of %d; %d 個エラー"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix スタックの末尾です"
 
-#: ../quickfix.c:1869
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix スタックの先頭です"
 
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "エラー一覧 %d of %d; %d 個エラー"
+msgid "No entries"
+msgstr "エントリがありません"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' オプションが設定されているので書込みません"
 
-#: ../quickfix.c:2812
+msgid "Error file"
+msgstr "エラーファイル"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: ファイル名が無いか無効なパターンです"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "ファイル \"%s\" を開けません"
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: バッファは読み込まれませんでした"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
 msgstr "E777: 文字列かリストが必要です"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: 無効な項目です: %s%%[]"
 
 #
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: %s[ の後に ] がありません"
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( が釣り合っていません"
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( が釣り合っていません"
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) が釣り合っていません"
 
 #
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( はココでは許可されていません"
 
 #
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 その他はココでは許可されていません"
 
 #
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ の後に ] がありません"
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] が空です"
 
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
 msgstr "E339: パターンが長過ぎます"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
 msgstr "E50: \\z( が多過ぎます"
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: %s( が多過ぎます"
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( が釣り合っていません"
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ の後に不正な文字がありました"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: 複雑な %s{...} が多過ぎます"
 
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61:%s* が入れ子になっています"
 
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62:%s%c が入れ子になっています"
 
 #
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ の無効な使用方法です"
 
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c の後になにもありません"
 
 #
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
 msgstr "E65: 不正な後方参照です"
 
 #
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z の後に不正な文字がありました"
 
 #
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: %s%%[dxouU] の後に不正な文字がありました"
 
 #
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% の後に不正な文字がありました"
 
-#: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} 内に文法エラーがあります"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
 msgstr "外部の部分該当:\n"
 
@@ -5004,7 +4780,6 @@ msgstr "外部の部分該当:\n"
 msgid "E888: (NFA regexp) cannot repeat %s"
 msgstr "E888: (NFA 正規表現) 繰り返せません %s"
 
-#: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -5015,62 +4790,54 @@ msgstr ""
 msgid "Switching to backtracking RE engine for pattern: "
 msgstr "次のパターンにバックトラッキング RE エンジンを適用します: "
 
-#: ../regexp_nfa.c:239
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました"
 
-#: ../regexp_nfa.c:240
 #, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
 
-#: ../regexp_nfa.c:242
+#
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr "E877: (NFA 正規表現) 無効な文字クラス: %<PRId64>"
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (NFA 正規表現) 無効な文字クラス: %ld"
 
-#: ../regexp_nfa.c:1261
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) 未知のオペレータです: '\\z%c'"
 
-#: ../regexp_nfa.c:1387
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) 未知のオペレータです: '\\%%%c'"
 
-#: ../regexp_nfa.c:1802
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: 等価クラスを含むNFA構築に失敗しました!"
+
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
 msgstr "E869: (NFA) 未知のオペレータです: '\\@%c'"
 
-#: ../regexp_nfa.c:1831
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA 正規表現) 繰り返しの制限回数を読込中にエラー"
 
 #. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
 msgstr "E871: (NFA 正規表現) 繰り返し の後に 繰り返し はできません!"
 
 #. Too many `('
-#: ../regexp_nfa.c:2037
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA 正規表現) '(' が多過ぎます"
 
-#: ../regexp_nfa.c:2042
 msgid "E879: (NFA regexp) Too many \\z("
 msgstr "E879: (NFA 正規表現) \\z( が多過ぎます"
 
-#: ../regexp_nfa.c:2066
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA 正規表現) 終端記号がありません"
 
-#: ../regexp_nfa.c:2599
 msgid "E874: (NFA) Could not pop the stack !"
 msgstr "E874: (NFA) スタックをポップできません!"
 
-#: ../regexp_nfa.c:3298
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
@@ -5078,177 +4845,136 @@ msgstr ""
 "E875: (NFA 正規表現) (後置文字列をNFAに変換中に) スタックに残されたステートが"
 "多過ぎます"
 
-#: ../regexp_nfa.c:3302
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (NFA 正規表現) NFA全体を保存するには空きスペースが足りません"
 
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"
+
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
 "NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準出力に"
 "出力します。"
 
-#: ../regexp_nfa.c:4840
 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA) ログファイル %s を開けません!"
 
-#: ../regexp_nfa.c:6049
 msgid "Could not open temporary log file for writing "
 msgstr "NFA正規表現エンジン用のログファイルを書込用として開けません。"
 
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " 仮想置換"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " 置換"
 
-#: ../screen.c:7440
 msgid " REVERSE"
 msgstr " 反転"
 
-#: ../screen.c:7441
 msgid " INSERT"
 msgstr " 挿入"
 
-#: ../screen.c:7443
 msgid " (insert)"
 msgstr " (挿入)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (置換)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (仮想置換)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " ヘブライ"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " アラビア"
 
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (言語)"
-
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (貼り付け)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " ビジュアル"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " ビジュアル 行"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " ビジュアル 矩形"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " セレクト"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " 行指向選択"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " 矩形選択"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "記録中"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: 無効な検索文字列です: %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: 上まで検索しましたが該当箇所はありません: %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: 下まで検索しましたが該当箇所はありません: %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' のあとには '?' か '/' が期待されている"
 
-#: ../search.c:4085
 msgid " (includes previously listed match)"
 msgstr " (前に列挙した該当箇所を含む)"
 
 #. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
 msgstr "--- インクルードされたファイル "
 
-#: ../search.c:4106
 msgid "not found "
 msgstr "見つかりません "
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "パスに ----\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (既に列挙)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
 msgstr "  見つかりません"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "インクルードされたファイルをスキャン中: %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
 msgstr "インクルードされたファイルをスキャン中 %s"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
 msgstr "E387: 現在行に該当があります"
 
-#: ../search.c:4517
 msgid "All included files were found"
 msgstr "全てのインクルードされたファイルが見つかりました"
 
-#: ../search.c:4519
 msgid "No included files"
 msgstr "インクルードファイルはありません"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
 msgstr "E388: 定義を見つけられません"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
 msgstr "E389: パターンを見つけられません"
 
-#: ../search.c:4668
 msgid "Substitute "
 msgstr "Substitute "
 
-#: ../search.c:4681
 #, c-format
 msgid ""
 "\n"
@@ -5259,99 +4985,131 @@ msgstr ""
 "# 最後の %s検索パターン:\n"
 "~"
 
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: スペルファイルの書式エラーです"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: スペルチェックは無効化されています"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"警告: 単語リスト \"%s_%s.spl\" および \"%s_ascii.spl\" は見つかりません"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"警告: 単語リスト \"%s.%s.spl\" および \"%s.ascii.spl\" は見つかりません"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand の SpellFileMissing がバッファを削除しました"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "警告9: %s という範囲はサポートされていません"
+
+msgid "Sorry, no suggestions"
+msgstr "残念ですが, 修正候補はありません"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "残念ですが, 修正候補は %ld 個しかありません"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" を次へ変換:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: スペル置換がまだ実行されていません"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: 見つかりません: %s"
 
-#: ../spell.c:952
 msgid "E758: Truncated spell file"
 msgstr "E758: スペルファイルが切取られているようです"
 
-#: ../spell.c:953
 #, c-format
 msgid "Trailing text in %s line %d: %s"
 msgstr "%s (%d 行目) に続くテキスト: %s"
 
-#: ../spell.c:954
 #, c-format
 msgid "Affix name too long in %s line %d: %s"
 msgstr "%s (%d 行目) の affix 名が長過ぎます: %s"
 
-#: ../spell.c:955
 msgid "E761: Format error in affix file FOL, LOW or UPP"
 msgstr ""
 "E761: affixファイルの FOL, LOW もしくは UPP のフォーマットにエラーがあります"
 
-#: ../spell.c:957
 msgid "E762: Character in FOL, LOW or UPP is out of range"
 msgstr "E762: FOL, LOW もしくは UPP の文字が範囲外です"
 
-#: ../spell.c:958
 msgid "Compressing word tree..."
 msgstr "単語ツリーを圧縮しています..."
 
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: スペルチェックは無効化されています"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"警告: 単語リスト \"%s.%s.spl\" および \"%s.ascii.spl\" は見つかりません"
-
-#: ../spell.c:2473
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "スペルファイル \"%s\" を読込中"
 
-#: ../spell.c:2496
 msgid "E757: This does not look like a spell file"
 msgstr "E757: スペルファイルではないようです"
 
-#: ../spell.c:2501
 msgid "E771: Old spell file, needs to be updated"
 msgstr "E771: 古いスペルファイルなので, アップデートしてください"
 
-#: ../spell.c:2504
 msgid "E772: Spell file is for newer version of Vim"
 msgstr "E772: より新しいバージョンの Vim 用のスペルファイルです"
 
-#: ../spell.c:2602
 msgid "E770: Unsupported section in spell file"
 msgstr "E770: スペルファイルにサポートしていないセクションがあります"
 
-#: ../spell.c:3762
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "警告9: %s という範囲はサポートされていません"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug ファイルではないようです: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: より新しいバージョンの Vim 用の .sug ファイルです: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug ファイルが .spl ファイルと一致しません: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"
 
-#: ../spell.c:4550
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "affix ファイル %s を読込中..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "%s (%d 行目) の単語を変換できませんでした: %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "%s 内の次の変換はサポートされていません: %s から %s へ"
 
-#: ../spell.c:4642
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "%s 内の変換はサポートされていません"
+
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s 内の %d 行目の FLAG に無効な値があります: %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s 内の %d 行目にフラグの二重使用があります: %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
@@ -5360,7 +5118,6 @@ msgstr ""
 "%s の %d 行目の PFX 項目の後の COMPOUNDFORBIDFLAG の定義は誤った結果を生じる"
 "ことがあります"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
@@ -5369,43 +5126,35 @@ msgstr ""
 "%s の %d 行目の PFX 項目の後の COMPOUNDPERMITFLAG の定義は誤った結果を生じる"
 "ことがあります"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "COMPOUNDRULES の値に誤りがあります. ファイル %s の %d 行目: %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "%s の %d 行目の COMPOUNDWORDMAX の値に誤りがあります: %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "%s の %d 行目の COMPOUNDMIN の値に誤りがあります: %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "%s の %d 行目の COMPOUNDSYLMAX の値に誤りがあります: %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "%s の %d 行目の CHECKCOMPOUNDPATTERN の値に誤りがあります: %s"
 
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
 "%s の %d 行目の 連続 affix ブロックのフラグの組合せに違いがあります: %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "%s の %d 行目に 重複した affix を検出しました: %s"
 
-#: ../spell.c:4871
 #, c-format
 msgid ""
 "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
@@ -5414,308 +5163,206 @@ msgstr ""
 "%s の %d 行目の affix は BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST "
 "に使用してください: %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "%s の %d 行目では Y か N が必要です: %s"
 
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "%s の %d 行目の 条件は壊れています: %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s の %d 行目には REP(SAL) の回数が必要です"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "%s の %d 行目には MAP の回数が必要です"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "%s の %d 行目の MAP に重複した文字があります"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "%s の %d 行目に 認識できないか重複した項目があります: %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "%s 行目に FOL/LOW/UPP がありません"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "SYLLABLE が指定されない COMPOUNDSYLMAX"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
 msgstr "遅延後置子が多過ぎます"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "複合フラグが多過ぎます"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "遅延後置子 と/もしくは 複合フラグが多過ぎます"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "SOFO%s 行が %s にありません"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "SAL行 と SOFO行 が %s で両方指定されています"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "%s の %d 行の フラグが数値ではありません: %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "%s の %d 行目の フラグが不正です: %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "値 %s は他の .aff ファイルで使用されたのと異なります"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "辞書ファイル %s をスキャン中..."
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: %s には単語数がありません"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "行 %6d, 単語 %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "%s の %d 行目で 重複単語が見つかりました: %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "重複のうち最初の単語は %s の %d 行目です: %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d 個の単語が見つかりました (%s 内)"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "非ASCII文字を含む %d 個の単語を無視しました (%s 内)"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "標準入力から読込み中 %s ..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "%s の %d 行目の 重複した /encoding= 行を無視しました: %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr "%s の %d 行目の 単語の後の /encoding= 行を無視しました: %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "%s の %d 行目の 重複した /regions= 行を無視しました: %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "%s の %d 行目, 範囲指定が多過ぎます: %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "%s の %d 行目の 重複した / 行を無視しました: %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "%s の %d 行目 無効な nr 領域です: %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "%s の %d 行目 認識不能なフラグです: %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "非ASCII文字を含む %d 個の単語を無視しました"
 
-#: ../spell.c:6656
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: メモリが足りないので、単語リストは不完全です"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "ノード %d 個(全 %d 個中) を圧縮しました; 残り %d (%d%%)"
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "スペルファイルを逆読込中"
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "音声畳込みを実行中..."
 
-#: ../spell.c:7368
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "音声畳込み後の総単語数: %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "音声畳込み後の総単語数: %ld"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
 msgstr "総単語数: %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "修正候補ファイル \"%s\" を書込み中..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "推定メモリ使用量: %d バイト"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
 msgstr "E751: 出力ファイル名には範囲名を含められません"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: 範囲は 8 個までしかサポートされていません"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: 無効な範囲です: %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "警告: 複合フラグと NOBREAK が両方とも指定されました"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "スペルファイル %s を書込み中..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "実行しました!"
 
-#: ../spell.c:8034
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' には %ld 個のエントリはありません"
 
-#: ../spell.c:8074
 #, c-format
 msgid "Word '%.*s' removed from %s"
 msgstr "単語 '%.*s' が %s から削除されました"
 
-#: ../spell.c:8117
 #, c-format
 msgid "Word '%.*s' added to %s"
 msgstr "単語 '%.*s' が %s へ追加されました"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: 単語の文字がスペルファイルと異なります"
 
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "残念ですが, 修正候補はありません"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "残念ですが, 修正候補は %<PRId64> 個しかありません"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" を次へ変換:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: スペル置換がまだ実行されていません"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: 見つかりません: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug ファイルではないようです: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: より新しいバージョンの Vim 用の .sug ファイルです: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug ファイルが .spl ファイルと一致しません: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"
-
 #. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
+#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP エントリに重複文字が存在します"
 
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
 msgstr "このバッファに定義された構文要素はありません"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: 不正な引数です: %s"
@@ -5723,28 +5370,22 @@ msgstr "E390: 不正な引数です: %s"
 msgid "syntax iskeyword "
 msgstr "シンタックス用 iskeyword "
 
-#: ../syntax.c:3299
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: そのような構文クラスタはありません: %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "C言語風コメントから同期中"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "非同期"
 
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "同期開始 "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
 msgstr " 行前(トップ行よりも)"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5752,7 +5393,6 @@ msgstr ""
 "\n"
 "--- 構文同期要素 ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5760,7 +5400,6 @@ msgstr ""
 "\n"
 "要素上で同期中"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5768,53 +5407,41 @@ msgstr ""
 "\n"
 "--- 構文要素 ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: そのような構文クラスタはありません: %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimal "
 
-#: ../syntax.c:3503
 msgid "maximal "
 msgstr "maximal "
 
-#: ../syntax.c:3513
 msgid "; match "
 msgstr "; 該当 "
 
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " 個の改行"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
 msgstr "E395: この場所では引数containsは許可されていません"
 
-#: ../syntax.c:4096
 msgid "E844: invalid cchar value"
 msgstr "E844: 無効なccharの値です"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: ここではグループは許可されません"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: %s の範囲要素が見つかりません"
 
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: ファイル名が必要です"
 
-#: ../syntax.c:4221
 msgid "E847: Too many syntax includes"
 msgstr "E847: 構文の取り込み(include)が多過ぎます"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' がありません: %s"
@@ -5823,221 +5450,173 @@ msgstr "E789: ']' がありません: %s"
 msgid "E890: trailing char after ']': %s]%s"
 msgstr "E890: ']' の後ろに余分な文字があります: %s]%s"
 
-#: ../syntax.c:4531
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' がありません: %s"
 
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: 引数が足りません: 構文範囲 %s"
 
-#: ../syntax.c:4870
 msgid "E848: Too many syntax clusters"
 msgstr "E848: 構文クラスタが多過ぎます"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
 msgstr "E400: クラスタが指定されていません"
 
-#. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: パターン区切りが見つかりません: %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: パターンのあとにゴミがあります: %s"
 
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: 構文同期: 連続行パターンが2度指定されました"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: 不正な引数です: %s"
 
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: 等号がありません: %s"
 
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: 空の引数: %s"
 
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s はココでは許可されていません"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s は内容リストの先頭でなければならない"
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: 未知のグループ名: %s"
 
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: 無効な :syntax のサブコマンド: %s"
 
-#: ../syntax.c:5854
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 msgstr ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim の再帰呼び出しを検出しました"
 
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: ハイライトグループが見つかりません: %s"
 
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: 引数が充分ではない: \":highlight link %s\""
 
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: 引数が多過ぎます: \":highlight link %s\""
 
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: グループが設定されているのでハイライトリンクは無視されます"
 
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: 予期せぬ等号です: %s"
 
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: 等号がありません: %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: 引数がありません: %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: 不正な値です: %s"
 
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
 msgstr "E419: 未知の前景色です"
 
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
 msgstr "E420: 未知の背景色です"
 
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: カラー名や番号を認識できません: %s"
 
-#: ../syntax.c:6714
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: 終端コードが長過ぎます: %s"
 
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: 不正な引数です: %s"
 
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: 多くの異なるハイライト属性が使われ過ぎています"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
 msgstr "E669: グループ名に印刷不可能な文字があります"
 
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
 msgstr "W18: グループ名に不正な文字があります"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: ハイライトと構文グループが多過ぎます"
 
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
 msgstr "E555: タグスタックの末尾です"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
 msgstr "E556: タグスタックの先頭です"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: 最初の該当タグを超えて戻ることはできません"
 
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: タグが見つかりません: %s"
 
-#: ../tag.c:528
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "ファイル\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
 msgstr "E427: 該当タグが1つだけしかありません"
 
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: 最後に該当するタグを超えて進むことはできません"
 
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "ファイル \"%s\" がありません"
 
 #. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "タグ %d (全%d%s)"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " かそれ以上"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
 msgstr "  タグを異なるcaseで使用します!"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: ファイル \"%s\" がありません"
 
 #. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -6045,79 +5624,66 @@ msgstr ""
 "\n"
 "  # TO タグ        FROM 行    in file/text"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
 msgstr "タグファイル %s を検索中"
 
-#: ../tag.c:1545
+#, c-format
+msgid "E430: Tag file path truncated for %s\n"
+msgstr "E430: タグファイルのパスが %s に切り捨てられました\n"
+
 msgid "Ignoring long line in tags file"
 msgstr "タグファイル内の長い行を無視します"
 
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: タグファイル \"%s\" のフォーマットにエラーがあります"
 
-#: ../tag.c:1917
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "直前の %<PRId64> バイト"
+msgid "Before byte %ld"
+msgstr "直前の %ld バイト"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: タグファイルがソートされていません: %s"
 
 #. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
 msgstr "E433: タグファイルがありません"
 
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
 msgstr "E434: タグパターンを見つけられません"
 
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: タグを見つけられないので単に推測します!"
 
-#: ../tag.c:2797
 #, c-format
 msgid "Duplicate field name: %s"
 msgstr "重複したフィールド名: %s"
 
-#: ../term.c:1442
 msgid "' not known. Available builtin terminals are:"
 msgstr "' は未知です. 現行の組み込み端末は次のとおりです:"
 
-#: ../term.c:1463
 msgid "defaulting to '"
 msgstr "省略値を次のように設定します '"
 
-#: ../term.c:1731
 msgid "E557: Cannot open termcap file"
 msgstr "E557: termcapファイルを開けません"
 
-#: ../term.c:1735
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfoに端末エントリを見つけられません"
 
-#: ../term.c:1737
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcapに端末エントリを見つけられません"
 
-#: ../term.c:1878
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcapに \"%s\" のエントリがありません"
 
-#: ../term.c:2249
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: 端末に \"cm\" 機能が必要です"
 
 #. Highlight title
-#: ../term.c:4376
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -6125,168 +5691,347 @@ msgstr ""
 "\n"
 "--- 端末キー ---"
 
-#: ../ui.c:481
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txtを開けません"
+
+msgid "new shell started\n"
+msgstr "新しいシェルを起動します\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: 入力を読込み中のエラーにより終了します...\n"
 
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "空の選択領域のかわりにCUT_BUFFER0が使用されました"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: ../undo.c:379
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: 予期せず行カウントが変わりました"
 
-#: ../undo.c:627
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "可能なアンドゥはありません: とりあえず続けます"
+
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: 書込み用にアンドゥファイルを開けません: %s"
 
-#: ../undo.c:717
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: アンドゥファイルが壊れています (%s): %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr "'undodir'のディレクトリにアンドゥファイルを書き込めません"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "アンドゥファイルとして読み込めないので上書きしません: %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr "アンドゥファイルではないので上書きしません: %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
 msgstr "対象がないのでアンドゥファイルの書き込みをスキップします"
 
-#: ../undo.c:1121
 #, c-format
 msgid "Writing undo file: %s"
 msgstr "アンドゥファイル書き込み中: %s"
 
-#: ../undo.c:1213
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: アンドゥファイルの書き込みエラーです: %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "オーナーが異なるのでアンドゥファイルを読み込みません: %s"
 
-#: ../undo.c:1292
 #, c-format
 msgid "Reading undo file: %s"
 msgstr "アンドゥファイル読込中: %s"
 
-#: ../undo.c:1299
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: アンドゥファイルを読込用として開けません: %s"
 
-#: ../undo.c:1308
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: アンドゥファイルではありません: %s"
 
-#: ../undo.c:1313
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: 非暗号化ファイルが暗号化されたアンドゥファイルを使ってます: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: 暗号化されたアンドゥファイルの解読に失敗しました: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: アンドゥファイルが暗号化されています: %s"
+
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: 互換性の無いアンドゥファイルです: %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
 msgstr "ファイルの内容が変わっているため、アンドゥ情報を利用できません"
 
-#: ../undo.c:1497
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr "アンドゥファイル %s の取込を完了"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "既に一番古い変更です"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "既に一番新しい変更です"
 
-#: ../undo.c:1806
 #, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: アンドゥ番号 %<PRId64> は見つかりません"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: アンドゥ番号 %ld は見つかりません"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 行番号が間違っています"
 
-#: ../undo.c:2183
 msgid "more line"
 msgstr "行 追加しました"
 
-#: ../undo.c:2185
 msgid "more lines"
 msgstr "行 追加しました"
 
-#: ../undo.c:2187
 msgid "line less"
 msgstr "行 削除しました"
 
-#: ../undo.c:2189
 msgid "fewer lines"
 msgstr "行 削除しました"
 
-#: ../undo.c:2193
 msgid "change"
 msgstr "箇所変更しました"
 
-#: ../undo.c:2195
 msgid "changes"
 msgstr "箇所変更しました"
 
-#: ../undo.c:2225
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
 
-#: ../undo.c:2228
 msgid "before"
 msgstr "前方"
 
-#: ../undo.c:2228
 msgid "after"
 msgstr "後方"
 
-#: ../undo.c:2325
 msgid "Nothing to undo"
 msgstr "アンドゥ対象がありません"
 
-#: ../undo.c:2330
 msgid "number changes  when               saved"
 msgstr "通番   変更数   変更時期           保存済"
 
-#: ../undo.c:2360
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> 秒経過しています"
+msgid "%ld seconds ago"
+msgstr "%ld 秒経過しています"
 
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo の直後に undojoin はできません"
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: アンドゥリストが壊れています"
 
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: アンドゥ行がありません"
 
-#: ../version.c:600
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: 辞書型内にエントリが既に存在します"
+
+msgid "E718: Funcref required"
+msgstr "E718: 関数参照型が要求されます"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: 未知の関数です: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: 不正な引数です: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: 引数名が重複しています: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: 関数の引数が多過ぎます: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: 関数の無効な引数です: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s を実行中です"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s が中断されました"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s が #%ld を返しました"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s が %s を返しました"
+
+msgid "E699: Too many arguments"
+msgstr "E699: 引数が多過ぎます"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: 未知の関数です: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: 関数は削除されました: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: 関数の引数が足りません: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: スクリプト以外で<SID>が使われました: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: 辞書用関数が呼ばれましたが辞書がありません: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: 関数名が要求されます"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: 関数名にはコロンは含められません: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: 未定義の関数です: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' がありません: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: ここでは g: は使えません"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: クロージャー関数はトップレベルに記述できません: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction がありません"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: 関数名が変数名と衝突します: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: 関数 %s を再定義できません: 使用中です"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: 関数 %s を削除できません: 使用中です"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: 関数外に :return がありました"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: カッコ '(' がありません: %s"
+
+#. Only MS VC 4.1 and earlier can do Win32s
+msgid ""
+"\n"
+"MS-Windows 16/32-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 16/32 ビット GUI 版"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 64 ビット GUI 版"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 32 ビット GUI 版"
+
+msgid " with OLE support"
+msgstr " with OLE サポート"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"MS-Windows 64 ビット コンソール 版"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"MS-Windows 32 ビット コンソール 版"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"MacOS X (unix) 版"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"MacOS X 版"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"MacOS 版"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"OpenVMS 版"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -6294,7 +6039,6 @@ msgstr ""
 "\n"
 "適用済パッチ: "
 
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
@@ -6302,11 +6046,9 @@ msgstr ""
 "\n"
 "追加拡張パッチ: "
 
-#: ../version.c:639 ../version.c:864
 msgid "Modified by "
 msgstr "Modified by "
 
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
@@ -6314,11 +6056,9 @@ msgstr ""
 "\n"
 "Compiled "
 
-#: ../version.c:649
 msgid "by "
 msgstr "by "
 
-#: ../version.c:660
 msgid ""
 "\n"
 "Huge version "
@@ -6326,1886 +6066,926 @@ msgstr ""
 "\n"
 "Huge 版 "
 
-#: ../version.c:661
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Big 版 "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"通常 版 "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Small 版 "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Tiny 版 "
+
 msgid "without GUI."
 msgstr "without GUI."
 
-#: ../version.c:662
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "with GTK2-GNOME GUI."
+
+msgid "with GTK2 GUI."
+msgstr "with GTK2 GUI."
+
+msgid "with X11-Motif GUI."
+msgstr "with X11-Motif GUI."
+
+msgid "with X11-neXtaw GUI."
+msgstr "with X11-neXtaw GUI."
+
+msgid "with X11-Athena GUI."
+msgstr "with X11-Athena GUI."
+
+msgid "with Photon GUI."
+msgstr "with Photon GUI."
+
+msgid "with GUI."
+msgstr "with GUI."
+
+msgid "with Carbon GUI."
+msgstr "with Carbon GUI."
+
+msgid "with Cocoa GUI."
+msgstr "with Cocoa GUI."
+
+msgid "with (classic) GUI."
+msgstr "with (クラシック) GUI."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  機能の一覧 有効(+)/無効(-)\n"
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
 msgstr "      システム vimrc: \""
 
-#: ../version.c:672
 msgid "     user vimrc file: \""
 msgstr "      ユーザー vimrc: \""
 
-#: ../version.c:677
 msgid " 2nd user vimrc file: \""
 msgstr "   第2ユーザー vimrc: \""
 
-#: ../version.c:682
 msgid " 3rd user vimrc file: \""
 msgstr "   第3ユーザー vimrc: \""
 
-#: ../version.c:687
 msgid "      user exrc file: \""
 msgstr "       ユーザー exrc: \""
 
-#: ../version.c:692
 msgid "  2nd user exrc file: \""
 msgstr "    第2ユーザー exrc: \""
 
-#: ../version.c:699
+msgid "  system gvimrc file: \""
+msgstr "     システム gvimrc: \""
+
+msgid "    user gvimrc file: \""
+msgstr "     ユーザー gvimrc: \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "  第2ユーザー gvimrc: \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "  第3ユーザー gvimrc: \""
+
+msgid "       defaults file: \""
+msgstr "  デフォルトファイル: \""
+
+msgid "    system menu file: \""
+msgstr "    システムメニュー: \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "       省略時の $VIM: \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "省略時の $VIMRUNTIME: \""
 
-#: ../version.c:709
 msgid "Compilation: "
 msgstr "コンパイル: "
 
-#: ../version.c:712
+msgid "Compiler: "
+msgstr "コンパイラ: "
+
 msgid "Linking: "
 msgstr "リンク: "
 
-#: ../version.c:717
 msgid "  DEBUG BUILD"
 msgstr "デバッグビルド"
 
-#: ../version.c:767
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: ../version.c:769
 msgid "version "
 msgstr "version "
 
-#: ../version.c:770
 msgid "by Bram Moolenaar et al."
 msgstr "by Bram Moolenaar 他."
 
-#: ../version.c:774
 msgid "Vim is open source and freely distributable"
 msgstr "Vim はオープンソースであり自由に配布可能です"
 
-#: ../version.c:776
 msgid "Help poor children in Uganda!"
 msgstr "ウガンダの恵まれない子供たちに援助を!"
 
-#: ../version.c:777
 msgid "type  :help iccf<Enter>       for information "
 msgstr "詳細な情報は           :help iccf<Enter>      "
 
-#: ../version.c:779
 msgid "type  :q<Enter>               to exit         "
 msgstr "終了するには           :q<Enter>              "
 
-#: ../version.c:780
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "オンラインヘルプは     :help<Enter> か <F1>   "
 
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "バージョン情報は       :help version7<Enter>  "
+msgid "type  :help version8<Enter>   for version info"
+msgstr "バージョン情報は       :help version8<Enter>  "
 
-#: ../version.c:784
 msgid "Running in Vi compatible mode"
 msgstr "Vi互換モードで動作中"
 
-#: ../version.c:785
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "Vim推奨値にするには    :set nocp<Enter>       "
 
-#: ../version.c:786
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "詳細な情報は           :help cp-default<Enter>"
 
-#: ../version.c:827
+msgid "menu  Help->Orphans           for information    "
+msgstr "詳細はメニューの ヘルプ->孤児 を参照して下さい   "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "モード無で実行中, タイプした文字が挿入されます"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "メニューの 編集->全体設定->挿入(初心者)モード切替 "
+
+msgid "                              for two modes      "
+msgstr "                              でモード有に       "
+
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "メニューの 編集->全体設定->Vi互換モード切替      "
+
+msgid "                              for Vim defaults   "
+msgstr "                              でVimとして動作    "
+
 msgid "Sponsor Vim development!"
 msgstr "Vimの開発を応援してください!"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
 msgstr "Vimの登録ユーザーになってください!"
 
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "詳細な情報は           :help sponsor<Enter>   "
 
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
 msgstr "詳細な情報は           :help register<Enter>  "
 
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
 
-#: ../window.c:119
+msgid "WARNING: Windows 95/98/ME detected"
+msgstr "警告: Windows 95/98/ME を検出しました"
+
+msgid "type  :help windows95<Enter>  for info on this"
+msgstr "詳細な情報は            :help windows95<Enter>"
+
 msgid "Already only one window"
 msgstr "既にウィンドウは1つしかありません"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: プレビューウィンドウがありません"
 
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: 左上と右下を同時に分割することはできません"
 
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: 他のウィンドウが分割されている時には順回できません"
 
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
 msgstr "E444: 最後のウィンドウを閉じることはできません"
 
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: autocmdウィンドウは閉じられません"
 
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: autocmdウィンドウしか残らないため、ウィンドウは閉じられません"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
 msgstr "E445: 他のウィンドウには変更があります"
 
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
 msgstr "E446: カーソルの下にファイル名がありません"
 
-msgid "List or number required"
-msgstr "リストか数値が必要です"
-
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfish暗号のビッグ/リトルエンディアンが間違っています"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: sha256のテストに失敗しました"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Blowfish暗号のテストに失敗しました"
-
-#~ msgid "Patch file"
-#~ msgstr "パッチファイル"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "決定(&O)\n"
-#~ "キャンセル(&C)"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Vim サーバへの接続がありません"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: %s へ送ることができません"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: サーバの応答がありません"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: クライアントへ送ることができません"
-
-#~ msgid "Save As"
-#~ msgstr "別名で保存"
-
-#~ msgid "Edit File"
-#~ msgstr "ファイルを編集"
-
-# Added at 27-Jan-2004.
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (見つかりません)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Vimスクリプトの取込み"
-
-#~ msgid "unknown"
-#~ msgstr "不明"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "新しいウィンドウでファイルを編集します"
-
-#~ msgid "Append File"
-#~ msgstr "追加ファイル"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "ウィンドウ位置: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "リダイレクトを保存します"
-
-#~ msgid "Save View"
-#~ msgstr "ビューを保存します"
-
-#~ msgid "Save Session"
-#~ msgstr "セッション情報を保存します"
-
-#~ msgid "Save Setup"
-#~ msgstr "設定を保存します"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< は +eval 機能が無いと利用できません"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: このバージョンに合字はありません"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr " はデバイスです ('opendevice' オプションで回避できます)"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "標準入力から読込み中..."
-
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish暗号化]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[暗号化]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: ファイルが未知の方法で暗号化されています"
-
-# Added at 19-Jan-2004.
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeansは未変更のバッファを上書することは許可していません"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "NetBeansバッファの一部を書き出すことはできません"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "'opendevice' オプションによりデバイスへの書き込みはできません"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: リソースフォークが失われるかもしれません (! を追加で強制)"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: GUI用のプロセスの起動に失敗しました"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: 子プロセスがGUIの起動に失敗しました"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: GUIを開始できません"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: \"%s\"から読込むことができません"
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: 有効なフォントが見つからないので, GUIを開始できません"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' が無効です"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' に設定された値が無効です"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: %s の色を割り当てられません"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "カーソルの位置にマッチはありません, 次を検索しています"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<開けません> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: フォント %s を取得できません"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: 現在のディレクトリに戻れません"
-
-#~ msgid "Pathname:"
-#~ msgstr "パス名:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: 現在のディレクトリを取得できません"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Cancel"
-#~ msgstr "キャンセル"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "スクロールバー: 画像を取得できませんでした."
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim ダイアログ"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: メッセージとコールバックのある BalloonEval を作成できません"
-
-#~ msgid "Input _Methods"
-#~ msgstr "インプットメソッド"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - 検索と置換..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - 検索..."
-
-#~ msgid "Find what:"
-#~ msgstr "検索文字列:"
-
-#~ msgid "Replace with:"
-#~ msgstr "置換文字列:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "正確に該当するものだけ"
-
-#~ msgid "Match case"
-#~ msgstr "大文字/小文字を区別する"
-
-#~ msgid "Direction"
-#~ msgstr "方向"
-
-#~ msgid "Up"
-#~ msgstr "上"
-
-#~ msgid "Down"
-#~ msgstr "下"
-
-#~ msgid "Find Next"
-#~ msgstr "次を検索"
-
-#~ msgid "Replace"
-#~ msgstr "置換"
-
-#~ msgid "Replace All"
-#~ msgstr "全て置換"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n"
-
-#~ msgid "Close"
-#~ msgstr "閉じる"
-
-#~ msgid "New tab"
-#~ msgstr "新規タブページ"
-
-#~ msgid "Open Tab..."
-#~ msgstr "タブページを開く..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: メインウィンドウが不意に破壊されました\n"
-
-#~ msgid "&Filter"
-#~ msgstr "フィルタ(&F)"
-
-#~ msgid "&Cancel"
-#~ msgstr "キャンセル(&C)"
-
-#~ msgid "Directories"
-#~ msgstr "ディレクトリ"
-
-#~ msgid "Filter"
-#~ msgstr "フィルタ"
-
-#~ msgid "&Help"
-#~ msgstr "ヘルプ(&H)"
-
-#~ msgid "Files"
-#~ msgstr "ファイル"
-
-#~ msgid "&OK"
-#~ msgstr "&OK"
-
-#~ msgid "Selection"
-#~ msgstr "選択"
-
-#~ msgid "Find &Next"
-#~ msgstr "次を検索(&N)"
-
-#~ msgid "&Replace"
-#~ msgstr "置換(&R)"
-
-#~ msgid "Replace &All"
-#~ msgstr "全て置換(&A)"
-
-#~ msgid "&Undo"
-#~ msgstr "アンドゥ(&U)"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: MDIアプリの中ではウィンドウを開けません"
-
-#~ msgid "Close tab"
-#~ msgstr "タブページを閉じる"
-
-#~ msgid "Open tab..."
-#~ msgstr "タブページを開く"
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "検索文字列 ('\\' を検索するには '\\\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "検索・置換 ('\\' を検索するには '\\\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "使われません"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "ディレクトリ\t*.nothing\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr "Vim E458: 色指定が正しくないのでエントリを割り当てられません"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: 以下の文字セットのフォントがありません %s:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: フォントセット名: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "フォント '%s' は固定幅ではありません"
-
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: フォントセット名: %s"
-
-#~ msgid "Font0: %s"
-#~ msgstr "フォント0: %s"
-
-#~ msgid "Font1: %s"
-#~ msgstr "フォント1: %s"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "フォント%<PRId64> の幅がフォント0の2倍ではありません"
-
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "フォント0の幅: %<PRId64>"
-
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "フォント1の幅: %<PRId64>"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "無効なフォント指定です"
-
-#~ msgid "&Dismiss"
-#~ msgstr "却下する(&D)"
-
-#~ msgid "no specific match"
-#~ msgstr "マッチするものがありません"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - フォント選択"
-
-#~ msgid "Name:"
-#~ msgstr "名前:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "サイズをポイントで表示する"
-
-#~ msgid "Encoding:"
-#~ msgstr "エンコード:"
-
-#~ msgid "Font:"
-#~ msgstr "フォント:"
-
-#~ msgid "Style:"
-#~ msgstr "スタイル:"
-
-#~ msgid "Size:"
-#~ msgstr "サイズ:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: ハングルオートマトンエラー"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat エラー"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: cscopeデータベース: %s を開くことができません"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: cscopeデータベースの情報を取得できません"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Luaライブラリをロードできません."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "アンドゥ情報が保存できません"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: このコマンドは無効です. MzScheme ライブラリをロードできません."
-
-#~ msgid "invalid expression"
-#~ msgstr "無効な式です"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "式はコンパイル時に無効にされています"
-
-#~ msgid "hidden option"
-#~ msgstr "隠しオプション"
-
-#~ msgid "unknown option"
-#~ msgstr "未知のオプションです"
-
-#~ msgid "window index is out of range"
-#~ msgstr "範囲外のウィンドウ番号です"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "バッファを開けません"
-
-#~ msgid "cannot delete line"
-#~ msgstr "行を消せません"
-
-#~ msgid "cannot replace line"
-#~ msgstr "行を置換できません"
-
-#~ msgid "cannot insert line"
-#~ msgstr "行を挿入できません"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "文字列には改行文字を含められません"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "Scheme値のVimへの変換エラー"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim エラー: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Vim エラー"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "バッファは無効です"
-
-#~ msgid "window is invalid"
-#~ msgstr "ウィンドウは無効です"
-
-#~ msgid "linenr out of range"
-#~ msgstr "範囲外の行番号です"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "サンドボックスでは許されません"
-
-#~ 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ライブラリをロードできませんでし"
-#~ "た."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じら"
-#~ "れています"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: このコマンドは無効です,ごめんなさい: Pythonライブラリをロードできま"
-#~ "せんでした."
-
-# Added at 07-Feb-2004.
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Python を再帰的に実行することはできません"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: このVimでは :python を使った後に :py3 を使えません"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ は文字列のインスタンスでなければなりません"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: このコマンドは無効です,ごめんなさい: Rubyライブラリをロードできませ"
-#~ "んでした."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: 予期せぬ return です"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: 予期せぬ next です"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: 予期せぬ break です"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: 予期せぬ redo です"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: rescue の外の retry です"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: 取り扱われなかった例外があります"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: 未知のlongjmp状態: %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "実装と定義を切り替える"
-
-#~ msgid "Show base class of"
-#~ msgstr "次のクラスの基底を表示"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "オーバーライドされたメンバ関数を表示"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "ファイルから回復する"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "プロジェクトから回復する"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "全てのプロジェクトから回復する"
-
-#~ msgid "Retrieve"
-#~ msgstr "回復"
-
-#~ msgid "Show source of"
-#~ msgstr "次のソースを表示する"
-
-#~ msgid "Find symbol"
-#~ msgstr "見つけたシンボル"
-
-#~ msgid "Browse class"
-#~ msgstr "クラスを参照"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "階層でクラスを表示"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "限定された階層でクラスを表示"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref の参照先"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref が参照される"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref が次のものをもっています"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref が使用される"
-
-#~ msgid "Show docu of"
-#~ msgstr "次の文章を表示"
-
-#~ msgid "Generate docu for"
-#~ msgstr "次の文章を生成"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "SNiFF+に接続できません. 環境をチェックしてください(sniffemacs が $PATH に"
-#~ "なければなりません).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: 読込中にエラーが発生しました. 切断しました"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "現在SNiFF+ の状態は「"
-
-#~ msgid "not "
-#~ msgstr "未"
-
-#~ msgid "connected"
-#~ msgstr "接続」です"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: 未知の SNiFF+ リクエストです: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: SNiFF+ への接続中のエラーです"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ に接続されていません"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: SNiFF+ バッファがありません"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: 書込み中にエラーが発生したので切断しました"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "無効なバッファ番号です"
-
-#~ msgid "not implemented yet"
-#~ msgstr "まだ実装されていません"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "行を設定できません"
-
-#~ msgid "invalid mark name"
-#~ msgstr "無効なマーク名です"
-
-#~ msgid "mark not set"
-#~ msgstr "マークは設定されていません"
-
-#~ msgid "row %d column %d"
-#~ msgstr "行 %d 列 %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "行の挿入/追加をできません"
-
-#~ msgid "line number out of range"
-#~ msgstr "範囲外の行番号です"
-
-#~ msgid "unknown flag: "
-#~ msgstr "未知のフラグ: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "未知の vimOption です"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "キーボード割込み"
-
-#~ msgid "vim error"
-#~ msgstr "vim エラー"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "バッファ/ウィンドウ作成コマンドを作成できません: オブジェクトが消去されて"
-#~ "いました"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "コールバックコマンドを登録できません: バッファ/ウィンドウが既に消去されま"
-#~ "した"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: TCL 致命的エラー: reflist 汚染!? vim-dev@vim.org に報告してください"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "コールバックコマンドを登録できません: バッファ/ウィンドウの参照が見つかり"
-#~ "ません"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: このコマンドは無効です,ごめんなさい: Tclライブラリをロードできません"
-#~ "でした."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: 終了コード %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "行を取得できません"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "命令サーバの名前を登録できません"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: 目的のプログラムへのコマンド送信に失敗しました"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: 無効なサーバIDが使われました: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans はこのGUIでは利用できません\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' 使用不可能です: コンパイル時に無効にされています\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: エラー: NetBeansからgvimをスタートできません\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "大小文字が無視される場合は大文字にするために / を前置してください"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tこのgvimをOLEとして登録する"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tgvimのOLE登録を解除する"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tGUIで起動する (\"gvim\" と同じ)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f or  --nofork\tフォアグラウンド: GUIを始めるときにforkしない"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\tウィンドウを開くのに newcli を使用しない"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tI/Oに <device> を使用する"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\t.gvimrcの代わりに <gvimrc> を使う"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t暗号化されたファイルを編集する"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tvimを指定した X サーバに接続する"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tXサーバに接続しない"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t可能ならばVimサーバで <files> を編集する"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  同上, サーバが無くても警告文を出力しない"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>\t--remote後 ファイルの編集が終わるのを待つ"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <files>  同上, サーバが無くても警告文を出力しない"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <files>  --remoteでファイル1つにつき1つのタブ"
-#~ "ページを開く"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\tVimサーバに <keys> を送信して終了する"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\tサーバで <expr> を実行して結果を表示する"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tVimサーバ名の一覧を表示して終了する"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\tVimサーバ <name> に送信/名前設定する"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvimによって解釈される引数(Motifバージョン):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvimによって解釈される引数(neXtawバージョン):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvimによって解釈される引数(Athenaバージョン):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t<display> でvimを実行する"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t最小化した状態でvimを起動する"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\t背景色に <color> を使う(同義: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\t前景色に <color> を使う(同義: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t\tテキスト表示に <font> を使う(同義: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\t太字に <font> を使う"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <for>\t斜体字に <font> を使う"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\t初期配置に <geom> を使う(同義: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t境界の幅を <width> にする(同義: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <width>  スクロールバーの幅を <width> にする(同義: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <height>\tメニューバーの高さを <height> にする(同義: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\t反転映像を使用する(同義: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t反転映像を使用しない(同義: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t特定のリソースを使用する"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvimによって解釈される引数(GTK+バージョン):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t<display> でvimを実行する(同義: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\tメインウィンドウを識別する一意な役割(role)を設定する"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t異なるGTK widgetでVimを開く"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\tウィンドウIDを標準出力に出力する"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <親のタイトル>\tVimを親アプリケーションの中で起動する"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\t異なるWin32 widgetの内部にVimを開く"
-
-#~ msgid "No display"
-#~ msgstr "ディスプレイが見つかりません"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": 送信に失敗しました.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": 送信に失敗しました. ローカルでの実行を試みています\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d 個 (%d 個中) のファイルを編集しました"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "ディスプレイがありません: 式の送信に失敗しました.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": 式の送信に失敗しました.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: 無効なコードページです"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: ICの値を設定できません"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: インプットコンテキストの作成に失敗しました"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: インプットメソッドのオープンに失敗しました"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: 警告: IMの破壊コールバックを設定できませんでした"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: インプットメソッドはどんなスタイルもサポートしません"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: インプットメソッドは my preedit type をサポートしません"
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: pathには \"%s\" というファイルがありません"
 
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: スワップファイルの暗号を更新中にエラーが発生しました"
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: 無効な ID: %ld (1 以上でなければなりません)"
 
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr ""
-#~ "E833: %s はこのバージョンのVimでサポートしていない形式で暗号化されています"
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID はすでに利用中です: %ld"
 
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "スワップファイルは暗号化されています: \"%s\""
+msgid "List or number required"
+msgstr "リストか数値が必要です"
 
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "新しい暗号キーを入力したあとにテキストファイルを保存していない場合は,"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: 無効な ID: %ld (1 以上でなければなりません)"
 
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "新しい暗号キーを入力してください."
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID はありません: %ld"
 
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "暗号キーを変えたあとにテキストファイルを保存した場合は, テキストファイルと"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ライブラリ %s をロードできませんでした"
 
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "スワップファイルに同じ暗号キーを使うためにenterだけを押してください."
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"このコマンドは無効です, ごめんなさい: Perlライブラリをロードできませんでした."
 
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "スワップファイルから取得した暗号キーをテキストファイルに使います.\n"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
+"ています"
 
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [このVimバージョンでは使用できません]"
+msgid "Edit with &multiple Vims"
+msgstr "複数のVimで編集する (&M)"
 
-#~ msgid "Tear off this menu"
-#~ msgstr "このメニューを切り取る"
+msgid "Edit with single &Vim"
+msgstr "1つのVimで編集する (&V)"
 
-#~ msgid "Select Directory dialog"
-#~ msgstr "ディレクトリ選択ダイアログ"
+msgid "Diff with Vim"
+msgstr "Vimで差分を表示する"
 
-#~ msgid "Save File dialog"
-#~ msgstr "ファイル保存ダイアログ"
+msgid "Edit with &Vim"
+msgstr "Vimで編集する (&V)"
 
-#~ msgid "Open File dialog"
-#~ msgstr "ファイル読込ダイアログ"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "起動済のVimで編集する - "
 
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr ""
-#~ "E338: コンソールモードではファイルブラウザを使えません, ごめんなさい"
+msgid "Edits the selected file(s) with Vim"
+msgstr "選択したファイルをVimで編集する"
 
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: ファイルを保存中...\n"
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "プロセスの作成に失敗: gvimが環境変数PATH上にあるか確認してください!"
 
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: 終了しました.\n"
+msgid "gvimext.dll error"
+msgstr "gvimext.dll エラー"
 
-#~ msgid "ERROR: "
-#~ msgstr "エラー: "
+msgid "Path length too long!"
+msgstr "パスが長過ぎます!"
 
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[メモリ(バイト)] 総割当-解放量 %<PRIu64>-%<PRIu64>, 使用量 %<PRIu64>, ピー"
-#~ "ク時 %<PRIu64>\n"
+msgid "--No lines in buffer--"
+msgstr "--バッファに行がありません--"
 
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[呼出] 総 re/malloc() 回数 %<PRIu64>, 総 free() 回数 %<PRIu64>\n"
-#~ "\n"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: コマンドが中断されました"
 
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: 行が長くなり過ぎました"
+msgid "E471: Argument required"
+msgstr "E471: 引数が必要です"
 
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: 内部エラー: lalloc(%<PRId64>,)"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ の後は / か ? か & でなければなりません"
 
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: 不正な 'mouseshape' です"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: コマンドラインでは無効です; <CR>で実行, CTRL-Cでやめる"
 
-#~ msgid "Enter encryption key: "
-#~ msgstr "暗号化用のキーを入力してください: "
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: 現在のディレクトリやタグ検索ではexrc/vimrcのコマンドは許可されません"
 
-#~ msgid "Enter same key again: "
-#~ msgstr "もう一度同じキーを入力してください: "
+msgid "E171: Missing :endif"
+msgstr "E171: :endif がありません"
 
-#~ msgid "Keys don't match!"
-#~ msgstr "キーが一致しません"
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry がありません"
 
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Netbeans #2 に接続できません"
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile がありません"
 
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Netbeans に接続できません"
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor がありません"
 
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: NetBeansの接続情報ファイルのアクセスモードに問題があります: \"%s\""
+msgid "E588: :endwhile without :while"
+msgstr "E588: :while のない :endwhile があります"
 
-#~ msgid "read from Netbeans socket"
-#~ msgstr "Netbeans のソケットを読込み"
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor のない :for があります"
 
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: バッファ %<PRId64> の NetBeans 接続が失われました"
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: ファイルが存在します (! を追加で上書)"
 
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: NetBeansはこのGUIには対応していません"
+msgid "E472: Command failed"
+msgstr "E472: コマンドが失敗しました"
 
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: NetBeansは既に接続しています"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: 未知のフォントセット: %s"
 
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s は読込専用です (強制書込には ! を追加)"
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: 未知のフォント: %s"
 
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: 式評価機能が無効になっています"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: フォント \"%s\" は固定幅ではありません"
 
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "%<PRId64> 行を解放中"
+msgid "E473: Internal error"
+msgstr "E473: 内部エラーです"
 
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: GUIでは 'term' を変更できません"
+msgid "Interrupted"
+msgstr "割込まれました"
 
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: GUIをスタートするには \":gui\" を使用してください"
+msgid "E14: Invalid address"
+msgstr "E14: 無効なアドレスです"
 
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: GTK+2 GUIでは変更できません"
+msgid "E474: Invalid argument"
+msgstr "E474: 無効な引数です"
 
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: 無効なフォントです"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: 無効な引数です: %s"
 
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: フォントセットを選択できません"
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: 無効な式です: %s"
 
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: 無効なフォントセットです"
+msgid "E16: Invalid range"
+msgstr "E16: 無効な範囲です"
 
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: ワイドフォントを選択できません"
+msgid "E476: Invalid command"
+msgstr "E476: 無効なコマンドです"
 
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: 無効なワイドフォントです"
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" はディレクトリです"
 
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: マウスはサポートされません"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: \"%s\"() のライブラリ呼出に失敗しました"
 
-#~ msgid "cannot open "
-#~ msgstr "開けません "
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: ライブラリの関数 %s をロードできませんでした"
 
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: ウィンドウを開けません!\n"
+msgid "E19: Mark has invalid line number"
+msgstr "E19: マークに無効な行番号が指定されていました"
 
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Amigadosのバージョン 2.04かそれ以降が必要です\n"
+msgid "E20: Mark not set"
+msgstr "E20: マークは設定されていません"
 
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "%s のバージョン %<PRId64> が必要です\n"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: 'modifiable' がオフなので, 変更できません"
 
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "NILを開けません:\n"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: スクリプトの入れ子が深過ぎます"
 
-#~ msgid "Cannot create "
-#~ msgstr "作成できません "
+msgid "E23: No alternate file"
+msgstr "E23: 副ファイルはありません"
 
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vimは %d で終了します\n"
+msgid "E24: No such abbreviation"
+msgstr "E24: そのような短縮入力はありません"
 
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "コンソールモードを変更できません?!\n"
+msgid "E477: No ! allowed"
+msgstr "E477: ! は許可されていません"
 
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: コンソールではない??\n"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: GUIは使用不可能です: コンパイル時に無効にされています"
 
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: -f オプションでシェルを実行できません"
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: ヘブライ語は使用不可能です: コンパイル時に無効にされています\n"
 
-#~ msgid "Cannot execute "
-#~ msgstr "実行できません "
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
 
-#~ msgid "shell "
-#~ msgstr "シェル "
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
 
-#~ msgid " returned\n"
-#~ msgstr " 戻りました\n"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: そのような名のハイライトグループはありません: %s"
 
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE が小さ過ぎます."
+msgid "E29: No inserted text yet"
+msgstr "E29: まだテキストが挿入されていません"
 
-#~ msgid "I/O ERROR"
-#~ msgstr "入出力エラー"
+msgid "E30: No previous command line"
+msgstr "E30: 以前にコマンド行がありません"
 
-#~ msgid "Message"
-#~ msgstr "メッセージ"
+msgid "E31: No such mapping"
+msgstr "E31: そのようなマッピングはありません"
 
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' が80ではないため, 外部コマンドを実行できません"
+msgid "E479: No match"
+msgstr "E479: 該当はありません"
 
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: プリンタの選択に失敗しました"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: 該当はありません: %s"
 
-#~ msgid "to %s on %s"
-#~ msgstr "%s へ (%s 上の)"
+msgid "E32: No file name"
+msgstr "E32: ファイル名がありません"
 
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: 未知のプリンタオプションです: %s"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: 正規表現置換がまだ実行されていません"
 
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: 印刷エラー: %s"
+msgid "E34: No previous command"
+msgstr "E34: コマンドがまだ実行されていません"
 
-#~ msgid "Printing '%s'"
-#~ msgstr "印刷しています: '%s'"
+msgid "E35: No previous regular expression"
+msgstr "E35: 正規表現がまだ実行されていません"
 
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: 文字セット名 \"%s\" は不正です (フォント名 \"%s\")"
+msgid "E481: No range allowed"
+msgstr "E481: 範囲指定は許可されていません"
 
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
+msgid "E36: Not enough room"
+msgstr "E36: ウィンドウに十分な高さもしくは幅がありません"
 
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: 2重のシグナルのため, 終了します\n"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: %s という名前の登録されたサーバーはありません"
 
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: 致命的シグナル %s を検知しました\n"
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: ファイル %s を作成できません"
 
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: 致命的シグナルを検知しました\n"
+msgid "E483: Can't get temp file name"
+msgstr "E483: 一時ファイルの名前を取得できません"
 
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "Xサーバへの接続に %<PRId64> ミリ秒かかりました"
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: ファイル \"%s\" を開けません"
 
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X のエラーを検出しましたr\n"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: ファイル %s を読込めません"
 
-#~ msgid "Testing the X display failed"
-#~ msgstr "X display のチェックに失敗しました"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
 
-#~ msgid "Opening the X display timed out"
-#~ msgstr "X display の open がタイムアウトしました"
+msgid "E37: No write since last change"
+msgstr "E37: 最後の変更が保存されていません"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "sh シェルを実行できません\n"
+msgid "E38: Null argument"
+msgstr "E38: 引数が空です"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "パイプを作成できません\n"
+msgid "E39: Number expected"
+msgstr "E39: 数値が要求されています"
 
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "fork できません\n"
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: エラーファイル %s を開けません"
 
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "コマンドを中断しました\n"
+msgid "E233: cannot open display"
+msgstr "E233: ディスプレイを開けません"
 
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP がICE接続を失いました"
+msgid "E41: Out of memory!"
+msgstr "E41: メモリが尽き果てました!"
 
-#~ msgid "Opening the X display failed"
-#~ msgstr "X display の open に失敗しました"
+msgid "Pattern not found"
+msgstr "パターンは見つかりませんでした"
 
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP がsave-yourself要求を処理しています"
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: パターンは見つかりませんでした: %s"
 
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP が接続を開始しています"
+msgid "E487: Argument must be positive"
+msgstr "E487: 引数は正の値でなければなりません"
 
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ICE接続が失敗したようです"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: 前のディレクトリに戻れません"
 
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnectionが失敗しました: %s"
+msgid "E42: No Errors"
+msgstr "E42: エラーはありません"
 
-#~ msgid "At line"
-#~ msgstr "行"
+msgid "E776: No location list"
+msgstr "E776: ロケーションリストはありません"
 
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "vim32.dll をロードできませんでした"
+msgid "E43: Damaged match string"
+msgstr "E43: 該当文字列が破損しています"
 
-#~ msgid "VIM Error"
-#~ msgstr "VIMエラー"
+msgid "E44: Corrupted regexp program"
+msgstr "E44: 不正な正規表現プログラムです"
 
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "DLLから関数ポインタを取得できませんでした"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 'readonly' オプションが設定されています (! を追加で上書き)"
 
-#~ msgid "shell returned %d"
-#~ msgstr "シェルがコード %d で終了しました"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
 
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: イベント %s を検知\n"
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません"
 
-#~ msgid "close"
-#~ msgstr "閉じる"
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: 辞書型に空のキーを使うことはできません"
 
-#~ msgid "logoff"
-#~ msgstr "ログオフ"
+msgid "E715: Dictionary required"
+msgstr "E715: 辞書型が必要です"
 
-#~ msgid "shutdown"
-#~ msgstr "シャットダウン"
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: リストのインデックスが範囲外です: %ld"
 
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: コマンドがありません"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXEが $PATH の中に見つかりません.\n"
-#~ "外部コマンドの終了後に一時停止をしません.\n"
-#~ "詳細は  :help win32-vimrun  を参照してください."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vimの警告"
-
-#~ msgid "Error file"
-#~ msgstr "エラーファイル"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: 等価クラスを含むNFA構築に失敗しました!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "警告: 単語リスト \"%s_%s.spl\" および \"%s_ascii.spl\" は見つかりません"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "%s 内の変換はサポートされていません"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: メモリが足りないので、単語リストは不完全です"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: タグファイルのパスが %s に切り捨てられました\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "新しいシェルを起動します\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "空の選択領域のかわりにCUT_BUFFER0が使用されました"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "可能なアンドゥはありません: とりあえず続けます"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr ""
-#~ "E832: 非暗号化ファイルが暗号化されたアンドゥファイルを使ってます: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: 暗号化されたアンドゥファイルの解読に失敗しました: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: アンドゥファイルが暗号化されています: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 ビット GUI 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 ビット GUI 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 ビット GUI 版"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " in Win32s モード"
-
-#~ msgid " with OLE support"
-#~ msgstr " with OLE サポート"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 ビット コンソール 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 ビット コンソール 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16 ビット 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 ビット MS-DOS 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 ビット MS-DOS 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (unix) 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "OpenVMS 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Big 版 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "通常 版 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Small 版 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Tiny 版 "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "with GTK2-GNOME GUI."
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 関数の引数が多過ぎます: %s"
 
-#~ msgid "with GTK2 GUI."
-#~ msgstr "with GTK2 GUI."
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: 辞書型にキーが存在しません: %s"
 
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "with X11-Motif GUI."
+msgid "E714: List required"
+msgstr "E714: リスト型が必要です"
 
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "with X11-neXtaw GUI."
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
 
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "with X11-Athena GUI."
+msgid "E47: Error while reading errorfile"
+msgstr "E47: エラーファイルの読込中にエラーが発生しました"
 
-#~ msgid "with Photon GUI."
-#~ msgstr "with Photon GUI."
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: サンドボックスでは許されません"
 
-#~ msgid "with GUI."
-#~ msgstr "with GUI."
+msgid "E523: Not allowed here"
+msgstr "E523: ここでは許可されません"
 
-#~ msgid "with Carbon GUI."
-#~ msgstr "with Carbon GUI."
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: スクリーンモードの設定には対応していません"
 
-#~ msgid "with Cocoa GUI."
-#~ msgstr "with Cocoa GUI."
+msgid "E49: Invalid scroll size"
+msgstr "E49: 無効なスクロール量です"
 
-#~ msgid "with (classic) GUI."
-#~ msgstr "with (クラシック) GUI."
+msgid "E91: 'shell' option is empty"
+msgstr "E91: 'shell' オプションが空です"
 
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "     システム gvimrc: \""
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: sign のデータを読込めませんでした"
 
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "       ユーザ gvimrc: \""
+msgid "E72: Close error on swap file"
+msgstr "E72: スワップファイルのクローズ時エラーです"
 
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "    第2ユーザ gvimrc: \""
+msgid "E73: tag stack empty"
+msgstr "E73: タグスタックが空です"
 
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "    第3ユーザ gvimrc: \""
+msgid "E74: Command too complex"
+msgstr "E74: コマンドが複雑過ぎます"
 
-#~ msgid "    system menu file: \""
-#~ msgstr "    システムメニュー: \""
+msgid "E75: Name too long"
+msgstr "E75: 名前が長過ぎます"
 
-#~ msgid "Compiler: "
-#~ msgstr "コンパイラ: "
+msgid "E76: Too many ["
+msgstr "E76: [ が多過ぎます"
 
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "詳細はメニューの ヘルプ→孤児 を参照して下さい   "
+msgid "E77: Too many file names"
+msgstr "E77: ファイル名が多過ぎます"
 
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "モード無で実行中, タイプした文字が挿入されます"
+msgid "E488: Trailing characters"
+msgstr "E488: 余分な文字が後ろにあります"
 
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "メニューの 編集→全体設定→挿入(初心者)モード切替 "
+msgid "E78: Unknown mark"
+msgstr "E78: 未知のマーク"
 
-#~ msgid "                              for two modes      "
-#~ msgstr "                              でモード有に       "
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: ワイルドカードを展開できません"
 
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "メニューの 編集→全体設定→Vi互換モード切替      "
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' は 'winminheight' より小さくできません"
 
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                              でVimとして動作    "
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' は 'winminwidth' より小さくできません"
 
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "   警告: Windows 95/98/Me を検出  "
+msgid "E80: Error while writing"
+msgstr "E80: 書込み中のエラー"
 
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr " 詳細な情報は          :help windows95<Enter> "
+msgid "Zero count"
+msgstr "ゼロカウント"
 
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "複数のVimで編集する (&M)"
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: スクリプト以外で<SID>が使われました"
 
-#~ msgid "Edit with single &Vim"
-#~ msgstr "1つのVimで編集する (&V)"
+msgid "E449: Invalid expression received"
+msgstr "E449: 無効な式を受け取りました"
 
-#~ msgid "Diff with Vim"
-#~ msgstr "Vimで差分を表示する"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: 領域が保護されているので, 変更できません"
 
-#~ msgid "Edit with &Vim"
-#~ msgstr "Vimで編集する (&V)"
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
 
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "起動済のVimで編集する - "
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 内部エラーです: %s"
 
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "選択したファイルをVimで編集する"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: パターンが 'maxmempattern' 以上のメモリを使用します"
 
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "プロセスの作成に失敗: gvimが環境変数PATH上にあるか確認してください!"
+msgid "E749: empty buffer"
+msgstr "E749: バッファが空です"
 
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll エラー"
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: バッファ %ld はありません"
 
-#~ msgid "Path length too long!"
-#~ msgstr "パスが長すぎます!"
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: 検索パターンか区切り記号が不正です"
 
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: 未知のフォントセット: %s"
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: 同じ名前のファイルが他のバッファで読込まれています"
 
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: 未知のフォント: %s"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: オプション '%s' は設定されていません"
 
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: フォント \"%s\" は固定幅ではありません"
+msgid "E850: Invalid register name"
+msgstr "E850: 無効なレジスタ名です"
 
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: ライブラリの関数 %s をロードできませんでした"
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: ディレクトリが '%s' の中にありません: \"%s\""
 
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: ヘブライ語は使用不可能です: コンパイル時に無効にされています\n"
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "上まで検索したので下に戻ります"
 
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "下まで検索したので上に戻ります"
 
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "暗号キーが必要です: \"%s\""
 
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: %s という名前の登録されたサーバはありません"
+msgid "empty keys are not allowed"
+msgstr "空のキーは許可されていません"
 
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: ディスプレイを開けません"
+msgid "dictionary is locked"
+msgstr "辞書はロックされています"
 
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: 無効な式を受け取りました"
+msgid "list is locked"
+msgstr "リストはロックされています"
 
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: 領域が保護されているので, 変更できません"
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "辞書にキー '%s' を追加するのに失敗しました"
 
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "インデックスは %s ではなく整数かスライスにしてください"
 
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "暗号キーが必要です: \"%s\""
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "str() もしくは unicode() のインスタンスが期待されているのに %s でした"
 
-#~ msgid "empty keys are not allowed"
-#~ msgstr "空のキーは許可されていません"
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bytes() もしくは str() のインスタンスが期待されているのに %s でした"
 
-#~ msgid "dictionary is locked"
-#~ msgstr "辞書はロックされています"
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "long() かそれへ変換可能なものが期待されているのに %s でした"
 
-#~ msgid "list is locked"
-#~ msgstr "リストはロックされています"
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "int() かそれへ変換可能なものが期待されているのに %s でした"
 
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "辞書にキー '%s' を追加するのに失敗しました"
+msgid "value is too large to fit into C int type"
+msgstr "C言語の int 型としては値が大き過ぎます"
 
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "インデックスは %s ではなく整数かスライスにしてください"
+msgid "value is too small to fit into C int type"
+msgstr "C言語の int 型としては値が小さ過ぎます"
 
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr ""
-#~ "str() もしくは unicode() のインスタンスが期待されているのに %s でした"
+msgid "number must be greater than zero"
+msgstr "数値は 0 より大きくなければなりません"
 
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "bytes() もしくは str() のインスタンスが期待されているのに %s でした"
+msgid "number must be greater or equal to zero"
+msgstr "数値は 0 かそれ以上でなければなりません"
 
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr "long() かそれへ変換可能なものが期待されているのに %s でした"
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject属性を消せません"
 
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr "int() かそれへ変換可能なものが期待されているのに %s でした"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "無効な属性です: %s"
 
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "C言語の int 型としては値が大き過ぎます"
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: I/Oオブジェクトの初期化エラー"
 
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "C言語の int 型としては値が小さ過ぎます"
+msgid "failed to change directory"
+msgstr "辞書の変更に失敗しました"
 
-#~ msgid "number must be greater then zero"
-#~ msgstr "数値は 0 より大きくなければなりません"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "imp.find_module() が %s を返しました (期待値: 3 要素のタプル)"
 
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "数値は 0 かそれ以上でなければなりません"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "imp.find_module() が %d 要素のタプルを返しました (期待値: 3)"
 
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "OutputObject属性を消せません"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "内部エラー: imp.find_module が NULL を含むタプルを返しました"
 
-#~ msgid "invalid attribute: %s"
-#~ msgstr "無効な属性です: %s"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary属性は消せません"
 
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: I/Oオブジェクトの初期化エラー"
+msgid "cannot modify fixed dictionary"
+msgstr "固定された辞書は変更できません"
 
-#~ msgid "failed to change directory"
-#~ msgstr "辞書の変更に失敗しました"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "属性 %s は設定できません"
 
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "imp.find_module() が %s を返しました (期待値: 2 要素のタプル)"
+msgid "hashtab changed during iteration"
+msgstr "イテレーション中に hashtab が変更されました"
 
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr "impl.find_module() が %d 要素のタプルを返しました (期待値: 2)"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "シーケンスの要素数には 2 が期待されていましたが %d でした"
 
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "内部エラー: imp.find_module が NULL を含むタプルを返しました"
+msgid "list constructor does not accept keyword arguments"
+msgstr "リストのコンストラクタはキーワード引数を受け付けません"
 
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "vim.Dictionary属性は消せません"
+msgid "list index out of range"
+msgstr "リスト範囲外のインデックスです"
 
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "固定された辞書は変更できません"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "内部エラー: vimのリスト要素 %d の取得に失敗しました"
 
-#~ msgid "cannot set attribute %s"
-#~ msgstr "属性 %s は設定できません"
+msgid "slice step cannot be zero"
+msgstr "スライスのステップに 0 は指定できません"
 
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "イテレーション中に hashtab が変更されました"
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr "長さ %d の拡張スライスに、より長いスライスを割り当てようとしました"
 
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr "シーケンスの要素数には 2 が期待されていましたが %d でした"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "内部エラー: vimのリスト要素 %d はありません"
 
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "リストのコンストラクタはキーワード引数を受け付けません"
+msgid "internal error: not enough list items"
+msgstr "内部エラー: リストに十分な要素がありません"
 
-#~ msgid "list index out of range"
-#~ msgstr "リスト範囲外のインデックスです"
+msgid "internal error: failed to add item to list"
+msgstr "内部エラー: リストへの要素追加に失敗しました"
 
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "内部エラー: vimのリスト要素 %d の取得に失敗しました"
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr "長さ %d のスライスを %d の拡張スライスに割り当てようとしました"
 
-#~ msgid "failed to add item to list"
-#~ msgstr "リストへの要素追加に失敗しました"
+msgid "failed to add item to list"
+msgstr "リストへの要素追加に失敗しました"
 
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "内部エラー: vimのリスト要素 %d はありません"
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List 属性は消せません"
 
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "内部エラー: リストへの要素追加に失敗しました"
+msgid "cannot modify fixed list"
+msgstr "固定されたリストは変更できません"
 
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "vim.List 属性は消せません"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "無名関数 %s は存在しません"
 
-#~ msgid "cannot modify fixed list"
-#~ msgstr "固定されたリストは変更できません"
+#, c-format
+msgid "function %s does not exist"
+msgstr "関数 %s がありません"
 
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "無名関数 %s は存在しません"
+#, c-format
+msgid "failed to run function %s"
+msgstr "関数 %s の実行に失敗しました"
 
-#~ msgid "function %s does not exist"
-#~ msgstr "関数 %s がありません"
+msgid "unable to get option value"
+msgstr "オプションの値は取得できません"
 
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "関数のコンストラクタはキーワード引数を受け付けません"
+msgid "internal error: unknown option type"
+msgstr "内部エラー: 未知のオプション型です"
 
-#~ msgid "failed to run function %s"
-#~ msgstr "関数 %s の実行に失敗しました"
+msgid "problem while switching windows"
+msgstr "ウィンドウを切換中に問題が発生しました"
 
-#~ msgid "problem while switching windows"
-#~ msgstr "ウィンドウを切換中に問題が発生しました"
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "グローバルオプション %s の設定解除はできません"
 
-#~ msgid "unable to unset global option %s"
-#~ msgstr "グローバルオプション %s の設定解除はできません"
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "グローバルな値の無いオプション %s の設定解除はできません"
 
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "グローバルな値の無いオプション %s の設定解除はできません"
+msgid "attempt to refer to deleted tab page"
+msgstr "削除されたタブを参照しようとしました"
 
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "削除されたタブを参照しようとしました"
+msgid "no such tab page"
+msgstr "そのようなタブページはありません"
 
-#~ msgid "no such tab page"
-#~ msgstr "そのようなタブページはありません"
+msgid "attempt to refer to deleted window"
+msgstr "削除されたウィンドウを参照しようとしました"
 
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "削除されたウィンドウを参照しようとしました"
+msgid "readonly attribute: buffer"
+msgstr "読込専用属性: バッファー"
 
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "読込専用属性: バッファー"
+msgid "cursor position outside buffer"
+msgstr "カーソル位置がバッファの外側です"
 
-#~ msgid "cursor position outside buffer"
-#~ msgstr "カーソル位置がバッファの外側です"
+msgid "no such window"
+msgstr "そのようなウィンドウはありません"
 
-#~ msgid "no such window"
-#~ msgstr "そのようなウィンドウはありません"
+msgid "attempt to refer to deleted buffer"
+msgstr "削除されたバッファを参照しようとしました"
 
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "削除されたバッファを参照しようとしました"
+msgid "failed to rename buffer"
+msgstr "バッファ名の変更に失敗しました"
 
-#~ msgid "failed to rename buffer"
-#~ msgstr "バッファ名の変更に失敗しました"
+msgid "mark name must be a single character"
+msgstr "マーク名は1文字のアルファベットでなければなりません"
 
-#~ msgid "mark name must be a single character"
-#~ msgstr "マーク名は1文字のアルファベットでなければなりません"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "vim.Bufferオブジェクトが期待されているのに %s でした"
 
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "vim.Bufferオブジェクトが期待されているのに %s でした"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "指定されたバッファ %d への切り替えに失敗しました"
 
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "指定されたバッファ %d への切り替えに失敗しました"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "vim.Windowオブジェクトが期待されているのに %s でした"
 
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "vim.Windowオブジェクトが期待されているのに %s でした"
+msgid "failed to find window in the current tab page"
+msgstr "現在のタブには指定されたウィンドウがありませんでした"
 
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "現在のタブには指定されたウィンドウがありませんでした"
+msgid "did not switch to the specified window"
+msgstr "指定されたウィンドウに切り替えませんでした"
 
-#~ msgid "did not switch to the specified window"
-#~ msgstr "指定されたウィンドウに切り替えませんでした"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "vim.TabPageオブジェクトが期待されているのに %s でした"
 
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "vim.TabPageオブジェクトが期待されているのに %s でした"
+msgid "did not switch to the specified tab page"
+msgstr "指定されたタブページに切り替えませんでした"
 
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "指定されたタブページに切り替えませんでした"
+msgid "failed to run the code"
+msgstr "コードの実行に失敗しました"
 
-#~ msgid "failed to run the code"
-#~ msgstr "コードの実行に失敗しました"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: 式評価は有効なpythonオブジェクトを返しませんでした"
 
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: 式評価は有効なpythonオブジェクトを返しませんでした"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: 返されたpythonオブジェクトをvimの値に変換できませんでした"
 
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: 返されたpythonオブジェクトをvimの値に変換できませんでした"
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "%s vimの辞書型に変換できません"
 
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "%s vimの辞書型に変換できません"
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s をvimのリストに変換できません"
 
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "%s をvimの構造体に変換できません"
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "%s をvimの構造体に変換できません"
 
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "内部エラー: NULL参照が渡されました"
+msgid "internal error: NULL reference passed"
+msgstr "内部エラー: NULL参照が渡されました"
 
-#~ msgid "internal error: invalid value type"
-#~ msgstr "内部エラー: 無効な値型です"
+msgid "internal error: invalid value type"
+msgstr "内部エラー: 無効な値型です"
 
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "パスフックの設定に失敗しました: sys.path_hooks がリストではありません\n"
-#~ "すぐに下記を実施してください:\n"
-#~ "- vim.path_hooks を sys.path_hooks へ追加\n"
-#~ "- vim.VIM_SPECIAL_PATH を sys.path へ追加\n"
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"パスフックの設定に失敗しました: sys.path_hooks がリストではありません\n"
+"すぐに下記を実施してください:\n"
+"- vim.path_hooks を sys.path_hooks へ追加\n"
+"- vim.VIM_SPECIAL_PATH を sys.path へ追加\n"
 
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "パスの設定に失敗しました: sys.path がリストではありません\n"
-#~ "すぐに vim.VIM_SPECIAL_PATH を sys.path に追加してください"
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"パスの設定に失敗しました: sys.path がリストではありません\n"
+"すぐに vim.VIM_SPECIAL_PATH を sys.path に追加してください"