Merge pull request #4585 from dbarnett/vim-fc39ec

vim-patch:fc39ec

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.4.  Last change: 2015 Jul 20
+*autocmd.txt*   For Vim version 7.4.  Last change: 2015 Aug 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1100,7 +1100,7 @@ Instead of a pattern buffer-local autocommands use one of these forms:
 Examples: >
     :au CursorHold <buffer>  echo 'hold'
     :au CursorHold <buffer=33>  echo 'hold'
-    :au CursorHold <buffer=abuf>  echo 'hold'
+    :au BufNewFile * CursorHold <buffer=abuf>  echo 'hold'
 
 All the commands for autocommands also work with buffer-local autocommands,
 simply use the special string instead of the pattern.  Examples: >

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.4.  Last change: 2015 Jun 25
+*change.txt*    For Vim version 7.4.  Last change: 2015 Aug 04
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -622,9 +622,9 @@ For MS-Windows: $TMP, $TEMP, $USERPROFILE, current-dir.
 			may add [flags], see |:s_flags|.
 			Note that after `:substitute` the '&' flag can't be
 			used, it's recognized as a pattern separator.
-			The space between `:substitute` and the 'c', 'g' and
+			The space between `:substitute` and the 'c', 'g',
-			'r' flags isn't required, but in scripts it's a good
+			'i', 'I' and 'r' flags isn't required, but in scripts
-			idea to keep it to avoid confusion.
+			it's a good idea to keep it to avoid confusion.
 
 :[range]~[&][flags] [count]					*:~*
 			Repeat last substitute with same substitute string

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.4.  Last change: 2015 Jul 21
+*cmdline.txt*   For Vim version 7.4.  Last change: 2015 Jul 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -715,13 +715,13 @@ to insert special things while typing you can use the CTRL-R command.  For
 example, "%" stands for the current file name, while CTRL-R % inserts the
 current file name right away.  See |c_CTRL-R|.
 
-Note: If you want to avoid the special characters in a Vim script you may want
+Note:  If you want to avoid the effects of special characters in a Vim script
-to use |fnameescape()|.  Also see |`=|.
+you may want to use |fnameescape()|.  Also see |`=|.
 
 
 In Ex commands, at places where a file name can be used, the following
 characters have a special meaning.  These can also be used in the expression
-function expand() |expand()|.
+function |expand()|.
 	%	Is replaced with the current file name.		  *:_%* *c_%*
 	#	Is replaced with the alternate file name.	  *:_#* *c_#*
 		This is remembered for every window.
@@ -757,6 +757,7 @@ it, no matter how many backslashes.
 	   \#			#
 	   \\#			\#
 Also see |`=|.
+
 			       *:<cword>* *:<cWORD>* *:<cfile>* *<cfile>*
 			       *:<sfile>* *<sfile>* *:<afile>* *<afile>*
 			       *:<abuf>* *<abuf>* *:<amatch>* *<amatch>*
@@ -777,7 +778,7 @@ Note: these are typed literally, they are not special keys!
 		   <afile> only when the file name isn't used to match with
 		   (for FileType, Syntax and SpellFileMissing events).
 	<sfile>    When executing a ":source" command, is replaced with the
-		   file name of the sourced file.  *E498* 
+		   file name of the sourced file.  *E498*
 		   When executing a function, is replaced with
 		   "function {function-name}"; function call nesting is
 		   indicated like this:
@@ -845,7 +846,7 @@ These modifiers can be given, in this order:
 	:gs?pat?sub?
 		Substitute all occurrences of "pat" with "sub".  Otherwise
 		this works like ":s".
-	:S	Escape special characters for use with a shell command (see 
+	:S	Escape special characters for use with a shell command (see
 		|shellescape()|). Must be the last one. Examples: >
 		    :!dir <cfile>:S
 		    :call system('chmod +w -- ' . expand('%:S'))
@@ -898,9 +899,8 @@ name).  This is included for backwards compatibility with version 3.0, the
 
 Note: Where a file name is expected wildcards expansion is done.  On Unix the
 shell is used for this, unless it can be done internally (for speed).
-Backticks also work, like in >
+Unless in |restricted-mode|, backticks work also, like in >
 	:n `echo *.c`
-(backtick expansion is not possible in |restricted-mode|)
 But expansion is only done if there are any wildcards before expanding the
 '%', '#', etc..  This avoids expanding wildcards inside a file name.  If you
 want to expand the result of <cfile>, add a wildcard character to it.
@@ -937,6 +937,7 @@ for the file "$home" in the root directory.  A few examples:
 	\$home		file "$home" in current directory
 	/\$home		file "$home" in root directory
 	\\$home		file "\\", followed by expanded $home
+
 Also see |`=|.
 
 ==============================================================================

