Merge #9172 from justinmk/vim-d473c8c10126

2 files changed, 245 insertions, 257 deletions

diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index 52592d0767..d1ce47d97c 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -72,26 +72,23 @@ msgstr "E516: Neniu bufro estis forviŝita"
 msgid "E517: No buffers were wiped out"
 msgstr "E517: Neniu bufro estis detruita"
 
-msgid "1 buffer unloaded"
-msgstr "1 bufro malŝargita"
-
 #, c-format
-msgid "%d buffers unloaded"
-msgstr "%d bufroj malŝargitaj"
-
-msgid "1 buffer deleted"
-msgstr "1 bufro forviŝita"
+msgid "%d buffer unloaded"
+msgid_plural "%d buffers unloaded"
+msgstr[0] "%d bufro malŝargita"
+msgstr[1] "%d bufroj malŝargitaj"
 
 #, c-format
-msgid "%d buffers deleted"
-msgstr "%d bufroj forviŝitaj"
-
-msgid "1 buffer wiped out"
-msgstr "1 bufro detruita"
+msgid "%d buffer deleted"
+msgid_plural "%d buffers deleted"
+msgstr[0] "%d bufro forviŝita"
+msgstr[1] "%d bufroj forviŝitaj"
 
 #, c-format
-msgid "%d buffers wiped out"
-msgstr "%d bufroj detruitaj"
+msgid "%d buffer wiped out"
+msgid_plural "%d buffers wiped out"
+msgstr[0] "%d bufro detruita"
+msgstr[1] "%d bufroj detruitaj"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Ne eblas malŝargi la lastan bufron"
@@ -167,12 +164,10 @@ msgid "[readonly]"
 msgstr "[nurlegebla]"
 
 #, c-format
-msgid "1 line --%d%%--"
-msgstr "1 linio --%d%%--"
-
-#, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld linioj --%d%%--"
+msgid "%ld line --%d%%--"
+msgid_plural "%ld lines --%d%%--"
+msgstr[0] "%ld linio --%d%%--"
+msgstr[1] "%ld linioj --%d%%--"
 
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
@@ -209,6 +204,9 @@ msgstr ""
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
 
+msgid "[Prompt]"
+msgstr "[Invito]"
+
 msgid "[Scratch]"
 msgstr "[Malneto]"
 
@@ -740,6 +738,9 @@ msgstr "E916: nevalida tasko"
 msgid "E701: Invalid type for len()"
 msgstr "E701: Nevalida datumtipo de len()"
 
+msgid "E957: Invalid window number"
+msgstr "E957: Nevalida numero de vindozo"
+
 #, c-format
 msgid "E798: ID is reserved for \":match\": %ld"
 msgstr "E798: ID estas rezervita por \":match\": %ld"
@@ -825,12 +826,11 @@ msgstr "> %d, Deksesuma %08x, Okuma %o"
 msgid "E134: Move lines into themselves"
 msgstr "E134: Movas liniojn en ilin mem"
 
-msgid "1 line moved"
-msgstr "1 linio movita"
-
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld linioj movitaj"
+msgid "%ld line moved"
+msgid_plural "%ld lines moved"
+msgstr[0] "%ld linio movita"
+msgstr[1] "%ld linioj movitaj"
 
 #, c-format
 msgid "%ld lines filtered"
@@ -982,26 +982,29 @@ msgstr "ĉu anstataŭigi per %s (y/n/a/q/l/^E/^Y)?"
 msgid "(Interrupted) "
 msgstr "(Interrompita) "
 
-msgid "1 match"
-msgstr "1 kongruo"
-
-msgid "1 substitution"
-msgstr "1 anstataŭigo"
-
 #, c-format
-msgid "%ld matches"
-msgstr "%ld kongruoj"
+msgid "%ld match on %ld line"
+msgid_plural "%ld matches on %ld line"
+msgstr[0] "%ld kongruo en %ld linio"
+msgstr[1] "%ld kongruoj en %ld linio"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld anstataŭigoj"
+msgid "%ld substitution on %ld line"
+msgid_plural "%ld substitutions on %ld line"
+msgstr[0] "%ld anstataŭigo en %ld linio"
+msgstr[1] "%ld anstataŭigoj en %ld linio"
 
