changeset 10306:d75e2380db0e

commit https://github.com/vim/vim/commit/6d5ad4c4118cab5fd96db157621c3aa9af368edb Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 27 17:00:16 2016 +0200 Updated runtime files.
author Christian Brabandt <cb@256bit.org>
date Thu, 27 Oct 2016 17:15:05 +0200
parents cc0b395eaa88
children f4798aebef67
files runtime/doc/todo.txt runtime/keymap/kazakh-jcuken.vim runtime/syntax/c.vim runtime/syntax/sh.vim runtime/syntax/sm.vim runtime/syntax/tags.vim runtime/syntax/tex.vim runtime/syntax/vim.vim src/po/ga.po
diffstat 9 files changed, 1105 insertions(+), 694 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.0.  Last change: 2016 Oct 23
+*todo.txt*      For Vim version 8.0.  Last change: 2016 Oct 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -37,8 +37,6 @@ not be repeated below, unless there is e
 +channel:
 - Check for job cleanup more often?  Patch from Ozaki Kiichi, 2016 Oct 22.
 - Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026)
-- On Windows job_stop() stops cmd.exe, not the commands it runs. (#1184)
-    Patch from Yasuhiro Matsumoto, Oct 21.
 - Add 'cwd' argument to start_job(): directory to change to in the child.
     check for valid directory before forking.
   Part of patch for environment, Yasuhiro Matsumoto, #1160
@@ -103,13 +101,23 @@ Regexp problems:
 json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
 What if there is an invalid character?
 
+Bug: Json with same key should not give internal error. (Lcd, 2016 Oct 26)
+Make dict_add give a duplicate key error.
+
 Should json_encode()/json_decode() restrict recursiveness?
 Or avoid recursiveness.
 
+Allow using json with empty key?  Dict already has it.
+
+Json string with trailing \u should be an error. (Lcd)
+
 Patch to fix conceal mode. (Christian Brabandt, 2016 Oct 23, close #1092)
 
 Patch to reset ex_exitvalue after catch. (Christian Brabandt, 2016 Oct 23)
 
+Patch to deal with changed configure events in GTK 3. (Jan Alexander Steffens,
+2016 Oct 23 #1193)
+
 Wrong diff highlighting with three files. (2016 Oct 20, #1186)
 Also get E749 on exit.
 
@@ -146,6 +154,8 @@ E.g. deepcopy(test_null_list())
 Patch to make it possible to extend a list with itself.
 (Nikolai Pavlov, 2016 Sep 23)
 
+Patch to add Zstandard compressed file support. (Nick Terrell, 2016 Oct 24)
+
 min() and max() spawn lots of error messages if sorted list/dictionary
 contains invalid data (Nikolay Pavlov, 2016 Sep 4, #1039)
 
@@ -184,6 +194,8 @@ cmap using execute() has side effects. (
 
 Patch to change order of compiler flags. (Yousong Zhou, 2016 Sep 19, #1100)
 
+Patch to order results from taglist(). (Duncan McDougall, 2016 Oct 25)
+
 Patch for :pyx, run python commands depending on the supported version.
 (Marc Weber, update from Ken Takata, 2016 Sep 19)
 
new file mode 100644
--- /dev/null
+++ b/runtime/keymap/kazakh-jcuken.vim
@@ -0,0 +1,102 @@
+" Vim Keymap file for kazakh characters, layout 'jcuken', classical variant
+
+" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" Maintainer:   Darkhan Kubigenov <darkhanu@gmail.com>
+" Last Changed: 2016 Oct 25
+
+" All characters are given literally, conversion to another encoding (e.g.,
+" UTF-8) should work.
+scriptencoding utf-8
+
+let b:keymap_name = "kk"
+
+loadkeymap
+~	)	CYRILLIC CAPITAL LETTER IO
+`	(	CYRILLIC SMALL LETTER IO
+F	А	CYRILLIC CAPITAL LETTER A
+<	Б	CYRILLIC CAPITAL LETTER BE
+D	В	CYRILLIC CAPITAL LETTER VE
+U	Г	CYRILLIC CAPITAL LETTER GHE
+L	Д	CYRILLIC CAPITAL LETTER DE
+T	Е	CYRILLIC CAPITAL LETTER IE
+:	Ж	CYRILLIC CAPITAL LETTER ZHE
+P	З	CYRILLIC CAPITAL LETTER ZE
+B	И	CYRILLIC CAPITAL LETTER I
+Q	Й	CYRILLIC CAPITAL LETTER SHORT I
+R	К	CYRILLIC CAPITAL LETTER KA
+K	Л	CYRILLIC CAPITAL LETTER EL
+V	М	CYRILLIC CAPITAL LETTER EM
+Y	Н	CYRILLIC CAPITAL LETTER EN
+J	О	CYRILLIC CAPITAL LETTER O
+G	П	CYRILLIC CAPITAL LETTER PE
+H	Р	CYRILLIC CAPITAL LETTER ER
+C	С	CYRILLIC CAPITAL LETTER ES
+N	Т	CYRILLIC CAPITAL LETTER TE
+E	У	CYRILLIC CAPITAL LETTER U
+A	Ф	CYRILLIC CAPITAL LETTER EF
+{	Х	CYRILLIC CAPITAL LETTER HA
+W	Ц	CYRILLIC CAPITAL LETTER TSE
+X	Ч	CYRILLIC CAPITAL LETTER CHE
+I	Ш	CYRILLIC CAPITAL LETTER SHA
+O	Щ	CYRILLIC CAPITAL LETTER SHCHA
+}	Ъ	CYRILLIC CAPITAL LETTER HARD SIGN
+S	Ы	CYRILLIC CAPITAL LETTER YERU
+M	Ь	CYRILLIC CAPITAL LETTER SOFT SIGN
+\"	Э	CYRILLIC CAPITAL LETTER E
+>	Ю	CYRILLIC CAPITAL LETTER YU
+Z	Я	CYRILLIC CAPITAL LETTER YA
+f	а	CYRILLIC SMALL LETTER A
+,	б	CYRILLIC SMALL LETTER BE
+d	в	CYRILLIC SMALL LETTER VE
+u	г	CYRILLIC SMALL LETTER GHE
+l	д	CYRILLIC SMALL LETTER DE
+t	е	CYRILLIC SMALL LETTER IE
+;	ж	CYRILLIC SMALL LETTER ZHE
+p	з	CYRILLIC SMALL LETTER ZE
+b	и	CYRILLIC SMALL LETTER I
+q	й	CYRILLIC SMALL LETTER SHORT I
+r	к	CYRILLIC SMALL LETTER KA
+k	л	CYRILLIC SMALL LETTER EL
+v	м	CYRILLIC SMALL LETTER EM
+y	н	CYRILLIC SMALL LETTER EN
+j	о	CYRILLIC SMALL LETTER O
+g	п	CYRILLIC SMALL LETTER PE
+h	р	CYRILLIC SMALL LETTER ER
+c	с	CYRILLIC SMALL LETTER ES
+n	т	CYRILLIC SMALL LETTER TE
+e	у	CYRILLIC SMALL LETTER U
+a	ф	CYRILLIC SMALL LETTER EF
+[	х	CYRILLIC SMALL LETTER HA
+w	ц	CYRILLIC SMALL LETTER TSE
+x	ч	CYRILLIC SMALL LETTER CHE
+i	ш	CYRILLIC SMALL LETTER SHA
+o	щ	CYRILLIC SMALL LETTER SHCHA
+]	ъ	CYRILLIC SMALL LETTER HARD SIGN
+s	ы	CYRILLIC SMALL LETTER YERU
+m	ь	CYRILLIC SMALL LETTER SOFT SIGN
+'	э	CYRILLIC SMALL LETTER E
+.	ю	CYRILLIC SMALL LETTER YU
+z	я	CYRILLIC SMALL LETTER YA
+@	Ә	CYRILLIC CAPITAL LETTER SCHWA
+#	І	CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+$	Ң	CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+%	Ғ	CYRILLIC CAPITAL LETTER GHE WITH STROKE
+^	;
+&	:
+*	Ү	CYRILLIC CAPITAL LETTER STRAIGHT U
+(	Ұ	CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+)	Қ	CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+_	Ө	CYRILLIC CAPITAL LETTER BARRED O
++	Һ	CYRILLIC CAPITAL LETTER SHHA
+1	"
+2	ә	CYRILLIC SMALL LETTER SCHWA
+3	і	CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+4	ң	CYRILLIC SMALL LETTER EN WITH DESCENDER
+5	ғ	CYRILLIC SMALL LETTER GHE WITH STROKE
+6	,
+7	.
+8	ү	CYRILLIC SMALL LETTER STRAIGHT U
+9	ұ	CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+0	қ	CYRILLIC SMALL LETTER KA WITH DESCENDER
+-	ө	CYRILLIC SMALL LETTER BARRED O
+=	һ	CYRILLIC SMALL LETTER SHHA
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Jul 07
+" Last Change:	2016 Oct 27
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -358,36 +358,36 @@ if !exists("c_no_c99") " ISO C99
 endif
 
 " Accept %: for # (C99)
-syn region	cPreCondit	start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
-syn match	cPreConditMatch	display "^\s*\(%:\|#\)\s*\(else\|endif\)\>"
+syn region	cPreCondit	start="^\s*\zs\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
+syn match	cPreConditMatch	display "^\s*\zs\(%:\|#\)\s*\(else\|endif\)\>"
 if !exists("c_no_if0")
   syn cluster	cCppOutInGroup	contains=cCppInIf,cCppInElse,cCppInElse2,cCppOutIf,cCppOutIf2,cCppOutElse,cCppInSkip,cCppOutSkip
-  syn region	cCppOutWrapper	start="^\s*\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold
-  syn region	cCppOutIf	contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse
+  syn region	cCppOutWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold
+  syn region	cCppOutIf	contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\zs\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse
   if !exists("c_no_if0_fold")
-    syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold
+    syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold
   else
     syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
   endif
-  syn region	cCppOutElse	contained matchgroup=cCppOutWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit
-  syn region	cCppInWrapper	start="^\s*\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse fold
-  syn region	cCppInIf	contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit
+  syn region	cCppOutElse	contained matchgroup=cCppOutWrapper start="^\s*\zs\(%:\|#\)\s*\(else\|elif\)" end="^\s*\zs\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit
+  syn region	cCppInWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse fold
+  syn region	cCppInIf	contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\zs\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit
   if !exists("c_no_if0_fold")
-    syn region	cCppInElse	contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold
+    syn region	cCppInElse	contained start="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold
   else
-    syn region	cCppInElse	contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2
+    syn region	cCppInElse	contained start="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2
   endif
-  syn region	cCppInElse2	contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
-  syn region	cCppOutSkip	contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip
-  syn region	cCppInSkip	contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc
+  syn region	cCppInElse2	contained matchgroup=cCppInWrapper start="^\s*\zs\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\zs\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
+  syn region	cCppOutSkip	contained start="^\s*\zs\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\zs\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip
+  syn region	cCppInSkip	contained matchgroup=cCppInWrapper start="^\s*\zs\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\zs\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc
 endif
 syn region	cIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
 syn match	cIncluded	display contained "<[^>]*>"
-syn match	cInclude	display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded
+syn match	cInclude	display "^\s*\zs\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded
 "syn match cLineSkip	"\\$"
 syn cluster	cPreProcGroup	contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti,cBadBlock
-syn region	cDefine		start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
-syn region	cPreProc	start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
+syn region	cDefine		start="^\s*\zs\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
+syn region	cPreProc	start="^\s*\zs\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
 
 " Highlight User Labels
 syn cluster	cMultiGroup	contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
@@ -396,21 +396,21 @@ if s:ft ==# 'c' || exists("cpp_no_cpp11"
 endif
 " Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
 syn cluster	cLabelGroup	contains=cUserLabel
-syn match	cUserCont	display "^\s*\I\i*\s*:$" contains=@cLabelGroup
-syn match	cUserCont	display ";\s*\I\i*\s*:$" contains=@cLabelGroup
+syn match	cUserCont	display "^\s*\zs\I\i*\s*:$" contains=@cLabelGroup
+syn match	cUserCont	display ";\s*\zs\I\i*\s*:$" contains=@cLabelGroup
 if s:ft ==# 'cpp'
-  syn match	cUserCont	display "^\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
-  syn match	cUserCont	display ";\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display "^\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display ";\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 else
-  syn match	cUserCont	display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
-  syn match	cUserCont	display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display "^\s*\zs\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display ";\s*\zs\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 endif
 
 syn match	cUserLabel	display "\I\i*" contained
 
 " Avoid recognizing most bitfields as labels
-syn match	cBitField	display "^\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
-syn match	cBitField	display ";\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
+syn match	cBitField	display "^\s*\zs\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
+syn match	cBitField	display ";\s*\zs\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
 
 if exists("c_minlines")
   let b:c_minlines = c_minlines
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " 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 31, 2016
-" Version:		162
+" Last Change:		Sep 22, 2016
+" Version:		165
 " 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)
@@ -170,7 +170,7 @@ if exists("b:is_kornshell") || exists("b
 
  " Touch: {{{1
  " =====
- syn match shTouch	'\<touch\>[^;#]*'	skipwhite nextgroup=shComment contains=shTouchCmd
+ syn match shTouch	'\<touch\>[^;#]*'	skipwhite nextgroup=shComment contains=shTouchCmd,shDoubleQuote,shSingleQuote,shDeref,shDerefSimple
  syn match shTouchCmd	'\<touch\>'		contained
 endif
 
@@ -220,7 +220,7 @@ syn region shSubSh transparent matchgrou
 "=======
 syn region shExpr	matchgroup=shRange start="\[" skip=+\\\\\|\\$\|\[+ end="\]" contains=@shTestList,shSpecial
 syn region shTest	transparent matchgroup=shStatement start="\<test\s" skip=+\\\\\|\\$+ matchgroup=NONE end="[;&|]"me=e-1 end="$" contains=@shExprList1
-syn region shNoQuote	start='\S'	skip='\%(\\\\\)*\\.'	end='\ze\s'	contained
+syn region shNoQuote	start='\S'	skip='\%(\\\\\)*\\.'	end='\ze\s'	contained contains=shDerefSimple,shDeref
 syn match  shAstQuote	contained	'\*\ze"'	nextgroup=shString
 syn match  shTestOpr	contained	'[^-+/%]\zs=' skipwhite nextgroup=shTestDoubleQuote,shTestSingleQuote,shTestPattern
 syn match  shTestOpr	contained	"<=\|>=\|!=\|==\|=\~\|-.\>\|-\(nt\|ot\|ef\|eq\|ne\|lt\|le\|gt\|ge\)\>\|[!<>]"
@@ -355,7 +355,11 @@ syn region  shBkslshDblQuote	contained	m
 " Comments: {{{1
 "==========
 syn cluster	shCommentGroup	contains=shTodo,@Spell
-syn keyword	shTodo	contained		COMBAK FIXME TODO XXX
+if exists("b:is_bash")
+ syn match	shTodo	contained		"\<\%(COMBAK\|FIXME\|TODO\|XXX\)\ze:\=\>"
+else
+ syn keyword	shTodo	contained		COMBAK FIXME TODO XXX
+endif
 syn match	shComment		"^\s*\zs#.*$"	contains=@shCommentGroup
 syn match	shComment		"\s\zs#.*$"	contains=@shCommentGroup
 syn match	shComment	contained	"#.*$"	contains=@shCommentGroup
@@ -381,7 +385,7 @@ ShFoldHereDoc syn region shHereDoc match
 
 " Here Strings: {{{1
 " =============
-" available for: bash; ksh (really should be ksh93 only) but not if it's a posix
+" available for: bash; ksh (really should be ksh93 only) but not if its a posix
 if exists("b:is_bash") || (exists("b:is_kornshell") && !exists("g:is_posix"))
  syn match shHereString "<<<"	skipwhite	nextgroup=shCmdParenRegion
 endif
--- a/runtime/syntax/sm.vim
+++ b/runtime/syntax/sm.vim
@@ -1,10 +1,9 @@
 " Vim syntax file
 " Language:	sendmail
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	7
+" Last Change:	Oct 25, 2016
+" Version:	8
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SM
-
 if exists("b:current_syntax")
   finish
 endif
@@ -62,10 +61,10 @@ 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 smElse	Delimiter
 hi def link smHeader	Statement
 hi def link smHeaderSep	String
-hi def link smMesg		Special
+hi def link smMesg	Special
 hi def link smPrecedence	Number
 hi def link smRewrite	Statement
 hi def link smRewriteComment	Comment
@@ -76,7 +75,6 @@ hi def link smRuleset	Preproc
 hi def link smTrusted	Special
 hi def link smVar		String
 
-
 let b:current_syntax = "sm"
 
 " vim: ts=18
--- 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:	Aug 31, 2016
-" Version:		6
+" Last Change:	Oct 26, 2016
+" Version:		7
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TAGS
 
 " quit when a syntax file was already loaded
@@ -9,27 +9,23 @@ if exists("b:current_syntax")
   finish
 endif
 
-syn match	tagName	"^[^\t]\+"		skipwhite	nextgroup=tagPath
-syn match	tagPath	"[^\t]\+"	contained	skipwhite	nextgroup=tagAddr	contains=tagBaseFile
+syn match	tagName		"^[^\t]\+"	skipwhite	nextgroup=tagPath
+syn match	tagPath		"[^\t]\+"	contained	skipwhite	nextgroup=tagAddr	contains=tagBaseFile
 syn match	tagBaseFile	"[a-zA-Z_]\+[\.a-zA-Z_0-9]*\t"me=e-1		contained
-syn match	tagAddr	"\d*"	contained skipwhite nextgroup=tagComment
-syn region	tagAddr	matchgroup=tagDelim start="/" skip="\(\\\\\)*\\/" matchgroup=tagDelim end="$\|/" oneline contained skipwhite nextgroup=tagComment
-syn match	tagComment	";.*$"	contained contains=tagField
+syn match	tagAddr		"\d*"		contained skipwhite nextgroup=tagComment
+syn region	tagAddr				matchgroup=tagDelim start="/" skip="\(\\\\\)*\\/" matchgroup=tagDelim end="$\|/" oneline contained skipwhite nextgroup=tagComment
+syn match	tagComment	";.*$"		contained contains=tagField
 syn match	tagComment	"^!_TAG_.*$"
-syn match	tagField	contained "[a-z]*:"
+syn match	tagField			contained "[a-z]*:"
 
 " Define the default highlighting.
 if !exists("skip_drchip_tags_inits")
-
-  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
-
+ 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
 endif
 
 let b:current_syntax = "tags"
-
-" vim: ts=12
--- 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:	Aug 31, 2016
-" Version:	100
+" Last Change:	Sep 20, 2016
+" Version:	101
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -160,15 +160,17 @@ syn cluster texBoldGroup		contains=texAc
 syn cluster texItalGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texBeginEnd,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract,texItalStyle,texItalBoldStyle,texNoSpell
 if !s:tex_nospell
  syn cluster texMatchGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,@Spell
+ syn cluster texMatchNMGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,@Spell
  syn cluster texStyleGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texStyleStatement,@Spell,texStyleMatcher
 else
  syn cluster texMatchGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption
+ syn cluster texMatchNMGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption
  syn cluster texStyleGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texStyleStatement,texStyleMatcher
 endif
-syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
+syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
 syn cluster texRefGroup			contains=texMatcher,texComment,texDelimiter
 if !exists("g:tex_no_math")
- syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
+ syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
  syn cluster texMathZones		contains=texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ
  syn cluster texMatchGroup		add=@texMathZones
  syn cluster texMathDelimGroup		contains=texMathDelimBad,texMathDelimKey,texMathDelimSet1,texMathDelimSet2
@@ -199,9 +201,13 @@ if s:tex_fast =~# 'm'
   if !s:tex_no_error
    syn region texMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchGroup,texError
    syn region texMatcher	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchGroup,texError,@NoSpell
+   syn region texMatcherNM	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchNMGroup,texError
+   syn region texMatcherNM	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchNMGroup,texError,@NoSpell
   else
    syn region texMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchGroup
    syn region texMatcher	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchGroup
+   syn region texMatcherNM	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchNMGroup
+   syn region texMatcherNM	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchNMGroup
   endif
   if !s:tex_nospell
    syn region texParen		start="("	end=")"								transparent contains=@texMatchGroup,@Spell
@@ -399,7 +405,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 hi link.
+ "                 "S" appended.  Handles: cluster, syntax, sync, and highlighting.
  fun! TexNewMathZone(sfx,mathzone,starform)
    let grpname  = "texMathZone".a:sfx
    let syncname = "texSyncMathZone".a:sfx
@@ -1262,13 +1268,13 @@ if !exists("skip_tex_syntax_inits")
   if !exists("g:tex_no_error")
    if !exists("g:tex_no_math")
     hi def link texBadMath		texError
-    hi def link texMathDelimBad	texError
+    hi def link texMathDelimBad		texError
     hi def link texMathError		texError
     if !b:tex_stylish
-      hi def link texOnlyMath	texError
+      hi def link texOnlyMath		texError
     endif
    endif
-   hi def link texError		Error
+   hi def link texError			Error
   endif
 
   hi texBoldStyle		gui=bold	cterm=bold
@@ -1277,59 +1283,59 @@ if !exists("skip_tex_syntax_inits")
   hi texItalBoldStyle		gui=bold,italic cterm=bold,italic
   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 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
+  hi def link texLigature	texSpecialChar
   if !exists("g:tex_no_math")
    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 texAccent	texStatement
    hi def link texGreek		texStatement
    hi def link texSuperscript	texStatement
-   hi def link texSubscript		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
+   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
-  hi def link texBeginEnd		texCmdName
+  hi def link texBeginEnd	texCmdName
   hi def link texBeginEndName	texSection
-  hi def link texSpaceCode		texStatement
+  hi def link texSpaceCode	texStatement
   hi def link texStyleStatement	texStatement
-  hi def link texTypeSize		texType
-  hi def link texTypeStyle		texType
+  hi def link texTypeSize	texType
+  hi def link texTypeStyle	texType
 
    " Basic TeX highlighting groups
-  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 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 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 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 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 texSpecialChar	SpecialChar
+  hi def link texStatement	Statement
   hi def link texString		String
   hi def link texTodo		Todo
   hi def link texType		Type
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,9 @@
 " Vim syntax file
-" Language:	Vim 7.4 script
+" Language:	Vim 8.0 script
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	September 06, 2016
-" Version:	7.4-54
+" Last Change:	September 29, 2016
+" Version:	8.0-01
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
 " Automatically generated keyword lists: {{{1
 
 " Quit when a syntax file was already loaded {{{2
@@ -18,12 +19,12 @@ syn keyword vimTodo contained	COMBAK	FIX
 syn cluster vimCommentGroup	contains=vimTodo,@Spell
 
 " regular vim commands {{{2
-syn keyword vimCommand contained	a arga[dd] argu[ment] bad[d] bn[ext] breakd[el] bw[ipeout] cadde[xpr] cc cf[ile] changes cla[st] cnf[ile] comp[iler] cq[uit] cw[indow] delep dell diffg[et] dig[raphs] doau ea el[se] endt[ry] f[ile] fina[lly] foldd[oopen] go[to] ha[rdcopy] hid[e] ij[ump] isp[lit] keepa l[ist] lat lcl[ose] lex[pr] lgetb[uffer] lhi[story] lmapc[lear] loadk lop[en] lt[ag] lvimgrepa[dd] marks mk[exrc] mod[e] nbc[lose] noautocmd nu[mber] opt[ions] pc[lose] popu[p] prof[ile] ptN[ext] ptn[ext] pw[d] pyf[ile] r[ead] redraws[tatus] rew[ind] rubyd[o] sIc sIp san[dbox] sbf[irst] sbr[ewind] sci scs setl[ocal] sgc sgp sie sin sm[agic] sn[ext] sor[t] spellr[epall] srI srl star[tinsert] sts[elect] sv[iew] syncbind tab tabf[ind] tabnew tags tf[irst] tn[ext] ts[elect] undol[ist] up[date] vi[sual] vmapc[lear] wa[ll] winp[os] ws[verb] xmapc[lear] xprop
-syn keyword vimCommand contained	ab argd[elete] as[cii] bd[elete] bo[tright] breakl[ist] cN[ext] caddf[ile] ccl[ose] cfdo chd[ir] cle[arjumps] co[py] con[tinue] cr[ewind] d[elete] deletel delm[arks] diffo[ff] dir dp earlier elsei[f] endw[hile] files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] iuna[bbrev] keepalt la[st] later lcs lf[ile] lgete[xpr] ll lne[xt] loadkeymap lp[revious] lua lw[indow] mat[ch] mks[ession] mz[scheme] nbs[tart] noh[lsearch] o[pen] ownsyntax pe[rl] pp[op] profd[el] pta[g] ptp[revious] py3 python3 rec[over] reg[isters] ri[ght] rubyf[ile] sIe sIr sav[eas] sbl[ast] sc scl scscope sf[ind] sge sgr sig sip sm[ap] sno[magic] sp[lit] spellu[ndo] src srn startg[replace] sun[hide] sw[apname] syntime tabN[ext] tabfir[st] tabo[nly] tc[l] th[row] to[pleft] tu[nmenu] unh[ide] v vie[w] vne[w] wh[ile] wn[ext] wundo xme xunme
-syn keyword vimCommand contained	abc[lear] argdo au bel[owright] bp[revious] bro[wse] cNf[ile] cal[l] cd cfir[st] che[ckpath] clo[se] col[der] conf[irm] cs debug deletep delp diffp[atch] dj[ump] dr[op] ec em[enu] ene[w] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] j[oin] keepj[umps] lad[dexpr] lb[uffer] lcscope lfdo lgr[ep] lla[st] lnew[er] loc[kmarks] lpf[ile] luado m[ove] menut[ranslate] mksp[ell] mzf[ile] new nor ol[dfiles] p[rint] ped[it] pre[serve] promptf[ind] ptf[irst] ptr[ewind] py3do q[uit] red[o] res[ize] rightb[elow] rundo sIg sN[ext] sbN[ext] sbm[odified] scI scp se[t] sfir[st] sgi sh[ell] sign sir sme snoreme spe[llgood] spellw[rong] sre[wind] srp startr[eplace] sunme sy t tabc[lose] tabl[ast] tabp[revious] tcld[o] tj[ump] tp[revious] u[ndo] unl ve[rsion] vim[grep] vs[plit] win[size] wp[revious] wv[iminfo] xmenu xunmenu
-syn keyword vimCommand contained	abo[veleft] arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] cat[ch] cdo cg[etfile] checkt[ime] cmapc[lear] colo[rscheme] cope[n] cscope debugg[reedy] deletl dep diffpu[t] dl ds[earch] echoe[rr] en[dif] ex filetype fix[del] for gui helpg[rep] ia in ju[mps] keepp[atterns] laddb[uffer] lbo[ttom] ld[o] lfir[st] lgrepa[dd] lli[st] lnf[ile] lockv[ar] lr[ewind] luafile ma[rk] mes mkv[imrc] n[ext] nmapc[lear] nore omapc[lear] pa[ckadd] perld[o] prev[ious] promptr[epl] ptj[ump] pts[elect] py[thon] qa[ll] redi[r] ret[ab] ru[ntime] rv[iminfo] sIl sa[rgument] sb[uffer] sbn[ext] sce scr[iptnames] setf[iletype] sg sgl si sil[ent] sl[eep] smenu snoremenu spelld[ump] spr[evious] srg st[op] stj[ump] sunmenu syn tN[ext] tabd[o] tabm[ove] tabr[ewind] tclf[ile] tl[ast] tr[ewind] una[bbreviate] unlo[ckvar] verb[ose] vimgrepa[dd] wN[ext] winc[md] wq x[it] xnoreme xwininfo
-syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers cabc[lear] cb[uffer] ce[nter] cgetb[uffer] chi[story] cn[ext] com cp[revious] cstag delc[ommand] deletp di[splay] diffs[plit] dli[st] dsp[lit] echom[sg] endf[unction] exi[t] filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] intro k lN[ext] laddf[ile] lc[d] le[ft] lg[etfile] lh[elpgrep] lmak[e] lo[adview] lol[der] ls lv[imgrep] mak[e] messages mkvie[w] nb[key] noa nos[wapfile] on[ly] packl[oadall] po[p] pro ps[earch] ptl[ast] pu[t] pydo quita[ll] redr[aw] retu[rn] rub[y] sI sIn sal[l] sba[ll] sbp[revious] scg scripte[ncoding] setg[lobal] sgI sgn sic sim[alt] sla[st] smile so[urce] spelli[nfo] sr sri sta[g] stopi[nsert] sus[pend] sync ta[g] tabe[dit] tabn[ext] tabs te[aroff] tm[enu] try undoj[oin] uns[ilent] vert[ical] viu[sage] w[rite] windo wqa[ll] xa[ll] xnoremenu y[ank]
-syn keyword vimCommand contained	ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cad[dbuffer] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cnew[er] comc[lear] cpf[ile] cuna[bbrev] delel delf[unction] dif[fupdate] difft[his] do e[dit] echon endfo[r] exu[sage] fin[d] foldc[lose] g h[elp] hi if is[earch] kee[pmarks] lNf[ile] lan[guage] lch[dir] lefta[bove] 
+syn keyword vimCommand contained	a argd[elete] as[cii] bd[elete] bo[tright] breakl[ist] cN[ext] caddf[ile] ccl[ose] cfdo chd[ir] cle[arjumps] co[py] con[tinue] cr[ewind] d[elete] deletel delm[arks] diffo[ff] dir dp earlier em[enu] ene[w] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i in ju[mps] keepp[atterns] lad[dexpr] later lcl[ose] lefta[bove] lg[etfile] lh[elpgrep] lmak[e] lo[adview] lol[der] ls lv[imgrep] mak[e] messages mkvie[w] nb[key] noa nos[wapfile] on[ly] packl[oadall] po[p] pro ps[earch] ptl[ast] pu[t] pydo quita[ll] redr[aw] retu[rn] rub[y] sI sIn sal[l] sba[ll] sbp[revious] scg scripte[ncoding] setg[lobal] sgI sgn sic sim[alt] sla[st] smile so[urce] spelli[nfo] sr sri sta[g] stopi[nsert] sus[pend] sync ta[g] tabe[dit] tabn[ext] tabs te[aroff] tm[enu] try undoj[oin] up[date] vi[sual] vmapc[lear] wa[ll] winp[os] ws[verb] xmapc[lear] xprop
+syn keyword vimCommand contained	abc[lear] argdo au bel[owright] bp[revious] bro[wse] cNf[ile] cal[l] cd cfir[st] che[ckpath] clo[se] col[der] conf[irm] cs debug deletep delp diffp[atch] dj[ump] dr[op] echoe[rr] en[dif] ex filetype fix[del] for gui helpg[rep] iabc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcs lex[pr] lgetb[uffer] lhi[story] lmapc[lear] loadk lop[en] lt[ag] lvimgrepa[dd] marks mk[exrc] mod[e] nbc[lose] noautocmd nu[mber] opt[ions] pc[lose] popu[p] prof[ile] ptN[ext] ptn[ext] pw[d] pyf[ile] r[ead] redraws[tatus] rew[ind] rubyd[o] sIc sIp san[dbox] sbf[irst] sbr[ewind] sci scs setl[ocal] sgc sgp sie sin sm[agic] sn[ext] sor[t] spellr[epall] srI srl star[tinsert] sts[elect] sv[iew] syncbind tab tabf[ind] tabnew tags tf[irst] tn[ext] ts[elect] undol[ist] v vie[w] vne[w] wh[ile] wn[ext] wundo xme xunme
+syn keyword vimCommand contained	abo[veleft] arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] cat[ch] cdo cg[etfile] checkt[ime] cmapc[lear] colo[rscheme] cope[n] cscope debugg[reedy] deletl dep diffpu[t] dl ds[earch] echom[sg] endf[unction] exi[t] filt[er] fo[ld] fu[nction] gvim helpt[ags] if is[earch] kee[pmarks] lNf[ile] laddf[ile] lbo[ttom] lcscope lf[ile] lgete[xpr] ll lne[xt] loadkeymap lp[revious] lua lw[indow] mat[ch] mks[ession] mz[scheme] nbs[tart] noh[lsearch] o[pen] ownsyntax pe[rl] pp[op] profd[el] pta[g] ptp[revious] py3 python3 rec[over] reg[isters] ri[ght] rubyf[ile] sIe sIr sav[eas] sbl[ast] sc scl scscope sf[ind] sge sgr sig sip sm[ap] sno[magic] sp[lit] spellu[ndo] src srn startg[replace] sun[hide] sw[apname] syntime tabN[ext] tabfir[st] tabo[nly] tc[l] th[row] to[pleft] tu[nmenu] unh[ide] ve[rsion] vim[grep] vs[plit] win[size] wp[revious] wv[iminfo] xmenu xunmenu
+syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers cabc[lear] cb[uffer] ce[nter] cgetb[uffer] chi[story] cn[ext] com cp[revious] cstag delc[ommand] deletp di[splay] diffs[plit] dli[st] dsp[lit] echon endfo[r] exu[sage] fin[d] foldc[lose] g h[elp] hi ij[ump] isp[lit] keepa l[ist] lan[guage] lc[d] ld[o] lfdo lgr[ep] lla[st] lnew[er] loc[kmarks] lpf[ile] luado m[ove] menut[ranslate] mksp[ell] mzf[ile] new nor ol[dfiles] p[rint] ped[it] pre[serve] promptf[ind] ptf[irst] ptr[ewind] py3do q[uit] red[o] res[ize] rightb[elow] rundo sIg sN[ext] sbN[ext] sbm[odified] scI scp se[t] sfir[st] sgi sh[ell] sign sir sme snoreme spe[llgood] spellw[rong] sre[wind] srp startr[eplace] sunme sy t tabc[lose] tabl[ast] tabp[revious] tcld[o] tj[ump] tp[revious] u[ndo] unlo[ckvar] verb[ose] vimgrepa[dd] wN[ext] winc[md] wq x[it] xnoreme xwininfo
+syn keyword vimCommand contained	ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cad[dbuffer] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cnew[er] comc[lear] cpf[ile] cuna[bbrev] delel delf[unction] dif[fupdate] difft[his] do e[dit] el[se] endt[ry] f[ile] fina[lly] foldd[oopen] go[to] ha[rdcopy] hid[e] il[ist] iuna[bbrev] keepalt la[st] lat lch[dir] le[ft] lfir[st] lgrepa[dd] lli[st] lnf[ile] lockv[ar] lr[ewind] luafile ma[rk] mes mkv[imrc] n[ext] nmapc[lear] nore omapc[lear] pa[ckadd] perld[o] prev[ious] promptr[epl] ptj[ump] pts[elect] py[thon] qa[ll] redi[r] ret[ab] ru[ntime] rv[iminfo] sIl sa[rgument] sb[uffer] sbn[ext] sce scr[iptnames] setf[iletype] sg sgl si sil[ent] sl[eep] smenu snoremenu spelld[ump] spr[evious] srg st[op] stj[ump] sunmenu syn tN[ext] tabd[o] tabm[ove] tabr[ewind] tclf[ile] tl[ast] tr[ewind] una[bbreviate] uns[ilent] vert[ical] viu[sage] w[rite] windo wqa[ll] xa[ll] xnoremenu y[ank]
+syn keyword vimCommand contained	arga[dd] argu[ment] bad[d] bn[ext] breakd[el] bw[ipeout] cadde[xpr] cc cf[ile] changes cla[st] cnf[ile] comp[iler] cq[uit] cw[indow] delep dell diffg[et] dig[raphs] doau ea elsei[f] endw[hile] files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] imapc[lear] j[oin] keepj[umps] 
 syn match   vimCommand contained	"\<z[-+^.=]\=\>"
 syn keyword vimStdPlugin contained	DiffOrig Man N[ext] P[rint] S TOhtml XMLent XMLns 
 
@@ -48,15 +49,15 @@ syn keyword vimOption contained	invai in
 syn keyword vimOption contained	invakm invanti invarab invari invautoindent invautowriteall invbackup invbin invbl invbri invci invcompatible invcp invcscopetag invcst invcul invcursorline invdg invea invedcompatible invemoji invequalalways invet invexrc invfileignorecase invfk invfs invgdefault invhidden invhkmapp invhlsearch invignorecase invimcmdline invincsearch invinsertmode invjs 
 
 " termcap codes (which can also be set) {{{2
-syn keyword vimOption contained	t_8b t_AB t_al t_bc t_ce t_cl t_Co t_Cs t_CV t_db t_DL t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_fs t_IE t_IS t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_ke t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RB t_RI t_RV t_Sb t_se t_Sf t_SI t_so t_sr t_SR t_te t_ti t_ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_WP t_WS t_xn t_xs t_ZH t_ZR
-syn keyword vimOption contained	t_8f t_AF t_AL t_cd t_Ce t_cm t_cs t_CS t_da t_dl t_EI 
-syn match   vimOption contained	"t_%1"
+syn keyword vimOption contained	t_8b t_AB t_AL t_CV t_Co t_DL t_F1 t_F3 t_F5 t_F7 t_F9 t_IS t_K1 t_K3 t_K4 t_K5 t_K6 t_K7 t_K8 t_K9 t_KA t_KB t_KC t_KD t_KE t_KF t_KG t_KH t_KI t_KJ t_KK t_KL t_RB t_RI t_RV t_SI t_SR t_Sb t_Sf t_WP t_WS t_ZH t_ZR t_al t_bc t_cd t_ce t_cl t_cm t_cs t_da t_db t_dl t_fs t_k1 t_k2 t_k3 t_k4 t_k5 t_k6 t_k7 t_k8 t_k9 t_kB t_kD t_kI t_kN t_kP t_kb t_kd t_ke t_kh t_kl t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_se t_so t_sr t_te t_ti t_ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_xn t_xs
+syn keyword vimOption contained	t_8f t_AF t_CS t_Ce t_Cs t_EI t_F2 t_F4 t_F6 t_F8 t_IE 
 syn match   vimOption contained	"t_#2"
 syn match   vimOption contained	"t_#4"
-syn match   vimOption contained	"t_@7"
+syn match   vimOption contained	"t_%1"
+syn match   vimOption contained	"t_%i"
+syn match   vimOption contained	"t_&8"
 syn match   vimOption contained	"t_*7"
-syn match   vimOption contained	"t_&8"
-syn match   vimOption contained	"t_%i"
+syn match   vimOption contained	"t_@7"
 syn match   vimOption contained	"t_k;"
 
 " unsupported settings: some were supported by vi but don't do anything in vim {{{2
@@ -76,10 +77,10 @@ syn match vimHLGroup contained	"Conceal"
 syn case match
 
 " Function Names {{{2
-syn keyword vimFuncName contained	abs append argv assert_fails assert_notequal atan2 buflisted bufwinid byteidxcomp char2nr ch_evalraw ch_log ch_readraw ch_status complete copy cscope_connection did_filetype escape execute expand filewritable float2nr fnamemodify foldtext function getbufline getcharsearch getcmdwintype getfontname getftype getpid getregtype getwininfo glob has_key histdel hlID index inputrestore invert items job_start js_decode json_encode libcall line2byte log map match matcharg matchlist max mode nr2char perleval printf pyeval reltime remote_expr remote_read rename reverse screenchar search searchpairpos serverlist setcmdpos setloclist setqflist settabwinvar shellescape sin soundfold split str2nr strdisplaywidth stridx strpart strwidth synconcealed synIDtrans systemlist tabpagewinnr tan test_alloc_fail test_garbagecollect_now test_null_job test_null_string timer_pause timer_stopall tr undofile values wildmenumode win_findbuf winheight winline winrestview wordcount
-syn keyword vimFuncName contained	acos argc asin assert_false assert_notmatch browse bufloaded bufwinnr call ch_close ch_getbufnr ch_logfile ch_sendexpr cindent complete_add cos cursor diff_filler eval exepath extend filter floor foldclosed foldtextresult garbagecollect getbufvar getcmdline getcompletion getfperm getline getpos gettabinfo getwinposx glob2regpat haslocaldir histget hostname input inputsave isdirectory job_getchannel job_status js_encode keys libcallnr lispindent log10 maparg matchadd matchdelete matchstr min mzeval or pow pumvisible range reltimefloat remote_foreground remote_send repeat round screencol searchdecl searchpos setbufvar setfperm setmatches setreg setwinvar shiftwidth sinh spellbadword sqrt strcharpart strftime string strridx submatch synID synstack tabpagebuflist tagfiles tanh test_autochdir test_null_channel test_null_list test_settime timer_start tolower trunc undotree virtcol winbufnr win_getid win_id2tabwin winnr winsaveview writefile
-syn keyword vimFuncName contained	add argidx assert_equal assert_inrange assert_true browsedir bufname byte2line ceil ch_close_in ch_getjob ch_open ch_sendraw clearmatches complete_check cosh deepcopy diff_hlID eventhandler exists feedkeys finddir fmod foldclosedend foreground get getchar getcmdpos getcurpos getfsize getloclist getqflist gettabvar getwinposy globpath hasmapto histnr iconv inputdialog inputsecret islocked job_info job_stop json_decode len line localtime luaeval mapcheck matchaddpos matchend matchstrpos mkdir nextnonblank pathshorten prevnonblank py3eval readfile reltimestr remote_peek remove resolve screenattr screenrow searchpair server2client setcharsearch setline setpos settabvar sha256 simplify sort spellsuggest str2float strchars strgetchar strlen strtrans substitute synIDattr system tabpagenr taglist tempname test_disable_char_avail test_null_dict test_null_partial timer_info timer_stop toupper type uniq visualmode wincol win_gotoid win_id2win winrestcmd winwidth xor
-syn keyword vimFuncName contained	and arglistid assert_exception assert_match atan bufexists bufnr byteidx changenr ch_evalexpr ch_info ch_read ch_setoptions col confirm count delete empty executable exp filereadable findfile fnameescape foldlevel funcref getbufinfo getcharmod getcmdtype getcwd getftime getmatches getreg gettabwinvar getwinvar has histadd hlexists indent inputlist insert isnan job_setoptions join 
+syn keyword vimFuncName contained	abs append argv assert_fails assert_notequal atan2 buflisted bufwinid byteidxcomp ch_close_in ch_getjob ch_open ch_sendraw char2nr complete copy cscope_connection did_filetype escape execute expand filewritable float2nr fnamemodify foldtext function getbufline getcharsearch getcmdwintype getfontname getftype getpid getregtype getwininfo glob has_key histdel hlexists index inputrestore invert items job_start js_decode json_encode libcall line2byte log map match matcharg matchlist max mode nr2char perleval printf pyeval reltime remote_expr remote_read rename reverse screenchar search searchpairpos serverlist setcmdpos setloclist setqflist settabwinvar shellescape sin soundfold split str2nr strdisplaywidth stridx strpart strwidth synID synconcealed systemlist tabpagewinnr tan test_alloc_fail test_garbagecollect_now test_null_job test_null_string timer_pause timer_stopall tr undofile values wildmenumode win_gotoid winbufnr winline winrestview wordcount
+syn keyword vimFuncName contained	acos argc asin assert_false assert_notmatch browse bufloaded bufwinnr call ch_evalexpr ch_info ch_read ch_setoptions cindent complete_add cos cursor diff_filler eval exepath extend filter floor foldclosed foldtextresult garbagecollect getbufvar getcmdline getcompletion getfperm getline getpos gettabinfo getwinposx glob2regpat haslocaldir histget hostname input inputsave isdirectory job_getchannel job_status js_encode keys libcallnr lispindent log10 maparg matchadd matchdelete matchstr min mzeval or pow pumvisible range reltimefloat remote_foreground remote_send repeat round screencol searchdecl searchpos setbufvar setfperm setmatches setreg setwinvar shiftwidth sinh spellbadword sqrt strcharpart strftime string strridx submatch synIDattr synstack tabpagebuflist tagfiles tanh test_autochdir test_null_channel test_null_list test_settime timer_start tolower trunc undotree virtcol win_findbuf win_id2tabwin wincol winnr winsaveview writefile
+syn keyword vimFuncName contained	add argidx assert_equal assert_inrange assert_true browsedir bufname byte2line ceil ch_evalraw ch_log ch_readraw ch_status clearmatches complete_check cosh deepcopy diff_hlID eventhandler exists feedkeys finddir fmod foldclosedend foreground get getchar getcmdpos getcurpos getfsize getloclist getqflist gettabvar getwinposy globpath hasmapto histnr iconv inputdialog inputsecret islocked job_info job_stop json_decode len line localtime luaeval mapcheck matchaddpos matchend matchstrpos mkdir nextnonblank pathshorten prevnonblank py3eval readfile reltimestr remote_peek remove resolve screenattr screenrow searchpair server2client setcharsearch setline setpos settabvar sha256 simplify sort spellsuggest str2float strchars strgetchar strlen strtrans substitute synIDtrans system tabpagenr taglist tempname test_disable_char_avail test_null_dict test_null_partial timer_info timer_stop toupper type uniq visualmode win_getid win_id2win winheight winrestcmd winwidth xor
+syn keyword vimFuncName contained	and arglistid assert_exception assert_match atan bufexists bufnr byteidx ch_close ch_getbufnr ch_logfile ch_sendexpr changenr col confirm count delete empty executable exp filereadable findfile fnameescape foldlevel funcref getbufinfo getcharmod getcmdtype getcwd getftime getmatches getreg gettabwinvar getwinvar has histadd hlID indent inputlist insert isnan job_setoptions join 
 
 "--- syntax here and above generated by mkvimvim ---
 " Special Vim Highlighting (not automatic) {{{1
@@ -498,7 +499,7 @@ syn cluster vimFuncBodyList add=vimSynTy
 syn cluster	vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation
 syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
 syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
-syn match	vimSynMtchOpt	contained	"\<\(conceal\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
+syn match	vimSynMtchOpt	contained	"\<\(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
 if has("conceal")
  syn match	vimSynMtchOpt	contained	"\<cchar="	nextgroup=vimSynMtchCchar
  syn match	vimSynMtchCchar	contained	"\S"
--- a/src/po/ga.po
+++ b/src/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-10 22:25-0500\n"
+"POT-Creation-Date: 2016-10-25 09:31-0500\n"
 "PO-Revision-Date: 2010-04-14 10:01-0500\n"
 "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -14,6 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :"
+"(n>6 && n<11) ? 3 : 4;\n"
 
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: cuireadh glaoch ar bf_key_init() le focal faire folamh"
@@ -34,7 +36,7 @@ msgid "[Location List]"
 msgstr "[Liosta Suomh]"
 
 msgid "[Quickfix List]"
-msgstr "[Liosta Ceartchn Tapa]"
+msgstr "[Liosta Mearcheartchn]"
 
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: Tobscoireadh an t-ord mar gheall ar uathorduithe"
@@ -45,6 +47,12 @@ msgstr "E82: N fidir maoln a dhileadh, ag scor..."
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: N fidir maoln a dhileadh, ag sid cinn eile..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: N fidir an maoln a chlr"
+
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: Iarracht ar mhaoln in sid a scriosadh"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: N raibh aon mhaoln dluchtaithe"
 
@@ -196,6 +204,56 @@ msgstr "Comhartha do %s:"
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    lne=%ld  id=%d  ainm=%s"
 
+msgid "E902: Cannot connect to port"
+msgstr "E902: N fidir ceangal leis an bport"
+
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: gethostbyname() in channel_open()"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: socket() in channel_open()"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: fuarthas ord le hargint nach bhfuil ina theaghrn"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: n mr don argint dheireanach ar expr/call a bheith ina huimhir"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: Caithfidh an tr argint a bheith ina liosta"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: fuarthas ord anaithnid: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): scrobh gan ceangal a bheith ann"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): theip ar scrobh"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: N fidir aisghlaoch a sid le %s()"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: n fidir ch_evalexpr()/ch_sendexpr() a sid le cainal raw n nl"
+
+msgid "E906: not an open channel"
+msgstr "E906: n cainal oscailte "
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: caithfear _name a shocr chun comhad _io a sid"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: caithfear in_buf n in_name a shocr chun maoln in_io a sid"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: n mr an maoln a lucht: %s"
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: Comhad criptithe le modh anaithnid"
 
@@ -215,7 +273,30 @@ msgid "[crypted]"
 msgstr "[criptithe]"
 
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Idirstad ar iarraidh i bhFoclir: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Eochair dhblach i bhFoclir: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Camg ar iarraidh i bhFoclir: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: '}' ar iarraidh ag deireadh foclra: %s"
+
+msgid "extend() argument"
+msgstr "argint extend()"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: T eochair ann cheana: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
 msgstr "E96: N fidir diff a dhanamh ar nos m n %ld maoln"
 
 msgid "E810: Cannot read or write temp files"
@@ -372,55 +453,17 @@ msgstr "comhoirin %d as %d"
 msgid "match %d"
 msgstr "comhoirin %d"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Carachtair gan choinne i :let"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: innacs liosta as raon: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Athrg gan sainmhni: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: `]' ar iarraidh"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Caithfidh argint de %s a bheith ina Liosta"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: Caithfidh argint de %s a bheith ina Liosta n Foclir"
-
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: N fidir eochair fholamh a sid le Foclir"
-
-msgid "E714: List required"
-msgstr "E714: T g le liosta"
-
-msgid "E715: Dictionary required"
-msgstr "E715: T g le foclir"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: An iomarca argint d'fheidhm: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Nl an eochair seo san Fhoclir: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: T feidhm %s ann cheana, cuir ! leis an ord chun  a asiti"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: T an iontril foclra seo ann cheana"
-
-msgid "E718: Funcref required"
-msgstr "E718: T g le Funcref"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: N fidir [:] a sid le foclir"
 
@@ -429,10 +472,6 @@ msgid "E734: Wrong variable type for %s=
 msgstr "E734: Cinel mcheart athrige le haghaidh %s="
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: Feidhm anaithnid: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Ainm athrige neamhcheadaithe: %s"
 
@@ -471,10 +510,6 @@ msgid "E690: Missing \"in\" after :for"
 msgstr "E690: \"in\" ar iarraidh i ndiaidh :for"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Libn ar iarraidh: %s"
-
-#, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Nl a leithid d'athrg: \"%s\""
 
@@ -496,9 +531,6 @@ msgstr "E735: Is fidir Foclir a chur i gcomparid le Foclir eile amhin"
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Oibrocht neamhbhail ar Fhoclir"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Is fidir Funcref a chur i gcomparid le Funcref eile amhin"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Oibrocht neamhbhail ar Funcref"
 
@@ -511,6 +543,9 @@ msgstr "E110: ')' ar iarraidh"
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: N fidir Funcref a innacs"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: N fidir athrg speisialta a innacs"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: Ainm rogha ar iarraidh: %s"
@@ -527,59 +562,116 @@ msgstr "E114: Comhartha athfhriotail ar 
 msgid "E115: Missing quote: %s"
 msgstr "E115: Comhartha athfhriotail ar iarraidh: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: Camg ar iarraidh i Liosta: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: ']' ar iarraidh ag deireadh liosta: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
-msgstr "Nl go leor cuimhne ann le tagairt a shocr; baili dramhaola  thobscor!"
-
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Idirstad ar iarraidh i bhFoclir: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Eochair dhblach i bhFoclir: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Camg ar iarraidh i bhFoclir: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: '}' ar iarraidh ag deireadh foclra: %s"
+msgstr ""
+"Nl go leor cuimhne ann le tagairt a shocr; baili dramhaola  thobscor!"
 
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: athrg neadaithe rdhomhain chun  a thaispeint"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: An iomarca argint d'fheidhm %s"
-
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: Argint neamhbhail d'fheidhm %s"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Feidhm anaithnid: %s"
-
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: Nl go leor feidhmeanna d'fheidhm: %s"
-
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID>  sid ach gan a bheith i gcomhthacs scripte: %s"
-
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Feidhm 'dict'  ghlao gan Foclir: %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: Snmhphointe  sid mar Uimhir"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: Funcref  sid mar Uimhir"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: Liosta  sid mar Uimhir"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: Foclir  sid mar Uimhir"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: Jab  sid mar Uimhir"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: Cainal  sid mar Uimhir"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Funcref  sid mar Shnmhphointe"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: Teaghrn  sid mar Shnmhphointe"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Liosta  sid mar Shnmhphointe"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Foclir  sid mar Shnmhphointe"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: Luach speisialta  sid mar Shnmhphointe"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: Jab  sid mar Shnmhphointe"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: Cainal  sid mar Shnmhphointe"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: Funcref  sid mar Theaghrn"
+
+msgid "E730: using List as a String"
+msgstr "E730: Liosta  sid mar Theaghrn"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: Foclir  sid mar Theaghrn"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: luach neamhbhail  sid mar Theaghrn"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: N fidir athrg %s a scriosadh"
+
+#, c-format
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Caithfidh ceannlitir a bheith ar dts ainm Funcref: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Tagann ainm athrige salach ar fheidhm at ann cheana: %s"
+
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: T an luach faoi ghlas: %s"
+
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#, c-format
+msgid "E742: Cannot change value of %s"
+msgstr "E742: N fidir an luach de %s a athr"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: athrg neadaithe rdhomhain chun  a chipeil"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# athrga comhchoiteanna:\n"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tSocraithe is dana  "
+
+msgid "map() argument"
+msgstr "argint map()"
+
+msgid "filter() argument"
+msgstr "argint filter()"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: Caithfidh argint de %s a bheith ina Liosta"
+
+msgid "E928: String required"
+msgstr "E928: Teaghrn de dhth"
 
 msgid "E808: Number or Float required"
 msgstr "E808: Uimhir n Snmhphointe de dhth"
@@ -587,9 +679,6 @@ msgstr "E808: Uimhir n Snmhphointe de dhth"
 msgid "add() argument"
 msgstr "argint add()"
 
-msgid "E699: Too many arguments"
-msgstr "E699: An iomarca argint"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: is fidir complete() a sid sa mhd Ionsite amhin"
 
@@ -602,26 +691,24 @@ msgid "&Ok"
 msgstr "&Ok"
 
 #, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: T eochair ann cheana: %s"
-
-msgid "extend() argument"
-msgstr "argint extend()"
-
-msgid "map() argument"
-msgstr "argint map()"
-
-msgid "filter() argument"
-msgstr "argint filter()"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld lne: "
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld lne: "
+msgstr[1] "+-%s%3ld lne: "
+msgstr[2] "+-%s%3ld lne: "
+msgstr[3] "+-%s%3ld lne: "
+msgstr[4] "+-%s%3ld lne: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Feidhm anaithnid: %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: bhothas ag sil le foclir"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: Caithfidh an dara hargint de function() a bheith ina liosta n ina foclir"
+
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -638,9 +725,16 @@ msgstr "argint insert()"
 msgid "E786: Range not allowed"
 msgstr "E786: N cheadatear an raon"
 
+msgid "E916: not a valid job"
+msgstr "E916: n jab bail "
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: Cinel neamhbhail le haghaidh len()"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: Aitheantas in irithe do \":match\": %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: Is nialas  an chim"
 
@@ -672,6 +766,10 @@ msgstr "argint reverse()"
 msgid "E258: Unable to send to client"
 msgstr "E258: N fidir aon rud a sheoladh chuig an chliant"
 
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: Gnomh neamhbhail: '%s'"
+
 msgid "sort() argument"
 msgstr "argint sort()"
 
@@ -687,154 +785,15 @@ msgstr "E882: Theip ar fheidhm chomparide Uniq"
 msgid "(Invalid)"
 msgstr "(Neamhbhail)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: uimhir fho-mheaitsela neamhbhail: %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: Earrid agus comhad sealadach  scrobh"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Snmhphointe  sid mar Uimhir"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Funcref  sid mar Uimhir"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: Liosta  sid mar Uimhir"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Foclir  sid mar Uimhir"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: Funcref  sid mar Theaghrn"
-
-msgid "E730: using List as a String"
-msgstr "E730: Liosta  sid mar Theaghrn"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: Foclir  sid mar Theaghrn"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Mmheaitseil idir cinelacha athrige: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: N fidir athrg %s a scriosadh"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Caithfidh ceannlitir a bheith ar dts ainm Funcref: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Tagann ainm athrige salach ar fheidhm at ann cheana: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: T an luach faoi ghlas: %s"
-
-msgid "Unknown"
-msgstr "Anaithnid"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: N fidir an luach de %s a athr"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: athrg neadaithe rdhomhain chun  a chipeil"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Feidhm gan sainmhni: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ar iarraidh: %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: N fidir g: a sid anseo"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: Argint neamhcheadaithe: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: Argint dhbailte: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ar iarraidh"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: Tagann ainm na feidhme salach ar athrg: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr ""
-"E127: N fidir sainmhni nua a dhanamh ar fheidhm %s: In sid cheana"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr ""
-"E746: Nl ainm na feidhme comhoirinach le hainm comhaid na scripte: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: T g le hainm feidhme"
-
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: Caithfidh ceannlitir a bheith ar dts ainm feidhme, n \"s:\": %s"
-
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: N cheadatear idirstad in ainm feidhme: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: N fidir feidhm %s a scriosadh: T s in sid faoi lthair"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: Doimhneacht na nglaonna nos m n 'maxfuncdepth'"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s  glao"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s tobscortha"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%s ag aisfhilleadh #%ld"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s ag aisfhilleadh %s"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "ag leanint i %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: Caithfidh :return a bheith isteach i bhfeidhm"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# athrga comhchoiteanna:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tSocraithe is dana  "
-
-msgid "No old files"
-msgstr "Gan seanchomhaid"
+msgid "E921: Invalid callback argument"
+msgstr "E921: Argint neamhbhail ar aisghlaoch"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -899,6 +858,10 @@ msgid "E137: Viminfo file is not writabl
 msgstr "E137: Nl an comhad Viminfo inscrofa: %s"
 
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: An iomarca comhad sealadach viminfo, mar shampla %s!"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: N fidir comhad viminfo %s a scrobh!"
 
@@ -928,6 +891,13 @@ msgstr "# Luach 'encoding' agus an comhad seo  scrobh\n"
 msgid "Illegal starting char"
 msgstr "Carachtar neamhcheadaithe tosaigh"
 
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Barralnte, cipeilte focal ar fhocal:\n"
+
 msgid "Save As"
 msgstr "Sbhil Mar"
 
@@ -1063,8 +1033,8 @@ msgid "Sorry, help file \"%s\" not found
 msgstr "T brn orm, comhad cabhrach \"%s\" gan aimsi"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: N comhadlann : %s"
+msgid "E151: No match: %s"
+msgstr "E151: Gan meaitseil: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1083,6 +1053,10 @@ msgid "E154: Duplicate tag \"%s\" in fil
 msgstr "E154: Clib dhblach \"%s\" i gcomhad %s/%s"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: N comhadlann : %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Ord anaithnid comhartha: %s"
 
@@ -1107,6 +1081,9 @@ msgstr "E159: Uimhir chomhartha ar iarra
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Ainm maolin neamhbhail: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: N fidir lim go maoln gan ainm"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ID neamhbhail comhartha: %ld"
@@ -1124,6 +1101,9 @@ msgstr " (nl an rogha seo ar fil)"
 msgid "[Deleted]"
 msgstr "[Scriosta]"
 
+msgid "No old files"
+msgstr "Gan seanchomhaid"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Md dfhabhtaithe  thos.  Clscrobh \"cont\" chun leanint."
 
@@ -1135,6 +1115,13 @@ msgstr "lne %ld: %s"
 msgid "cmd: %s"
 msgstr "ord: %s"
 
+msgid "frame is zero"
+msgstr "is nialas  an frma"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "frma ag an leibhal is airde: %d"
+
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "Brisphointe i \"%s%s\" lne %ld"
@@ -1189,8 +1176,8 @@ msgid "Searching for \"%s\""
 msgstr "Ag danamh cuardach ar \"%s\""
 
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "gan aimsi i 'runtimepath': \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "gan aimsi in '%s': \"%s\""
 
 msgid "Source Vim script"
 msgstr "Foinsigh script Vim"
@@ -1219,6 +1206,10 @@ msgstr "lne %ld: \"%s\"  fhoinsi"
 msgid "finished sourcing %s"
 msgstr "deireadh ag foinsi %s"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "ag leanint i %s"
+
 msgid "modeline"
 msgstr "mdlne"
 
@@ -1351,7 +1342,8 @@ msgstr ""
 "sideoir"
 
 msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: Ainm in irithe, n fidir  a chur ar ord sainithe ag an sideoir"
+msgstr ""
+"E841: Ainm in irithe, n fidir  a chur ar ord sainithe ag an sideoir"
 
 #, c-format
 msgid "E184: No such user-defined command: %s"
@@ -1425,6 +1417,9 @@ msgstr "E188: N fidir ionad na fuinneoige a fhil amach ar an chras seo"
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: n folir dh argint uimhrila le :winpos"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: N fidir :redir a sid laistigh de execute()"
+
 msgid "Save Redirection"
 msgstr "Sbhil Atreor"
 
@@ -1637,6 +1632,9 @@ msgstr "Sloinn:"
 msgid "Input Line"
 msgstr "Lne an Ionchuir:"
 
+msgid "Debug Line"
+msgstr "Lne Dhfhabhtaithe"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar os cionn fad an ordaithe"
 
@@ -1888,11 +1886,6 @@ msgstr "1 carachtar"
 msgid "%lld characters"
 msgstr "%lld carachtar"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld carachtar"
-
 msgid "[noeol]"
 msgstr "[ganEOL]"
 
@@ -1986,6 +1979,12 @@ msgstr "uathord  bhaint go huathoibroch: %s <maoln=%d>"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Nl a leithid de ghrpa: \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: N fidir an grpa reatha a scriosadh"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: Iarracht ar augroup at fs in sid a scriosadh"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Carachtar neamhcheadaithe i ndiaidh *: %s"
@@ -2047,8 +2046,13 @@ msgid "E351: Cannot delete fold with cur
 msgstr "E351: N fidir filleadh a scriosadh leis an 'foldmethod' reatha"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld lne fillte "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld lne fillte "
+msgstr[1] "+--%3ld lne fillte "
+msgstr[2] "+--%3ld lne fillte "
+msgstr[3] "+--%3ld lne fillte "
+msgstr[4] "+--%3ld lne fillte "
 
 msgid "E222: Add to read buffer"
 msgstr "E222: Cuir leis an maoln lite"
@@ -2144,6 +2148,18 @@ msgid "E232: Cannot create BalloonEval w
 msgstr ""
 "E232: N fidir BalloonEval a chruth le teachtaireacht agus aisghlaoch araon"
 
+msgid "_Cancel"
+msgstr "_Cealaigh"
+
+msgid "_Save"
+msgstr "_Sbhil"
+
+msgid "_Open"
+msgstr "_Oscail"
+
+msgid "_OK"
+msgstr "_OK"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2153,6 +2169,12 @@ msgstr ""
 "&Nl\n"
 "&Cealaigh"
 
+msgid "Yes"
+msgstr "T"
+
+msgid "No"
+msgstr "Nl"
+
 msgid "Input _Methods"
 msgstr "_Modhanna ionchuir"
 
@@ -2187,23 +2209,23 @@ msgstr "Suas"
 msgid "Down"
 msgstr "Sos"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "An Chad Cheann Eile"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "Ionadaigh"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "Ionadaigh Uile"
 
+msgid "_Close"
+msgstr "_Dn"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: Fuarthas iarratas \"die\"  bhainisteoir an tseisiin\n"
 
-msgid "Close"
-msgstr "Dn"
+msgid "Close tab"
+msgstr "Dn cluaisn"
 
 msgid "New tab"
 msgstr "Cluaisn nua"
@@ -2250,20 +2272,6 @@ msgstr "Ionadaigh &Uile"
 msgid "&Undo"
 msgstr "&Cealaigh"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: N fidir teideal na fuinneoige \"%s\" a aimsi"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: Argint gan tacaocht: \"-%s\"; Bain sid as an leagan OLE."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: N fidir fuinneog a oscailt isteach i bhfeidhmchlr MDI"
-
-msgid "Close tab"
-msgstr "Dn cluaisn"
-
 msgid "Open tab..."
 msgstr "Oscail cluaisn..."
 
@@ -2281,6 +2289,17 @@ msgstr "Gan sid"
 msgid "Directory\t*.nothing\n"
 msgstr "Comhadlann\t*.neamhn\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: N fidir teideal na fuinneoige \"%s\" a aimsi"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: Argint gan tacaocht: \"-%s\"; Bain sid as an leagan OLE."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: N fidir fuinneog a oscailt isteach i bhfeidhmchlr MDI"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr ""
 "Vim E458: N fidir iontril dathmhapla a dhileadh, is fidir go mbeidh "
@@ -2546,6 +2565,7 @@ msgstr "%-5s: %s%*s (sid: %s)"
 
 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"
@@ -2556,6 +2576,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: Aimsigh ritis sannachin leis an tsiombail seo\n"
 "       c: Aimsigh feidhmeanna a chuireann glaoch ar an bhfeidhm seo\n"
 "       d: Aimsigh feidhmeanna a gcuireann an fheidhm seo glaoch orthu\n"
 "       e: Aimsigh an patrn egrep seo\n"
@@ -2627,6 +2648,13 @@ msgstr ""
 "E815: T brn orm, bh an t-ord seo dchumasaithe, norbh fhidir "
 "leabharlanna MzScheme a lucht."
 
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: r leithscal, t an t-ord seo dchumasaithe; norbh fhidir "
+"modl racket/base MzScheme a lucht."
+
 msgid "invalid expression"
 msgstr "slonn neamhbhail"
 
@@ -2679,7 +2707,8 @@ msgid "not allowed in the Vim sandbox"
 msgstr "n cheadatear  seo i mbosca gainimh Vim"
 
 msgid "E836: This Vim cannot execute :python after using :py3"
-msgstr "E836: N fidir leis an leagan seo de Vim :python a rith tar is :py3 a sid"
+msgstr ""
+"E836: N fidir leis an leagan seo de Vim :python a rith tar is :py3 a sid"
 
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
@@ -2699,7 +2728,8 @@ msgid "E659: Cannot invoke Python recurs
 msgstr "E659: N fidir Python a rith go hathchrsach"
 
 msgid "E837: This Vim cannot execute :py3 after using :python"
-msgstr "E837: N fidir leis an leagan seo de Vim :py3 a rith tar is :python a sid"
+msgstr ""
+"E837: N fidir leis an leagan seo de Vim :py3 a rith tar is :python a sid"
 
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: caithfidh $_ a bheith cinel Teaghrin"
@@ -2732,95 +2762,6 @@ msgstr "E272: eisceacht gan limhseil"
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: stdas anaithnid longjmp %d"
 
-msgid "Toggle implementation/definition"
-msgstr "Scornaigh feidhmi/sainmhni"
-
-msgid "Show base class of"
-msgstr "Taispein an bunaicme de"
-
-msgid "Show overridden member function"
-msgstr "Taispein ballfheidhm sraithe"
-
-msgid "Retrieve from file"
-msgstr "Aisghabh  chomhad"
-
-msgid "Retrieve from project"
-msgstr "Aisghabh  thionscadal"
-
-msgid "Retrieve from all projects"
-msgstr "Aisghabh  gach tionscadal"
-
-msgid "Retrieve"
-msgstr "Aisghabh"
-
-msgid "Show source of"
-msgstr "Taispein foinse"
-
-msgid "Find symbol"
-msgstr "Aimsigh siombail"
-
-msgid "Browse class"
-msgstr "Brabhsil aicme"
-
-msgid "Show class in hierarchy"
-msgstr "Taispein an aicme in ordlathas"
-
-msgid "Show class in restricted hierarchy"
-msgstr "Taispein an aicme in ordlathas srianta"
-
-msgid "Xref refers to"
-msgstr "Tagraonn Xref do"
-
-msgid "Xref referred by"
-msgstr "Xref tagartha ag"
-
-msgid "Xref has a"
-msgstr "Rud at ag Xref:"
-
-msgid "Xref used by"
-msgstr "Xref  sid ag"
-
-msgid "Show docu of"
-msgstr "Taispein eolas faoi"
-
-msgid "Generate docu for"
-msgstr "Gin eolas faoi"
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"N fidir nasc a dhanamh le SNiFF+. Seiceil do chuid athrga "
-"thimpeallachta (caithfidh t sniffemacs a chur i do $PATH).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: Earrid sa lamh. Dnasctha"
-
-msgid "SNiFF+ is currently "
-msgstr "SNiFF+ stdas faoi lthair: "
-
-msgid "not "
-msgstr "n "
-
-msgid "connected"
-msgstr "nasctha"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: Iarratas anaithnid SNiFF+: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: Earrid ag nascadh le SNiFF+"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SNiFF+ gan nasc"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: N maoln SNiFF+ "
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: Earrid sa scrobh. Dnasctha"
-
 msgid "invalid buffer number"
 msgstr "uimhir neamhbhail mhaolin"
 
@@ -2904,6 +2845,14 @@ msgstr "E573: Aitheantas neamhbhail freastala in sid: %s"
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: Air mchumtha sa chlrlann isc VIM.  Scriosta!"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: Camg ar iarraidh i Liosta: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ']' ar iarraidh ag deireadh liosta: %s"
+
 msgid "Unknown option argument"
 msgstr "Argint anaithnid rogha"
 
@@ -2930,12 +2879,12 @@ msgstr "%d comhad le heagr\n"
 msgid "netbeans is not supported with this GUI\n"
 msgstr "N thacatear le netbeans sa GUI seo\n"
 
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "N fidir '-nb' a sid: nor cumasaodh  ag am tiomsaithe\n"
+
 msgid "This Vim was not compiled with the diff feature."
 msgstr "Nor tiomsaodh an leagan Vim seo le `diff' ar fil."
 
-msgid "'-nb' cannot be used: not enabled at compile time\n"
-msgstr "N fidir '-nb' a sid: nor cumasaodh  ag am tiomsaithe\n"
-
 msgid "Attempt to open script file again: \""
 msgstr "Dan iarracht ar oscailt na scripte ars: \""
 
@@ -2948,6 +2897,9 @@ msgstr "N fidir a oscailt le haghaidh an aschuir scripte: \""
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: Earrid: Theip ar thos gvim  NetBeans\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: Earrid: N fidir an leagan seo de Vim a rith i dteirminal Cygwin\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Rabhadh: Nl an t-aschur ag dul chuig teirminal\n"
 
@@ -3114,6 +3066,9 @@ msgstr "-F\t\t\tTosaigh sa mhd Pheirsise"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <teirminal>\tSocraigh cinel teirminal"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\tN bac le rabhadh faoi ionchur/aschur gan a bheith n teirminal"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\tsid <vimrc> in ionad aon .vimrc"
 
@@ -3509,7 +3464,8 @@ msgstr ""
 #, c-format
 msgid ""
 "E833: %s is encrypted and this version of Vim does not support encryption"
-msgstr "E833: t %s criptithe agus n thacaonn an leagan seo de Vim le cripti"
+msgstr ""
+"E833: t %s criptithe agus n thacaonn an leagan seo de Vim le cripti"
 
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " rinneadh dochar d (mid an leathanaigh nos l n an osmhid).\n"
@@ -3534,7 +3490,8 @@ msgid ""
 "If you entered a new crypt key but did not write the text file,"
 msgstr ""
 "\n"
-"M chuir t eochair nua chriptichin isteach, ach mura scrobh t an tacschomhad,"
+"M chuir t eochair nua chriptichin isteach, ach mura scrobh t an "
+"tacschomhad,"
 
 msgid ""
 "\n"
@@ -3548,7 +3505,8 @@ msgid ""
 "If you wrote the text file after changing the crypt key press enter"
 msgstr ""
 "\n"
-"M scrobh t an tacschomhad tar is duit an eochair chriptichn a athr, brigh Enter"
+"M scrobh t an tacschomhad tar is duit an eochair chriptichn a athr, "
+"brigh Enter"
 
 msgid ""
 "\n"
@@ -3612,11 +3570,12 @@ msgstr ""
 "(B'fhidir gur mian leat an comhad seo a shbhil de rir ainm eile\n"
 
 msgid "and run diff with the original file to check for changes)"
-msgstr ""
-"agus dan comparid leis an mbunchomhad chun athruithe a lorg)"
+msgstr "agus dan comparid leis an mbunchomhad chun athruithe a lorg)"
 
 msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "Athshln crochnaithe. Is ionann an t-bhar sa mhaoln agus an t-bhar sa chomhad."
+msgstr ""
+"Athshln crochnaithe. Is ionann an t-bhar sa mhaoln agus an t-bhar sa "
+"chomhad."
 
 msgid ""
 "\n"
@@ -3628,7 +3587,8 @@ msgstr ""
 "\n"
 
 msgid "Using crypt key from swap file for the text file.\n"
-msgstr "Eochair chriptichin n gcomhad babhtla  hsid ar an tacschomhad.\n"
+msgstr ""
+"Eochair chriptichin n gcomhad babhtla  hsid ar an tacschomhad.\n"
 
 #. use msg() to start the scrolling properly
 msgid "Swap files found:"
@@ -3806,15 +3766,12 @@ 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) Seans go bhfuil an comhad seo  chur in eagar ag clr eile. M t,\n"
-"    B cramach nach bhfuil dh leagan den chomhad canna agat nuair\n"
-"    a athraonn t ."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "  Scoir, n lean ar aghaidh go hairdeallach.\n"
+"    b cramach nach bhfuil dh leagan den chomhad canna agat nuair\n"
+"    a athraonn t . Scoir anois, n lean ort go faichilleach.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Thuairteil seisin eagarthireachta.\n"
@@ -4120,19 +4077,10 @@ msgstr "E346: Nl comhadlann \"%s\" sa cdpath a thuilleadh"
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: Nl comhad \"%s\" sa chonair a thuilleadh"
 
-msgid "Cannot connect to Netbeans #2"
-msgstr "N fidir nascadh le Netbeans #2"
-
-msgid "Cannot connect to Netbeans"
-msgstr "N fidir nascadh le Netbeans"
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr "E668: Md mcheart rochtana ar an chomhad eolas naisc NetBeans: \"%s\""
 
-msgid "read from Netbeans socket"
-msgstr "ladh  shoicad Netbeans"
-
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: Cailleadh nasc NetBeans le haghaidh maolin %ld"
@@ -4269,35 +4217,35 @@ msgstr "E574: Cinel anaithnid tabhaill %d"
 msgid ""
 "E883: search pattern and expression register may not contain two or more "
 "lines"
-msgstr "E883: n cheadatear nos m n lne amhin i bpatrn cuardaigh n sa slonntabhall"
+msgstr ""
+"E883: n cheadatear nos m n lne amhin i bpatrn cuardaigh n sa "
+"slonntabhall"
 
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld Coln; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Roghnaodh %s%ld as %ld Lne; %ld as %ld Focal; %ld as %ld Beart"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "Roghnaodh %s%ld as %ld Lne; %lld as %lld Focal; %lld as %lld Beart"
 
 #, c-format
 msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr ""
-"Roghnaodh %s%ld as %ld Lne; %ld as %ld Focal; %ld as %ld Carachtar; %ld as "
-"%ld Beart"
-
-#, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s as %s; Lne %ld as %ld; Focal %ld as %ld; Beart %ld as %ld"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
+msgstr ""
+"Roghnaodh %s%ld as %ld Lne; %lld as %lld Focal; %lld as %lld Carachtar; %lld as %lld Beart"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "Col %s as %s; Lne %ld as %ld; Focal %lld as %lld; Beart %lld as %lld"
 
 #, c-format
 msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
-msgstr ""
-"Col %s as %s; Lne %ld as %ld; Focal %ld as %ld; Carachtar %ld as %ld; Beart "
-"%ld as %ld"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
+msgstr ""
+"Col %s as %s; Lne %ld as %ld; Focal %lld as %lld; Carachtar %lld as %lld; Beart %lld as %lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4532,9 +4480,6 @@ msgstr "EARRID I/A"
 msgid "Message"
 msgstr "Teachtaireacht"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "n 80  'columns', n fidir orduithe seachtracha a rith"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: Theip ar roghn printara"
 
@@ -4561,6 +4506,11 @@ msgstr ""
 "\"%s\""
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr ""
+"E244: Ainm neamhcheadaithe ar chilocht \"%s\" in ainm cl \"%s\""
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: Carachtar neamhcheadaithe '%c' mar phirt d'ainm cl \"%s\""
 
@@ -4595,25 +4545,13 @@ msgstr ""
 "\n"
 "Norbh fhidir comhthacs slndla a shocr le haghaidh "
 
-msgid "Could not set security context "
-msgstr "Norbh fhidir comhthacs slndla a shocr "
-
-msgid " for "
-msgstr " le haghaidh "
-
-#. no enough size OR unexpected error
-msgid "Could not get security context "
-msgstr "Norbh fhidir comhthacs slndla a fhil "
-
-msgid ". Removing it!\n"
-msgstr ".  scriosadh!\n"
-
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"N fidir blaosc a rith "
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "Norbh fhidir comhthacs slndla %s a shocr le haghaidh %s"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr "Norbh fhidir comhthacs slndla %s a fhil le haghaidh %s.  bhaint!"
 
 msgid ""
 "\n"
@@ -4646,6 +4584,13 @@ msgstr ""
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"N fidir blaosc a rith "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4687,10 +4632,6 @@ msgid "Could not fix up function pointer
 msgstr "Norbh fhidir pointeoir feidhme a chiri i gcomhair an DLL!"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "d'aisfhill an bhlaosc %d"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: Fuarthas teagmhas %s\n"
 
@@ -4719,6 +4660,10 @@ msgid "Vim Warning"
 msgstr "Rabhadh Vim"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "d'aisfhill an bhlaosc %d"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: An iomarca %%%c i dteaghrn formide"
 
@@ -4741,6 +4686,7 @@ msgstr "E376: %%%c neamhbhail i rimr an teaghrin formide"
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: %%%c neamhbhail i dteaghrn formide"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: Nl aon phatrn i 'errorformat'"
 
@@ -4750,6 +4696,15 @@ msgstr "E379: Ainm comhadlainne ar iarraidh, n folamh"
 msgid "E553: No more items"
 msgstr "E553: Nl aon mhr eile"
 
+msgid "E924: Current window was closed"
+msgstr "E924: Dnadh an fhuinneog reatha"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: Athraodh an mearcheartchn reatha"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: Athraodh an liosta suomh reatha"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d as %d)%s%s: "
@@ -4757,15 +4712,18 @@ msgstr "(%d as %d)%s%s: "
 msgid " (line deleted)"
 msgstr " (lne scriosta)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%sliosta earrid %d as %d; %d earrid "
+
 msgid "E380: At bottom of quickfix stack"
-msgstr "E380: In ochtar na cruaiche quickfix"
+msgstr "E380: In ochtar chruach na mearcheartchn"
 
 msgid "E381: At top of quickfix stack"
-msgstr "E381: In uachtar na cruaiche quickfix"
-
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "liosta earrid %d as %d; %d earrid"
+msgstr "E381: In uachtar chruach na mearcheartchn"
+
+msgid "No entries"
+msgstr "Gan iontril"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: N fidir scrobh, rogha 'buftype' socraithe"
@@ -4884,10 +4842,13 @@ msgstr "E888: (slonn NFA) n fidir %s a athdhanamh"
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
-msgstr "E864: N cheadatear ach 0, 1, n 2 tar is \\%#=. sidfear an t-inneall uathoibroch "
+msgstr ""
+"E864: N cheadatear ach 0, 1, n 2 tar is \\%#=. sidfear an t-inneall "
+"uathoibroch "
 
 msgid "Switching to backtracking RE engine for pattern: "
-msgstr "Ag athr go dt an t-inneall rianaithe siar le haghaidh an phatrin seo: "
+msgstr ""
+"Ag athr go dt an t-inneall rianaithe siar le haghaidh an phatrin seo: "
 
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Thngthas ar dheireadh an tsloinn gan sil leis"
@@ -4939,17 +4900,23 @@ msgstr "E874: (NFA) Norbh fhidir an chruach a phlobadh!"
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
-msgstr "E875: (slonn NFA) (Le linn tiontaithe  postfix go NFA), an iomarca staideanna fgtha ar an gcruach"
+msgstr ""
+"E875: (slonn NFA) (Le linn tiontaithe  postfix go NFA), an iomarca "
+"staideanna fgtha ar an gcruach"
 
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (slonn NFA) Nl go leor spis ann don NFA iomln "
 
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-msgstr "E878: (NFA) Norbh fhidir cuimhne a leithdhileadh leis an gcraobh a thrasnal!"
+msgstr ""
+"E878: (NFA) Norbh fhidir cuimhne a leithdhileadh leis an gcraobh a "
+"thrasnal!"
 
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
-msgstr "Norbh fhidir logchomhad sealadach a oscailt le scrobh ann,  thaispeint ar stderr..."
+msgstr ""
+"Norbh fhidir logchomhad sealadach a oscailt le scrobh ann,  thaispeint "
+"ar stderr..."
 
 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
@@ -4985,9 +4952,6 @@ msgstr " Eabhrais"
 msgid " Arabic"
 msgstr " Araibis"
 
-msgid " (lang)"
-msgstr " (teanga)"
-
 msgid " (paste)"
 msgstr " (greamaigh)"
 
@@ -5083,8 +5047,49 @@ msgstr ""
 "# %sPatrn Cuardaigh Is Dana:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: Earrid fhormide i gcomhad litrithe"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: Nl seiceil litrithe cumasaithe"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"Rabhadh: N fidir liosta focal \"%s_%s.spl\" n \"%s_ascii.spl\" a aimsi"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr ""
+"Rabhadh: N fidir liosta focal \"%s.%s.spl\" n \"%s.ascii.spl\" a aimsi"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: Scrios uathord SpellFileMissing an maoln"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "Rabhadh: rigin %s gan tacaocht"
+
+msgid "Sorry, no suggestions"
+msgstr "T brn orm, nl aon mholadh ann"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "T brn orm, nl ach %ld moladh ann"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Athraigh \"%.*s\" go:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: Nl aon ionada litrithe roimhe seo"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Gan aimsi: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: Comhad teasctha litrithe"
@@ -5106,19 +5111,6 @@ msgstr "E762: Carachtar i FOL, LOW n UPP as raon"
 msgid "Compressing word tree..."
 msgstr "Crann focal  chomhbhr..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: Nl seiceil litrithe cumasaithe"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr ""
-"Rabhadh: N fidir liosta focal \"%s_%s.spl\" n \"%s_ascii.spl\" a aimsi"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"Rabhadh: N fidir liosta focal \"%s.%s.spl\" n \"%s.ascii.spl\" a aimsi"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Comhad litrithe \"%s\"  lamh"
@@ -5136,8 +5128,24 @@ msgid "E770: Unsupported section in spel
 msgstr "E770: Rannn gan tacaocht i gcomhad litrithe"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "Rabhadh: rigin %s gan tacaocht"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: Nl s cosil le comhad .sug: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: Seanchomhad .sug, t g lena nuashonr: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: Oibronn an comhad .sug le leagan nos nua de Vim: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: Nl an comhad .sug comhoirinach leis an gcomhad .spl: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: earrid agus comhad .sug  lamh: %s"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5408,50 +5416,6 @@ msgstr "Cuireadh focal '%.*s' le %s"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: T carachtair dhifrila fhocail sna comhaid litrithe"
 
-msgid "Sorry, no suggestions"
-msgstr "T brn orm, nl aon mholadh ann"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "T brn orm, nl ach %ld moladh ann"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Athraigh \"%.*s\" go:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: Nl aon ionada litrithe roimhe seo"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Gan aimsi: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: Nl s cosil le comhad .sug: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Seanchomhad .sug, t g lena nuashonr: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: Oibronn an comhad .sug le leagan nos nua de Vim: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: Nl an comhad .sug comhoirinach leis an gcomhad .spl: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: earrid agus comhad .sug  lamh: %s"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
@@ -5464,6 +5428,9 @@ msgstr "Nl aon mhr chomhrire sainmhnithe le haghaidh an mhaolin seo"
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Argint neamhcheadaithe: %s"
 
+msgid "syntax iskeyword "
+msgstr "comhrir iskeyword "
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Nl a leithid de mhogall comhrire: %s"
@@ -5541,6 +5508,10 @@ msgid "E789: Missing ']': %s"
 msgstr "E789: ']' ar iarraidh: %s"
 
 #, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: carachtar tar is ']': %s]%s"
+
+#, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' ar iarraidh: %s"
 
@@ -5782,6 +5753,9 @@ msgstr ""
 "\n"
 "--- Eochracha teirminil ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "N fidir $VIMRUNTIME/rgb.txt a oscailt"
+
 msgid "new shell started\n"
 msgstr "tosaodh blaosc nua\n"
 
@@ -5929,13 +5903,132 @@ msgstr "E439: t an liosta cealaithe truaillithe"
 msgid "E440: undo line missing"
 msgstr "E440: lne chealaithe ar iarraidh"
 
-#. Only MS VC 4.1 and earlier can do Win32s
-msgid ""
-"\n"
-"MS-Windows 16/32-bit GUI version"
-msgstr ""
-"\n"
-"Leagan GUI 16/32 giotn MS-Windows"
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: T feidhm %s ann cheana, cuir ! leis an ord chun  a asiti"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: T an iontril foclra seo ann cheana"
+
+msgid "E718: Funcref required"
+msgstr "E718: T g le Funcref"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: Feidhm anaithnid: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: Argint neamhcheadaithe: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Argint dhbailte: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: An iomarca argint d'fheidhm %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: Argint neamhbhail d'fheidhm %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: Doimhneacht na nglaonna nos m n 'maxfuncdepth'"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s  glao"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s tobscortha"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s ag aisfhilleadh #%ld"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s ag aisfhilleadh %s"
+
+msgid "E699: Too many arguments"
+msgstr "E699: An iomarca argint"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Feidhm anaithnid: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: Scriosadh an fheidhm: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: Nl go leor feidhmeanna d'fheidhm: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <SID>  sid ach gan a bheith i gcomhthacs scripte: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Feidhm 'dict'  ghlao gan Foclir: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: T g le hainm feidhme"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr ""
+"E128: Caithfidh ceannlitir a bheith ar dts ainm feidhme, n \"s:\": %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: N cheadatear idirstad in ainm feidhme: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Feidhm gan sainmhni: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' ar iarraidh: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: N fidir g: a sid anseo"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: N mr don chlabhsr a bheith ag an mbarrleibhal: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction ar iarraidh"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: Tagann ainm na feidhme salach ar athrg: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr ""
+"E127: N fidir sainmhni nua a dhanamh ar fheidhm %s: In sid cheana"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr ""
+"E746: Nl ainm na feidhme comhoirinach le hainm comhaid na scripte: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: N fidir feidhm %s a scriosadh: T s in sid faoi lthair"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: Caithfidh :return a bheith isteach i bhfeidhm"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Libn ar iarraidh: %s"
 
 msgid ""
 "\n"
@@ -5951,9 +6044,6 @@ msgstr ""
 "\n"
 "Leagan GUI 32 giotn MS-Windows"
 
-msgid " in Win32s mode"
-msgstr " i md Win32s"
-
 msgid " with OLE support"
 msgstr " le tacaocht OLE"
 
@@ -5973,27 +6063,6 @@ msgstr ""
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"Leagan 16 giotn MS-Windows"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"Leagan 32 giotn MS-DOS"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"Leagan 16 giotn MS-DOS"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -6086,6 +6155,9 @@ msgstr ""
 msgid "without GUI."
 msgstr "gan GUI."
 
+msgid "with GTK3 GUI."
+msgstr "le GUI GTK3."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "le GUI GTK2-GNOME."
 
@@ -6149,6 +6221,9 @@ msgstr "dara comhad gvimrc sideora: \""
 msgid "3rd user gvimrc file: \""
 msgstr "tr comhad gvimrc sideora: \""
 
+msgid "       defaults file: \""
+msgstr "       comhad na ramhshocruithe: \""
+
 msgid "    system menu file: \""
 msgstr "    comhad roghchlir an chrais: \""
 
@@ -6244,12 +6319,6 @@ msgstr "clscrobh  :help register<Enter>       chun eolas a fhil "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "roghchlr  Help->Sponsor/Register       chun eolas a fhil "
 
-msgid "WARNING: Windows 95/98/ME detected"
-msgstr "RABHADH: Braitheadh Windows 95/98/ME"
-
-msgid "type  :help windows95<Enter>  for info on this"
-msgstr "clscrobh  :help windows95<Enter>      chun eolas a fhil "
-
 msgid "Already only one window"
 msgstr "Nl ach aon fhuinneog amhin ann cheana"
 
@@ -6282,10 +6351,26 @@ msgstr "E446: Nl ainm comhaid faoin chrsir"
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: Nl aon fhil ar chomhad \"%s\" sa chonair"
 
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: Aitheantas neamhbhail: %ld (n mr d a bheith >= 1)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: Aitheantas in sid cheana: %ld"
+
 msgid "List or number required"
 msgstr "T g le liosta n uimhir"
 
 #, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: Aitheantas neamhbhail: %ld (n mr d a bheith >= 1)"
+
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: Aitheantas gan aimsi: %ld"
+
+#, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: Norbh fhidir an leabharlann %s a oscailt"
 
@@ -6578,6 +6663,31 @@ msgstr "E46: N fidir athrg inlite amhin \"%s\" a athr"
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: N fidir athrg a shocr sa bhosca gainimh: \"%s\""
 
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: N fidir eochair fholamh a sid le Foclir"
+
+msgid "E715: Dictionary required"
+msgstr "E715: T g le foclir"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: innacs liosta as raon: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: An iomarca argint d'fheidhm: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Nl an eochair seo san Fhoclir: %s"
+
+msgid "E714: List required"
+msgstr "E714: T g le liosta"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: Caithfidh argint de %s a bheith ina Liosta n Foclir"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Earrid agus comhad earride  lamh"
 
@@ -6677,6 +6787,10 @@ msgstr "E764: Rogha '%s' gan socr"
 msgid "E850: Invalid register name"
 msgstr "E850: Ainm neamhbhail tabhaill"
 
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: Comhadlann gan aimsi in '%s': \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "Buaileadh an BARR le linn an chuardaigh, ag leanint ag an CHROCH"
 
@@ -6715,11 +6829,14 @@ msgstr "bhothas ag sil le bytes() n str(), ach fuarthas %s"
 #, c-format
 msgid ""
 "expected int(), long() or something supporting coercing to long(), but got %s"
-msgstr "bhothas ag sil le int(), long(), n rud igin inathraithe ina long(), ach fuarthas %s"
+msgstr ""
+"bhothas ag sil le int(), long(), n rud igin inathraithe ina long(), ach "
+"fuarthas %s"
 
 #, c-format
 msgid "expected int() or something supporting coercing to int(), but got %s"
-msgstr "bhothas ag sil le int() n rud igin inathraithe ina int(), ach fuarthas %s"
+msgstr ""
+"bhothas ag sil le int() n rud igin inathraithe ina int(), ach fuarthas %s"
 
 msgid "value is too large to fit into C int type"
 msgstr "t an luach nos m n athrg int sa teanga C"
@@ -6748,11 +6865,15 @@ msgstr "norbh fhidir an chomhadlann a athr"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got %s"
-msgstr "bhothas ag sil le 3-chodach mar thoradh ar imp.find_module(), ach fuarthas %s"
+msgstr ""
+"bhothas ag sil le 3-chodach mar thoradh ar imp.find_module(), ach fuarthas "
+"%s"
 
 #, c-format
 msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-msgstr "bhothas ag sil le 3-chodach mar thoradh ar imp.find_module(), ach fuarthas %d-chodach"
+msgstr ""
+"bhothas ag sil le 3-chodach mar thoradh ar imp.find_module(), ach fuarthas "
+"%d-chodach"
 
 msgid "internal error: imp.find_module returned tuple with NULL"
 msgstr "earrid inmhenach: fuarthas codach NULL ar ais  imp.find_module"
@@ -6823,9 +6944,6 @@ msgstr "nl feidhm %s gan ainm ann"
 msgid "function %s does not exist"
 msgstr "nl feidhm %s ann"
 
-msgid "function constructor does not accept keyword arguments"
-msgstr "n ghlacann cruthaitheoir na feidhme le hargint eochairfhocail"
-
 #, c-format
 msgid "failed to run function %s"
 msgstr "norbh fhidir feidhm %s a rith"
@@ -6913,6 +7031,10 @@ msgid "unable to convert %s to vim dicti
 msgstr "n fidir foclir vim a dhanamh as %s"
 
 #, c-format
+msgid "unable to convert %s to vim list"
+msgstr "n fidir liosta vim a dhanamh as %s"
+
+#, c-format
 msgid "unable to convert %s to vim structure"
 msgstr "n fidir struchtr vim a dhanamh as %s"
 
@@ -6927,12 +7049,185 @@ msgid ""
 "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 "Norbh fhidir path_hook a shocr: n liosta  sys.path_hooks\nBa chir duit na ruda seo a leanas a dhanamh:\n- cuir vim.path_hook le deireadh sys.path_hooks\n- cuir vim.VIM_SPECIAL_PATH le deireadh sys.path\n"
+msgstr ""
+"Norbh fhidir path_hook a shocr: n liosta  sys.path_hooks\n"
+"Ba chir duit na ruda seo a leanas a dhanamh:\n"
+"- cuir vim.path_hook le deireadh sys.path_hooks\n"
+"- cuir vim.VIM_SPECIAL_PATH le deireadh 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 "Norbh fhidir an chonair a shocr: n liosta  sys.path\nBa chir duit vim.VIM_SPECIAL_PATH a cheangal le deireadh sys.path"
+msgstr ""
+"Norbh fhidir an chonair a shocr: n liosta  sys.path\n"
+"Ba chir duit vim.VIM_SPECIAL_PATH a cheangal le deireadh sys.path"
+
+#~ msgid "E693: Can only compare Funcref with Funcref"
+#~ msgstr "E693: Is fidir Funcref a chur i gcomparid le Funcref eile amhin"
+
+#~ msgid "E706: Variable type mismatch for: %s"
+#~ msgstr "E706: Mmheaitseil idir cinelacha athrige: %s"
+
+#~ msgid "%ld characters"
+#~ msgstr "%ld carachtar"
+
+#~ msgid "Toggle implementation/definition"
+#~ msgstr "Scornaigh feidhmi/sainmhni"
+
+#~ msgid "Show base class of"
+#~ msgstr "Taispein an bunaicme de"
+
+#~ msgid "Show overridden member function"
+#~ msgstr "Taispein ballfheidhm sraithe"
+
+#~ msgid "Retrieve from file"
+#~ msgstr "Aisghabh  chomhad"
+
+#~ msgid "Retrieve from project"
+#~ msgstr "Aisghabh  thionscadal"
+
+#~ msgid "Retrieve from all projects"
+#~ msgstr "Aisghabh  gach tionscadal"
+
+#~ msgid "Retrieve"
+#~ msgstr "Aisghabh"
+
+#~ msgid "Show source of"
+#~ msgstr "Taispein foinse"
+
+#~ msgid "Find symbol"
+#~ msgstr "Aimsigh siombail"
+
+#~ msgid "Browse class"
+#~ msgstr "Brabhsil aicme"
+
+#~ msgid "Show class in hierarchy"
+#~ msgstr "Taispein an aicme in ordlathas"
+
+#~ msgid "Show class in restricted hierarchy"
+#~ msgstr "Taispein an aicme in ordlathas srianta"
+
+#~ msgid "Xref refers to"
+#~ msgstr "Tagraonn Xref do"
+
+#~ msgid "Xref referred by"
+#~ msgstr "Xref tagartha ag"
+
+#~ msgid "Xref has a"
+#~ msgstr "Rud at ag Xref:"
+
+#~ msgid "Xref used by"
+#~ msgstr "Xref  sid ag"
+
+#~ msgid "Show docu of"
+#~ msgstr "Taispein eolas faoi"
+
+#~ msgid "Generate docu for"
+#~ msgstr "Gin eolas faoi"
+
+#~ msgid ""
+#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
+#~ "$PATH).\n"
+#~ msgstr ""
+#~ "N fidir nasc a dhanamh le SNiFF+. Seiceil do chuid athrga "
+#~ "thimpeallachta (caithfidh t sniffemacs a chur i do $PATH).\n"
+
+#~ msgid "E274: Sniff: Error during read. Disconnected"
+#~ msgstr "E274: Sniff: Earrid sa lamh. Dnasctha"
+
+#~ msgid "SNiFF+ is currently "
+#~ msgstr "SNiFF+ stdas faoi lthair: "
+
+#~ msgid "not "
+#~ msgstr "n "
+
+#~ msgid "connected"
+#~ msgstr "nasctha"
+
+#~ msgid "E275: Unknown SNiFF+ request: %s"
+#~ msgstr "E275: Iarratas anaithnid SNiFF+: %s"
+
+#~ msgid "E276: Error connecting to SNiFF+"
+#~ msgstr "E276: Earrid ag nascadh le SNiFF+"
+
+#~ msgid "E278: SNiFF+ not connected"
+#~ msgstr "E278: SNiFF+ gan nasc"
+
+#~ msgid "E279: Not a SNiFF+ buffer"
+#~ msgstr "E279: N maoln SNiFF+ "
+
+#~ msgid "Sniff: Error during write. Disconnected"
+#~ msgstr "Sniff: Earrid sa scrobh. Dnasctha"
+
+#~ msgid "  Quit, or continue with caution.\n"
+#~ msgstr "  Scoir, n lean ar aghaidh go hairdeallach.\n"
+
+#~ msgid "Cannot connect to Netbeans #2"
+#~ msgstr "N fidir nascadh le Netbeans #2"
+
+#~ msgid "read from Netbeans socket"
+#~ msgstr "ladh  shoicad Netbeans"
+
+#~ msgid "'columns' is not 80, cannot execute external commands"
+#~ msgstr "n 80  'columns', n fidir orduithe seachtracha a rith"
+
+#~ msgid "Could not set security context "
+#~ msgstr "Norbh fhidir comhthacs slndla a shocr "
+
+#~ msgid " for "
+#~ msgstr " le haghaidh "
+
+#~ msgid "Could not get security context "
+#~ msgstr "Norbh fhidir comhthacs slndla a fhil "
+
+#~ msgid ". Removing it!\n"
+#~ msgstr ".  scriosadh!\n"
+
+#~ msgid " (lang)"
+#~ msgstr " (teanga)"
+
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E759: Earrid fhormide i gcomhad litrithe"
+
+#~ msgid ""
+#~ "\n"
+#~ "MS-Windows 16/32-bit GUI version"
+#~ msgstr ""
+#~ "\n"
+#~ "Leagan GUI 16/32 giotn MS-Windows"
+
+#~ msgid " in Win32s mode"
+#~ msgstr " i md Win32s"
+
+#~ msgid ""
+#~ "\n"
+#~ "MS-Windows 16-bit version"
+#~ msgstr ""
+#~ "\n"
+#~ "Leagan 16 giotn MS-Windows"
+
+#~ msgid ""
+#~ "\n"
+#~ "32-bit MS-DOS version"
+#~ msgstr ""
+#~ "\n"
+#~ "Leagan 32 giotn MS-DOS"
+
+#~ msgid ""
+#~ "\n"
+#~ "16-bit MS-DOS version"
+#~ msgstr ""
+#~ "\n"
+#~ "Leagan 16 giotn MS-DOS"
+
+#~ msgid "WARNING: Windows 95/98/ME detected"
+#~ msgstr "RABHADH: Braitheadh Windows 95/98/ME"
+
+#~ msgid "type  :help windows95<Enter>  for info on this"
+#~ msgstr "clscrobh  :help windows95<Enter>      chun eolas a fhil "
+
+#~ msgid "function constructor does not accept keyword arguments"
+#~ msgstr "n ghlacann cruthaitheoir na feidhme le hargint eochairfhocail"
 
 #~ msgid "Vim dialog..."
 #~ msgstr "Dialg Vim..."
@@ -7030,9 +7325,6 @@ msgstr "Norbh fhidir an chonair a shocr: n liosta  sys.path\nBa chir duit vim.VIM_SPECIAL_PATH a cheangal le deireadh sys.path"
 #~ msgid "with GTK-GNOME GUI."
 #~ msgstr "le GUI GTK-GNOME."
 
-#~ msgid "with GTK GUI."
-#~ msgstr "le GUI GTK."
-
 #~ msgid "E569: maximum number of cscope connections reached"
 #~ msgstr "E569: n cheadatear nos m n an lon uasta nasc cscope"