runtime/doc/editing.txt

@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.4.  Last change: 2015 Jul 21
+*editing.txt*   For Vim version 7.4.  Last change: 2015 Jul 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -378,22 +378,34 @@ Finds files:
 	/usr/include/sys/types.h
 	/usr/inc_old/types.h
 					*backtick-expansion* *`-expansion*
-On Unix and a few other systems you can also use backticks in the file name,
+On Unix and a few other systems you can also use backticks for the file name
-for example: >
+argument, for example: >
-	:e `find . -name ver\\*.c -print`
+	:next `find . -name ver\\*.c -print`
-The backslashes before the star are required to prevent "ver*.c" to be
+The backslashes before the star are required to prevent the shell from
-expanded by the shell before executing the find program.
+expanding "ver*.c" prior to execution of the find program.  The backslash
+before the shell pipe symbol "|" prevents Vim from parsing it as command
+termination.
 This also works for most other systems, with the restriction that the
 backticks must be around the whole item.  It is not possible to have text
 directly before the first or just after the last backtick.
 
 							*`=*
-You can have the backticks expanded as a Vim expression, instead of an
+You can have the backticks expanded as a Vim expression, instead of as an
-external command, by using the syntax `={expr}` e.g.: >
+external command, by putting an equal sign right after the first backtick,
+e.g.: >
 	:e `=tempname()`
 The expression can contain just about anything, thus this can also be used to
 avoid the special meaning of '"', '|', '%' and '#'.  However, 'wildignore'
 does apply like to other wildcards.
+
+Environment variables are expanded before evaluating the expression, thus this
+does not work: >
+	:e `=$HOME . '.vimrc'`
+Because $HOME is expanding early, resulting in: >
+	:e `=/home/user . '.vimrc'`
+This does work: >
+	:e `=expand('$HOME') . '.vimrc'`
+
 If the expression returns a string then names are to be separated with line
 breaks.  When the result is a |List| then each item is used as a name.  Line
 breaks also separate names.
@@ -1294,7 +1306,7 @@ There are a few things to remember when editing binary files:
   and when the file is written the <NL> will be replaced with <CR> <NL>.
 - <Nul> characters are shown on the screen as ^@.  You can enter them with
   "CTRL-V CTRL-@" or "CTRL-V 000".
-- To insert a <NL> character in the file split up a line.  When writing the
+- To insert a <NL> character in the file split a line.  When writing the
   buffer to a file a <NL> will be written for the <EOL>.
 - Vim normally appends an <EOL> at the end of the file if there is none.
   Setting the 'binary' option prevents this.  If you want to add the final

runtime/doc/eval.txt

@@ -1858,6 +1858,7 @@ getbufvar( {expr}, {varname} [, {def}])
 				any	variable {varname} in buffer {expr}
 getchar( [expr])		Number	get one character from the user
 getcharmod( )			Number	modifiers for the last typed character
+getcharsearch()			Dict	last character search
 getcmdline()			String	return the current command-line
 getcmdpos()			Number	return cursor position in command-line
 getcmdtype()			String	return current command-line type

runtime/indent/sh.vim

@@ -1,10 +1,11 @@
 " Vim indent file
-" Language:         Shell Script
+" Language:            Shell Script
-" Maintainer:       Currently unmaintained. If you want to take it, please
+" Maintainer:          Christian Brabandt <cb@256bit.org>
-" 		    email Bram
 " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
-" Original Author:  Nikolai Weibull <now@bitwi.se>
+" Original Author:     Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2014-08-22
+" Latest Revision:     2015-07-28
+" License:             Vim (see :h license)
+" Repository:          https://github.com/chrisbra/vim-sh-indent
 
 if exists("b:did_indent")
   finish