-msgid " on 1 line"
-msgstr " en 1 linio"
+#, c-format
+msgid "%ld match on %ld lines"
+msgid_plural "%ld matches on %ld lines"
+msgstr[0] "%ld kongruo en %ld linioj"
+msgstr[1] "%ld kongruoj en %ld linioj"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " en %ld linioj"
+msgid "%ld substitution on %ld lines"
+msgid_plural "%ld substitutions on %ld lines"
+msgstr[0] "%ld anstataŭigo en %ld linioj"
+msgstr[1] "%ld anstataŭigoj en %ld linioj"
 
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: Ne eblas fari \":global\" rekursie kun amplekso"
@@ -1305,19 +1308,17 @@ msgstr "E319: Bedaŭrinde, tiu komando ne haveblas en tiu versio"
 msgid "E172: Only one file name allowed"
 msgstr "E172: Nur unu dosiernomo permesebla"
 
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "1 plia redaktenda dosiero. Ĉu tamen eliri?"
-
 #, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?"
-
-msgid "E173: 1 more file to edit"
-msgstr "E173: 1 plia redaktenda dosiero"
+msgid "%d more file to edit.  Quit anyway?"
+msgid_plural "%d more files to edit.  Quit anyway?"
+msgstr[0] "%d plia redaktenda dosiero. Ĉu tamen eliri?"
+msgstr[1] "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: %ld pliaj redaktendaj dosieroj"
+msgid "E173: %ld more file to edit"
+msgid_plural "E173: %ld more files to edit"
+msgstr[0] "E173: %ld plia redaktenda dosiero"
+msgstr[1] "E173: %ld pliaj redaktendaj dosieroj"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
@@ -1399,6 +1400,9 @@ msgstr "E784: Ne eblas fermi lastan langeton"
 msgid "Already only one tab page"
 msgstr "Jam nur unu langeto"
 
+msgid "Edit File in new tab page"
+msgstr "Redakti Dosieron en nova langeto"
+
 msgid "Edit File in new window"
 msgstr "Redakti Dosieron en nova fenestro"
 
@@ -1698,9 +1702,6 @@ msgstr "Legado el stdin..."
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Konverto igis la dosieron nelegebla!"
 
-msgid "[fifo/socket]"
-msgstr "[rektvica memoro/kontaktoskatolo]"
-
 msgid "[fifo]"
 msgstr "[rektvica memoro]"
 
@@ -1880,19 +1881,17 @@ msgstr "[unikso]"
 msgid "[unix format]"
 msgstr "[formato unikso]"
 
-msgid "1 line, "
-msgstr "1 linio, "
-
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld linioj, "
-
-msgid "1 character"
-msgstr "1 signo"
+msgid "%ld line, "
+msgid_plural "%ld lines, "
+msgstr[0] "%ld linio, "
+msgstr[1] "%ld linioj, "
 
 #, c-format
-msgid "%lld characters"
-msgstr "%lld signoj"
+msgid "%lld character"
+msgid_plural "%lld characters"
+msgstr[0] "%lld signo"
+msgstr[1] "%lld signoj"
 
 msgid "[noeol]"
 msgstr "[sen EOL]"
@@ -2264,11 +2263,11 @@ msgstr "&Malfari"
 msgid "Open tab..."
 msgstr "Malfermi langeton..."
 
-msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "Trovi ĉenon (uzu '\\\\' por trovi '\\')"
+msgid "Find string"
+msgstr "Trovi ĉenon"
 
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "Trovi kaj anstataŭigi (uzu '\\\\' por trovi '\\')"
+msgid "Find & Replace"
+msgstr "Trovi & Anstataŭigi"
 
 msgid "Not Used"
 msgstr "Ne uzata"
@@ -3947,19 +3946,17 @@ msgstr ""
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "Tajpu nombron kaj <Enenklavon> (malpleno rezignas): "
 
