vim-patch:664f3cf3f21d

Runtime file updates.
https://github.com/vim/vim/commit/664f3cf3f21d3699bfd179c318ef5c869c085648

14 files changed, 1187 insertions, 876 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 44e6069b52..6ffa7cf4db 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -17,7 +17,8 @@ Using expressions is introduced in chapter 41 of the user manual |usr_41.txt|.
 							*E712*
 There are six types of variables:
 
-Number		A 32 or 64 bit signed number.  |expr-number| *Number*
+							*Number* *Integer*
+Number		A 32 or 64 bit signed number.  |expr-number|
 		Examples:  -123  0x10  0177  0b1011
 
 Float		A floating point number. |floating-point-format| *Float*
diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt
index 324e2e44af..f0a70d993e 100644
--- a/runtime/doc/ft_sql.txt
+++ b/runtime/doc/ft_sql.txt
@@ -338,8 +338,8 @@ The defaults static maps are: >
     imap <buffer> <C-C>T <C-\><C-O>:call sqlcomplete#Map('sqlType')<CR><C-X><C-O>
     imap <buffer> <C-C>s <C-\><C-O>:call sqlcomplete#Map('sqlStatement')<CR><C-X><C-O>
 
-The use of "<C-C>" can be user chosen by using the following in your 
-|init.vim| as it may not work properly on all platforms: >
+The use of "<C-C>" can be user chosen by using the following in your |init.vim|
+as it may not work properly on all platforms: >
     let g:ftplugin_sql_omni_key = '<C-C>'
 >
 The static maps (which are based on the syntax highlight groups) follow this
@@ -518,7 +518,7 @@ The SQL completion plugin can also display a list of columns for particular
 tables.  The column completion is trigger via <C-C>c.
 
 NOTE: The following example uses <Right> to trigger a column list while
-      the popup window is active.  
+      the popup window is active.
 
 Example of using column completion:
      - Press <C-C>t again to display the list of tables.
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index d855f33376..dc46fa515a 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -189,20 +189,20 @@ vim.eval(str)						*python-eval*
 						# a number.
 
 vim.strwidth(str)					*python-strwidth*
-	Like |strwidth()|: returns number of display cells str occupies, tab 
+	Like |strwidth()|: returns number of display cells str occupies, tab
 	is counted as one cell.
 
 vim.foreach_rtp(callable)				*python-foreach_rtp*
-	Call the given callable for each path in 'runtimepath' until either 
-	callable returns something but None, the exception is raised or there 
-	are no longer paths. If stopped in case callable returned non-None, 
+	Call the given callable for each path in 'runtimepath' until either
+	callable returns something but None, the exception is raised or there
+	are no longer paths. If stopped in case callable returned non-None,
 	vim.foreach_rtp function returns the value returned by callable.
 
 vim.chdir(*args, **kwargs)				*python-chdir*
 vim.fchdir(*args, **kwargs)				*python-fchdir*
 	Run os.chdir or os.fchdir, then all appropriate vim stuff.
-	Note: you should not use these functions directly, use os.chdir and 
-	      os.fchdir instead. Behavior of vim.fchdir is undefined in case 
+	Note: you should not use these functions directly, use os.chdir and
+	      os.fchdir instead. Behavior of vim.fchdir is undefined in case
 	      os.fchdir does not exist.
 
 Error object of the "vim" module
@@ -237,15 +237,15 @@ vim.windows						*python-windows*
 	    :py w in vim.windows	# Membership test
 	    :py n = len(vim.windows)	# Number of elements
 	    :py for w in vim.windows:	# Sequential access
-<	Note: vim.windows object always accesses current tab page. 
-	|python-tabpage|.windows objects are bound to parent |python-tabpage| 
-	object and always use windows from that tab page (or throw vim.error 
-	in case tab page was deleted). You can keep a reference to both 
-	without keeping a reference to vim module object or |python-tabpage|, 
+<	Note: vim.windows object always accesses current tab page.
+	|python-tabpage|.windows objects are bound to parent |python-tabpage|
+	object and always use windows from that tab page (or throw vim.error
+	in case tab page was deleted). You can keep a reference to both
+	without keeping a reference to vim module object or |python-tabpage|,
 	they will not lose their properties in this case.
 
 vim.tabpages						*python-tabpages*
-	A sequence object providing access to the list of vim tab pages. The 
+	A sequence object providing access to the list of vim tab pages. The
 	object supports the following operations: >
 	    :py t = vim.tabpages[i]	# Indexing (read-only)
 	    :py t in vim.tabpages	# Membership test
@@ -266,12 +266,12 @@ vim.current						*python-current*
 	"current range".  A range is a bit like a buffer, but with all access
 	restricted to a subset of lines.  See |python-range| for more details.
 
-	Note: When assigning to vim.current.{buffer,window,tabpage} it expects 
-	valid |python-buffer|, |python-window| or |python-tabpage| objects 
-	respectively. Assigning triggers normal (with |autocommand|s) 
-	switching to given buffer, window or tab page. It is the only way to 
-	switch UI objects in python: you can't assign to 
-	|python-tabpage|.window attribute. To switch without triggering 
+	Note: When assigning to vim.current.{buffer,window,tabpage} it expects
+	valid |python-buffer|, |python-window| or |python-tabpage| objects
+	respectively. Assigning triggers normal (with |autocommand|s)
+	switching to given buffer, window or tab page. It is the only way to
+	switch UI objects in python: you can't assign to
+	|python-tabpage|.window attribute. To switch without triggering
 	autocommands use >
 	    py << EOF
 	    saved_eventignore = vim.options['eventignore']
@@ -284,11 +284,11 @@ vim.current						*python-current*
 <
 vim.vars						*python-vars*
 vim.vvars						*python-vvars*
-	Dictionary-like objects holding dictionaries with global (|g:|) and 
+	Dictionary-like objects holding dictionaries with global (|g:|) and
 	vim (|v:|) variables respectively.
 
 vim.options						*python-options*
-	Object partly supporting mapping protocol (supports setting and 
+	Object partly supporting mapping protocol (supports setting and
 	getting items) providing a read-write access to global options.
 	Note: unlike |:set| this provides access only to global options. You
 	cannot use this object to obtain or set local options' values or
@@ -299,7 +299,7 @@ vim.options						*python-options*
 	buffer-local options and |python-window| objects to access to
 	window-local options.
 
-	Type of this object is available via "Options" attribute of vim 
+	Type of this object is available via "Options" attribute of vim
 	module.
 
 Output from Python					*python-output*
@@ -320,10 +320,10 @@ Output from Python					*python-output*
 		    *python2-directory* *python3-directory* *pythonx-directory*
 Python 'runtimepath' handling				*python-special-path*
 
-In python vim.VIM_SPECIAL_PATH special directory is used as a replacement for 
-the list of paths found in 'runtimepath': with this directory in sys.path and 
-vim.path_hooks in sys.path_hooks python will try to load module from 
-{rtp}/python2 (or python3) and {rtp}/pythonx (for both python versions) for 
+In python vim.VIM_SPECIAL_PATH special directory is used as a replacement for
+the list of paths found in 'runtimepath': with this directory in sys.path and
+vim.path_hooks in sys.path_hooks python will try to load module from
+{rtp}/python2 (or python3) and {rtp}/pythonx (for both python versions) for
 each {rtp} found in 'runtimepath'.
 
 Implementation is similar to the following, but written in C: >
@@ -351,8 +351,8 @@ Implementation is similar to the following, but written in C: >
             fmr = find_module(fullname, path)
             return load_module(fullname, *fmr)
 
-    # It uses vim module itself in place of VimPathFinder class: it does not 
-    # matter for python which object has find_module function attached to as 
+    # It uses vim module itself in place of VimPathFinder class: it does not
+    # matter for python which object has find_module function attached to as
     # an attribute.
     class VimPathFinder(object):
         @classmethod
@@ -375,28 +375,28 @@ Implementation is similar to the following, but written in C: >
     sys.path_hooks.append(hook)
 
 vim.VIM_SPECIAL_PATH					*python-VIM_SPECIAL_PATH*
-	String constant used in conjunction with vim path hook. If path hook 
-	installed by vim is requested to handle anything but path equal to 
-	vim.VIM_SPECIAL_PATH constant it raises ImportError. In the only other 
+	String constant used in conjunction with vim path hook. If path hook
+	installed by vim is requested to handle anything but path equal to
+	vim.VIM_SPECIAL_PATH constant it raises ImportError. In the only other
 	case it uses special loader.
 
-	Note: you must not use value of this constant directly, always use 
+	Note: you must not use value of this constant directly, always use
 	      vim.VIM_SPECIAL_PATH object.
 
 vim.find_module(...)					*python-find_module*
 vim.path_hook(path)					*python-path_hook*
-	Methods or objects used to implement path loading as described above. 
-	You should not be using any of these directly except for vim.path_hook 
-	in case you need to do something with sys.meta_path. It is not 
-	guaranteed that any of the objects will exist in the future vim 
+	Methods or objects used to implement path loading as described above.
+	You should not be using any of these directly except for vim.path_hook
+	in case you need to do something with sys.meta_path. It is not
+	guaranteed that any of the objects will exist in the future vim
 	versions.
 
 vim._get_paths						*python-_get_paths*
-	Methods returning a list of paths which will be searched for by path 
-	hook. You should not rely on this method being present in future 
+	Methods returning a list of paths which will be searched for by path
+	hook. You should not rely on this method being present in future
 	versions, but can use it for debugging.
 
-	It returns a list of {rtp}/python2 (or {rtp}/python3) and 
+	It returns a list of {rtp}/python2 (or {rtp}/python3) and
 	{rtp}/pythonx directories for each {rtp} in 'runtimepath'.
 
 ==============================================================================
@@ -425,21 +425,21 @@ line numbers, which start from 1.  This is particularly relevant when dealing
 with marks (see below) which use vim line numbers.
 
 The buffer object attributes are:
-	b.vars		Dictionary-like object used to access 
+	b.vars		Dictionary-like object used to access
 			|buffer-variable|s.
-	b.options	Mapping object (supports item getting, setting and 
-			deleting) that provides access to buffer-local options 
-			and buffer-local values of |global-local| options. Use 
-			|python-window|.options if option is window-local, 
-			this object will raise KeyError. If option is 
-			|global-local| and local value is missing getting it 
+	b.options	Mapping object (supports item getting, setting and
+			deleting) that provides access to buffer-local options
+			and buffer-local values of |global-local| options. Use
+			|python-window|.options if option is window-local,
+			this object will raise KeyError. If option is
+			|global-local| and local value is missing getting it
 			will return None.
 	b.name		String, RW. Contains buffer name (full path).
-			Note: when assigning to b.name |BufFilePre| and 
+			Note: when assigning to b.name |BufFilePre| and
 			|BufFilePost| autocommands are launched.
 	b.number	Buffer number. Can be used as |python-buffers| key.
 			Read-only.
-	b.valid		True or False. Buffer object becomes invalid when 
+	b.valid		True or False. Buffer object becomes invalid when
 			corresponding buffer is wiped out.
 
 The buffer object methods are:
@@ -527,16 +527,16 @@ Window attributes are:
 				This is a tuple, (row,col).
 	height (read-write)	The window height, in rows
 	width (read-write)	The window width, in columns
-	vars (read-only)	The window |w:| variables. Attribute is 
-				unassignable, but you can change window 
+	vars (read-only)	The window |w:| variables. Attribute is
+				unassignable, but you can change window
 				variables this way
-	options (read-only)	The window-local options. Attribute is 
-				unassignable, but you can change window 
-				options this way. Provides access only to 
-				window-local options, for buffer-local use 
-				|python-buffer| and for global ones use 
-				|python-options|. If option is |global-local| 
-				and local value is missing getting it will 
+	options (read-only)	The window-local options. Attribute is
+				unassignable, but you can change window
+				options this way. Provides access only to
+				window-local options, for buffer-local use
+				|python-buffer| and for global ones use
+				|python-options|. If option is |global-local|
+				and local value is missing getting it will
 				return None.
 	number (read-only)	Window number.  The first window has number 1.
 				This is zero in case it cannot be determined
@@ -545,7 +545,7 @@ Window attributes are:
 	row, col (read-only)	On-screen window position in display cells.
 				First position is zero.
 	tabpage (read-only)	Window tab page.
-	valid (read-write)	True or False. Window object becomes invalid 
+	valid (read-write)	True or False. Window object becomes invalid
 				when corresponding window is closed.
 
 The height attribute is writable only if the screen is split horizontally.
@@ -556,21 +556,21 @@ Window object type is available using "Window" attribute of vim module.
 ==============================================================================
 Tab page objects					*python-tabpage*
 
-Tab page objects represent vim tab pages. You can obtain them in a number of 
+Tab page objects represent vim tab pages. You can obtain them in a number of
 ways:
 	- via vim.current.tabpage (|python-current|)
 	- from indexing vim.tabpages (|python-tabpages|)
 
-You can use this object to access tab page windows. They have no methods and 
+You can use this object to access tab page windows. They have no methods and
 no sequence or other interfaces.
 
 Tab page attributes are:
-	number		The tab page number like the one returned by 
+	number		The tab page number like the one returned by
 			|tabpagenr()|.
 	windows		Like |python-windows|, but for current tab page.
 	vars		The tab page |t:| variables.
 	window		Current tabpage window.
-	valid		True or False. Tab page object becomes invalid when 
+	valid		True or False. Tab page object becomes invalid when
 			corresponding tab page is closed.
 
 TabPage object type is available using "TabPage" attribute of vim module.
@@ -578,7 +578,7 @@ TabPage object type is available using "TabPage" attribute of vim module.
 ==============================================================================
 pyeval() and py3eval() Vim functions			*python-pyeval*
 
-To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()| 
+To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()|
 functions to evaluate Python expressions and pass their values to Vim script.
 |pyxeval()| is also available.
 
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 2896709cd1..21f70d0947 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -528,7 +528,7 @@ The examples below assume a 'shiftwidth' of 4.
 <
 			*javascript-cinoptions* *javascript-indenting* *cino-J*
 	JN    Indent JavaScript object declarations correctly by not confusing
-	      them with labels.  The value 'N' is currently unused but must be 
+	      them with labels.  The value 'N' is currently unused but must be
 	      non-zero (e.g. 'J1').  If you enable this you probably also want
 	      to set |cino-j|. >
 
@@ -537,7 +537,7 @@ The examples below assume a 'shiftwidth' of 4.
 			that: this,
 			some: ok,
 		    },