@@ -12,7 +13,7 @@ endif
 let b:did_indent = 1
 
 setlocal indentexpr=GetShIndent()
-setlocal indentkeys+=0=then,0=do,0=else,0=elif,0=fi,0=esac,0=done,),0=;;,0=;&
+setlocal indentkeys+=0=then,0=do,0=else,0=elif,0=fi,0=esac,0=done,0=end,),0=;;,0=;&
 setlocal indentkeys+=0=fin,0=fil,0=fip,0=fir,0=fix
 setlocal indentkeys-=:,0#
 setlocal nosmartindent
@@ -56,8 +57,8 @@ function! GetShIndent()
 
   let ind = indent(lnum)
   let line = getline(lnum)
-  if line =~ '^\s*\%(if\|then\|do\|else\|elif\|case\|while\|until\|for\|select\)\>'
+  if line =~ '^\s*\%(if\|then\|do\|else\|elif\|case\|while\|until\|for\|select\|foreach\)\>'
-    if line !~ '\<\%(fi\|esac\|done\)\>\s*\%(#.*\)\=$'
+    if line !~ '\<\%(fi\|esac\|done\|end\)\>\s*\%(#.*\)\=$'
       let ind += s:indent_value('default')
     endif
   elseif s:is_case_label(line, pnum)
@@ -78,7 +79,7 @@ function! GetShIndent()
 
   let pine = line
   let line = getline(v:lnum)
-  if line =~ '^\s*\%(then\|do\|else\|elif\|fi\|done\)\>' || line =~ '^\s*}'
+  if line =~ '^\s*\%(then\|do\|else\|elif\|fi\|done\|end\)\>' || line =~ '^\s*}'
     let ind -= s:indent_value('default')
   elseif line =~ '^\s*esac\>' && s:is_case_empty(getline(v:lnum - 1))
     let ind -= s:indent_value('default')

runtime/makemenu.vim

@@ -177,6 +177,7 @@ SynMenu DE.Doxygen.C\ with\ doxygen:c.doxygen
 SynMenu DE.Doxygen.C++\ with\ doxygen:cpp.doxygen
 SynMenu DE.Doxygen.IDL\ with\ doxygen:idl.doxygen
 SynMenu DE.Doxygen.Java\ with\ doxygen:java.doxygen
+SynMenu DE.Doxygen.DataScript\ with\ doxygen:datascript.doxygen
 SynMenu DE.Dracula:dracula
 SynMenu DE.DSSSL:dsl
 SynMenu DE.DTD:dtd

runtime/plugin/matchit.vim

@@ -303,7 +303,7 @@ fun! s:CleanUp(options, mode, startline, startcol, ...)
       let regexp = s:Wholematch(matchline, a:1, currcol-1)
       let endcol = matchend(matchline, regexp)
       if endcol > currcol  " This is NOT off by one!
-	execute "normal!" . (endcol - currcol) . "l"
+	call cursor(0, endcol)
       endif
     endif " a:0
   endif " a:mode != "o" && etc.

runtime/synmenu.vim

@@ -161,6 +161,7 @@ an 50.30.290 &Syntax.DE.Doxygen.C\ with\ doxygen :cal SetSyn("c.doxygen")<CR>
 an 50.30.300 &Syntax.DE.Doxygen.C++\ with\ doxygen :cal SetSyn("cpp.doxygen")<CR>
 an 50.30.310 &Syntax.DE.Doxygen.IDL\ with\ doxygen :cal SetSyn("idl.doxygen")<CR>
 an 50.30.320 &Syntax.DE.Doxygen.Java\ with\ doxygen :cal SetSyn("java.doxygen")<CR>
+an 50.30.320 &Syntax.DE.Doxygen.DataScript\ with\ doxygen :cal SetSyn("datascript.doxygen")<CR>
 an 50.30.330 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
 an 50.30.340 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
 an 50.30.350 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>

runtime/syntax/datascript.vim

@@ -1,11 +1,12 @@
 " Vim syntax file
-" Language:	Datascript
+" Language:	DataScript
 " Maintainer:	Dominique Pelle <dominique.pelle@gmail.com>