-msgid "1 more line"
-msgstr "1 plia linio"
-
-msgid "1 line less"
-msgstr "1 malplia linio"
-
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld pliaj linioj"
+msgid "%ld more line"
+msgid_plural "%ld more lines"
+msgstr[0] "%ld plia linio"
+msgstr[1] "%ld pliaj linioj"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld malpliaj linioj"
+msgid "%ld line less"
+msgid_plural "%ld fewer lines"
+msgstr[0] "%ld malplia linio"
+msgstr[1] "%ld malpliaj linioj"
 
 msgid " (Interrupted)"
 msgstr " (Interrompita)"
@@ -4097,31 +4094,26 @@ msgstr ""
 "Vim"
 
 #, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 linio %sita 1 foje"
-
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 linio %sita %d foje"
-
-#, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld linio %sita 1 foje"
+msgid "%ld line %sed %d time"
+msgid_plural "%ld line %sed %d times"
+msgstr[0] "%ld linio %sita %d foje"
+msgstr[1] "%ld linio %sita %d foje"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld linioj %sitaj %d foje"
+msgid "%ld lines %sed %d time"
+msgid_plural "%ld lines %sed %d times"
+msgstr[0] "%ld linioj %sitaj %d foje"
+msgstr[1] "%ld linioj %sitaj %d foje"
 
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld krommarĝenendaj linioj... "
 
-msgid "1 line indented "
-msgstr "1 linio krommarĝenita "
-
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld linioj krommarĝenitaj "
+msgid "%ld line indented "
+msgid_plural "%ld lines indented "
+msgstr[0] "%ld linio krommarĝenita "
+msgstr[1] "%ld linioj krommarĝenitaj "
 
 msgid "E748: No previously used register"
 msgstr "E748: Neniu reĝistro antaŭe uzata"
@@ -4129,12 +4121,11 @@ msgstr "E748: Neniu reĝistro antaŭe uzata"
 msgid "cannot yank; delete anyway"
 msgstr "ne eblas kopii; tamen forviŝi"
 
-msgid "1 line changed"
-msgstr "1 linio ŝanĝita"
-
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld linioj ŝanĝitaj"
+msgid "%ld line changed"
+msgid_plural "%ld lines changed"
+msgstr[0] "%ld linio ŝanĝita"
+msgstr[1] "%ld linioj ŝanĝitaj"
 
 #, c-format
 msgid "freeing %ld lines"
@@ -4145,20 +4136,16 @@ msgid " into \"%c"
 msgstr " en \"%c"
 
 #, c-format
-msgid "block of 1 line yanked%s"
-msgstr "bloko de 1 linio kopiita%s"
-
-#, c-format
-msgid "1 line yanked%s"
-msgstr "1 linio kopiita%s"
-
-#, c-format
-msgid "block of %ld lines yanked%s"
-msgstr "bloko de %ld linioj kopiita%s"
+msgid "block of %ld line yanked%s"
+msgid_plural "block of %ld lines yanked%s"
+msgstr[0] "bloko de %ld linio kopiita%s"
+msgstr[1] "bloko de %ld linioj kopiitaj%s"
 
 #, c-format
-msgid "%ld lines yanked%s"
-msgstr "%ld linioj kopiitaj%s"
+msgid "%ld line yanked%s"
+msgid_plural "%ld lines yanked%s"
+msgstr[0] "%ld linio kopiita%s"
+msgstr[1] "%ld linioj kopiitaj%s"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -4744,6 +4731,9 @@ msgstr "E69: Mankas ] malantaŭ %s%%["
 msgid "E70: Empty %s%%[]"
 msgstr "E70: Malplena %s%%[]"
 
+msgid "E956: Cannot use pattern recursively"
+msgstr "E956: Ne eblas uzi ŝablonon rekursie"
+
 msgid "E65: Illegal back reference"
 msgstr "E65: Nevalida retro-referenco"
 
@@ -4858,6 +4848,11 @@ msgstr "E879: (NFA-regulesprimo) tro da \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA-regulesprimo) propra end-eraro"
 
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr ""
+"Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur "
+"stderr..."
+
 msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Ne povis elpreni de la staplo!"
 