-		    "bar":{ 
+		    "bar":{
 			a : 2,
 			b: "123abc",
 			x: 4,
@@ -887,7 +887,7 @@ To automatically remove '\r' characters when the 'fileformat' is set to Unix: >
 							*PHP_BracesAtCodeLevel*
 To indent braces at the same level than the code they contain: >
     :let g:PHP_BracesAtCodeLevel = 1
-    
+
 This will give the following result: >
     if ($foo)
 	{
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 3edd4864a1..a6e3dcd436 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -394,10 +394,11 @@ to set options automatically for one or more files:
 
 					*modeline* *vim:* *vi:* *ex:* *E520*
 There are two forms of modelines.  The first form:
-	[text]{white}{vi:|vim:|ex:}[white]{options}
+	[text{white}]{vi:|vim:|ex:}[white]{options}
 
-[text]			any text or empty
-{white}			at least one blank character (<Space> or <Tab>)
+[text{white}]		empty or any text followed by at least one blank
+			character (<Space> or <Tab>); "ex:" always requires at
+			least one blank character
 {vi:|vim:|ex:}		the string "vi:", "vim:" or "ex:"
 [white]			optional white space
 {options}		a list of option settings, separated with white space
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index a60e3d4b60..294a90306a 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -311,7 +311,7 @@ processing a quickfix or location list command, it will be aborted.
 							*:cex* *:cexpr* *E777*
 :cex[pr][!] {expr}	Create a quickfix list using the result of {expr} and
 			jump to the first error.
-			If {expr} is a String, then each new-line terminated
+			If {expr} is a String, then each newline terminated
 			line in the String is processed using the global value
 			of 'errorformat' and the result is added to the
 			quickfix list.
@@ -1090,7 +1090,7 @@ id-utils) in a similar way to its compiler integration (see |:make| above).
 			allowed with |:bufdo|.
 			An example that uses the argument list and avoids
 			errors for files without matches: >
-                                :silent argdo try 
+                                :silent argdo try
 				  \ | grepadd! something %
 				  \ | catch /E480:/
 				  \ | endtry"
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index fbeb1fd3bb..257550082d 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -621,7 +621,7 @@ Short explanation of each option:		*option-list*
 'binary'	  'bin'     read/write/edit file in binary mode
 'bomb'			    prepend a Byte Order Mark to the file
 'breakat'	  'brk'     characters that may cause a line break
-'breakindent'	  'bri'     wrapped line repeats indent 
+'breakindent'	  'bri'     wrapped line repeats indent
 'breakindentopt'  'briopt'  settings for 'breakindent'
 'browsedir'	  'bsdir'   which directory to start browsing in
 'bufhidden'	  'bh'	    what to do when buffer is no longer in window
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index e9e0ec0581..203430e9bc 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -70,7 +70,7 @@ The default for [range] is the whole buffer (1,$).  Use "CTRL-C" to interrupt
 the command.  If an error message is given for a line, the command for that
 line is aborted and the global command continues with the next marked or
 unmarked line.
-								*E147* 
+								*E147*
 When the command is used recursively, it only works on one line.  Giving a
 range is then not allowed. This is useful to find all lines that match a
 pattern and do not match another pattern: >
@@ -366,7 +366,7 @@ nested as deep as the number of files that can be opened at one time (about
 You can use the "<sfile>" string (literally, this is not a special key) inside
 of the sourced file, in places where a file name is expected.  It will be
 replaced by the file name of the sourced file.  For example, if you have a
-"other.vimrc" file in the same directory as your |init.vim| file, you can 
+"other.vimrc" file in the same directory as your |init.vim| file, you can
 source it from your |init.vim| file with this command: >
 	:source <sfile>:h/other.vimrc
 
@@ -505,7 +505,7 @@ When Vim starts up, after processing your .vimrc, it scans all directories in
 directories are added to 'runtimepath'.  Then all the plugins are loaded.
 See |packload-two-steps| for how these two steps can be useful.
 
-In the example Vim will find "pack/foo/start/foobar/plugin/foo.vim" and adds 
+In the example Vim will find "pack/foo/start/foobar/plugin/foo.vim" and adds
 "~/.local/share/nvim/site/pack/foo/start/foobar" to 'runtimepath'.
 
 If the "foobar" plugin kicks in and sets the 'filetype' to "some", Vim will
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index ed4b5eb659..c1329e7fdc 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1378,26 +1378,26 @@ to your startup file.
 
 EUPHORIA	    *euphoria3.vim* *euphoria4.vim* *ft-euphoria-syntax*
 
-Two syntax highlighting files exists for Euphoria. One for Euphoria 
-version 3.1.1, which is the default syntax highlighting file, and one for 
+Two syntax highlighting files exists for Euphoria. One for Euphoria
+version 3.1.1, which is the default syntax highlighting file, and one for
 Euphoria version 4.0.5 or later.
 
-Euphoria version 3.1.1 (http://www.rapideuphoria.com/) is still necessary 
-for developing applications for the DOS platform, which Euphoria version 4 
+Euphoria version 3.1.1 (http://www.rapideuphoria.com/) is still necessary
+for developing applications for the DOS platform, which Euphoria version 4
 (http://www.openeuphoria.org/) does not support.
 
-The following file extensions are auto-detected as Euphoria file type: 
-    
+The following file extensions are auto-detected as Euphoria file type:
+
 	*.e, *.eu, *.ew, *.ex, *.exu, *.exw
 	*.E, *.EU, *.EW, *.EX, *.EXU, *.EXW
 
-To select syntax highlighting file for Euphoria, as well as for 
+To select syntax highlighting file for Euphoria, as well as for
 auto-detecting the *.e and *.E file extensions as Euphoria file type,
 add the following line to your startup file: >
 
 	:let filetype_euphoria="euphoria3"
 
-	or 
+	or
 
 	:let filetype_euphoria="euphoria4"
 
@@ -3492,26 +3492,26 @@ It will look much better with a font in a quadratic cell size, e.g. for X: >
 YAML						*yaml.vim* *ft-yaml-syntax*
 
 					*g:yaml_schema* *b:yaml_schema*
-A YAML schema is a combination of a set of tags and a mechanism for resolving 
-non-specific tags. For user this means that YAML parser may, depending on 
-plain scalar contents, treat plain scalar (which can actually be only string 
-and nothing else) as a value of the other type: null, boolean, floating-point, 
-integer. `g:yaml_schema` option determines according to which schema values 
+A YAML schema is a combination of a set of tags and a mechanism for resolving
+non-specific tags. For user this means that YAML parser may, depending on
+plain scalar contents, treat plain scalar (which can actually be only string
+and nothing else) as a value of the other type: null, boolean, floating-point,
+integer. `g:yaml_schema` option determines according to which schema values
 will be highlighted specially. Supported schemas are
 
 Schema		Description ~
 failsafe	No additional highlighting.
 json		Supports JSON-style numbers, booleans and null.
 core		Supports more number, boolean and null styles.
-pyyaml		In addition to core schema supports highlighting timestamps, 
-		but there are some differences in what is recognized as 
-		numbers and many additional boolean values not present in core 
+pyyaml		In addition to core schema supports highlighting timestamps,
+		but there are some differences in what is recognized as
+		numbers and many additional boolean values not present in core
 		schema.
 
 Default schema is `core`.
 
-Note that schemas are not actually limited to plain scalars, but this is the 
-only difference between schemas defined in YAML specification and the only 
+Note that schemas are not actually limited to plain scalars, but this is the
+only difference between schemas defined in YAML specification and the only
 difference defined in the syntax file.
 
 
@@ -3631,7 +3631,7 @@ SYNTAX ISKEYWORD SETTING				*:syn-iskeyword*
 
 	clear:		Syntax specific iskeyword setting is disabled and the
 			buffer-local 'iskeyword' setting is used.
-	{option}        Set the syntax 'iskeyword' option to a new value. 
+	{option}        Set the syntax 'iskeyword' option to a new value.
 
 	Example: >
   :syntax iskeyword @,48-57,192-255,$,_
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index 97a67befb9..79519da51e 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -212,7 +212,7 @@ Check the ICCF web site for the latest information!  See |iccf| for the URL.
 USA:		The methods mentioned below can be used.
 		Sending a check to the Nehemiah Group Outreach Society (NGOS)
 		is no longer possible, unfortunately. We are looking for
-		another way to get you an IRS tax receipt. 
+		another way to get you an IRS tax receipt.
 		For sponsoring a child contact KCF in Canada (see below). US
 		checks can be sent to them to lower banking costs.
 
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index a500e87e35..0fc164965a 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -257,7 +257,7 @@ respectively:
 		(the magic number at the start of the file is wrong), then
 		this fails, unless the ! was added.
 		If it exists and does look like an undo file it is
-		overwritten. If there is no undo-history, nothing will be 
+		overwritten. If there is no undo-history, nothing will be
 		written.
 		Implementation detail: Overwriting happens by first deleting
 		the existing file and then creating a new file with the same
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index 96fc02aaa5..7c78146056 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -74,9 +74,9 @@ higher.  Pressing "-" does the same thing, without the need to move to the
 You can press <F1> to get help on the things you can do in the netrw file
 browser.  This is what you get: >
 
-    9. Directory Browsing	 netrw-browse   netrw-dir   netrw-list   netrw-help 
+    9. Directory Browsing	 netrw-browse   netrw-dir   netrw-list   netrw-help
 
-    MAPS								 netrw-maps 
+    MAPS								 netrw-maps
      	 <F1>.............Help.......................................|netrw-help|
      	 <cr>.............Browsing...................................|netrw-cr|
      	 <del>............Deleting Files or Directories..............|netrw-delete|
diff --git a/runtime/nvim.desktop b/runtime/nvim.desktop
index 1fe4b81668..e3bb9f2b3e 100644
--- a/runtime/nvim.desktop
+++ b/runtime/nvim.desktop
@@ -2,6 +2,7 @@
 Name=Neovim
 GenericName=Text Editor
 GenericName[de]=Texteditor
+GenericName[fr]=Éditeur de texte
 GenericName[ru]=Текстовый редактор
 GenericName[sr]=Текст Едитор
 GenericName[tr]=Metin Düzenleyici
@@ -27,7 +28,7 @@ Comment[et]=Redigeeri tekstifaile
 Comment[eu]=Editatu testu-fitxategiak
 Comment[fa]=ویرایش پرونده‌های متنی
 Comment[fi]=Muokkaa tekstitiedostoja
-Comment[fr]=Édite des fichiers texte
+Comment[fr]=Éditer des fichiers texte
 Comment[ga]=Eagar comhad Téacs
 Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો
 Comment[he]=ערוך קבצי טקסט
@@ -78,6 +79,7 @@ Exec=nvim %F
 Terminal=true
 Type=Application
 Keywords=Text;editor;
+Keywords[fr]=Texte;éditeur;
 Keywords[ru]=текст;текстовый редактор;
 Keywords[sr]=Текст;едитор;
 Keywords[tr]=Metin;düzenleyici;
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 5f1ca2fec5..3a474a3af1 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -62,8 +62,9 @@ msgstr ""
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Le tampon ne peut pas �tre enregistr�"
 
-msgid "E937: Attempt to delete a buffer that is in use"
-msgstr "E937: Tentative de suppression d'un tampon en cours d'utilisation"
+#, c-format
+msgid "E937: Attempt to delete a buffer that is in use: %s"
+msgstr "E937: Tentative de suppression d'un tampon en cours d'utilisation : %s"
 
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Aucun tampon n'a �t� d�charg�"
@@ -267,6 +268,9 @@ msgstr "E904: le troisi�me argument de \"call\" doit �tre une liste"
 msgid "E905: received unknown command: %s"
 msgstr "E905: commande inconnue re�ue : %s"
 
+msgid "E906: not an open channel"
+msgstr "E906: pas un canal ouvert"
+
 #, c-format
 msgid "E630: %s(): write while not connected"
 msgstr "E630: %s() : �criture sans �tre connect�"
@@ -284,9 +288,6 @@ msgstr ""
 "E912: Impossible d'utiliser ch_evalexpr()/ch_sendexpr() avec un canal brut "
 "ou nl"
 
-msgid "E906: not an open channel"
-msgstr "E906: pas un canal ouvert"
-
 msgid "E920: _io file requires _name to be set"
 msgstr "E920: fichier _io n�cessite _name"
 
@@ -297,6 +298,21 @@ msgstr "E915: tampon in_io n�cessite in_buf ou in_name "
 msgid "E918: buffer must be loaded: %s"
 msgstr "E918: le tampon doit �tre charg� : %s"
 
+msgid "E916: not a valid job"
+msgstr "E916: t�che invalide"
+
+# DB - TODO : Pas compris le message ni comment le d�clencher malgr� une visite
+#      dans le code.
+msgid "tagname"
+msgstr "nom du marqueur"
+
+# DB - TODO : Idem pr�c�dent.
+msgid " kind file\n"
+msgstr " type de fichier\n"
+
+msgid "'history' option is zero"
+msgstr "l'option 'history' vaut z�ro"
+
 msgid "E821: File is encrypted with unknown method"
 msgstr "E821: Le fichier est chiffr� avec une m�thode inconnue"
 
@@ -316,6 +332,55 @@ msgstr "Les cl�s ne correspondent pas !"
 msgid "[crypted]"
 msgstr "[chiffr�]"
 
+# AB - La version fran�aise de la premi�re phrase ne me satisfait pas.
+# DB - Suggestion.
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "Mode d�bogage activ�. Tapez \"cont\" pour continuer."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "Ancienneval = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "Nouvelleval = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "ligne %ld : %s"
+
+#, c-format
+msgid "cmd: %s"
+msgstr "cmde : %s"
+
+msgid "frame is zero"
+msgstr "le cadre de pile est z�ro"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "cadre de pile au niveau le plus haut : %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Point d'arr�t dans %s%s ligne %ld"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: Le point d'arr�t %s est introuvable"
+
+msgid "No breakpoints defined"
+msgstr "Aucun point d'arr�t n'est d�fini"
+
+# AB - Le deuxi�me %s est remplac� par "func" ou "file" sans que l'on puisse
+#      traduire ces mots.
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  ligne %ld"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Il manque ':' dans le Dictionnaire %s"
@@ -1171,22 +1236,7 @@ msgstr "Motif trouv� dans toutes les lignes : %s"
 
 #, c-format
 msgid "Pattern not found: %s"
-msgstr "Motif introuvable: %s"
-
-# AB - Ne pas traduire le dollar.
-# AB - Ce message n'est volontairement pas traduit. En effet, il fait partie
-#      d'un groupe de trois messages dans viminfo, dont deux ne sont pas soumis
-#      � internationalisation. J'attends que les deux autres messages soient
-#      traduisibles pour traduire celui-ci.
-# DB - TODO : Qu'en est-il � pr�sent ?
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Derni�res cha�nes de substitution :\n"
-"$"
+msgstr "Motif introuvable : %s"
 
 # This message should *so* be E42!
 msgid "E478: Don't panic!"
@@ -1290,58 +1340,6 @@ msgstr "[Effac�]"
 msgid "No old files"
 msgstr "Aucun vieux fichier"
 
-# AB - La version fran�aise de la premi�re phrase ne me satisfait pas.
-# DB - Suggestion.
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "Mode d�bogage activ�. Tapez \"cont\" pour continuer."
-
-#, c-format
-msgid "Oldval = \"%s\""
-msgstr "Ancienneval = \"%s\""
-
-#, c-format
-msgid "Newval = \"%s\""
-msgstr "Nouvelleval = \"%s\""
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "ligne %ld : %s"
-
-#, c-format
-msgid "cmd: %s"
-msgstr "cmde : %s"
-
-msgid "frame is zero"
-msgstr "le cadre de pile est z�ro"
-
-#, c-format
-msgid "frame at highest level: %d"
-msgstr "cadre de pile au niveau le plus haut : %d"
-
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Point d'arr�t dans %s%s ligne %ld"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Le point d'arr�t %s est introuvable"
-
-msgid "No breakpoints defined"
-msgstr "Aucun point d'arr�t n'est d�fini"
-
-# AB - Le deuxi�me %s est remplac� par "func" ou "file" sans que l'on puisse
-#      traduire ces mots.
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  ligne %ld"
-
-#, c-format
-msgid "%3d  expr %s"
-msgstr "%3d  expr %s"
-
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\""
-
 # AB - "changes to" est redondant et a �t� omis de la version fran�aise.
 #, c-format
 msgid "Save changes to \"%s\"?"
@@ -1361,32 +1359,11 @@ msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr ""
 "Alerte : Entr�e inattendue dans un autre tampon (v�rifier autocommandes)"
 
-msgid "E163: There is only one file to edit"
-msgstr "E163: Il n'y a qu'un seul fichier � �diter"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: Impossible d'aller avant le premier fichier"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Impossible d'aller au-del� du dernier fichier"
-
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: Compilateur %s non support�"
 
 #, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "Recherche de \"%s\" dans \"%s\""
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "Recherche de \"%s\""
-
-#, c-format
-msgid "not found in '%s': \"%s\""
-msgstr "introuvable dans '%s' : \"%s\""
-
-#, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
 msgstr "W20: Python version 2.x non support�, fichier %s ignor�"
 
@@ -1394,62 +1371,6 @@ msgstr "W20: Python version 2.x non support�, fichier %s ignor�"
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
 msgstr "W21: Python 3.x non support�, fichier %s ignor�"
 
-msgid "Source Vim script"
-msgstr "Sourcer un script - Vim"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Impossible de sourcer un r�pertoire : \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "impossible de sourcer \"%s\""
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "ligne %ld : impossible de sourcer \"%s\""
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "sourcement \"%s\""
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "ligne %ld : sourcement de \"%s\""
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "fin du sourcement de %s"
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "continuing in %s"
-msgstr "de retour dans %s"
-
-msgid "modeline"
-msgstr "ligne de mode"
-
-msgid "--cmd argument"
-msgstr "argument --cmd"
-
-msgid "-c argument"
-msgstr "argument -c"
-
-msgid "environment variable"
-msgstr "variable d'environnement"
-
-msgid "error handler"
-msgstr "gestionnaire d'erreur"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Alerte : S�parateur de ligne erron�, ^M possiblement manquant"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding utilis� en dehors d'un fichier sourc�"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish utilis� en dehors d'un fichier sourc�"
-
 # DB - Le premier %s est, au choix : "time ", "ctype " ou "messages ",
 #      sans qu'il soit possible de les traduire.
 #, c-format
@@ -1466,6 +1387,10 @@ msgstr "Mode Ex activ�. Tapez \"visual\" pour passer en mode Normal."
 msgid "E501: At end-of-file"
 msgstr "E501: � la fin du fichier"
 
+#, c-format
+msgid "Executing: %s"
+msgstr "Ex�cution de : %s"
+
 msgid "E169: Command too recursive"
 msgstr "E169: Commande trop r�cursive"
 
@@ -1640,15 +1565,6 @@ msgstr "E930: Impossible d'utiliser :redir dans execute()"
 msgid "Save Redirection"
 msgstr "Enregistrer la redirection"
 
-msgid "Save View"
-msgstr "Enregistrer la vue - Vim"
-
-msgid "Save Session"
-msgstr "Enregistrer la session - Vim"
-
-msgid "Save Setup"
-msgstr "Enregistrer les r�glages - Vim"
-
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Impossible de cr�er le r�pertoire \"%s\""
@@ -1695,9 +1611,6 @@ msgstr "E499: Nom de fichier vide pour '%' ou '#', ne marche qu'avec \":p:h\""
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: �valu� en une cha�ne vide"
 
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Impossible d'ouvrir le viminfo en lecture"
-
 # AB - Si les parenth�ses posent probl�me, il faudra remettre les guillemets
 #      ci-dessus.
 msgid "Untitled"
@@ -1815,46 +1728,6 @@ msgid "E811: Not allowed to change buffer information now"
 msgstr ""
 "E811: Changement des informations du tampon n'est pas permise maintenant"
 
-# DB - TODO : Pas compris le message ni comment le d�clencher malgr� une visite
-#      dans le code.
-msgid "tagname"
-msgstr "nom du marqueur"
-
-# DB - TODO : Idem pr�c�dent.
-msgid " kind file\n"
-msgstr " type de fichier\n"
-
-msgid "'history' option is zero"
-msgstr "l'option 'history' vaut z�ro"
-
-# DB - Messages et les suivants : fichier .viminfo.
-#      Pas de majuscule n�cessaire pour les messages d'apr�s.
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Historique %s (chronologie d�croissante) :\n"
-
-msgid "Command Line"
-msgstr "ligne de commande"
-
-msgid "Search String"
-msgstr "cha�ne de recherche"
-
-msgid "Expression"
-msgstr "expression"
-
-msgid "Input Line"
-msgstr "ligne de saisie"
-
-msgid "Debug Line"
-msgstr "Ligne de d�bogage"
-
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar au-del� de la longueur de la commande"
-
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Fen�tre ou tampon actif effac�"
 
@@ -1864,18 +1737,12 @@ msgstr "E812: Des autocommandes ont chang� le tampon ou le nom du tampon"
 msgid "Illegal file name"
 msgstr "Nom de fichier invalide"
 
-msgid "is a directory"
-msgstr "est un r�pertoire"
-
 msgid "is not a file"
 msgstr "n'est pas un fichier"
 
 msgid "is a device (disabled with 'opendevice' option)"
 msgstr "est un p�riph�rique (d�sactiv� par l'option 'opendevice')"
 
-msgid "[New File]"
-msgstr "[Nouveau fichier]"
-
 msgid "[New DIRECTORY]"
 msgstr "[Nouveau R�PERTOIRE]"
 
@@ -1917,12 +1784,6 @@ msgstr "[CR manquant]"
 msgid "[long lines split]"
 msgstr "[lignes longues coup�es]"
 
-msgid "[NOT converted]"
-msgstr "[NON converti]"
-
-msgid "[converted]"
-msgstr "[converti]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[ERREUR DE CONVERSION � la ligne %ld]"
@@ -1944,130 +1805,6 @@ msgstr "La conversion avec 'charconvert' a �chou�"
 msgid "can't read output of 'charconvert'"
 msgstr "Impossible de lire la sortie de 'charconvert'"
 
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: Pas d'autocommande correspondante pour le tampon acwrite"
-
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Des autocommandes ont effac� ou d�charg� le tampon � �crire"
-
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr ""
-"E204: L'autocommande a modifi� le nombre de lignes de mani�re inattendue"
-
-msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans interdit l'�criture des tampons non modifi�s"
-
-msgid "Partial writes disallowed for NetBeans buffers"
-msgstr "Netbeans interdit l'�criture partielle de ses tampons"
-
-msgid "is not a file or writable device"
-msgstr "n'est pas un fichier ou un p�riph�rique inscriptible"
-
-msgid "writing to device disabled with 'opendevice' option"
-msgstr "�criture vers un p�riph�rique d�sactiv� par l'option 'opendevice'"
-
-msgid "is read-only (add ! to override)"
-msgstr "est en lecture seule (ajoutez ! pour passer outre)"
-
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: Impossible d'�crire la copie de secours (! pour passer outre)"
-
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: Erreur de fermeture de la copie de secours (! pour passer outre)"
-
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr ""
-"E508: Impossible de lire le fichier pour la copie de secours (ajoutez ! pour "
-"passer outre)"
-
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr ""
-"E509: Impossible de cr�er la copie de secours (ajoutez ! pour passer outre)"
-
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr ""
-"E510: Impossible de g�n�rer la copie de secours (ajoutez ! pour passer outre)"
-
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: Impossible de g�n�rer un fichier temporaire pour y �crire"
-
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: Impossible de convertir (ajoutez ! pour �crire sans convertir)"
-
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: Impossible d'ouvrir le lien pour y �crire"
-
-msgid "E212: Can't open file for writing"
-msgstr "E212: Impossible d'ouvrir le fichier pour y �crire"
-
-msgid "E949: File changed while writing"
-msgstr "E949: Fichier modifi� apr�s �criture"
-
-msgid "E512: Close failed"
-msgstr "E512: Erreur de fermeture de fichier"
-
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr ""
-"E513: Erreur d'�criture, �chec de conversion (videz 'fenc' pour passer outre)"
-
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: Erreur d'�criture, �chec de conversion � la ligne %ld (videz 'fenc' "
-"pour passer outre)"
-
-msgid "E514: write error (file system full?)"
-msgstr "E514: erreur d'�criture (syst�me de fichiers plein ?)"
-
-msgid " CONVERSION ERROR"
-msgstr " ERREUR DE CONVERSION"
-
-#, c-format
-msgid " in line %ld;"
-msgstr " � la ligne %ld"
-
-msgid "[Device]"
-msgstr "[P�riph.]"
-
-msgid "[New]"
-msgstr "[Nouveau]"
-
-msgid " [a]"
-msgstr " [a]"
-
-msgid " appended"
-msgstr " ajout�(s)"
-
-msgid " [w]"
-msgstr " [e]"
-
-msgid " written"
-msgstr " �crit(s)"
-
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patchmode : impossible d'enregistrer le fichier original"
-
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patchmode : impossible de cr�er le fichier original vide"
-
-msgid "E207: Can't delete backup file"
-msgstr "E207: Impossible d'effacer la copie de secours"
-
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"ALERTE: Le fichier original est peut-�tre perdu ou endommag�\n"
-
-# DB - todo : un peu long...
-msgid "don't quit the editor until the file is successfully written!"
-msgstr ""
-"ne quittez pas l'�diteur tant que le fichier n'est pas correctement "
-"enregistr� !"
-
 msgid "[dos]"
 msgstr "[dos]"
 
@@ -2104,12 +1841,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[Derni�re ligne incompl�te]"
 
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "ALERTE : Le fichier a �t� modifi� depuis que Vim l'a lu !"
-
-msgid "Do you really want to write to it"
-msgstr "Voulez-vous vraiment �crire dedans"
-
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Erreur lors de l'�criture dans \"%s\""
@@ -2246,6 +1977,60 @@ msgstr "E219: { manquant."
 msgid "E220: Missing }."
 msgstr "E220: } manquant."
 
+msgid "<empty>"
+msgstr "<vide>"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: Trop de liens symboliques (cycle ?)"
+
+# DB : Les trois messages qui suivent sont des titres de bo�tes
+#      de dialogue par d�faut.
+msgid "Select Directory dialog"
+msgstr "S�lecteur de r�pertoire"
+
+msgid "Save File dialog"
+msgstr "Enregistrer un fichier"
+
+msgid "Open File dialog"
+msgstr "Ouvrir un fichier"
+
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: D�sol�, pas de s�lecteur de fichiers en mode console"
+
+msgid "E854: path too long for completion"
+msgstr "E854: chemin trop long pour compl�tement"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: Chemin invalide : '**[nombre]' doit �tre � la fin du chemin ou �tre "
+"suivi de '%s'."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: R�pertoire \"%s\" introuvable dans 'cdpath'"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: Fichier \"%s\" introuvable dans 'path'"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: Plus de r�pertoire \"%s\" dans 'cdpath'"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: Plus de fichier \"%s\" dans 'path'"
+
+msgid "E446: No file name under cursor"
+msgstr "E446: Aucun nom de fichier sous le curseur"
+
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: Le fichier \"%s\" est introuvable dans 'path'"
+
 msgid "E490: No fold found"
 msgstr "E490: Aucun repli trouv�"
 
@@ -2261,37 +2046,18 @@ msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld ligne d�plac�e "
 msgstr[1] "+--%3ld lignes d�plac�es "
 
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld ligne : "
+msgstr[1] "+-%s%3ld lignes : "
+
 msgid "E222: Add to read buffer"
 msgstr "E222: Ajout au tampon de lecture"
 
 msgid "E223: recursive mapping"
 msgstr "E223: mappage r�cursif"
 
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: une abr�viation globale existe d�j� pour %s"
-
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: un mappage global existe d�j� pour %s"
-
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: une abr�viation existe d�j� pour %s"
-
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: un mappage existe d�j� pour %s"
-
-msgid "No abbreviation found"
-msgstr "Aucune abr�viation trouv�e"
-
-msgid "No mapping found"
-msgstr "Aucun mappage trouv�"
-
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap : mode invalide"
-
 msgid "E851: Failed to create a new process for the GUI"
 msgstr ""
 "E851: �chec lors de la cr�ation d'un nouveau processus pour l'interface "
@@ -2508,6 +2274,9 @@ msgstr "E671: Titre de fen�tre \"%s\" introuvable"
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: Argument non support� : \"-%s\" ; Utilisez la version OLE."
 
+msgid "E988: GUI cannot be used. Cannot execute gvim.exe."
+msgstr "E988: L'interface graphique ne peut pas �tre utilis�e. Impossible d'ex�cuter gvim.exe."
+
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Impossible d'ouvrir une fen�tre dans une application MDI"
 
@@ -2586,9 +2355,6 @@ msgstr "Style :"
 msgid "Size:"
 msgstr "Taille :"
 
-msgid "E256: Hangul automata ERROR"
-msgstr "E256: ERREUR dans l'automate Hangul"
-
 msgid "E550: Missing colon"
 msgstr "E550: ':' manquant"
 
@@ -2686,6 +2452,94 @@ msgstr "E365: L'impression du fichier PostScript a �chou�"
 msgid "Print job sent."
 msgstr "T�che d'impression envoy�e."
 
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: boucle r�cursive lors du chargement de syncolor.vim"
+
+#, c-format
+msgid "E411: highlight group not found: %s"
+msgstr "E411: groupe de surbrillance introuvable : %s"
+
+#, c-format
+msgid "E412: Not enough arguments: \":highlight link %s\""
+msgstr "E412: Trop peu d'arguments : \":highlight link %s\""
+
+#, c-format
+msgid "E413: Too many arguments: \":highlight link %s\""
+msgstr "E413: Trop d'arguments : \":highlight link %s\""
+
+msgid "E414: group has settings, highlight link ignored"
+msgstr "E414: le groupe a d�j� des attributs, lien de surbrillance ignor�"
+
+#, c-format
+msgid "E415: unexpected equal sign: %s"
+msgstr "E415: signe �gal inattendu : %s"
+
+#, c-format
+msgid "E416: missing equal sign: %s"
+msgstr "E416: '=' manquant : %s"
+
+#, c-format
+msgid "E417: missing argument: %s"
+msgstr "E417: argument manquant : %s"
+
+#, c-format
+msgid "E418: Illegal value: %s"
+msgstr "E418: Valeur invalide : %s"
+
+msgid "E419: FG color unknown"
+msgstr "E419: Couleur de premier plan inconnue"
+
+msgid "E420: BG color unknown"
+msgstr "E420: Couleur d'arri�re-plan inconnue"
+
+#, c-format
+msgid "E421: Color name or number not recognized: %s"
+msgstr "E421: Nom ou num�ro de couleur non reconnu : %s"
+
+#, c-format
+msgid "E422: terminal code too long: %s"
+msgstr "E422: le code de terminal est trop long : %s"
+
+#, c-format
+msgid "E423: Illegal argument: %s"
+msgstr "E423: Argument invalide : %s"
+
+msgid "E424: Too many different highlighting attributes in use"
+msgstr ""
+"E424: Trop d'attributs de surbrillance diff�rents en cours d'utilisation"
+
+msgid "E669: Unprintable character in group name"
+msgstr "E669: Caract�re non imprimable dans un nom de groupe"
+
+msgid "W18: Invalid character in group name"
+msgstr "W18: Caract�re invalide dans un nom de groupe"
+
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: Trop de groupes de surbrillance et de syntaxe"
+
+#, c-format
+msgid "E799: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E799: ID invalide : %d (doit �tre plus grand ou �gal � 1)"
+
+#, c-format
+msgid "E801: ID already taken: %d"
+msgstr "E801: ID d�j� pris : %d"
+
+msgid "List or number required"
+msgstr "Liste ou nombre requis"
+
+#, c-format
+msgid "E802: Invalid ID: %d (must be greater than or equal to 1)"
+msgstr "E802: ID invalide : %d (doit �tre plus grand ou �gal � 1)"
+
+#, c-format
+msgid "E803: ID not found: %d"
+msgstr "E803: ID introuvable : %d"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %d"
+msgstr "E798: ID est r�serv� pour \":match\" : %d"
+
 msgid "Add a new database"
 msgstr "Ajouter une base de donn�es"
 
@@ -3062,10 +2916,157 @@ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: Entr�e registre de l'instance de Vim mal format�e. Suppression !"
 
 #, c-format
+msgid "%ld lines to indent... "
+msgstr "%ld lignes � indenter... "
+
+#, c-format
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld ligne indent�e "
+msgstr[1] "%ld lignes indent�es "
+
+# AB - Remplacer "compl�tion" par "compl�tement" ? Voir l'�thymologie
+#      d'"accr�tion".
+msgid " Keyword completion (^N^P)"
+msgstr " Compl�tement de mot-cl� (^N^P)"
+
+# DB - todo : Faut-il une majuscule � "mode" ?
+msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+msgstr " mode ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
+
+msgid " Whole line completion (^L^N^P)"
+msgstr " Compl�tement de ligne enti�re (^L^N^P)"
+
+msgid " File name completion (^F^N^P)"
+msgstr " Compl�tement de nom de fichier (^F^N^P)"
+
+msgid " Tag completion (^]^N^P)"
+msgstr " Compl�tement de marqueur (^]^N^P)"
+
+# AB - J'ai d� avoir une bonne raison de faire une version fran�aise aussi
+#      diff�rente de la version anglaise. Il me faut la retrouver.
+# DB - TODO
+msgid " Path pattern completion (^N^P)"
+msgstr " Compl�tement global de mot-cl� (^N^P)"
+
+msgid " Definition completion (^D^N^P)"
+msgstr " Compl�tement de d�finition (^D^N^P)"
+
+# AB - Trouver une meilleure formulation que "selon le".
+# DB : proposition : "avec"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " Compl�tement avec le dictionnaire (^K^N^P)"
+
+# AB - Trouver une meilleure formulation que "selon le".
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Compl�tement avec le th�saurus (^T^N^P)"
+
+# AB - La version fran�aise est meilleure que la version anglaise.
+# DB : Suggestion.
+msgid " Command-line completion (^V^N^P)"
+msgstr " Compl�tement de ligne de commande (^V^N^P)"
+
+msgid " User defined completion (^U^N^P)"
+msgstr " Compl�tement d�fini par l'utilisateur (^U^N^P)"
+
+# DB : On doit pouvoir trouver nettement mieux que �a.
+msgid " Omni completion (^O^N^P)"
+msgstr " Compl�tement selon le type de fichier (Omni) (^O^N^P)"
+
+msgid " Spelling suggestion (s^N^P)"
+msgstr " Suggestion d'orthographe (s^N^P)"
+
+msgid " Keyword Local completion (^N^P)"
+msgstr " Compl�tement local de mot-cl� (^N/^P)"
+
+# AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
+#      Il faut �viter de le faire trop long. Je pense que la version fran�aise
+#      est suffisamment compr�hensible dans le contexte dans lequel elle est
+#      affich�e.
+msgid "Hit end of paragraph"
+msgstr "Fin du paragraphe"
+
+msgid "E839: Completion function changed window"
+msgstr "E839: La fonction de compl�tement a chang� la fen�tre"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: La fonction de compl�tement a effac� du texte"
+
+msgid "'dictionary' option is empty"
+msgstr "L'option 'dictionary' est vide"
+
+msgid "'thesaurus' option is empty"
+msgstr "L'option 'thesaurus' est vide"
+
+#, c-format
+msgid "Scanning dictionary: %s"
+msgstr "Examen du dictionnaire : %s"
+
+msgid " (insert) Scroll (^E/^Y)"
+msgstr " (insertion) D�filement (^E/^Y)"
+
+msgid " (replace) Scroll (^E/^Y)"
+msgstr " (remplacement) D�filement (^E/^Y)"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() n'est utilisable que dans le mode Insertion"
+
+#, c-format
+msgid "Scanning: %s"
+msgstr "Examen : %s"
+
+msgid "Scanning tags."
+msgstr "Examen des marqueurs."
+
+msgid "match in file"
+msgstr "correspondance dans le fichier"
+
+# AB - Cette cha�ne de caract�res est ajout�e en d�but de ligne lorsqu'une
+#      op�ration de compl�tion est r�p�t�e (typiquement avec CTRL-X CTRL-N).
+#      Que ce soit en anglais ou en fran�ais, il y a un probl�me de majuscules.
+#      Bien qu'insatisfaisante, cette traduction semble optimale.
+msgid " Adding"
+msgstr " Ajout"
+
+msgid "-- Searching..."
+msgstr "-- Recherche en cours..."
+
+# AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
+# AB - Faut-il utiliser "origine" ou "originel" au lieu d'"original" ?
+# DB : Suggestion.
+msgid "Back at original"
+msgstr "Retour au point de d�part"
+
+# AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
+msgid "Word from other line"
+msgstr "Mot d'une autre ligne"
+
+# AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
+msgid "The only match"
+msgstr "La seule correspondance"
+
+# AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
+# AB - Faut-il remplacer "sur" par "de" ?
+# DB : Pour moi, non.
+#, c-format
+msgid "match %d of %d"
+msgstr "Correspondance %d sur %d"
+
+# AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
+# DB - todo : la VO n'a pas de majuscule.
+#, c-format
+msgid "match %d"
+msgstr "Correspondance %d"
+
+#, c-format
 msgid "E938: Duplicate key in JSON: \"%s\""
 msgstr "E938: Cl� dupliqu�e dans le document JSON : \"%s\""
 
 #, c-format
+msgid "E899: Argument of %s must be a List or Blob"
+msgstr "E899: L'argument de %s doit �tre une Liste ou un Blob"
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Il manque une virgule dans la Liste %s"
 
@@ -3073,6 +3074,36 @@ msgstr "E696: Il manque une virgule dans la Liste %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Il manque ']' � la fin de la Liste %s"
 
+msgid "sort() argument"
+msgstr "argument de sort()"
+
+msgid "uniq() argument"
+msgstr "argument de uniq()"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: La fonction de comparaison de sort() a �chou�"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: La fonction de comparaison de uniq() a �chou�"
+
+msgid "map() argument"
+msgstr "argument de map()"
+
+msgid "filter() argument"
+msgstr "argument de filter()"
+
+msgid "add() argument"
+msgstr "argument de add()"
+
+msgid "insert() argument"
+msgstr "argument de insert()"
+
+msgid "remove() argument"
+msgstr "argument de remove()"
+
+msgid "reverse() argument"
+msgstr "argument de reverse()"
+
 msgid "Unknown option argument"
 msgstr "Option inconnue"
 
@@ -3279,9 +3310,6 @@ msgstr "-A\t\tD�marrer en mode arabe"
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\tD�marrer en mode h�breu"
 
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\tD�marrer en mode farsi"
-
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <term>\tR�gler le type du terminal sur <terminal>"
 
@@ -3512,6 +3540,39 @@ msgstr "Aucun display : L'envoi de l'expression a �chou�.\n"
 msgid ": Send expression failed.\n"
 msgstr " : L'envoi de l'expression a �chou�.\n"
 
+#, c-format
+msgid "E224: global abbreviation already exists for %s"
+msgstr "E224: une abr�viation globale existe d�j� pour %s"
+
+#, c-format
+msgid "E225: global mapping already exists for %s"
+msgstr "E225: un mappage global existe d�j� pour %s"
+
+#, c-format
+msgid "E226: abbreviation already exists for %s"
+msgstr "E226: une abr�viation existe d�j� pour %s"
+
+#, c-format
+msgid "E227: mapping already exists for %s"
+msgstr "E227: un mappage existe d�j� pour %s"
+
+msgid "No abbreviation found"
+msgstr "Aucune abr�viation trouv�e"
+
+msgid "No mapping found"
+msgstr "Aucun mappage trouv�"
+
+msgid "E228: makemap: Illegal mode"
+msgstr "E228: makemap : mode invalide"
+
+#, c-format
+msgid "E357: 'langmap': Matching character missing for %s"
+msgstr "E357: 'langmap' : Aucun caract�re correspondant pour %s"
+
+#, c-format
+msgid "E358: 'langmap': Extra characters after semicolon: %s"
+msgstr "E358: 'langmap' : Caract�res surnum�raires apr�s point-virgule : %s"
+
 msgid "No marks set"
 msgstr "Aucune marque positionn�e"
 
@@ -3540,30 +3601,6 @@ msgstr ""
 "\n"
 "modif  ligne col fichier/texte"
 
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# Marques dans le fichier :\n"
-
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# Liste de sauts (le plus r�cent en premier) :\n"
-
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Historique des marques dans les fichiers (les plus r�centes en premier) :\n"
-
-msgid "Missing '>'"
-msgstr "'>' manquant"
-
 msgid "E543: Not a valid codepage"
 msgstr "E543: Page de codes non valide"
 
@@ -3821,6 +3858,9 @@ msgstr "   Dans le r�pertoire "
 msgid "      -- none --\n"
 msgstr "     -- aucun --\n"
 
+msgid "%a %b %d %H:%M:%S %Y"
+msgstr "%a %b %d %H:%M:%S %Y"
+
 msgid "          owned by: "
 msgstr "      propri�t� de : "
 
@@ -3913,8 +3953,8 @@ msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get : num�ro de ligne invalide : %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get : ligne %ld introuvable"
+msgid "E316: ml_get: cannot find line %ld in buffer %d %s"
+msgstr "E316: ml_get : impossible de trouver la ligne %ld dans le tampon %d %s"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: mauvais id de pointeur de bloc 3"
@@ -4010,6 +4050,9 @@ msgstr ""
 "\"\n"
 "    pour �viter ce message.\n"
 
+msgid "Found a swap file that is not useful, deleting it"
+msgstr "Effacement de fichier d'�change inutile"
+
 msgid "Swap file \""
 msgstr "Le fichier d'�change \""
 
@@ -4160,20 +4203,6 @@ msgstr ""
 "Tout aban&donner\n"
 "&Annuler"
 
-# DB : Les trois messages qui suivent sont des titres de bo�tes
-#      de dialogue par d�faut.
-msgid "Select Directory dialog"
-msgstr "S�lecteur de r�pertoire"
-
-msgid "Save File dialog"
-msgstr "Enregistrer un fichier"
-
-msgid "Open File dialog"
-msgstr "Ouvrir un fichier"
-
-msgid "E338: Sorry, no file browser in console mode"
-msgstr "E338: D�sol�, pas de s�lecteur de fichiers en mode console"
-
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Pas assez d'arguments pour printf()"
 
@@ -4183,9 +4212,6 @@ msgstr "E807: printf() attend un argument de type Flottant"
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Trop d'arguments pour printf()"
 
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: Alerte : Modification d'un fichier en lecture seule"
-
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr "Tapez un nombre et <Entr�e> ou cliquez avec la souris (rien annule) :"
 
@@ -4210,6 +4236,15 @@ msgstr " (Interrompu)"
 msgid "Beep!"
 msgstr "Bip !"
 
+msgid "E677: Error writing temp file"
+msgstr "E677: Erreur lors de l'�criture du fichier temporaire"
+
+#, c-format
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "il y a %ld seconde"
+msgstr[1] "il y a %ld secondes"
+
 msgid "ERROR: "
 msgstr "ERREUR : "
 
@@ -4229,12 +4264,8 @@ msgstr ""
 "[appels] total re/malloc() %lu, total free() %lu\n"
 "\n"
 
-msgid "E340: Line is becoming too long"
-msgstr "E340: La ligne devient trop longue"
-
-#, c-format
-msgid "E341: Internal error: lalloc(%ld, )"
-msgstr "E341: Erreur interne : lalloc(%ld, )"
+msgid "E341: Internal error: lalloc(0, )"
+msgstr "E341: Erreur interne : lalloc(0, )"
 
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
@@ -4259,33 +4290,6 @@ msgstr "E548: chiffre attendu"
 msgid "E549: Illegal percentage"
 msgstr "E549: Pourcentage non autoris�"
 
-msgid "E854: path too long for completion"
-msgstr "E854: chemin trop long pour compl�tement"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Chemin invalide : '**[nombre]' doit �tre � la fin du chemin ou �tre "
-"suivi de '%s'."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: R�pertoire \"%s\" introuvable dans 'cdpath'"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Fichier \"%s\" introuvable dans 'path'"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Plus de r�pertoire \"%s\" dans 'cdpath'"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Plus de fichier \"%s\" dans 'path'"
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
@@ -4309,12 +4313,6 @@ msgstr "E505: %s est en lecture seule (ajoutez ! pour passer outre)"
 msgid "E349: No identifier under cursor"
 msgstr "E349: Aucun identifiant sous le curseur"
 
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' est vide"
-
-msgid "E775: Eval feature not available"
-msgstr "E775: La fonctionnalit� d'�valuation n'est pas disponible"
-
 # DB : Il est ici question du mode Visuel.
 msgid "Warning: terminal cannot highlight"
 msgstr "Alerte : le terminal ne peut pas surligner"
@@ -4323,7 +4321,7 @@ msgid "E348: No string under cursor"
 msgstr "E348: Aucune cha�ne sous le curseur"
 
 msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: Impossible d'effacer des replis avec la 'foldmethod'e actuelle"
+msgstr "E352: Impossible d'effacer des replis avec la 'foldmethod' actuelle"
 
 msgid "E664: changelist is empty"
 msgstr "E664: La liste des modifications (changelist) est vide"
@@ -4339,6 +4337,9 @@ msgstr ""
 "Tapez  :qa!  puis <Entr�e> pour abandonner tous les changements et quitter "
 "Vim"
 
+msgid "Type  :qa  and press <Enter> to exit Vim"
+msgstr "Tapez  :qa  puis <Entr�e> pour quitter Vim"
+
 #, c-format
 msgid "%ld line %sed %d time"
 msgid_plural "%ld line %sed %d times"
@@ -4351,19 +4352,6 @@ msgid_plural "%ld lines %sed %d times"
 msgstr[0] "%ld lignes %s�es %d fois"
 msgstr[1] "%ld lignes %s�es %d fois"
 
-#, c-format
-msgid "%ld lines to indent... "
-msgstr "%ld lignes � indenter... "
-
-#, c-format
-msgid "%ld line indented "
-msgid_plural "%ld lines indented "
-msgstr[0] "%ld ligne indent�e "
-msgstr[1] "%ld lignes indent�es "
-
-msgid "E748: No previously used register"
-msgstr "E748: Aucun registre n'a �t� pr�c�demment utilis�"
-
 # DB - Question O/N.
 msgid "cannot yank; delete anyway"
 msgstr "impossible de r�aliser une copie ; effacer tout de m�me"
@@ -4375,58 +4363,6 @@ msgstr[0] "%ld ligne modifi�e"
 msgstr[1] "%ld lignes modifi�es"
 
 #, c-format
-msgid "freeing %ld lines"
-msgstr "lib�ration de %ld lignes"
-
-#, c-format
-msgid " into \"%c"
-msgstr " dans \"%c"
-
-#, c-format
-msgid "block of %ld line yanked%s"
-msgid_plural "block of %ld lines yanked%s"
-msgstr[0] "bloc de %ld ligne copi�%s"
-msgstr[1] "bloc de %ld lignes copi�%s"
-
-#, c-format
-msgid "%ld line yanked%s"
-msgid_plural "%ld lines yanked%s"
-msgstr[0] "%ld ligne copi�e%s"
-msgstr[1] "%ld lignes copi�es%s"
-
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: Le registre %s est vide"
-
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- Registres ---"
-
-msgid "Illegal register name"
-msgstr "Nom de registre invalide"
-
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# Registres :\n"
-
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: Type de registre %d inconnu"
-
-msgid ""
-"E883: search pattern and expression register may not contain two or more "
-"lines"
-msgstr ""
-"E883: le motif de recherche et le registre d'expression ne peuvent pas "
-"contenir deux lignes ou plus"
-
-#, c-format
 msgid "%ld Cols; "
 msgstr "%ld Colonnes ; "
 
@@ -4461,8 +4397,11 @@ msgstr ""
 msgid "(+%lld for BOM)"
 msgstr "(+%lld pour le BOM)"
 
-msgid "Thanks for flying Vim"
-msgstr "Merci d'avoir choisi Vim"
+msgid "E774: 'operatorfunc' is empty"
+msgstr "E774: 'operatorfunc' est vide"
+
+msgid "E775: Eval feature not available"
+msgstr "E775: La fonctionnalit� d'�valuation n'est pas disponible"
 
 msgid "E518: Unknown option"
 msgstr "E518: Option inconnue"
@@ -4473,6 +4412,9 @@ msgstr "E519: Option non support�e"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Non autoris� dans une ligne de mode"
 
+msgid "E992: Not allowed in a modeline when 'modelineexpr' is off"
+msgstr "E992: Non autoris� dans une ligne de mode avec 'modelineexpr' d�s�lectionn�e"
+
 msgid "E846: Key code not set"
 msgstr "E846: Le code de touche n'est pas configur�"
 
@@ -4482,6 +4424,66 @@ msgstr "E521: Nombre requis apr�s ="
 msgid "E522: Not found in termcap"
 msgstr "E522: Introuvable dans termcap"
 
+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr ""
+"E946: terminal avec t�che en cours d'ex�cution ne peut pas �tre modifiable"
+
+msgid "E590: A preview window already exists"
+msgstr "E590: Il existe d�j� une fen�tre de pr�visualisation"
+
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: L'arabe n�cessite l'UTF-8, tapez ':set encoding=utf-8'"
+
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: Couleurs en 24-bits non support�es sur cet environnement."
+
+#, c-format
+msgid "E593: Need at least %d lines"
+msgstr "E593: Au moins %d lignes sont n�cessaires"
+
+#, c-format
+msgid "E594: Need at least %d columns"
+msgstr "E594: Au moins %d colonnes sont n�cessaires"
+
+#, c-format
+msgid "E355: Unknown option: %s"
+msgstr "E355: Option inconnue : %s"
+
+#, c-format
+msgid "E521: Number required: &%s = '%s'"
+msgstr "E521: Nombre requis : &%s = '%s'"
+
+msgid ""
+"\n"
+"--- Terminal codes ---"
+msgstr ""
+"\n"
+"--- Codes de terminal ---"
+
+msgid ""
+"\n"
+"--- Global option values ---"
+msgstr ""
+"\n"
+"--- Valeur des options globales ---"
+
+msgid ""
+"\n"
+"--- Local option values ---"
+msgstr ""
+"\n"
+"--- Valeur des options locales ---"
+
+msgid ""
+"\n"
+"--- Options ---"
+msgstr ""
+"\n"
+"--- Options ---"
+
+msgid "E356: get_varp ERROR"
+msgstr "E356: ERREUR get_varp"
+
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Caract�re <%s> invalide"
@@ -4490,6 +4492,18 @@ msgstr "E539: Caract�re <%s> invalide"
 msgid "For option %s"
 msgstr "Pour l'option %s"
 
+# DB - Le code est sans ambigu�t� sur le caract�re manquant.
+#      � d�faut d'une traduction valable, au moins comprend-on
+#      ce qui se passe.
+msgid "E540: Unclosed expression sequence"
+msgstr "E540: '}' manquant"
+
+msgid "E541: too many items"
+msgstr "E541: trop d'�l�ments"
+
+msgid "E542: unbalanced groups"
+msgstr "E542: parenth�ses non �quilibr�es"
+
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' ne doit pas �tre une cha�ne vide"
 
@@ -4531,8 +4545,8 @@ msgstr "E527: Virgule manquante"
 msgid "E528: Must specify a ' value"
 msgstr "E528: Une valeur ' doit �tre sp�cifi�e"
 
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: contient des caract�res � largeur double non-imprimables"
+msgid "E595: 'showbreak' contains unprintable or wide character"
+msgstr "E595: 'showbreak' contient des caract�res � largeur double ou non imprimables"
 
 msgid "E596: Invalid font(s)"
 msgstr "E596: Police(s) invalide(s)"
@@ -4560,89 +4574,6 @@ msgstr "E536: virgule requise"
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' doit �tre vide ou contenir %s"
 
-msgid "E538: No mouse support"
-msgstr "E538: La souris n'est pas support�e"
-
-# DB - Le code est sans ambigu�t� sur le caract�re manquant.
-#      � d�faut d'une traduction valable, au moins comprend-on
-#      ce qui se passe.
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: '}' manquant"
-
-msgid "E541: too many items"
-msgstr "E541: trop d'�l�ments"
-
-msgid "E542: unbalanced groups"
-msgstr "E542: parenth�ses non �quilibr�es"
-
-msgid "E946: Cannot make a terminal with running job modifiable"
-msgstr ""
-"E946: terminal avec t�che en cours d'ex�cution ne peut pas �tre modifiable"
-
-msgid "E590: A preview window already exists"
-msgstr "E590: Il existe d�j� une fen�tre de pr�visualisation"
-
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: L'arabe n�cessite l'UTF-8, tapez ':set encoding=utf-8'"
-
-msgid "E954: 24-bit colors are not supported on this environment"
-msgstr "E954: Couleurs en 24-bits non-support�es sur cet environnement."
-
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: Au moins %d lignes sont n�cessaires"
-
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: Au moins %d colonnes sont n�cessaires"
-
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: Option inconnue : %s"
-
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: Nombre requis : &%s = '%s'"
-
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- Codes de terminal ---"
-
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- Valeur des options globales ---"
-
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- Valeur des options locales ---"
-
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- Options ---"
-
-msgid "E356: get_varp ERROR"
-msgstr "E356: ERREUR get_varp"
-
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap' : Aucun caract�re correspondant pour %s"
-
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap' : Caract�res surnum�raires apr�s point-virgule : %s"
-
 msgid "cannot open "
 msgstr "impossible d'ouvrir "
 
@@ -4736,6 +4667,10 @@ msgstr ""
 "\n"
 "Vim : R�ception d'une erreur X\n"
 
+#, c-format
+msgid "restoring display %s"
+msgstr "restauration du display %s"
+
 msgid "Testing the X display failed"
 msgstr "Le test du display X a �chou�"
 
@@ -4833,15 +4768,6 @@ msgstr "XSMP : SmcOpenConnection a �chou� : %s"
 msgid "At line"
 msgstr "� la ligne"
 
-msgid "Could not load vim32.dll!"
-msgstr "Impossible de charger vim32.dll !"
-
-msgid "VIM Error"
-msgstr "Erreur VIM"
-
-msgid "Could not fix up function pointers to the DLL!"
-msgstr "Impossible d'initialiser les pointeurs de fonction vers la DLL !"
-
 # DB - Les �v�nements en question sont ceux des messages qui suivent.
 #, c-format
 msgid "Vim: Caught %s event\n"
@@ -4875,6 +4801,26 @@ msgstr "Alerte Vim"
 msgid "shell returned %d"
 msgstr "le shell a retourn� %d"
 
+msgid "E278: Cannot put a terminal buffer in a popup window"
+msgstr "E278: Impossible de mettre un tampon de terminal dans une fen�tre contextuelle"
+
+#, c-format
+msgid "E997: Tabpage not found: %d"
+msgstr "E997: Onglet introuvable : %d"
+
+#, c-format
+msgid "E993: window %d is not a popup window"
+msgstr "E993: la fen�tre %d n'est pas une fen�tre contextuelle"
+
+msgid "E994: Not allowed in a popup window"
+msgstr "E994: Op�ration interdite dans une fen�tre contextuelle"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\""
+
+msgid "E553: No more items"
+msgstr "E553: Plus d'�l�ments"
+
 msgid "E926: Current location list was changed"
 msgstr "E926: La liste d'emplacements courante a chang�"
 
@@ -4907,9 +4853,6 @@ msgstr "E378: 'errorformat' ne contient aucun motif"
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Nom de r�pertoire vide ou absent"
 
-msgid "E553: No more items"
-msgstr "E553: Plus d'�l�ments"
-
 msgid "E924: Current window was closed"
 msgstr "E924: La fen�tre courante doit �tre ferm�e"
 
@@ -4953,6 +4896,10 @@ msgid "E777: String or List expected"
 msgstr "E777: Cha�ne ou Liste attendue"
 
 #, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: Action invalide : � %s �"
+
+#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: �l�ment invalide dans %s%%[]"
 
@@ -4995,37 +4942,26 @@ msgstr "E70: %s%%[] vide"
 msgid "E956: Cannot use pattern recursively"
 msgstr "E956: Impossible d'utiliser le motif r�cursivement"
 
-msgid "E65: Illegal back reference"
-msgstr "E65: post-r�f�rence invalide"
-
-msgid "E339: Pattern too long"
-msgstr "E339: Motif trop long"
-
-msgid "E50: Too many \\z("
-msgstr "E50: Trop de \\z("
-
 #, c-format
-msgid "E51: Too many %s("
-msgstr "E51: Trop de %s("
-
-msgid "E52: Unmatched \\z("
-msgstr "E52: Pas de correspondance pour \\z("
+msgid "E554: Syntax error in %s{...}"
+msgstr "E554: Erreur de syntaxe dans %s{...}"
 
 #, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: caract�re invalide apr�s %s@"
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (regexp NFA) %s ne peut pas �tre r�p�t�"
 
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: Trop de %s{...}s complexes"
+msgid ""
+"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+"used "
+msgstr ""
+"E864: \\%#= peut �tre suivi uniquement de 0, 1 ou 2. Le moteur automatique "
+"sera utilis� "
 
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: %s* imbriqu�s"
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Moteur RE avec backtracking utilis� pour le motif : "
 
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: %s%c imbriqu�s"
+msgid "E65: Illegal back reference"
+msgstr "E65: post-r�f�rence invalide"
 
 msgid "E63: invalid use of \\_"
 msgstr "E63: utilisation invalide de \\_"
@@ -5046,25 +4982,36 @@ msgid "E71: Invalid character after %s%%"
 msgstr "E71: Caract�re invalide apr�s %s%%"
 
 #, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: Erreur de syntaxe dans %s{...}"
+msgid "E59: invalid character after %s@"
+msgstr "E59: caract�re invalide apr�s %s@"
 
-msgid "External submatches:\n"
-msgstr "Sous-correspondances externes :\n"
+#, c-format
+msgid "E60: Too many complex %s{...}s"
+msgstr "E60: Trop de %s{...}s complexes"
 
 #, c-format
-msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (regexp NFA) %s ne peut pas �tre r�p�t�"
+msgid "E61: Nested %s*"
+msgstr "E61: %s* imbriqu�s"
 
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: \\%#= peut �tre suivi uniquement de 0, 1 ou 2. Le moteur automatique "
-"sera utilis� "
+#, c-format
+msgid "E62: Nested %s%c"
+msgstr "E62: %s%c imbriqu�s"
 
-msgid "Switching to backtracking RE engine for pattern: "
-msgstr "Moteur RE avec backtracking utilis� pour le motif : "
+msgid "E50: Too many \\z("
+msgstr "E50: Trop de \\z("
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: Trop de %s("
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: Pas de correspondance pour \\z("
+
+msgid "E339: Pattern too long"
+msgstr "E339: Motif trop long"
+
+msgid "External submatches:\n"
+msgstr "Sous-correspondances externes :\n"
 
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Fin de regexp rencontr�e pr�matur�ment"
@@ -5074,8 +5021,8 @@ msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (regexp NFA) %c au mauvais endroit"
 
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %ld"
-msgstr "E877: (regexp NFA) Classe de caract�re invalide : %ld"
+msgid "E877: (NFA regexp) Invalid character class: %d"
+msgstr "E877: (regexp NFA) Classe de caract�re invalide : %d"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -5132,6 +5079,47 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr ""
 "E878: (NFA) Impossible d'allouer la m�moire pour parcourir les branches !"
 
+msgid "E748: No previously used register"
+msgstr "E748: Aucun registre n'a �t� pr�c�demment utilis�"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "lib�ration de %ld lignes"
+
+#, c-format
+msgid " into \"%c"
+msgstr " dans \"%c"
+
+#, c-format
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "bloc de %ld ligne copi�%s"
+msgstr[1] "bloc de %ld lignes copi�%s"
+
+#, c-format
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld ligne copi�e%s"
+msgstr[1] "%ld lignes copi�es%s"
+
+#, c-format
+msgid "E353: Nothing in register %s"
+msgstr "E353: Le registre %s est vide"
+
+msgid ""
+"\n"
+"Type Name Content"
+msgstr ""
+"\n"
+"Type nom  Contenu"
+
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: le motif de recherche et le registre d'expression ne peuvent pas "
+"contenir deux lignes ou plus"
+
 msgid " VREPLACE"
 msgstr " VREMPLACEMENT"
 
@@ -5185,6 +5173,81 @@ msgid "recording"
 msgstr "Enregistrement"
 
 #, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "Recherche de \"%s\" dans \"%s\""
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "Recherche de \"%s\""
+
+#, c-format
+msgid "not found in '%s': \"%s\""
+msgstr "introuvable dans '%s' : \"%s\""
+
+msgid "Source Vim script"
+msgstr "Sourcer un script - Vim"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "Impossible de sourcer un r�pertoire : \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "impossible de sourcer \"%s\""
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "ligne %ld : impossible de sourcer \"%s\""
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "sourcement \"%s\""
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "ligne %ld : sourcement de \"%s\""
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "fin du sourcement de %s"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+#, c-format
+msgid "continuing in %s"
+msgstr "de retour dans %s"
+
+msgid "modeline"
+msgstr "ligne de mode"
+
+msgid "--cmd argument"
+msgstr "argument --cmd"
+
+msgid "-c argument"
+msgstr "argument -c"
+
+msgid "environment variable"
+msgstr "variable d'environnement"
+
+msgid "error handler"
+msgstr "gestionnaire d'erreur"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: Alerte : S�parateur de ligne erron�, ^M possiblement manquant"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding utilis� en dehors d'un fichier sourc�"
+
+msgid "E984: :scriptversion used outside of a sourced file"
+msgstr "E984: :scriptversion utilis� en dehors d'un fichier sourc�"
+
+#, c-format
+msgid "E999: scriptversion not supported: %d"
+msgstr "E999: scriptversion non support� : %d"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish utilis� en dehors d'un fichier sourc�"
+
+#, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Cha�ne de recherche invalide : %s"
 
@@ -5271,22 +5334,6 @@ msgstr "E797: L'autocommande SpellFileMissing a effac� le tampon"
 msgid "Warning: region %s not supported"
 msgstr "Alerte : r�gion %s non support�e"
 
-msgid "Sorry, no suggestions"
-msgstr "D�sol�, aucune suggestion"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "D�sol�, seulement %ld suggestions"
-
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Remplacer \"%.*s\" par :"
-
-# DB - todo : l'int�r�t de traduire ce message m'�chappe.
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
 msgid "E752: No previous spell replacement"
 msgstr "E752: Pas de suggestion orthographique pr�c�dente"
 
@@ -5624,6 +5671,22 @@ msgstr ""
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: caract�re dupliqu� dans l'entr�e MAP"
 
+msgid "Sorry, no suggestions"
+msgstr "D�sol�, aucune suggestion"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "D�sol�, seulement %ld suggestions"
+
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Remplacer \"%.*s\" par :"
+
+# DB - todo : l'int�r�t de traduire ce message m'�chappe.
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
 msgid "No Syntax items defined for this buffer"
 msgstr "Aucun �l�ment de syntaxe d�fini pour ce tampon"
 
@@ -5744,7 +5807,7 @@ msgstr "E789: ']' manquant : %s"
 
 #, c-format
 msgid "E890: trailing char after ']': %s]%s"
-msgstr "E890: Caract�re surnum�raire apr�s ']': %s]%s"
+msgstr "E890: Caract�re surnum�raire apr�s ']' : %s]%s"
 
 #, c-format
 msgid "E398: Missing '=': %s"
@@ -5805,76 +5868,17 @@ msgid ""
 msgstr ""
 "  TOTAL      NOMBRE MATCH   PLUS LENT   MOYEN     NOM                MOTIF"
 
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: boucle r�cursive lors du chargement de syncolor.vim"
-
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: groupe de surbrillance introuvable : %s"
-
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: Trop peu d'arguments : \":highlight link %s\""
-
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: Trop d'arguments : \":highlight link %s\""
-
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: le groupe a d�j� des attributs, lien de surbrillance ignor�"
-
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: signe �gal inattendu : %s"
-
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: '=' manquant : %s"
-
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: argument manquant : %s"
-
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: Valeur invalide : %s"
-
-msgid "E419: FG color unknown"
-msgstr "E419: Couleur de premier plan inconnue"
-
-msgid "E420: BG color unknown"
-msgstr "E420: Couleur d'arri�re-plan inconnue"
-
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: Nom ou num�ro de couleur non reconnu : %s"
-
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: le code de terminal est trop long : %s"
-
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: Argument invalide : %s"
-
-msgid "E424: Too many different highlighting attributes in use"
-msgstr ""
-"E424: Trop d'attributs de surbrillance diff�rents en cours d'utilisation"
-
-msgid "E669: Unprintable character in group name"
-msgstr "E669: Caract�re non-imprimable dans un nom de groupe"
-
-msgid "W18: Invalid character in group name"
-msgstr "W18: Caract�re invalide dans un nom de groupe"
-
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: Trop de groupes de surbrillance et de syntaxe"
-
 msgid "E555: at bottom of tag stack"
-msgstr "E555: En bas de la pile de marqueurs"
+msgstr "E555: En bas de la pile des marqueurs"
 
 msgid "E556: at top of tag stack"
-msgstr "E556: Au sommet de la pile de marqueurs"
+msgstr "E556: Au sommet de la pile des marqueurs"
+
+msgid "E986: cannot modify the tag stack within tagfunc"
+msgstr "E986: impossible de modifier la pile des marqueurs dans tagfunc"
+
+msgid "E987: invalid return value from tagfunc"
+msgstr "E987: tagfunc a retourn� une valeur de retour invalide"
 
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Impossible d'aller avant le premier marqueur correspondant"
@@ -5883,12 +5887,6 @@ msgstr "E425: Impossible d'aller avant le premier marqueur correspondant"
 msgid "E426: tag not found: %s"
 msgstr "E426: Marqueur introuvable : %s"
 
-msgid "  # pri kind tag"
-msgstr "  # pri type marqueur"
-
-msgid "file\n"
-msgstr "fichier\n"
-
 msgid "E427: There is only one matching tag"
 msgstr "E427: Il n'y a qu'un marqueur correspondant"
 
@@ -5913,6 +5911,12 @@ msgstr "  Utilisation d'un marqueur avec une casse diff�rente !"
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Le fichier \"%s\" n'existe pas"
 
+msgid "  # pri kind tag"
+msgstr "  # pri type marqueur"
+
+msgid "file\n"
+msgstr "fichier\n"
+
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5928,9 +5932,6 @@ msgstr "Examen du fichier de marqueurs %s"
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Chemin de fichiers de marqueurs tronqu� pour %s\n"
 
-msgid "Ignoring long line in tags file"
-msgstr "Ignore longue ligne dans le fichier de marqueurs"
-
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Erreur de format dans le fichier de marqueurs \"%s\""
@@ -5946,6 +5947,9 @@ msgstr "E432: Le fichier de marqueurs %s n'est pas ordonn�"
 msgid "E433: No tags file"
 msgstr "E433: Aucun fichier de marqueurs"
 
+msgid "Ignoring long line in tags file"
+msgstr "Ignore longue ligne dans le fichier de marqueurs"
+
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Le motif de marqueur est introuvable"
 
@@ -5990,6 +5994,13 @@ msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "Impossible d'ouvrir $VIMRUNTIME/rgb.txt"
 
 #, c-format
+msgid "E181: Invalid attribute: %s"
+msgstr "E181: Attribut invalide : %s"
+
+msgid "E279: Sorry, ++shell is not supported on this system"
+msgstr "E279: ++shell non support� sur cet environnement"
+
+#, c-format
 msgid "Kill job in \"%s\"?"
 msgstr "Terminer la t�che d'ex�cution dans \"%s\"?"
 
@@ -6082,7 +6093,7 @@ msgstr "E823: Ce n'est pas un fichier d'annulations : %s"
 
 #, c-format
 msgid "E832: Non-encrypted file has encrypted undo file: %s"
-msgstr "E832: Fichier non-chiffr� a un fichier d'annulations chiffr� : %s"
+msgstr "E832: Fichier non chiffr� a un fichier d'annulations chiffr� : %s"
 
 #, c-format
 msgid "E826: Undo file decryption failed: %s"
@@ -6153,12 +6164,6 @@ msgstr "Rien � annuler"
 msgid "number changes  when               saved"
 msgstr "num�ro modif.   instant            enregistr�"
 
-#, c-format
-msgid "%ld second ago"
-msgid_plural "%ld seconds ago"
-msgstr[0] "il y a %ld seconde"
-msgstr[1] "il y a %ld secondes"
-
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin n'est pas autoris� apr�s une annulation"
 
@@ -6168,6 +6173,66 @@ msgstr "E439: la liste d'annulation est corrompue"
 msgid "E440: undo line missing"
 msgstr "E440: ligne d'annulation manquante"
 
+msgid ""
+"\n"
+"    Name              Args Address Complete    Definition"
+msgstr ""
+"\n"
+"    Nom               Args Adresse Complet     D�finition"
+
+msgid "No user-defined commands found"
+msgstr "Aucune commande d�finie par l'utilisateur trouv�e"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: Valeur de type d'adresse invalide : %s"
+
+#, c-format
+msgid "E180: Invalid complete value: %s"
+msgstr "E180: Valeur invalide pour \"-complete=\" : %s"
+
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: Seul le compl�tement personnalis� accepte un argument"
+
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: Le compl�tement personnalis� n�cessite une fonction en argument"
+
+msgid "E175: No attribute specified"
+msgstr "E175: Pas d'attribut sp�cifi�"
+
+msgid "E176: Invalid number of arguments"
+msgstr "E176: Nombre d'arguments invalide"
+
+msgid "E177: Count cannot be specified twice"
+msgstr "E177: Le quantificateur ne peut �tre sp�cifi� deux fois"
+
+msgid "E178: Invalid default value for count"
+msgstr "E178: La valeur par d�faut du quantificateur est invalide"
+
+msgid "E179: argument required for -complete"
+msgstr "E179: argument requis avec -complete"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: argument requis avec -addr"
+
+#, c-format
+msgid "E174: Command already exists: add ! to replace it: %s"
+msgstr "E174: La commande existe d�j� : ajoutez ! pour la red�finir : %s"
+
+msgid "E182: Invalid command name"
+msgstr "E182: Nom de commande invalide"
+
+msgid "E183: User defined commands must start with an uppercase letter"
+msgstr "E183: Les commandes utilisateur doivent commencer par une majuscule"
+
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr ""
+"E841: Nom r�serv�, ne peux pas �tre utilis� pour une commande utilisateur"
+
+#, c-format
+msgid "E184: No such user-defined command: %s"
+msgstr "E184: Aucune commande %s d�finie par l'utilisateur"
+
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: La fonction %s existe d�j� (ajoutez ! pour la remplacer)"
@@ -6190,6 +6255,9 @@ msgstr "E125: Argument invalide : %s"
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Nom d'argument dupliqu� : %s"
 
+msgid "E989: Non-default argument follows default argument"
+msgstr "E989: Argument sans valeur par d�faut ne peut pas suivre un argument avec valeur par d�faut"
+
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: Trop d'arguments pour la fonction %s"
@@ -6232,8 +6300,12 @@ msgid "E117: Unknown function: %s"
 msgstr "E117: Fonction inconnue : %s"
 
 #, c-format
+msgid "E276: Cannot use function as a method: %s"
+msgstr "E276: Impossible d'utiliser une fonction comme m�thode : %s"
+
+#, c-format
 msgid "E933: Function was deleted: %s"
-msgstr "E933: La fonction a �t� effac�e: %s"
+msgstr "E933: La fonction a �t� effac�e : %s"
 
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
@@ -6285,7 +6357,7 @@ msgstr "E126: Il manque :endfunction"
 
 #, c-format
 msgid "W22: Text found after :endfunction: %s"
-msgstr "W22: Texte trouv� apr�s :endfunction: %s"
+msgstr "W22: Texte trouv� apr�s :endfunction : %s"
 
 #, c-format
 msgid "E707: Function name conflicts with variable: %s"
@@ -6312,15 +6384,25 @@ msgid "E133: :return not inside a function"
 msgstr "E133: :return en dehors d'une fonction"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Parenth�ses manquantes : %s"
-
-#, c-format
 msgid "%s (%s, compiled %s)"
 msgstr "%s (%s, compil� %s)"
 
 msgid ""
 "\n"
+"MS-Windows 64-bit GUI/console version"
+msgstr ""
+"\n"
+"Version interface graphique/console MS-Windows 64 bits"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI/console version"
+msgstr ""
+"\n"
+"Version interface graphique/console MS-Windows 32 bits"
+
+msgid ""
+"\n"
 "MS-Windows 64-bit GUI version"
 msgstr ""
 "\n"
@@ -6598,6 +6680,208 @@ msgstr "tapez  :help register<Entr�e>   pour plus d'informations          "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "menu  Aide->Sponsor/Enregistrement pour plus d'info"
 
+msgid ""
+"\n"
+"# Buffer list:\n"
+msgstr ""
+"\n"
+"# Liste des tampons :\n"
+
+# DB - Messages et les suivants : fichier .viminfo.
+#      Pas de majuscule n�cessaire pour les messages d'apr�s.
+#, c-format
+msgid ""
+"\n"
+"# %s History (newest to oldest):\n"
+msgstr ""
+"\n"
+"# Historique %s (chronologie d�croissante) :\n"
+
+msgid "Command Line"
+msgstr "ligne de commande"
+
+msgid "Search String"
+msgstr "cha�ne de recherche"
+
+msgid "Expression"
+msgstr "expression"
+
+msgid "Input Line"
+msgstr "ligne de saisie"
+
+msgid "Debug Line"
+msgstr "Ligne de d�bogage"
+
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Lignes commen�ant par |, copi�es litt�ralement :\n"
+
+# AB - Le num�ro et le message d'erreur (%s ci-dessous) et le "num�ro" de ligne
+#      sont des cha�nes de caract�res dont le contenu est � la discr�tion de
+#      l'appelant de la fonction viminfo_error().
+#, c-format
+msgid "%sviminfo: %s in line: "
+msgstr "%sviminfo : %s � la ligne "
+
+# AB - La version fran�aise est meilleure que la version anglaise.
+msgid "E136: viminfo: Too many errors, skipping rest of file"
+msgstr ""
+"E136: Il y a trop d'erreurs ; interruption de la lecture du fichier viminfo"
+
+# AB - La version fran�aise est capitalis�e pour �tre en accord avec les autres
+#      commentaires enregistr�s dans le fichier viminfo.
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# Variables globales:\n"
+
+# AB - Ne pas traduire le dollar.
+# AB - Ce message n'est volontairement pas traduit. En effet, il fait partie
+#      d'un groupe de trois messages dans viminfo, dont deux ne sont pas soumis
+#      � internationalisation. J'attends que les deux autres messages soient
+#      traduisibles pour traduire celui-ci.
+# DB - TODO : Qu'en est-il � pr�sent ?
+msgid ""
+"\n"
+"# Last Substitute String:\n"
+"$"
+msgstr ""
+"\n"
+"# Derni�res cha�nes de substitution :\n"
+"$"
+
+#, c-format
+msgid ""
+"\n"
+"# Last %sSearch Pattern:\n"
+"~"
+msgstr ""
+"\n"
+"# Dernier motif de recherche %s :\n"
+"~"
+
+msgid "Substitute "
+msgstr "Substitue "
+
+msgid "Illegal register name"
+msgstr "Nom de registre invalide"
+
+msgid ""
+"\n"
+"# Registers:\n"
+msgstr ""
+"\n"
+"# Registres :\n"
+
+#, c-format
+msgid "E574: Unknown register type %d"
+msgstr "E574: Type de registre %d inconnu"
+
+msgid ""
+"\n"
+"# History of marks within files (newest to oldest):\n"
+msgstr ""
+"\n"
+"# Historique des marques dans les fichiers (les plus r�centes en premier) :\n"
+
+msgid ""
+"\n"
+"# File marks:\n"
+msgstr ""
+"\n"
+"# Marques dans le fichier :\n"
+
+msgid ""
+"\n"
+"# Jumplist (newest first):\n"
+msgstr ""
+"\n"
+"# Liste de sauts (le plus r�cent en premier) :\n"
+
+msgid "Missing '>'"
+msgstr "'>' manquant"
+
+# AB - Ce texte est pass� en argument � la fonction viminfo_error().
+# AB - "ill�gal" est un terme trop fort � mon go�t.
+msgid "Illegal starting char"
+msgstr "Caract�re initial non valide"
+
+#, c-format
+msgid "# This viminfo file was generated by Vim %s.\n"
+msgstr "# Ce fichier viminfo a �t� g�n�r� par Vim %s.\n"
+
+# AB - Les deux versions, bien que diff�rentes, se valent.
+msgid ""
+"# You may edit it if you're careful!\n"
+"\n"
+msgstr ""
+"# Vous pouvez l'�diter, mais soyez prudent.\n"
+"\n"
+
+msgid "# Value of 'encoding' when this file was written\n"
+msgstr "# 'encoding' dans lequel ce fichier a �t� �crit\n"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+# DB - ... dont les valeurs possibles sont les messages
+#      qui suivent.
+#, c-format
+msgid "Reading viminfo file \"%s\"%s%s%s"
+msgstr "Lecture du fichier viminfo \"%s\"%s%s%s"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+# DB - Voir ci-dessus.
+msgid " info"
+msgstr " info"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+# DB - Voir ci-dessus.
+msgid " marks"
+msgstr " marques"
+
+msgid " oldfiles"
+msgstr " vieux fichiers"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+# DB - Voir ci-dessus.
+msgid " FAILED"
+msgstr " �CHEC"
+
+# AB - J'esp�re que la plupart des utilisateurs aura l'id�e d'aller v�rifier
+#      ses droits d'acc�s.
+# AB - Le mot "viminfo" a �t� retir� pour que le message ne d�passe pas 80
+#      caract�res dans le cas courant o� %s = /home/12345678/.viminfo
+#, c-format
+msgid "E137: Viminfo file is not writable: %s"
+msgstr "E137: L'�criture dans le fichier %s est interdite"
+
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: Trop de fichiers temporaires viminfo, comme %s!"
+
+# AB - Le point d'exclamation est superflu.
+# AB - Le mot "viminfo" a �t� retir� pour que le message ne d�passe pas 80
+#      caract�res dans le cas courant o� %s = /home/12345678/.viminfo
+#, c-format
+msgid "E138: Can't write viminfo file %s!"
+msgstr "E138: Impossible d'�crire le fichier %s"
+
+# AB - Ce texte est un message de d�bogage.
+#, c-format
+msgid "Writing viminfo file \"%s\""
+msgstr "�criture du fichier viminfo \"%s\""
+
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: Impossible de renommer viminfo en %s"
+
+msgid "E195: Cannot open viminfo file for reading"
+msgstr "E195: Impossible d'ouvrir le viminfo en lecture"
+
 msgid "Already only one window"
 msgstr "Il n'y a d�j� plus qu'une fen�tre"
 
@@ -6760,9 +7044,6 @@ msgstr "E685: Erreur interne : %s"
 msgid "Interrupted"
 msgstr "Interrompu"
 
-msgid "E14: Invalid address"
-msgstr "E14: Adresse invalide"
-
 msgid "E474: Invalid argument"
 msgstr "E474: Argument invalide"
 
@@ -6771,6 +7052,10 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: Argument invalide : %s"
 
 #, c-format
+msgid "E983: Duplicate argument: %s"
+msgstr "E983: Argument dupliqu� : %s"
+
+#, c-format
 msgid "E475: Invalid value for argument %s"
 msgstr "E475: Valeur d'argument invalide : %s"
 
@@ -6830,8 +7115,8 @@ msgstr "E25: L'interface graphique n'a pas �t� compil�e dans cette version"
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: Le support de l'h�breu n'a pas �t� compil� dans cette version\n"
 
-msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-msgstr "E27: Le support du farsi n'a pas �t� compil� dans cette version\n"
+msgid "E27: Farsi support has been removed\n"
+msgstr "E27: support du farsi a �t� supprim�\n"
 
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: Le support de l'arabe n'a pas �t� compil� dans cette version\n"
@@ -6939,6 +7224,21 @@ msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: L'option 'readonly' est activ�e (ajoutez ! pour passer outre)"
 
 #, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: Variable non d�finie : %s"
+
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: Type de variable erron� avec %s="
+
+#, c-format
+msgid "E461: Illegal variable name: %s"
+msgstr "E461: Nom de variable invalide : %s"
+
+msgid "E995: Cannot modify existing variable"
+msgstr "E995: Impossible de modifier une variable existante"
+
+#, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: La variable \"%s\" est en lecture seule"
 
@@ -6947,6 +7247,9 @@ msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr ""
 "E794: Impossible de modifier une variable depuis le bac � sable : \"%s\""
 
+msgid "E928: String required"
+msgstr "E928: Cha�ne requis"
+
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: Impossible d'utiliser une cl� vide dans un Dictionnaire"
 
@@ -7036,6 +7339,10 @@ msgstr "E939: Quantificateur positif requis"
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> utilis� en dehors d'un script"
 
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Parenth�ses manquantes : %s"
+
 msgid "E449: Invalid expression received"
 msgstr "E449: Expression invalide re�ue"