-" Last Change:	2014 Feb 26
+" Last Change:	2015 Jul 30
 "
 " DataScript is a formal language for modelling binary datatypes,
 " bitstreams or file formats. For more information, see:
-" http://datascript.berlios.de/DataScriptLanguageOverview.html
+"
+" http://dstools.sourceforge.net/DataScriptLanguageOverview.html
 
 if version < 600
   syntax clear
@@ -19,6 +20,8 @@ syn keyword dsPackage      import package
 syn keyword dsType         bit bool string
 syn keyword dsType         int int8 int16 int32 int64
 syn keyword dsType         uint8 uint16 uint32 uint64
+syn keyword dsType         varint16 varint32 varint64
+syn keyword dsType         varuint16 varuint32 varuint64
 syn keyword dsType         leint16 leint32 leint64
 syn keyword dsType         leuint16 leuint32 leuint64
 syn keyword dsEndian       little big
@@ -32,7 +35,8 @@ syn keyword dsOperator     sizeof bitsizeof lengthof is sum forall in
 syn keyword dsStorageClass const
 syn keyword dsTodo         contained TODO FIXME XXX
 syn keyword dsSql          sql sql_table sql_database sql_pragma sql_index
-syn keyword dsSql          sql_integer sql_metadata sql_key foreign_key
+syn keyword dsSql          sql_integer sql_metadata sql_key sql_virtual
+syn keyword dsSql          using reference_key foreign_key to
 
 " dsCommentGroup allows adding matches for special things in comments.
 syn cluster dsCommentGroup  contains=dsTodo
@@ -61,6 +65,8 @@ syn region   dsComment
 syn region  dsString
   \ start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
 
+syn sync ccomment dsComment
+
 " Define the default highlighting.
 hi def link dsType              Type
 hi def link dsEndian            StorageClass

runtime/syntax/synload.vim

@@ -60,8 +60,8 @@ fun! s:SynSet()
 endfun
 
 
-" Handle adding doxygen to other languages (C, C++, C#, IDL)
+" Handle adding doxygen to other languages (C, C++, C#, IDL, java, php, DataScript)
-au Syntax c,cpp,cs,idl,php
+au Syntax c,cpp,cs,idl,java,php,datascript
 	\ if (exists('b:load_doxygen_syntax') && b:load_doxygen_syntax)
 	\	|| (exists('g:load_doxygen_syntax') && g:load_doxygen_syntax)
 	\   | runtime! syntax/doxygen.vim

src/nvim/po/eo.po

@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
+"POT-Creation-Date: 2015-07-30 17:54+0200\n"
-"PO-Revision-Date: 2013-05-27 04:55+0200\n"
+"PO-Revision-Date: 2015-07-30 18:00+0200\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@@ -115,11 +115,6 @@ msgstr "E84: Neniu modifita bufro trovita"
 msgid "E85: There is no listed buffer"
 msgstr "E85: Estas neniu listigita bufro"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: La bufro %<PRId64> ne ekzistas"
-
 #: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Ne eblas iri preter la lastan bufron"
@@ -692,6 +687,10 @@ msgstr "E696: Mankas komo en Listo: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Mankas fino de Listo ']': %s"
 
+#: ../eval.c:5750
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr "Ne sufiĉa memory por valorigi referencojn, senrubigado ĉesigita!"
+
 #: ../eval.c:6475
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
@@ -1616,14 +1615,13 @@ msgstr "E173: %<PRId64> pliaj redaktendaj dosieroj"
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
 
-# DP: malfacilas traduki tion, kaj samtempe honori spacetojn
 #: ../ex_docmd.c:4432
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    Nomo        Arg Interv Kompleto  Difino"
+"    Nomo        Argumentoj Adreso    Kompleto  Difino"
 
 #: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
@@ -1649,6 +1647,10 @@ msgstr "E178: Nevalida defaŭlta valoro de kvantoro"
 msgid "E179: argument required for -complete"
 msgstr "E179: argumento bezonata por -complete"
 
+#: ../ex_docmd.c:4933
+msgid "E179: argument required for -addr"
+msgstr "E179: argumento bezonata por -addr"
+
 #: ../ex_docmd.c:4635
 #, c-format
 msgid "E181: Invalid attribute: %s"