@@ -4874,19 +4869,6 @@ msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmemorigi la tutan NFA "
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"
 
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr... "
-msgstr ""
-"Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur "
-"stderr..."
-
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) NE POVIS MALFERMI %s!"
-
-msgid "Could not open temporary log file for writing "
-msgstr "Ne povis malfermi la provizoran protokolan dosieron por skribi "
-
 msgid " VREPLACE"
 msgstr " V-ANSTATAŬIGO"
 
@@ -5373,6 +5355,9 @@ msgstr "E783: ripetita signo en rikordo MAP"
 msgid "No Syntax items defined for this buffer"
 msgstr "Neniu sintaksa elemento difinita por tiu bufro"
 
+msgid "'redrawtime' exceeded, syntax highlighting disabled"
+msgstr "'redrawtime' transpasita, sintaksa emfazo malŝaltita"
+
 msgid "syntax conceal on"
 msgstr "sintakso de conceal ŝaltata"
 
@@ -5402,6 +5387,9 @@ msgstr ""
 msgid "syntax iskeyword "
 msgstr "sintakso iskeyword "
 
+msgid "syntax iskeyword not set"
+msgstr "sintakso iskeyword ne ŝaltita"
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Nenia sintaksa fasko: %s"
@@ -5870,8 +5858,10 @@ msgid "number changes  when               saved"
 msgstr "numero ŝanĝoj   tempo              konservita"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "antaŭ %ld sekundoj"
+msgid "%ld second ago"
+msgid_plural "%ld seconds ago"
+msgstr[0] "antaŭ %ld sekundo"
+msgstr[1] "antaŭ %ld sekundoj"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin estas nepermesebla post malfaro"
@@ -6010,6 +6000,10 @@ msgstr "E133: \":return\" ekster funkcio"
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Mankas krampoj: %s"
 
+#, c-format
+msgid "%s (%s, compiled %s)"
+msgstr "%s (%s, kompilita %s)"
+
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 31b30d0454..5c4c154654 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -11,15 +11,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim(Fran�ais)\n"
+"Project-Id-Version: Vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-08 09:00+0200\n"
-"PO-Revision-Date: 2018-05-08 09:17+0200\n"
+"POT-Creation-Date: 2018-09-01 14:20+0200\n"
+"PO-Revision-Date: 2018-09-01 17:15+0200\n"
 "Last-Translator: Dominique Pell� <dominique.pelle@gmail.com>\n"
-"Language-Team: \n"
+"Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO_8859-15\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
@@ -74,26 +74,23 @@ msgstr "E516: Aucun tampon n'a �t� effac�"
 msgid "E517: No buffers were wiped out"
 msgstr "E517: Aucun tampon n'a �t� d�truit"
 
-msgid "1 buffer unloaded"
-msgstr "1 tampon a �t� d�charg�"
-
 #, c-format
-msgid "%d buffers unloaded"
-msgstr "%d tampons ont �t� d�charg�s"
-
-msgid "1 buffer deleted"
-msgstr "1 tampon a �t� effac�"
+msgid "%d buffer unloaded"
+msgid_plural "%d buffers unloaded"
+msgstr[0] "%d tampon a �t� d�charg�"
+msgstr[1] "%d tampons ont �t� d�charg�s"
 
 #, c-format
-msgid "%d buffers deleted"
-msgstr "%d tampons ont �t� effac�s"
-
-msgid "1 buffer wiped out"
-msgstr "1 tampon a �t� d�truit"
+msgid "%d buffer deleted"
+msgid_plural "%d buffers deleted"
+msgstr[0] "%d tampon a �t� effac�"
+msgstr[1] "%d tampons ont �t� effac�s"
 
 #, c-format
-msgid "%d buffers wiped out"
-msgstr "%d tampons ont �t� d�truits"
+msgid "%d buffer wiped out"
+msgid_plural "%d buffers wiped out"
+msgstr[0] "%d tampon a �t� d�truit"
+msgstr[1] "%d tampons ont �t� d�truits"
 
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Impossible de d�charger le dernier tampon"
@@ -177,12 +174,10 @@ msgid "[readonly]"
 msgstr "[lecture-seule]"
 
 #, c-format