@@ -1671,6 +1673,11 @@ msgstr "E841: Rezervita nomo, neuzebla por komando difinita de uzanto"
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: Neniu komando-difinita-de-uzanto kiel: %s"
 
+#: ../ex_docmd.c:5516
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: Nevalida valoro de tipo de adreso: %s"
+
 #: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
@@ -2951,6 +2958,11 @@ msgstr "E363: ŝablono uzas pli da memoro ol 'maxmempattern'"
 msgid "E749: empty buffer"
 msgstr "E749: malplena bufro"
 
+#: ../globals.h:1226
+#, c-format
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: La bufro %<PRId64> ne ekzistas"
+
 #: ../globals.h:1108
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: Nevalida serĉa ŝablono aŭ disigilo"
@@ -4599,6 +4611,11 @@ msgstr "E522: Netrovita en termcap"
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Nevalida signo <%s>"
 
+#: ../option.c:2253
+#, c-format
+msgid "For option %s"
+msgstr "Por opcio %s"
+
 #: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: Ne eblas agordi 'term' al malplena ĉeno"
@@ -6552,15 +6569,15 @@ msgstr "E446: Neniu dosiernomo sub la kursoro"
 #~ msgid "Reading from stdin..."
 #~ msgstr "Legado el stdin..."
 
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish]"
-
 #~ msgid "[crypted]"
 #~ msgstr "[ĉifrita]"
 
 #~ msgid "E821: File is encrypted with unknown method"
 #~ msgstr "E821: Dosiero estas ĉifrata per nekonata metodo"
 
+#~ msgid "Warning: Using a weak encryption method; see :help 'cm'"
+#~ msgstr "Averto: uzo de malfortika ĉifrada metodo; vidu :help 'cm'"
+
 #~ msgid "NetBeans disallows writes of unmodified buffers"
 #~ msgstr "NetBeans malpermesas skribojn de neŝanĝitaj bufroj"
 
@@ -6676,8 +6693,8 @@ msgstr "E446: Neniu dosiernomo sub la kursoro"
 #~ msgid "Vim: Received \"die\" request from session manager\n"
 #~ msgstr "Vim: Ricevis peton \"die\" (morti) el la seanca administrilo\n"
 
-#~ msgid "Close"
+#~ msgid "Close tab"
-#~ msgstr "Fermi"
+#~ msgstr "Fermi langeton"
 
 #~ msgid "New tab"
 #~ msgstr "Nova langeto"
@@ -6733,9 +6750,6 @@ msgstr "E446: Neniu dosiernomo sub la kursoro"
 #~ msgid "E672: Unable to open window inside MDI application"
 #~ msgstr "E672: Ne eblas malfermi fenestron interne de aplikaĵo MDI"
 
-#~ msgid "Close tab"
-#~ msgstr "Fermi langeton"
-
 #~ msgid "Open tab..."
 #~ msgstr "Malfermi langeton..."
 

src/nvim/po/fr.po

@@ -6,7 +6,7 @@
 #  FIRST AUTHOR  DindinX         <David.Odin@bigfoot.com>     2000.
 # SECOND AUTHOR  Adrien Beau     <version.francaise@free.fr>  2002, 2003.
 #  THIRD AUTHOR  David Blanchet  <david.blanchet@free.fr>     2006, 2008.
-# FOURTH AUTHOR  Dominique Pell<6C> <dominique.pelle@gmail.com>  2008, 2013.
+# FOURTH AUTHOR  Dominique Pell<6C> <dominique.pelle@gmail.com>  2008, 2015.
 #
 # Latest translation available at:
 #   http://dominique.pelle.free.fr/vim-fr.php
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Fran<61>ais)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
+"POT-Creation-Date: 2015-07-30 17:54+0200\n"
-"PO-Revision-Date: 2013-05-27 10:22+0200\n"
+"PO-Revision-Date: 2015-07-30 18:00+0200\n"
 "Last-Translator: Dominique Pell<6C> <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -113,11 +113,6 @@ msgstr "E84: Aucun tampon n'est modifi
 msgid "E85: There is no listed buffer"
 msgstr "E85: Aucun tampon n'est list<73>"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: Le tampon %<PRId64> n'existe pas"