-msgid "1 line --%d%%--"
-msgstr "1 ligne --%d%%--"
-
-#, c-format
-msgid "%ld lines --%d%%--"
-msgstr "%ld lignes --%d%%--"
+msgid "%ld line --%d%%--"
+msgid_plural "%ld lines --%d%%--"
+msgstr[0] "%ld ligne --%d%%--"
+msgstr[1] "%ld lignes --%d%%--"
 
 # AB - Faut-il remplacer "sur" par "de" ?
 # DB - Mon avis : oui.
@@ -229,6 +224,9 @@ msgstr ""
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: �criture impossible, l'option 'buftype' est activ�e"
 
+msgid "[Prompt]"
+msgstr "[Invite]"
+
 msgid "[Scratch]"
 msgstr "[Brouillon]"
 
@@ -821,6 +819,9 @@ msgstr "E916: t�che invalide"
 msgid "E701: Invalid type for len()"
 msgstr "E701: Type invalide avec len()"
 
+msgid "E957: Invalid window number"
+msgstr "E957: num�ro de fen�tre invalide"
+
 #, c-format
 msgid "E798: ID is reserved for \":match\": %ld"
 msgstr "E798: ID est r�serv� pour \":match\": %ld"
@@ -922,12 +923,11 @@ msgstr "> %d, Hexa %08x, Octal %o"
 msgid "E134: Move lines into themselves"
 msgstr "E134: La destination est dans la plage d'origine"
 
-msgid "1 line moved"
-msgstr "1 ligne d�plac�e"
-
 #, c-format
-msgid "%ld lines moved"
-msgstr "%ld lignes d�plac�es"
+msgid "%ld line moved"
+msgid_plural "%ld lines moved"
+msgstr[0] "%ld ligne d�plac�e"
+msgstr[1] "%ld lignes d�plac�es"
 
 #, c-format
 msgid "%ld lines filtered"
@@ -1135,26 +1135,29 @@ msgstr "remplacer par %s (y/n/a/q/l/^E/^Y)?"
 msgid "(Interrupted) "
 msgstr "(Interrompu) "
 
-msgid "1 match"
-msgstr "1 correspondance"
-
-msgid "1 substitution"
-msgstr "1 substitution"
-
 #, c-format
-msgid "%ld matches"
-msgstr "%ld correspondances"
+msgid "%ld match on %ld line"
+msgid_plural "%ld matches on %ld line"
+msgstr[0] "%ld correspondance sur %ld ligne"
+msgstr[1] "%ld correspondances sur %ld ligne"
 
 #, c-format
-msgid "%ld substitutions"
-msgstr "%ld substitutions"
+msgid "%ld substitution on %ld line"
+msgid_plural "%ld substitutions on %ld line"
+msgstr[0] "%ld substitution sur %ld ligne"
+msgstr[1] "%ld substitutions sur %ld ligne"
 
-msgid " on 1 line"
-msgstr " sur 1 ligne"
+#, c-format
+msgid "%ld match on %ld lines"
+msgid_plural "%ld matches on %ld lines"
+msgstr[0] "%ld correspondance sur %ld lignes"
+msgstr[1] "%ld correspondances sur %ld lignes"
 
 #, c-format
-msgid " on %ld lines"
-msgstr " sur %ld lignes"
+msgid "%ld substitution on %ld lines"
+msgid_plural "%ld substitutions on %ld lines"
+msgstr[0] "%ld substitution sur %ld lignes"
+msgstr[1] "%ld substitutions sur %ld lignes"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message devrait contenir une r�f�rence � :vglobal.
@@ -1504,19 +1507,17 @@ msgstr ""
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: D�sol�, cette commande n'est pas disponible dans cette version"
 
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "Encore 1 fichier � �diter. Quitter tout de m�me ?"
-
 #, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "Encore %d fichiers � �diter. Quitter tout de m�me ?"
-
-msgid "E173: 1 more file to edit"
-msgstr "E173: encore 1 fichier � �diter"
+msgid "%d more file to edit.  Quit anyway?"
+msgid_plural "%d more files to edit.  Quit anyway?"
+msgstr[0] "Encore %d fichier � �diter. Quitter tout de m�me ?"
+msgstr[1] "Encore %d fichiers � �diter. Quitter tout de m�me ?"
 
 #, c-format
-msgid "E173: %ld more files to edit"
-msgstr "E173: encore %ld fichiers � �diter"
+msgid "E173: %ld more file to edit"
+msgid_plural "E173: %ld more files to edit"
+msgstr[0] "E173: encore %ld fichier � �diter"
+msgstr[1] "E173: encore %ld fichiers � �diter"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La commande existe d�j� : ajoutez ! pour la red�finir"
@@ -1597,6 +1598,9 @@ msgstr "E784: Impossible de fermer le dernier onglet"
 msgid "Already only one tab page"
 msgstr "Il ne reste d�j� plus qu'un seul onglet"
 
+msgid "Edit File in new tab page"
+msgstr "Ouvrir un fichier dans un nouvel onglet"
+
 msgid "Edit File in new window"
 msgstr "Ouvrir un fichier dans une nouvelle fen�tre - Vim"
 
@@ -1904,9 +1908,6 @@ msgstr "Lecture de stdin..."
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: La conversion a rendu le fichier illisible !"
 
-msgid "[fifo/socket]"
-msgstr "[fifo/socket]"
-
 msgid "[fifo]"
 msgstr "[fifo]"
 
@@ -2091,19 +2092,17 @@ msgstr "[unix]"
 msgid "[unix format]"
 msgstr "[format unix]"
 
-msgid "1 line, "
-msgstr "1 ligne, "
-
 #, c-format
-msgid "%ld lines, "
-msgstr "%ld lignes, "
-
-msgid "1 character"
-msgstr "1 caract�re"
+msgid "%ld line, "
+msgid_plural "%ld lines, "
+msgstr[0] "%ld ligne, "
+msgstr[1] "%ld lignes, "
 
 #, c-format
-msgid "%lld characters"
-msgstr "%lld caract�res"
+msgid "%lld character"
+msgid_plural "%lld characters"
+msgstr[0] "%lld caract�re"
+msgstr[1] "%lld caract�res"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2489,11 +2488,11 @@ msgstr "Ann&uler"
 msgid "Open tab..."
 msgstr "Ouvrir dans un onglet..."
 
-msgid "Find string (use '\\\\' to find  a '\\')"
-msgstr "Chercher une cha�ne (utilisez '\\\\' pour chercher un '\\')"
+msgid "Find string"
+msgstr "Trouver une cha�ne"
 
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "Chercher et remplacer (utilisez '\\\\' pour trouver un '\\')"
+msgid "Find & Replace"
+msgstr "Trouver & remplacer"
 
 # DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
 #      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
@@ -4202,19 +4201,17 @@ msgstr "Tapez un nombre et <Entr�e> ou cliquez avec la souris (rien annule) :"
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "Tapez un nombre et <Entr�e> (rien annule) :"
 
-msgid "1 more line"
-msgstr "1 ligne en plus"
-
-msgid "1 line less"
-msgstr "1 ligne en moins"
-
 #, c-format
-msgid "%ld more lines"
-msgstr "%ld lignes en plus"
+msgid "%ld more line"
+msgid_plural "%ld more lines"
+msgstr[0] "%ld ligne en plus"
+msgstr[1] "%ld lignes en plus"
 
 #, c-format
-msgid "%ld fewer lines"
-msgstr "%ld lignes en moins"
+msgid "%ld line less"
+msgid_plural "%ld fewer lines"
+msgstr[0] "%ld ligne en moins"
+msgstr[1] "%ld lignes en moins"
 
 msgid " (Interrupted)"
 msgstr " (Interrompu)"
@@ -4352,31 +4349,26 @@ msgstr ""
 "Vim"
 
 #, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 ligne %s�e 1 fois"
-
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 ligne %s�e %d fois"
-
-#, c-format
-msgid "%ld lines %sed 1 time"
-msgstr "%ld lignes %s�es 1 fois"
+msgid "%ld line %sed %d time"
+msgid_plural "%ld line %sed %d times"
+msgstr[0] "%ld lignes %s�es %d fois"
+msgstr[1] "%ld lignes %s�es %d fois"
 
 #, c-format