-
 # AB - Je ne suis pas s<>r que l'on puisse obtenir ce message.
 #: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
@@ -756,6 +751,11 @@ msgstr "E696: Il manque une virgule dans la Liste %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Il manque ']' <20> la fin de la Liste %s"
 
+#: ../eval.c:5750
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr ""
+"Pas assez de m<>moire pour les r<>f<EFBFBD>rences, arr<72>t du ramassage de mi<6D>tes !"
+
 #: ../eval.c:6475
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
@@ -832,15 +832,15 @@ msgstr "E785: complete() n'est utilisable que dans le mode Insertion"
 msgid "&Ok"
 msgstr "&Ok"
 
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: un mappage existe d<>j<EFBFBD> pour %s"
-
 #: ../eval.c:8692
 msgid "extend() argument"
 msgstr "argument de extend()"
 
+#: ../eval.c:9345
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: un mappage existe d<>j<EFBFBD> pour %s"
+
 #: ../eval.c:8915
 msgid "map() argument"
 msgstr "argument de map()"
@@ -1798,10 +1798,10 @@ msgstr "E174: La commande existe d
 #: ../ex_docmd.c:4432
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    Nom         Args Plage Complet.  D<>finition"
+"    Nom         Args       Adresse   Complet.  D<>finition"
 
 #: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
@@ -1827,6 +1827,10 @@ msgstr "E178: La valeur par d
 msgid "E179: argument required for -complete"
 msgstr "E179: argument requis avec -complete"
 
+#: ../ex_docmd.c:4933
+msgid "E179: argument required for -addr"
+msgstr "E179: argument requis avec -addr"
+
 #: ../ex_docmd.c:4635
 #, c-format
 msgid "E181: Invalid attribute: %s"
@@ -1850,6 +1854,11 @@ msgstr ""
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: Aucune commande %s d<>finie par l'utilisateur"
 
+#: ../ex_docmd.c:5516
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: Valeur de type d'adresse invalide : %s"
+
 #: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
@@ -3155,6 +3164,11 @@ msgstr "E363: le motif utilise plus de m
 msgid "E749: empty buffer"
 msgstr "E749: tampon vide"
 
+#: ../buffer.c:1587
+#, c-format
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Le tampon %<PRId64> n'existe pas"
+
 #: ../globals.h:1108
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: D<>limiteur ou motif de recherche invalide"
@@ -4308,7 +4322,7 @@ msgid ""
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
 "\"\n"
-"    pour r<>cup<75>rer le fichier (voir \":help recovery\").\n"
+"    pour r<>cup<75>rer le fichier (consultez \":help recovery\").\n"
 
 #: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
@@ -4805,6 +4819,11 @@ msgstr "E522: Introuvable dans termcap"
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Caract<63>re <%s> invalide"
 
+#: ../option.c:2253
+#, c-format
+msgid "For option %s"
+msgstr "Pour l'option %s"
+
 #: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' ne doit pas <20>tre une cha<68>ne vide"
@@ -6779,9 +6798,6 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "Reading from stdin..."
 #~ msgstr "Lecture de stdin..."
 
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish]"
-
 #~ msgid "[crypted]"
 #~ msgstr "[chiffr<66>]"
 
@@ -6909,8 +6925,8 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgstr ""
 #~ "Vim : Une requ<71>te \"die\" a <20>t<EFBFBD> re<72>ue par le gestionnaire de session\n"
 
-#~ msgid "Close"
+#~ msgid "Close tab"
-#~ msgstr "Fermer"
+#~ msgstr "Fermer l'onglet"
 
 #~ msgid "New tab"
 #~ msgstr "Nouvel onglet"
@@ -6968,13 +6984,6 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "E672: Unable to open window inside MDI application"
 #~ msgstr "E672: Impossible d'ouvrir une fen<65>tre dans une application MDI"
 
-# DB - Les quelques messages qui suivent se retrouvent aussi ici :
-#      gui_gtk_x11.c:3170 et suivants.
-#      Les libell<6C>s changent un peu (majuscule par exemple).
-#      La VF t<>che de les unifier.
-#~ msgid "Close tab"
-#~ msgstr "Fermer l'onglet"
-
 #~ msgid "Open tab..."
 #~ msgstr "Ouvrir dans un onglet..."
 
@@ -7148,9 +7157,6 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "E836: This Vim cannot execute :python after using :py3"
 #~ msgstr "E836: Vim ne peut pas ex<65>cuter :python apr<70>s avoir utilis<69> :py3"
 
-#~ msgid "only string keys are allowed"
-#~ msgstr "seule une chaine est autoris<69>e comme cl<63>"
-
 #~ msgid ""
 #~ "E263: Sorry, this command is disabled, the Python library could not be "
 #~ "loaded."
@@ -7684,12 +7690,6 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "E338: Sorry, no file browser in console mode"
 #~ msgstr "E338: D<>sol<6F>, pas de s<>lecteur de fichiers en mode console"
 
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim : pr<70>servation des fichiers...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim : Fini.\n"
-
 #~ msgid "ERROR: "
 #~ msgstr "ERREUR : "
 
@@ -7718,6 +7718,10 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "E547: Illegal mouseshape"
 #~ msgstr "E547: Forme de curseur invalide"
 
+#~ msgid "Warning: Using a weak encryption method; see :help 'cm'"
+#~ msgstr ""
+#~ "Alerte : utilisation d'une m<>thode de chiffrage faible ; consultez :help 'cm'"
+
 #~ msgid "Enter encryption key: "
 #~ msgstr "Tapez la cl<63> de chiffrement : "
 
@@ -7861,15 +7865,6 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "E245: Illegal char '%c' in font name \"%s\""
 #~ msgstr "E245: Caract<63>re '%c' invalide dans le nom de fonte \"%s\""
 
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim : Double signal, sortie\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim : Signal mortel %s intercept<70>\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim : Signal mortel intercept<70>\n"
-
 #~ msgid "Opening the X display took %<PRId64> msec"
 #~ msgstr "L'ouverture du display X a pris %<PRId64> ms"
 
@@ -7970,7 +7965,7 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgstr ""
 #~ "VIMRUN.EXE est introuvable votre $PATH.\n"
 #~ "Les commandes externes ne feront pas de pause une fois termin<69>es.\n"
-#~ "Voir  :help win32-vimrun  pour plus d'informations."
+#~ "Consultez  :help win32-vimrun  pour plus d'informations."
 
 #~ msgid "Vim Warning"
 #~ msgstr "Alerte Vim"
@@ -7982,11 +7977,6 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgstr ""
 #~ "E868: Erreur lors de la construction du NFA avec classe d'<27>quivalence"
 
-#~ msgid "E999: (NFA regexp internal error) Should not process NOT node !"
-#~ msgstr ""
-#~ "E999: (erreur interne du regexp NFA) Un noeud 'NOT' ne devrait pas <20>tre "
-#~ "trait<69> !"
-
 #~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 #~ msgstr ""
 #~ "E878: (NFA) Impossible d'allouer la m<>moire pour parcourir les branches!"
@@ -8306,30 +8296,18 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "can't delete OutputObject attributes"
 #~ msgstr "impossible d'effacer les attributs d'OutputObject"
 
-#~ msgid "softspace must be an integer"
-#~ msgstr "softspace doit <20>tre un nombre entier"
-
 #~ msgid "invalid attribute"
 #~ msgstr "attribut invalide"
 
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines() requiert une liste de cha<68>nes"
-
 #~ msgid "E264: Python: Error initialising I/O objects"
 #~ msgstr "E264: Python : Erreur d'initialisation des objets d'E/S"
 
 #~ msgid "empty keys are not allowed"
 #~ msgstr "les cl<63>s vides ne sont pas autoris<69>es"
 
-#~ msgid "Cannot delete DictionaryObject attributes"
-#~ msgstr "Impossible d'effacer les attributs de DictionaryObject"
-
 #~ msgid "Cannot modify fixed dictionary"
 #~ msgstr "Impossible de modifier un dictionnaire fixe"
 
-#~ msgid "Cannot set this attribute"
-#~ msgstr "Impossible d'initialiser cet attribut"
-
 #~ msgid "dict is locked"
 #~ msgstr "dictionnaire est verrouill<6C>"
 