-msgid "%ld lines %sed %d times"
-msgstr "%ld lignes %s�es %d fois"
+msgid "%ld lines %sed %d time"
+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... "
 
-msgid "1 line indented "
-msgstr "1 ligne indent�e "
-
 #, c-format
-msgid "%ld lines indented "
-msgstr "%ld lignes indent�es "
+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�"
@@ -4385,12 +4377,11 @@ msgstr "E748: Aucun registre n'a �t� pr�c�demment utilis�"
 msgid "cannot yank; delete anyway"
 msgstr "impossible de r�aliser une copie ; effacer tout de m�me"
 
-msgid "1 line changed"
-msgstr "1 ligne modifi�e"
-
 #, c-format
-msgid "%ld lines changed"
-msgstr "%ld lignes modifi�es"
+msgid "%ld line changed"
+msgid_plural "%ld lines changed"
+msgstr[0] "%ld ligne modifi�e"
+msgstr[1] "%ld lignes modifi�es"
 
 #, c-format
 msgid "freeing %ld lines"
@@ -4401,20 +4392,16 @@ msgid " into \"%c"
 msgstr " dans \"%c"
 
 #, c-format
-msgid "block of 1 line yanked%s"
-msgstr "bloc de 1 ligne copi�%s"
-
-#, c-format
-msgid "1 line yanked%s"
-msgstr "1 ligne copi�e%s"
-
-#, c-format
-msgid "block of %ld lines yanked%s"
-msgstr "bloc de %ld lignes copi�%s"
+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 lines yanked%s"
-msgstr "%ld lignes copi�es%s"
+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"
@@ -5014,6 +5001,9 @@ msgstr "E69: ']' manquant apr�s %s%%["
 msgid "E70: Empty %s%%[]"
 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"
 
@@ -5129,6 +5119,11 @@ msgstr "E879: (regexp NFA) Trop de \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) erreur de terminaison"
 
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr ""
+"Impossible d'ouvrir le fichier de log temporaire en �criture, affichage sur "
+"stderr... "
+
 msgid "E874: (NFA) Could not pop the stack!"
 msgstr "E874: (NFA) Impossible de d�piler !"
 
@@ -5146,19 +5141,6 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr ""
 "E878: (NFA) Impossible d'allouer la m�moire pour parcourir les branches !"
 
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr... "
-msgstr ""
-"Impossible d'ouvrir le fichier de log temporaire en �criture, affichage sur "
-"stderr... "
-
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) IMPOSSIBLE D'OUVRIR %s !"
-
-msgid "Could not open temporary log file for writing "
-msgstr "Impossible d'ouvrir le fichier de log en �criture"
-
 msgid " VREPLACE"
 msgstr " VREMPLACEMENT"
 
@@ -5654,6 +5636,9 @@ msgstr "E783: caract�re dupliqu� dans l'entr�e MAP"
 msgid "No Syntax items defined for this buffer"
 msgstr "Aucun �l�ment de syntaxe d�fini pour ce tampon"
 
+msgid "'redrawtime' exceeded, syntax highlighting disabled"
+msgstr "'redrawtime' �coul�, surbrillance de syntaxe d�sactiv�e"
+
 msgid "syntax conceal on"
 msgstr "\"syntax conceal\" activ�e"
 
@@ -5684,6 +5669,9 @@ msgstr ""
 msgid "syntax iskeyword "
 msgstr "syntaxe iskeyword "
 
+msgid "syntax iskeyword not set"
+msgstr "iskeyword n'est pas activ�"
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Aucune grappe de syntaxe %s"
@@ -6175,8 +6163,10 @@ msgid "number changes  when               saved"
 msgstr "num�ro modif.   instant            enregistr�"
 
 #, c-format
-msgid "%ld seconds ago"
-msgstr "il y a %ld secondes"
+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"
@@ -6334,6 +6324,10 @@ msgstr "E133: :return en dehors d'une fonction"
 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 version"