@@ -8348,15 +8326,9 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "Failed to add item to list"
 #~ msgstr "Ajout <20> la liste a <20>chou<6F>"
 
-#~ msgid "can only assign lists to slice"
-#~ msgstr "seules des tranches peuvent <20>tre assign<67>es aux listes"
-
 #~ msgid "internal error: failed to add item to list"
 #~ msgstr "erreur interne : ajout d'<27>l<EFBFBD>ment <20> la liste a <20>chou<6F>"
 
-#~ msgid "can only concatenate with lists"
-#~ msgstr "on ne peut que concat<61>ner avec des listes"
-
 #~ msgid "cannot delete vim.dictionary attributes"
 #~ msgstr "impossible d'effacer les attributs de vim.dictionary"
 
@@ -8366,9 +8338,6 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "cannot set this attribute"
 #~ msgstr "impossible d'initialiser cet attribut"
 
-#~ msgid "'self' argument must be a dictionary"
-#~ msgstr "l'argument 'self' doit <20>tre un dictionnaire"
-
 #~ msgid "failed to run function"
 #~ msgstr "ex<65>cution de la fonction a <20>chou<6F>"
 
@@ -8378,24 +8347,9 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "unable to unset option without global value"
 #~ msgstr "impossible de d<>sactiver une option sans une valeur globale"
 
-#~ msgid "object must be integer"
-#~ msgstr "objet doit <20>tre un nombre entier"
-
-#~ msgid "object must be string"
-#~ msgstr "objet doit <20>tre de type string"
-
 #~ msgid "attempt to refer to deleted tab page"
 #~ msgstr "tentative de r<>f<EFBFBD>rencer un onglet effac<61>"
 
-#~ msgid "<tabpage object (deleted) at %p>"
-#~ msgstr "<objet onglet (effac<61>) <20> %p>"
-
-#~ msgid "<tabpage object (unknown) at %p>"
-#~ msgstr "<objet onglet (inconnu) <20> %p>"
-
-#~ msgid "<tabpage %d>"
-#~ msgstr "<onglet %d>"
-
 #~ msgid "no such tab page"
 #~ msgstr "cet onglet n'existe pas"
 
@@ -8408,27 +8362,12 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "cursor position outside buffer"
 #~ msgstr "curseur positionn<6E> en dehors du tampon"
 
-#~ msgid "<window object (deleted) at %p>"
-#~ msgstr "<objet fen<65>tre (effac<61>) <20> %p>"
-
-#~ msgid "<window object (unknown) at %p>"
-#~ msgstr "<objet fen<65>tre (inconnu) <20> %p>"
-
-#~ msgid "<window %d>"
-#~ msgstr "<fen<65>tre %d>"
-
 #~ msgid "no such window"
 #~ msgstr "Cette fen<65>tre n'existe pas"
 
 #~ msgid "attempt to refer to deleted buffer"
 #~ msgstr "tentative de r<>f<EFBFBD>rencer un tampon effac<61>"
 
-#~ msgid "<buffer object (deleted) at %p>"
-#~ msgstr "<objet tampon (effac<61>) <20> %p>"
-
-#~ msgid "key must be integer"
-#~ msgstr "la cl<63> doit <20>tre un nombre entier"
-
 #~ msgid "expected vim.buffer object"
 #~ msgstr "objet vim.buffer attendu"
 
@@ -8467,18 +8406,3 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 
 #~ msgid "internal error: invalid value type"
 #~ msgstr "erreur interne : type de valeur invalide"
-
-#~ msgid "E860: Eval did not return a valid python 3 object"
-#~ msgstr "E860: Eval n'a pas retourn<72> un object python 3 valid"
-
-#~ msgid "E861: Failed to convert returned python 3 object to vim value"
-#~ msgstr "E861: Conversion d'objet python 3 <20> une valeur de vim a <20>chou<6F>"
-
-#~ msgid "E863: return value must be an instance of str"
-#~ msgstr "E863: valeur de retour doit <20>tre une instance de Str"
-
-#~ msgid "Only boolean objects are allowed"
-#~ msgstr "Seuls les objets bool<6F>ens sont autoris<69>s"
-
-#~ msgid "no such key in dictionary"
-#~ msgstr "cette cl<63> est inexistante dans le dictionnaire"