vim-patch:74675a666b51

Updated runtime files and translations.

https://github.com/vim/vim/commit/74675a666b51edd61e0210132658d81a86c5102c

8 files changed, 591 insertions, 261 deletions

diff --git a/src/nvim/po/de.po b/src/nvim/po/de.po
index f04d3be4b4..751e9aeb4c 100644
--- a/src/nvim/po/de.po
+++ b/src/nvim/po/de.po
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-26 15:13+0200\n"
 "PO-Revision-Date: 2008-05-24 17:26+0200\n"
-"Last-Translator: Georg Dahn <georg.dahn@gmail.com>\n"
+"Last-Translator: was: Georg Dahn\n"
 "Language-Team: German <de@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index 3fb300c63f..188d86f478 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -13,18 +13,12 @@
 #   Komputeko:           http://komputeko.net/index_eo.php
 #   Komputada leksikono: http://bertilow.com/div/komputada_leksikono/
 #
-# Lasta versio:
-#   http://dominique.pelle.free.fr/vim-eo.php
-#
-# Ĉiu komento estas bonvenata...
-# Every remark is welcome...
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-16 00:30+0100\n"
-"PO-Revision-Date: 2017-01-16 01:14+0100\n"
+"POT-Creation-Date: 2017-07-11 23:10+0200\n"
+"PO-Revision-Date: 2017-07-12 05:14+0200\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@@ -442,6 +436,9 @@ msgstr "Analizas: %s"
 msgid "Scanning tags."
 msgstr "Analizas etikedojn."
 
+msgid "match in file"
+msgstr "kongruo en dosiero"
+
 msgid " Adding"
 msgstr " Aldonanta"
 
@@ -523,17 +520,23 @@ msgid "E711: List value has not enough items"
 msgstr "E711: Lista valoro ne havas sufiĉe da eroj"
 
 msgid "E690: Missing \"in\" after :for"
-msgstr "E690: \"in\" mankas post \":for\""
+msgstr "E690: \"in\" mankas malantaŭ \":for\""
 
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Ne estas tia variablo: \"%s\""
 
+#. For historic reasons this error is not given for a list or dict.
+#. * E.g., the b: dict could be locked/unlocked.
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: Ne eblas ŝlosi aŭ malŝlosi variablon %s"
+
 msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: variablo ingita tro profunde por malŝlosi"
+msgstr "E743: variablo ingita tro profunde por (mal)ŝlosi"
 
 msgid "E109: Missing ':' after '?'"
-msgstr "E109: Mankas ':' post '?'"
+msgstr "E109: Mankas ':' malantaŭ '?'"
 
 msgid "E691: Can only compare List with List"
 msgstr "E691: Eblas nur kompari Liston kun Listo"
@@ -706,12 +709,6 @@ msgid "&Ok"
 msgstr "&Bone"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld linio: "
-msgstr[1] "+-%s%3ld linioj: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Nekonata funkcio: %s"
 
@@ -756,8 +753,8 @@ msgstr "E727: Komenco preter fino"
 msgid "<empty>"
 msgstr "<malplena>"
 
-msgid "E240: No connection to Vim server"
-msgstr "E240: Neniu konekto al Vim-servilo"
+msgid "E240: No connection to the X server"
+msgstr "E240: Neniu konekto al X-servilo"
 
 #, c-format
 msgid "E241: Unable to send to %s"
@@ -766,6 +763,12 @@ msgstr "E241: Ne eblas sendi al %s"
 msgid "E277: Unable to read a server reply"
 msgstr "E277: Ne eblas legi respondon de servilo"
 
+msgid "E941: already started a server"
+msgstr "E941: servilo jam lanĉita"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: la eblo +clientserver ne disponeblas"
+
 msgid "remove() argument"
 msgstr "argumento de remove()"
 
@@ -1002,8 +1005,9 @@ msgstr " en 1 linio"
 msgid " on %ld lines"
 msgstr " en %ld linioj"
 
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: Ne eblas fari \":global\" rekursie"
+#. will increment global_busy to break out of the loop
+msgid "E147: Cannot do :global recursive with a range"
+msgstr "E147: Ne eblas fari \":global\" rekursie kun amplekso"
 
 # DP: global estas por ":global" do mi ne tradukis ĝin
 msgid "E148: Regular expression missing from global"
@@ -1189,6 +1193,14 @@ msgstr "Serĉado de \"%s\""
 msgid "not found in '%s': \"%s\""
 msgstr "ne trovita en '%s: \"%s\""
 
+#, c-format
+msgid "W20: Required python version 2.x not supported, ignoring file: %s"
+msgstr "W20: Pitono versio 2.x bezonata sed nesubtenata, ignoro de dosiero: %s"
+
+#, c-format
+msgid "W21: Required python version 3.x not supported, ignoring file: %s"
+msgstr "W21: pitono versio 3.x bezonata sed nesubtenata, ignore de dosiero: %s"
+
 msgid "Source Vim script"
 msgstr "Ruli Vim-skripton"
 
@@ -1286,6 +1298,9 @@ msgstr "Inversa amplekso donita, permuteblas"
 msgid "E494: Use w or w>>"
 msgstr "E494: Uzu w aŭ w>>"
 
+msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
+msgstr "E943: Tabulo de komandoj estas ĝisdatigenda, lanĉu 'make cmdidx'"
+
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Bedaŭrinde, tiu komando ne haveblas en tiu versio"
 
@@ -1562,7 +1577,7 @@ msgid "E583: multiple :else"
 msgstr "E583: pluraj \":else\""
 
 msgid "E584: :elseif after :else"
-msgstr "E584: \":elseif\" post \":else\""
+msgstr "E584: \":elseif\" malantaŭ \":else\""
 
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: \":while/:for\" ingita tro profunde"
@@ -1588,7 +1603,7 @@ msgstr "E603: \":catch\" sen \":try\""
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
 msgid "E604: :catch after :finally"
-msgstr "E604: \":catch\" post \":finally\""
+msgstr "E604: \":catch\" malantaŭ \":finally\""
 
 msgid "E606: :finally without :try"
 msgstr "E606: \":finally\" sen \":try\""
@@ -1986,7 +2001,7 @@ msgstr "W19: Forviŝo de augroup kiu estas ankoraŭ uzata"
 
 #, c-format
 msgid "E215: Illegal character after *: %s"
-msgstr "E215: Nevalida signo post *: %s"
+msgstr "E215: Nevalida signo malantaŭ *: %s"
 
 #, c-format
 msgid "E216: No such event: %s"
@@ -2044,12 +2059,6 @@ msgstr "E350: Ne eblas krei faldon per la aktuala 'foldmethod'"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Ne eblas forviŝi faldon per la aktuala 'foldmethod'"
 
-#, c-format
-msgid "+--%3ld line folded "
-msgid_plural "+--%3ld lines folded "
-msgstr[0] "+--%3ld linio faldita "
-msgstr[1] "+--%3ld linioj falditaj "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: Aldoni al lega bufro"
 
@@ -2859,10 +2868,10 @@ msgid "Too many edit arguments"
 msgstr "Tro da argumentoj de redakto"
 
 msgid "Argument missing after"
-msgstr "Argumento mankas post"
+msgstr "Argumento mankas malantaŭ"
 
 msgid "Garbage after option argument"
-msgstr "Forĵetindaĵo post argumento de opcio"
+msgstr "Forĵetindaĵo malantaŭ argumento de opcio"
 
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "Tro da argumentoj \"+komando\", \"-c komando\" aŭ \"--cmd komando\""
@@ -2968,7 +2977,7 @@ msgstr ""
 "Argumentoj:\n"
 
 msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tNur dosiernomoj post tio"
+msgstr "--\t\t\tNur dosiernomoj malantaŭ tio"
 
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tNe malvolvi ĵokerojn"
@@ -3069,8 +3078,7 @@ msgstr ""
 "--not-a-term\t\tPreterpasi averton por enigo/eligo, kiu ne estas terminalo"
 
 msgid "--ttyfail\t\tExit if input or output is not a terminal"
-msgstr ""
-"--ttyfail\t\tEliri se le eniro aŭ eliro ne estas terminalo"
+msgstr "--ttyfail\t\tEliri se la eniro aŭ eliro ne estas terminalo"
 
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\tUzi <vimrc> anstataŭ iun ajn .vimrc"
@@ -4116,8 +4124,8 @@ msgstr "E662: Ĉe komenco de ŝanĝlisto"
 msgid "E663: At end of changelist"
 msgstr "E663: Ĉe fino de ŝanĝlisto"
 
-msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "Tajpu \":quit<Enenklavo>\" por eliri el Vim"
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr "Tajpu  :qa!  kaj premu <Enenklavon> por forlasi ĉiujn ŝanĝojn kaj eliri el Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4262,7 +4270,7 @@ msgid "E846: Key code not set"
 msgstr "E846: Klavkodo ne agordita"
 
 msgid "E521: Number required after ="
-msgstr "E521: Nombro bezonata post ="
+msgstr "E521: Nombro bezonata malantaŭ ="
 
 msgid "E522: Not found in termcap"
 msgstr "E522: Netrovita en termcap"
@@ -4304,7 +4312,7 @@ msgstr "E525: Ĉeno de nula longo"
 
 #, c-format
 msgid "E526: Missing number after <%s>"
-msgstr "E526: Mankas nombro post <%s>"
+msgstr "E526: Mankas nombro malantaŭ <%s>"
 
 msgid "E527: Missing comma"
 msgstr "E527: Mankas komo"
@@ -4332,7 +4340,7 @@ msgstr "E534: Nevalida larĝa tiparo"
 
 #, c-format
 msgid "E535: Illegal character after <%c>"
-msgstr "E535: Nevalida signo post <%c>"
+msgstr "E535: Nevalida signo malantaŭ <%c>"
 
 msgid "E536: comma required"
 msgstr "E536: komo bezonata"
@@ -4415,7 +4423,7 @@ msgstr "E357: 'langmap': Kongrua signo mankas por %s"
 
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': Ekstraj signoj post punktokomo: %s"
+msgstr "E358: 'langmap': Ekstraj signoj malantaŭ punktokomo: %s"
 
 msgid "cannot open "
 msgstr "ne eblas malfermi "
@@ -4736,7 +4744,13 @@ msgstr "E369: nevalida ano en %s%%[]"
 
 #, c-format
 msgid "E769: Missing ] after %s["
-msgstr "E769: Mankas ] post %s["
+msgstr "E769: Mankas ] malantaŭ %s["
+
+msgid "E944: Reverse range in character class"
+msgstr "E944: Inversa amplekso en klaso de signoj"
+
+msgid "E945: Range too large in character class"
+msgstr "E945: tro larga amplekso de klaso de signoj"
 
 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4759,12 +4773,15 @@ msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie"
 
 #, c-format
 msgid "E69: Missing ] after %s%%["
-msgstr "E69: Mankas ] post %s%%["
+msgstr "E69: Mankas ] malantaŭ %s%%["
 
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: Malplena %s%%[]"
 
+msgid "E65: Illegal back reference"
+msgstr "E65: Nevalida retro-referenco"
+
 msgid "E339: Pattern too long"
 msgstr "E339: Ŝablono tro longa"
 
@@ -4780,7 +4797,7 @@ msgstr "E52: Neekvilibra \\z("
 
 #, c-format
 msgid "E59: invalid character after %s@"
-msgstr "E59: nevalida signo post %s@"
+msgstr "E59: nevalida signo malantaŭ %s@"
 
 #, c-format
 msgid "E60: Too many complex %s{...}s"
@@ -4801,19 +4818,16 @@ msgstr "E63: nevalida uzo de \\_"
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c sekvas nenion"
 
-msgid "E65: Illegal back reference"
-msgstr "E65: Nevalida retro-referenco"
-
 msgid "E68: Invalid character after \\z"
-msgstr "E68: Nevalida signo post \\z"
+msgstr "E68: Nevalida signo malantaŭ \\z"
 
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: Nevalida signo post %s%%[dxouU]"
+msgstr "E678: Nevalida signo malantaŭ %s%%[dxouU]"
 
 #, c-format
 msgid "E71: Invalid character after %s%%"
-msgstr "E71: Nevalida signo post %s%%"
+msgstr "E71: Nevalida signo malantaŭ %s%%"
 
 #, c-format
 msgid "E554: Syntax error in %s{...}"
@@ -4845,7 +4859,7 @@ msgstr "E866: (NFA-regulesprimo) Mispoziciigita %c"
 
 #, c-format
 msgid "E877: (NFA regexp) Invalid character class: %ld"
-msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo: %ld"
+msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signoj: %ld"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
@@ -4975,7 +4989,7 @@ msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: serĉo atingis SUBON sen trovi: %s"
 
 msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: Atendis '?' aŭ '/' post ';'"
+msgstr "E386: Atendis '?' aŭ '/' malantaŭ ';'"
 
 msgid " (includes previously listed match)"
 msgstr " (enhavas antaŭe listigitajn kongruojn)"
@@ -5406,10 +5420,31 @@ msgstr "E783: ripetita signo en rikordo MAP"
 msgid "No Syntax items defined for this buffer"
 msgstr "Neniu sintaksa elemento difinita por tiu bufro"
 
+msgid "syntax conceal on"
+msgstr "sintakso de conceal ŝaltata"
+
+msgid "syntax conceal off"
+msgstr "sintakso de conceal malŝaltita"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Nevalida argumento: %s"
 
+msgid "syntax case ignore"
+msgstr "sintakso ignoras usklecon"
+
+msgid "syntax case match"
+msgstr "sintakso konsideras usklecon"
+
+msgid "syntax spell toplevel"
+msgstr "literumado en teksto sen sintaksa grupo"
+
+msgid "syntax spell notoplevel"
+msgstr "sen literumado en teksto sen sintaksa grupo"
+
+msgid "syntax spell default"
+msgstr "literumado en teksto sen sintaksa grupo, nur se ne estas @Spell aŭ @NoSpell"
+
 msgid "syntax iskeyword "
 msgstr "sintakso iskeyword "
 
@@ -5491,7 +5526,7 @@ msgstr "E789: Mankas ']': %s"
 
 #, c-format
 msgid "E890: trailing char after ']': %s]%s"
-msgstr "E890: vosta signo post ']': %s]%s"
+msgstr "E890: vosta signo malantaŭ ']': %s]%s"
 
 #, c-format
 msgid "E398: Missing '=': %s"
@@ -5513,7 +5548,7 @@ msgstr "E401: Disigilo de ŝablono netrovita: %s"
 
 #, c-format
 msgid "E402: Garbage after pattern: %s"
-msgstr "E402: Forĵetindaĵo post ŝablono: %s"
+msgstr "E402: Forĵetindaĵo malantaŭ ŝablono: %s"
 
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: sintaksa sinkronigo: ŝablono de linia daŭrigo specifita dufoje"
@@ -5987,6 +6022,10 @@ msgid "E126: Missing :endfunction"
 msgstr "E126: Mankas \":endfunction\""
 
 #, c-format
+msgid "W22: Text found after :endfunction: %s"
+msgstr "W22: Teksto trovita malantaŭ :endfunction: %s"
+
+#, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Nomo de funkcio konfliktas kun variablo: %s"
 
@@ -6730,8 +6769,8 @@ msgstr "E592: 'winwidth' ne rajtas esti malpli ol 'winminwidth'"
 msgid "E80: Error while writing"
 msgstr "E80: Eraro dum skribado"
 
-msgid "Zero count"
-msgstr "Nul kvantoro"
+msgid "E939: Positive count required"
+msgstr "E939: Pozitiva kvantoro bezonata"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: Uzo de <SID> ekster kunteksto de skripto"
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index c0df5f2170..435042ad05 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -4,20 +4,17 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-#  FIRST AUTHOR  DindinX         <David.Odin@bigfoot.com>     2000.
-# SECOND AUTHOR  Adrien Beau     <version.francaise@free.fr>  2002, 2003.
-#  THIRD AUTHOR  David Blanchet  <david.blanchet@free.fr>     2006, 2008.
-# FOURTH AUTHOR  Dominique Pell� <dominique.pelle@gmail.com>  2008, 2017.
-#
-# Latest translation available at:
-#   http://dominique.pelle.free.fr/vim-fr.php
+#  FIRST AUTHOR  DindinX         <David.Odin@bigfoot.com>    2000.
+# SECOND AUTHOR  Adrien Beau     <version.francaise@free.fr> 2002, 2003.
+#  THIRD AUTHOR  David Blanchet  <david.blanchet@free.fr>    2006, 2008.
+# FOURTH AUTHOR  Dominique Pell� <dominique.pelle@gmail.com> 2008, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Fran�ais)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-16 00:30+0100\n"
-"PO-Revision-Date: 2017-01-16 00:51+0100\n"
+"POT-Creation-Date: 2017-07-11 23:10+0200\n"
+"PO-Revision-Date: 2017-01-12 05:16+0200\n"
 "Last-Translator: Dominique Pell� <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -481,6 +478,9 @@ 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.
@@ -584,6 +584,12 @@ msgstr "E690: \"in\" manquant apr�s :for"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Variable inexistante : %s"
 
+#. For historic reasons this error is not given for a list or dict.
+#. * E.g., the b: dict could be locked/unlocked.
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: Impossible de (d�)verrouiler la variable %s"
+
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: variable trop imbriqu�e pour la (d�)verrouiller"
 
@@ -774,12 +780,6 @@ msgid "&Ok"
 msgstr "&Ok"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld ligne : "
-msgstr[1] "+-%s%3ld lignes : "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Fonction inconnue : %s"
 
@@ -827,9 +827,7 @@ msgstr "E727: D�but au-del� de la fin"
 msgid "<empty>"
 msgstr "<vide>"
 
-# AB - � mon avis, la version anglaise est erron�e.
-# DB : V�rifier
-msgid "E240: No connection to Vim server"
+msgid "E240: No connection to the X server"
 msgstr "E240: Pas de connexion au serveur X"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
@@ -840,6 +838,12 @@ msgstr "E241: L'envoi au serveur %s a �chou�"
 msgid "E277: Unable to read a server reply"
 msgstr "E277: Impossible de lire la r�ponse du serveur"
 
+msgid "E941: already started a server"
+msgstr "E941: serveur d�j� d�marr�"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: La fonctionnalit� +clientserver n'est pas disponible"
+
 msgid "remove() argument"
 msgstr "argument de remove()"
 
@@ -1137,8 +1141,9 @@ msgstr " sur %ld lignes"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message devrait contenir une r�f�rence � :vglobal.
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global ne peut pas ex�cuter :global"
+#. will increment global_busy to break out of the loop
+msgid "E147: Cannot do :global recursive with a range"
+msgstr "E147: :global ne peut pas ex�cuter :global avec une plage"
 
 # AB - Ce message devrait contenir une r�f�rence � :vglobal.
 msgid "E148: Regular expression missing from global"
@@ -1357,6 +1362,14 @@ msgstr "Recherche de \"%s\""
 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�"
+
+#, c-format
+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"
 
@@ -1457,6 +1470,9 @@ msgstr "La plage sp�cifi�e est invers�e, OK pour l'inverser"
 msgid "E494: Use w or w>>"
 msgstr "E494: Utilisez w ou w>>"
 
+msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
+msgstr "E943: La table des commandes doit �tre mise � jour, lancez 'make cmdidxs'"
+
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: D�sol�, cette commande n'est pas disponible dans cette version"
 
@@ -2233,12 +2249,6 @@ msgstr "E350: Impossible de cr�er un repli avec la 'foldmethod'e actuelle"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Impossible de supprimer un repli avec la 'foldmethod'e actuelle"
 
-#, c-format
-msgid "+--%3ld line folded "
-msgid_plural "+--%3ld lines folded "
-msgstr[0] "+--%3ld ligne repli�e "
-msgstr[1] "+--%3ld lignes repli�es "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: Ajout au tampon de lecture"
 
@@ -3281,8 +3291,7 @@ msgstr ""
 "--no-a-term\t\tAucun avertissement si l'entr�e/sortie n'est pas un terminal"
 
 msgid "--ttyfail\t\tExit if input or output is not a terminal"
-msgstr ""
-"--ttyfail\t\tQuitte si l'entr�e ou la sortie ne sont pas un terminal"
+msgstr "--ttyfail\t\tQuitte si l'entr�e ou la sortie ne sont pas un terminal"
 
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\tUtiliser <vimrc> au lieu du vimrc habituel"
@@ -4338,8 +4347,8 @@ msgstr "E662: Au d�but de la liste des modifications"
 msgid "E663: At end of changelist"
 msgstr "E663: � la fin de la liste des modifications"
 
-msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "tapez  :q<Entr�e>  pour quitter Vim"
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr "Tapez  :qa!  puis <Entr�e> pour abandonner tous les changements et quitter Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4968,6 +4977,12 @@ msgstr "E369: �l�ment invalide dans %s%%[]"
 msgid "E769: Missing ] after %s["
 msgstr "E769: ']' manquant apr�s %s["
 
+msgid "E944: Reverse range in character class"
+msgstr "E944: Classe de caract�res invers�e"
+
+msgid "E945: Range too large in character class"
+msgstr "E945: Plage de classe de caract�res trop large"
+
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: Pas de correspondance pour %s%%("
@@ -4994,6 +5009,9 @@ msgstr "E69: ']' manquant apr�s %s%%["
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] vide"
 
+msgid "E65: Illegal back reference"
+msgstr "E65: post-r�f�rence invalide"
+
 msgid "E339: Pattern too long"
 msgstr "E339: Motif trop long"
 
@@ -5030,9 +5048,6 @@ msgstr "E63: utilisation invalide de \\_"
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c ne suit aucun atome"
 
-msgid "E65: Illegal back reference"
-msgstr "E65: post-r�f�rence invalide"
-
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Caract�re invalide apr�s \\z"
 
@@ -5642,10 +5657,31 @@ 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 "syntax conceal on"
+msgstr "\"syntax conceal\" activ�e"
+
+msgid "syntax conceal off"
+msgstr "\"syntax conceal\" d�sactiv�e"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Argument invalide : %s"
 
+msgid "syntax case ignore"
+msgstr "syntaxe ignore la casse"
+
+msgid "syntax case match"
+msgstr "syntaxe respecte la casse"
+
+msgid "syntax spell toplevel"
+msgstr "contr�le orthographique dans le texte sans groupe syntaxique"
+
+msgid "syntax spell notoplevel"
+msgstr "pas de contr�le orthographique dans le texte sans groupe syntaxique"
+
+msgid "syntax spell default"
+msgstr "contr�le orthographique dans le texte sans groupe syntaxique, sauf si @Spell/@NoSpell"
+
 msgid "syntax iskeyword "
 msgstr "syntaxe iskeyword "
 
@@ -6249,6 +6285,10 @@ msgid "E126: Missing :endfunction"
 msgstr "E126: Il manque :endfunction"
 
 #, c-format
+msgid "W22: Text found after :endfunction: %s"
+msgstr "W22: Texte trouv� apr�s :endfunction: %s"
+
+#, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Le nom de fonction entre en conflit avec la variable : %s"
 
@@ -6997,8 +7037,8 @@ msgstr "E592: 'winwidth' ne peut pas �tre plus petit que 'winminwidth'"
 msgid "E80: Error while writing"
 msgstr "E80: Erreur lors de l'�criture"
 
-msgid "Zero count"
-msgstr "Le quantificateur est nul"
+msgid "E939: Positive count required"
+msgstr "E939: Quantificateur positif requis"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> utilis� en dehors d'un script"
diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po
index abb3565077..281af86ba9 100644
--- a/src/nvim/po/ga.po
+++ b/src/nvim/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-25 09:31-0500\n"
+"POT-Creation-Date: 2017-07-11 15:45-0500\n"
 "PO-Revision-Date: 2010-04-14 10:01-0500\n"
 "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -239,7 +239,8 @@ msgid "E917: Cannot use a callback with %s()"
 msgstr "E917: N� f�idir aisghlaoch a �s�id le %s()"
 
 msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
-msgstr "E912: n� f�idir ch_evalexpr()/ch_sendexpr() a �s�id le cain�al raw n� nl"
+msgstr ""
+"E912: n� f�idir ch_evalexpr()/ch_sendexpr() a �s�id le cain�al raw n� nl"
 
 msgid "E906: not an open channel"
 msgstr "E906: n� cain�al oscailte �"
@@ -426,6 +427,9 @@ msgstr "%s � scanadh"
 msgid "Scanning tags."
 msgstr "Clibeanna � scanadh."
 
+msgid "match in file"
+msgstr "meaitse�il sa chomhad"
+
 msgid " Adding"
 msgstr " M�ad�"
 
@@ -513,6 +517,12 @@ msgstr "E690: \"in\" ar iarraidh i ndiaidh :for"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: N�l a leith�id d'athr�g: \"%s\""
 
+#. For historic reasons this error is not given for a list or dict.
+#. * E.g., the b: dict could be locked/unlocked.
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: N� f�idir athr�g %s a ghlas�il n� a dh�ghlas�il"
+
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: athr�g neadaithe r�dhomhain chun � a (d�)ghlas�il"
 
@@ -691,15 +701,6 @@ msgid "&Ok"
 msgstr "&Ok"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld l�ne: "
-msgstr[1] "+-%s%3ld l�ne: "
-msgstr[2] "+-%s%3ld l�ne: "
-msgstr[3] "+-%s%3ld l�ne: "
-msgstr[4] "+-%s%3ld l�ne: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Feidhm anaithnid: %s"
 
@@ -707,7 +708,9 @@ msgid "E922: expected a dict"
 msgstr "E922: bh�othas ag s�il le focl�ir"
 
 msgid "E923: Second argument of function() must be a list or a dict"
-msgstr "E923: Caithfidh an dara harg�int de function() a bheith ina liosta n� ina focl�ir"
+msgstr ""
+"E923: Caithfidh an dara harg�int de function() a bheith ina liosta n� ina "
+"focl�ir"
 
 msgid ""
 "&OK\n"
@@ -744,8 +747,8 @@ msgstr "E727: Tosach thar dheireadh"
 msgid "<empty>"
 msgstr "<folamh>"
 
-msgid "E240: No connection to Vim server"
-msgstr "E240: N�l aon nasc le freastala� Vim"
+msgid "E240: No connection to the X server"
+msgstr "E240: N�l aon cheangal leis an bhfreastala� X"
 
 #, c-format
 msgid "E241: Unable to send to %s"
@@ -754,6 +757,12 @@ msgstr "E241: N� f�idir aon rud a sheoladh chuig %s"
 msgid "E277: Unable to read a server reply"
 msgstr "E277: N� f�idir freagra �n fhreastala� a l�amh"
 
+msgid "E941: already started a server"
+msgstr "E941: tosa�odh freastala� cheana"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: n�l an ghn� +clientserver ar f�il"
+
 msgid "remove() argument"
 msgstr "arg�int remove()"
 
@@ -993,8 +1002,9 @@ msgstr " ar l�ne amh�in"
 msgid " on %ld lines"
 msgstr " ar %ld l�ne"
 
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: N� cheada�tear :global go hathch�rsach"
+#. will increment global_busy to break out of the loop
+msgid "E147: Cannot do :global recursive with a range"
+msgstr "E147: N� cheada�tear :global athch�rsach le raon"
 
 # should have ":"
 msgid "E148: Regular expression missing from global"
@@ -1179,6 +1189,14 @@ msgstr "Ag d�anamh cuardach ar \"%s\""
 msgid "not found in '%s': \"%s\""
 msgstr "gan aimsi� in '%s': \"%s\""
 
+#, c-format
+msgid "W20: Required python version 2.x not supported, ignoring file: %s"
+msgstr "W20: N�l leagan 2.x de Python ar f�il; ag d�anamh neamhaird de %s"
+
+#, c-format
+msgid "W21: Required python version 3.x not supported, ignoring file: %s"
+msgstr "W21: N�l leagan 3.x de Python ar f�il; ag d�anamh neamhaird de %s"
+
 msgid "Source Vim script"
 msgstr "Foinsigh script Vim"
 
@@ -1278,6 +1296,9 @@ msgstr "Raon droim ar ais, babht�il"
 msgid "E494: Use w or w>>"
 msgstr "E494: Bain �s�id as w n� w>>"
 
+msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
+msgstr "E943: Caithfear t�bla na n-orduithe a nuashonr�; rith 'make cmdidxs'"
+
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: T� br�n orm, n�l an t-ord� ar f�il sa leagan seo"
 
@@ -1391,7 +1412,7 @@ msgid "No swap file"
 msgstr "N�l aon chomhad babht�la ann"
 
 msgid "Append File"
-msgstr "Cuir Comhad i nDeireadh"
+msgstr "Ceangail Comhad ag an Deireadh"
 
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
@@ -1412,10 +1433,10 @@ msgid "Window position: X %d, Y %d"
 msgstr "Ionad na fuinneoige: X %d, Y %d"
 
 msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: N� f�idir ionad na fuinneoige a fh�il amach ar an ch�ras seo"
+msgstr "E188: N� f�idir ionad na fuinneoige a fh�il amach ar an gc�ras seo"
 
 msgid "E466: :winpos requires two number arguments"
-msgstr "E466: n� fol�ir dh� arg�int uimhri�la le :winpos"
+msgstr "E466: dh� arg�int uimhri�la de dh�th le :winpos"
 
 msgid "E930: Cannot use :redir inside execute()"
 msgstr "E930: N� f�idir :redir a �s�id laistigh de execute()"
@@ -2045,15 +2066,6 @@ msgstr "E350: N� f�idir filleadh a chruth� leis an 'foldmethod' reatha"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: N� f�idir filleadh a scriosadh leis an 'foldmethod' reatha"
 
-#, c-format
-msgid "+--%3ld line folded "
-msgid_plural "+--%3ld lines folded "
-msgstr[0] "+--%3ld l�ne fillte "
-msgstr[1] "+--%3ld l�ne fillte "
-msgstr[2] "+--%3ld l�ne fillte "
-msgstr[3] "+--%3ld l�ne fillte "
-msgstr[4] "+--%3ld l�ne fillte "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: Cuir leis an maol�n l�ite"
 
@@ -2652,8 +2664,8 @@ msgid ""
 "E895: Sorry, this command is disabled, the MzScheme's racket/base module "
 "could not be loaded."
 msgstr ""
-"E895: �r leithsc�al, t� an t-ord� seo d�chumasaithe; n�orbh fh�idir "
-"mod�l racket/base MzScheme a lucht�."
+"E895: �r leithsc�al, t� an t-ord� seo d�chumasaithe; n�orbh fh�idir mod�l "
+"racket/base MzScheme a lucht�."
 
 msgid "invalid expression"
 msgstr "slonn neamhbhail�"
@@ -2846,6 +2858,10 @@ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: Air� m�chumtha sa chl�rlann �isc VIM.  Scriosta!"
 
 #, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: Eochair dh�blach in JSON: \"%s\""
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Cam�g ar iarraidh i Liosta: %s"
 
@@ -2898,7 +2914,8 @@ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: Earr�id: Theip ar thos� gvim � NetBeans\n"
 
 msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
-msgstr "Vim: Earr�id: N� f�idir an leagan seo de Vim a rith i dteirmin�al Cygwin\n"
+msgstr ""
+"Vim: Earr�id: N� f�idir an leagan seo de Vim a rith i dteirmin�al Cygwin\n"
 
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Rabhadh: N�l an t-aschur ag dul chuig teirmin�al\n"
@@ -3067,7 +3084,12 @@ msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <teirmin�al>\tSocraigh cine�l teirmin�al"
 
 msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
-msgstr "--not-a-term\t\tN� bac le rabhadh faoi ionchur/aschur gan a bheith �n teirmin�al"
+msgstr ""
+"--not-a-term\t\tN� bac le rabhadh faoi ionchur/aschur gan a bheith �n "
+"teirmin�al"
+
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr "--ttyfail\t\tScoir mura bhfuil ionchur agus aschur ina dteirmin�il"
 
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t�s�id <vimrc> in ionad aon .vimrc"
@@ -4122,8 +4144,8 @@ msgstr "E662: Ag tosach liosta na n-athruithe"
 msgid "E663: At end of changelist"
 msgstr "E663: Ag deireadh liosta na n-athruithe"
 
-msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "Cl�scr�obh  :quit<Enter>  chun Vim a scor"
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr "Cl�scr�obh  :qa!  agus br�igh <Enter> le f�g�il � Vim gan athruithe a sh�bh�il"
 
 # ouch - English -ed ?
 #, c-format
@@ -4234,7 +4256,8 @@ msgid ""
 "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
 "%lld Bytes"
 msgstr ""
-"Roghna�odh %s%ld as %ld L�ne; %lld as %lld Focal; %lld as %lld Carachtar; %lld as %lld Beart"
+"Roghna�odh %s%ld as %ld L�ne; %lld as %lld Focal; %lld as %lld Carachtar; "
+"%lld as %lld Beart"
 
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
@@ -4245,7 +4268,8 @@ msgid ""
 "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
 "%lld of %lld"
 msgstr ""
-"Col %s as %s; L�ne %ld as %ld; Focal %lld as %lld; Carachtar %lld as %lld; Beart %lld as %lld"
+"Col %s as %s; L�ne %ld as %ld; Focal %lld as %lld; Carachtar %lld as %lld; "
+"Beart %lld as %lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4507,8 +4531,7 @@ msgstr ""
 
 #, c-format
 msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
-msgstr ""
-"E244: Ainm neamhcheadaithe ar ch�il�ocht \"%s\" in ainm cl� \"%s\""
+msgstr "E244: Ainm neamhcheadaithe ar ch�il�ocht \"%s\" in ainm cl� \"%s\""
 
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
@@ -4551,7 +4574,8 @@ msgstr "N�orbh fh�idir comhth�acs sl�nd�la %s a shocr� le haghaidh %s"
 
 #, c-format
 msgid "Could not get security context %s for %s. Removing it!"
-msgstr "N�orbh fh�idir comhth�acs sl�nd�la %s a fh�il le haghaidh %s. � bhaint!"
+msgstr ""
+"N�orbh fh�idir comhth�acs sl�nd�la %s a fh�il le haghaidh %s. � bhaint!"
 
 msgid ""
 "\n"
@@ -4752,6 +4776,12 @@ msgstr "E369: m�r neamhbhail� i %s%%[]"
 msgid "E769: Missing ] after %s["
 msgstr "E769: ] ar iarraidh i ndiaidh %s["
 
+msgid "E944: Reverse range in character class"
+msgstr "E944: Raon aisiompaithe in aicme carachtar"
+
+msgid "E945: Range too large in character class"
+msgstr "E945: Raon r�mh�r in aicme carachtar"
+
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( corr"
@@ -4778,6 +4808,9 @@ msgstr "E69: ] ar iarraidh i ndiaidh %s%%["
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] folamh"
 
+msgid "E65: Illegal back reference"
+msgstr "E65: C�ltagairt neamhbhail�"
+
 msgid "E339: Pattern too long"
 msgstr "E339: Slonn r�fhada"
 
@@ -4814,9 +4847,6 @@ msgstr "E63: �s�id neamhbhail� de \\_"
 msgid "E64: %s%c follows nothing"
 msgstr "E64: n�l aon rud roimh %s%c"
 
-msgid "E65: Illegal back reference"
-msgstr "E65: C�ltagairt neamhbhail�"
-
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Carachtar neamhbhail� i ndiaidh \\z"
 
@@ -5424,12 +5454,33 @@ msgstr "E783: carachtar d�blach in iontr�il MAP"
 msgid "No Syntax items defined for this buffer"
 msgstr "N�l aon mh�r chomhr�ire sainmh�nithe le haghaidh an mhaol�in seo"
 
+msgid "syntax conceal on"
+msgstr "syntax conceal on"
+
+msgid "syntax conceal off"
+msgstr "syntax conceal off"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Arg�int neamhcheadaithe: %s"
 
+msgid "syntax case ignore"
+msgstr "syntax case ignore"
+
+msgid "syntax case match"
+msgstr "syntax case match"
+
+msgid "syntax spell toplevel"
+msgstr "syntax spell toplevel"
+
+msgid "syntax spell notoplevel"
+msgstr "syntax spell notoplevel"
+
+msgid "syntax spell default"
+msgstr "syntax spell default"
+
 msgid "syntax iskeyword "
-msgstr "comhr�ir iskeyword "
+msgstr "syntax iskeyword "
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -6006,6 +6057,10 @@ msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction ar iarraidh"
 
 #, c-format
+msgid "W22: Text found after :endfunction: %s"
+msgstr "W22: Aims�odh t�acs tar �is :endfunction: %s"
+
+#, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Tagann ainm na feidhme salach ar athr�g: %s"
 
@@ -6475,6 +6530,10 @@ msgstr "E236: N� cl� aonleithid � \"%s\""
 msgid "E473: Internal error"
 msgstr "E473: Earr�id inmhe�nach"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Earr�id inmhe�nach: %s"
+
 msgid "Interrupted"
 msgstr "Idirbhriste"
 
@@ -6635,7 +6694,7 @@ msgid "E486: Pattern not found: %s"
 msgstr "E486: Patr�n gan aimsi�: %s"
 
 msgid "E487: Argument must be positive"
-msgstr "E487: N� fol�ir arg�int dheimhneach"
+msgstr "E487: Arg�int dheimhneach de dh�th"
 
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: N� f�idir a fhilleadh ar an chomhadlann roimhe seo"
@@ -6745,8 +6804,8 @@ msgstr "E592: n� cheada�tear 'winwidth' a bheith n�os l� n� 'winminwidth'"
 msgid "E80: Error while writing"
 msgstr "E80: Earr�id agus � scr�obh"
 
-msgid "Zero count"
-msgstr "Nialas"
+msgid "E939: Positive count required"
+msgstr "E939: Uimhir dheimhneach de dh�th"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> � �s�id nach i gcomhth�acs scripte"
@@ -6760,10 +6819,6 @@ msgstr "E463: R�igi�n cosanta, n� f�idir � a athr�"
 msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr "E744: N� cheada�onn NetBeans aon athr� i gcomhaid inl�ite amh�in"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Earr�id inmhe�nach: %s"
-
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: �s�ideann an patr�n n�os m� cuimhne n� 'maxmempattern'"
 
@@ -7062,6 +7117,28 @@ msgstr ""
 "N�orbh fh�idir an chonair a shocr�: n� liosta � sys.path\n"
 "Ba ch�ir duit vim.VIM_SPECIAL_PATH a cheangal le deireadh sys.path"
 
+#~ msgid "+-%s%3ld line: "
+#~ msgid_plural "+-%s%3ld lines: "
+#~ msgstr[0] "+-%s%3ld l�ne: "
+#~ msgstr[1] "+-%s%3ld l�ne: "
+#~ msgstr[2] "+-%s%3ld l�ne: "
+#~ msgstr[3] "+-%s%3ld l�ne: "
+#~ msgstr[4] "+-%s%3ld l�ne: "
+
+#~ msgid "+--%3ld line folded "
+#~ msgid_plural "+--%3ld lines folded "
+#~ msgstr[0] "+--%3ld l�ne fillte "
+#~ msgstr[1] "+--%3ld l�ne fillte "
+#~ msgstr[2] "+--%3ld l�ne fillte "
+#~ msgstr[3] "+--%3ld l�ne fillte "
+#~ msgstr[4] "+--%3ld l�ne fillte "
+
+#~ msgid "Type  :quit<Enter>  to exit Vim"
+#~ msgstr "Cl�scr�obh  :quit<Enter>  chun Vim a scor"
+
+#~ msgid "Zero count"
+#~ msgstr "Nialas"
+
 #~ msgid "E693: Can only compare Funcref with Funcref"
 #~ msgstr "E693: Is f�idir Funcref a chur i gcompar�id le Funcref eile amh�in"
 
diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
index 4b32096f1a..10d7342430 100644
--- a/src/nvim/po/ja.euc-jp.po
+++ b/src/nvim/po/ja.euc-jp.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 7.4\n"
+"Project-Id-Version: Vim 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-10 21:10+0900\n"
-"PO-Revision-Date: 2016-09-10 21:20+0900\n"
+"POT-Creation-Date: 2017-07-03 23:05+0900\n"
+"PO-Revision-Date: 2017-07-12 20:45+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
@@ -245,7 +245,8 @@ msgid "E917: Cannot use a callback with %s()"
 msgstr "E917: %s() �˥�����Хå��ϻȤ��ޤ���"
 
 msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
-msgstr "E912: ���� nl �����ͥ�� ch_evalexpr()/ch_sendexpr �ϻȤ��ޤ���"
+msgstr ""
+"E912: raw �� nl �⡼�ɤΥ����ͥ�� ch_evalexpr()/ch_sendexpr() �ϻȤ��ޤ���"
 
 msgid "E906: not an open channel"
 msgstr "E906: �����Ƥ��ʤ������ͥ�Ǥ�"
@@ -431,6 +432,9 @@ msgstr "���������: %s"
 msgid "Scanning tags."
 msgstr "�����򥹥������."
 
+msgid "match in file"
+msgstr "�ե�������Υޥå�"
+
 msgid " Adding"
 msgstr " �ɲ���"
 
@@ -519,6 +523,12 @@ msgstr "E690: :for �θ�� \"in\" ������ޤ���"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �����ѿ��Ϥ���ޤ���: \"%s\""
 
+#. For historic reasons this error is not given for a list or dict.
+#. * E.g., the b: dict could be locked/unlocked.
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: �ѿ� %s �ϥ��å��ޤ��ϥ�����å��Ǥ��ޤ���"
+
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: (����)���å�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
@@ -697,11 +707,6 @@ msgid "&Ok"
 msgstr "&Ok"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld ��: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: ̤�Τδؿ��Ǥ�: %s"
 
@@ -746,8 +751,8 @@ msgstr "E727: ���ϰ��֤���λ���֤�ۤ��ޤ���"
 msgid "<empty>"
 msgstr "<��>"
 
-msgid "E240: No connection to Vim server"
-msgstr "E240: Vim �����С��ؤ���³������ޤ���"
+msgid "E240: No connection to the X server"
+msgstr "E240: X �����С��ؤ���³������ޤ���"
 
 #, c-format
 msgid "E241: Unable to send to %s"
@@ -756,6 +761,12 @@ msgstr "E241: %s �����뤳�Ȥ��Ǥ��ޤ���"
 msgid "E277: Unable to read a server reply"
 msgstr "E277: �����С��α���������ޤ���"
 
+msgid "E941: already started a server"
+msgstr "E941: �����С��Ϥ��Ǥ˳��Ϥ��Ƥ��ޤ�"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: +clientserver ��ǽ��̵���ˤʤäƤ��ޤ�"
+
 msgid "remove() argument"
 msgstr "remove() ���"
 
@@ -993,8 +1004,9 @@ msgstr " (�� 1 ����)"
 msgid " on %ld lines"
 msgstr " (�� %ld ����)"
 
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global ��Ƶ�Ū�ˤϻȤ��ޤ���"
+#. will increment global_busy to break out of the loop
+msgid "E147: Cannot do :global recursive with a range"
+msgstr "E147: :global ���ϰ��դ��ǺƵ�Ū�ˤϻȤ��ޤ���"
 
 msgid "E148: Regular expression missing from global"
 msgstr "E148: global���ޥ�ɤ�����ɽ�������ꤵ��Ƥ��ޤ���"
@@ -1180,6 +1192,14 @@ msgstr "\"%s\" �򸡺���"
 msgid "not found in '%s': \"%s\""
 msgstr "'%s' ����ˤϤ���ޤ���: \"%s\""
 
+#, c-format
+msgid "W20: Required python version 2.x not supported, ignoring file: %s"
+msgstr "W20: �׵ᤵ�줿python 2.x���б����Ƥ��ޤ��󡢥ե������̵�뤷�ޤ�: %s"
+
+#, c-format
+msgid "W21: Required python version 3.x not supported, ignoring file: %s"
+msgstr "W21: �׵ᤵ�줿python 3.x���б����Ƥ��ޤ��󡢥ե������̵�뤷�ޤ�: %s"
+
 msgid "Source Vim script"
 msgstr "Vim������ץȤμ����"
 
@@ -1278,6 +1298,11 @@ msgstr "�դ��ޤ��ϰϤ����ꤵ��ޤ���, ���ؤ��ޤ���?"
 msgid "E494: Use w or w>>"
 msgstr "E494: w �⤷���� w>> ����Ѥ��Ƥ�������"
 
+msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
+msgstr ""
+"E943: ���ޥ�ɥơ��֥�򹹿�����ɬ�פ�����ޤ���'make cmdidxs' ��¹Ԥ��Ƥ���"
+"����"
+
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ���ΥС������ǤϤ��Υ��ޥ�ɤ����ѤǤ��ޤ���, �����ʤ���"
 
@@ -2030,11 +2055,6 @@ msgstr "E350: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ�����Ǥ��ޤ���"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ����Ǥ��ޤ���"
 
-#, c-format
-msgid "+--%3ld line folded "
-msgid_plural "+--%3ld lines folded "
-msgstr[0] "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: �ɹ��Хåե����ɲ�"
 
@@ -2819,6 +2839,10 @@ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ���Τ���Ͽ�ץ��ѥƥ��������Ǥ�. �õ�ޤ���!"
 
 #, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: JSON�˽�ʣ����������ޤ�: \"%s\""
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
 
@@ -2858,7 +2882,7 @@ msgid "This Vim was not compiled with the diff feature."
 msgstr "����Vim�ˤ�diff��ǽ������ޤ���(����ѥ��������)."
 
 msgid "Attempt to open script file again: \""
-msgstr "������ץȥե������Ƥӳ����Ƥߤޤ�: \""
+msgstr "������ץȥե������Ƥӳ������Ȥ��ޤ���: \""
 
 msgid "Cannot open for reading: \""
 msgstr "�ɹ��ѤȤ��Ƴ����ޤ���"
@@ -3039,6 +3063,9 @@ msgstr "-T <terminal>\tü���� <terminal> �����ꤹ��"
 msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
 msgstr "--not-a-term\t\t�����Ϥ�ü���Ǥʤ��Ȥηٹ�򥹥��åפ���"
 
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr "--ttyfail\t\t�����Ϥ�ü���Ǥʤ���н�λ����"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc������� <vimrc> ��Ȥ�"
 
@@ -3906,7 +3933,7 @@ msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() �ΰ������Խ�ʬ�Ǥ�"
 
 msgid "E807: Expected Float argument for printf()"
-msgstr "E807: printf() �ΰ����ˤ���ư�������������Ԥ���Ƥ��ޤ�"
+msgstr "E807: printf() �ΰ����ˤ���ư�������������Ԥ���Ƥ��ޤ�"
 
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() �ΰ�����¿�᤮�ޤ�"
@@ -4063,8 +4090,10 @@ msgstr "E662: �ѹ��ꥹ�Ȥ���Ƭ"
 msgid "E663: At end of changelist"
 msgstr "E663: �ѹ��ꥹ�Ȥ�����"
 
-msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "Vim��λ����ˤ� :quit<Enter> �����Ϥ��Ƥ�������"
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr ""
+"���٤Ƥ��ѹ����˴�����Vim��λ����ˤ�  :qa!  �����Ϥ� <Enter> �򲡤��Ƥ���"
+"����"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4413,9 +4442,6 @@ msgstr "�����ϥ��顼"
 msgid "Message"
 msgstr "������"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' �� 80 �ǤϤʤ����ᡢ�������ޥ�ɤ�¹ԤǤ��ޤ���"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: �ץ�󥿤�����˼��Ԥ��ޤ���"
 
@@ -4685,6 +4711,12 @@ msgstr "E369: ̵���ʹ��ܤǤ�: %s%%[]"
 msgid "E769: Missing ] after %s["
 msgstr "E769: %s[ �θ�� ] ������ޤ���"
 
+msgid "E944: Reverse range in character class"
+msgstr "E944: ʸ�����饹���ϰϤ��դǤ�"
+
+msgid "E945: Range too large in character class"
+msgstr "E945: ʸ�����饹���ϰϤ��礭�����ޤ�"
+
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( ������äƤ��ޤ���"
@@ -4714,6 +4746,10 @@ msgstr "E69: %s%%[ �θ�� ] ������ޤ���"
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] �����Ǥ�"
 
+#
+msgid "E65: Illegal back reference"
+msgstr "E65: �����ʸ������ȤǤ�"
+
 msgid "E339: Pattern too long"
 msgstr "E339: �ѥ�����Ĺ�᤮�ޤ�"
 
@@ -4752,10 +4788,6 @@ msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c �θ�ˤʤˤ⤢��ޤ���"
 
 #
-msgid "E65: Illegal back reference"
-msgstr "E65: �����ʸ������ȤǤ�"
-
-#
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z �θ��������ʸ��������ޤ���"
 
@@ -5363,12 +5395,33 @@ msgstr "E783: MAP ����ȥ�˽�ʣʸ����¸�ߤ��ޤ�"
 msgid "No Syntax items defined for this buffer"
 msgstr "���ΥХåե���������줿��ʸ���ǤϤ���ޤ���"
 
+msgid "syntax conceal on"
+msgstr "��ʸ�� conceal �ϸ��� on �Ǥ�"
+
+msgid "syntax conceal off"
+msgstr "��ʸ�� conceal �ϸ��� off �Ǥ�"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: �����ʰ����Ǥ�: %s"
 
+msgid "syntax case ignore"
+msgstr "��ʸ����ʸ����ʸ���ϸ��� ignore �Ǥ�"
+
+msgid "syntax case match"
+msgstr "��ʸ����ʸ����ʸ���ϸ��� match �Ǥ�"
+
+msgid "syntax spell toplevel"
+msgstr "��ʸ�� spell �ϸ��� toplevel �Ǥ�"
+
+msgid "syntax spell notoplevel"
+msgstr "��ʸ�� spell �ϸ��� notoplevel �Ǥ�"
+
+msgid "syntax spell default"
+msgstr "��ʸ�� spell �ϸ��� default �Ǥ�"
+
 msgid "syntax iskeyword "
-msgstr "���󥿥å����� iskeyword "
+msgstr "��ʸ�� iskeyword "
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -5579,7 +5632,7 @@ msgid "E556: at top of tag stack"
 msgstr "E556: ���������å�����Ƭ�Ǥ�"
 
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: �ǽ�γ���������Ķ������뤳�ȤϤǤ��ޤ���"
+msgstr "E425: �ǽ�γ���������ۤ�����뤳�ȤϤǤ��ޤ���"
 
 #, c-format
 msgid "E426: tag not found: %s"
@@ -5595,7 +5648,7 @@ msgid "E427: There is only one matching tag"
 msgstr "E427: ����������1�Ĥ�����������ޤ���"
 
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: �Ǹ�˳������륿����Ķ���ƿʤळ�ȤϤǤ��ޤ���"
+msgstr "E428: �Ǹ�γ���������ۤ��ƿʤळ�ȤϤǤ��ޤ���"
 
 #, c-format
 msgid "File \"%s\" does not exist"
@@ -5943,6 +5996,10 @@ msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction ������ޤ���"
 
 #, c-format
+msgid "W22: Text found after :endfunction: %s"
+msgstr "W22: :endfunction �θ��ʸ��������ޤ�: %s"
+
+#, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: �ؿ�̾���ѿ�̾�Ⱦ��ͤ��ޤ�: %s"
 
@@ -5965,14 +6022,6 @@ msgstr "E133: �ؿ����� :return ������ޤ���"
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: ���å� '(' ������ޤ���: %s"
 
-#. Only MS VC 4.1 and earlier can do Win32s
-msgid ""
-"\n"
-"MS-Windows 16/32-bit GUI version"
-msgstr ""
-"\n"
-"MS-Windows 16/32 �ӥå� GUI ��"
-
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -6256,12 +6305,6 @@ msgstr "�ܺ٤ʾ����           :help register<Enter>  "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "�ܺ٤ϥ�˥塼�� �إ��->���ݥ󥵡�/��Ͽ �򻲾Ȥ��Ʋ�����"
 
-msgid "WARNING: Windows 95/98/ME detected"
-msgstr "�ٹ�: Windows 95/98/ME �򸡽Ф��ޤ���"
-
-msgid "type  :help windows95<Enter>  for info on this"
-msgstr "�ܺ٤ʾ����            :help windows95<Enter>"
-
 msgid "Already only one window"
 msgstr "���˥�����ɥ���1�Ĥ�������ޤ���"
 
@@ -6415,6 +6458,10 @@ msgstr "E236: �ե���� \"%s\" �ϸ������ǤϤ���ޤ���"
 msgid "E473: Internal error"
 msgstr "E473: �������顼�Ǥ�"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: �������顼�Ǥ�: %s"
+
 msgid "Interrupted"
 msgstr "����ޤ�ޤ���"
 
@@ -6680,8 +6727,8 @@ msgstr "E592: 'winwidth' �� 'winminwidth' ��꾮�����Ǥ��ޤ���"
 msgid "E80: Error while writing"
 msgstr "E80: �������Υ��顼"
 
-msgid "Zero count"
-msgstr "�����������"
+msgid "E939: Positive count required"
+msgstr "E939: ���Υ�����Ȥ�ɬ�פǤ�"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: ������ץȰʳ���<SID>���Ȥ��ޤ���"
@@ -6695,10 +6742,6 @@ msgstr "E463: �ΰ褬�ݸ��Ƥ���Τ�, �ѹ��Ǥ��ޤ���"
 msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr "E744: NetBeans ���ɹ����ѥե�������ѹ����뤳�Ȥ�����ޤ���"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: �������顼�Ǥ�: %s"
-
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: �ѥ����� 'maxmempattern' �ʾ�Υ������Ѥ��ޤ�"
 
diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po
index 5cb789c93e..39b4a89517 100644
--- a/src/nvim/po/ja.po
+++ b/src/nvim/po/ja.po
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 7.4\n"
+"Project-Id-Version: Vim 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-10 21:10+0900\n"
-"PO-Revision-Date: 2016-09-10 21:20+0900\n"
+"POT-Creation-Date: 2017-07-03 23:05+0900\n"
+"PO-Revision-Date: 2017-07-12 20:45+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
@@ -245,7 +245,8 @@ msgid "E917: Cannot use a callback with %s()"
 msgstr "E917: %s() にコールバックは使えません"
 
 msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
-msgstr "E912: 生や nl チャンネルに ch_evalexpr()/ch_sendexpr は使えません"
+msgstr ""
+"E912: raw や nl モードのチャンネルに ch_evalexpr()/ch_sendexpr() は使えません"
 
 msgid "E906: not an open channel"
 msgstr "E906: 開いていないチャンネルです"
@@ -431,6 +432,9 @@ msgstr "スキャン中: %s"
 msgid "Scanning tags."
 msgstr "タグをスキャン中."
 
+msgid "match in file"
+msgstr "ファイル内のマッチ"
+
 msgid " Adding"
 msgstr " 追加中"
 
@@ -519,6 +523,12 @@ msgstr "E690: :for の後に \"in\" がありません"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: その変数はありません: \"%s\""
 
+#. For historic reasons this error is not given for a list or dict.
+#. * E.g., the b: dict could be locked/unlocked.
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: 変数 %s はロックまたはアンロックできません"
+
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: (アン)ロックするには変数の入れ子が深過ぎます"
 
@@ -697,11 +707,6 @@ msgid "&Ok"
 msgstr "&Ok"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld 行: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: 未知の関数です: %s"
 
@@ -746,8 +751,8 @@ msgstr "E727: 開始位置が終了位置を越えました"
 msgid "<empty>"
 msgstr "<空>"
 
-msgid "E240: No connection to Vim server"
-msgstr "E240: Vim サーバーへの接続がありません"
+msgid "E240: No connection to the X server"
+msgstr "E240: X サーバーへの接続がありません"
 
 #, c-format
 msgid "E241: Unable to send to %s"
@@ -756,6 +761,12 @@ msgstr "E241: %s へ送ることができません"
 msgid "E277: Unable to read a server reply"
 msgstr "E277: サーバーの応答がありません"
 
+msgid "E941: already started a server"
+msgstr "E941: サーバーはすでに開始しています"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: +clientserver 機能が無効になっています"
+
 msgid "remove() argument"
 msgstr "remove() の引数"
 
@@ -993,8 +1004,9 @@ msgstr " (計 1 行内)"
 msgid " on %ld lines"
 msgstr " (計 %ld 行内)"
 
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global を再帰的には使えません"
+#. will increment global_busy to break out of the loop
+msgid "E147: Cannot do :global recursive with a range"
+msgstr "E147: :global を範囲付きで再帰的には使えません"
 
 msgid "E148: Regular expression missing from global"
 msgstr "E148: globalコマンドに正規表現が指定されていません"
@@ -1180,6 +1192,14 @@ msgstr "\"%s\" を検索中"
 msgid "not found in '%s': \"%s\""
 msgstr "'%s' の中にはありません: \"%s\""
 
+#, c-format
+msgid "W20: Required python version 2.x not supported, ignoring file: %s"
+msgstr "W20: 要求されたpython 2.xは対応していません、ファイルを無視します: %s"
+
+#, c-format
+msgid "W21: Required python version 3.x not supported, ignoring file: %s"
+msgstr "W21: 要求されたpython 3.xは対応していません、ファイルを無視します: %s"
+
 msgid "Source Vim script"
 msgstr "Vimスクリプトの取込み"
 
@@ -1278,6 +1298,11 @@ msgstr "逆さまの範囲が指定されました, 入替えますか?"
 msgid "E494: Use w or w>>"
 msgstr "E494: w もしくは w>> を使用してください"
 
+msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
+msgstr ""
+"E943: コマンドテーブルを更新する必要があります、'make cmdidxs' を実行してくだ"
+"さい"
+
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: このバージョンではこのコマンドは利用できません, ごめんなさい"
 
@@ -2030,11 +2055,6 @@ msgstr "E350: 現在の 'foldmethod' では折畳みを作成できません"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません"
 
-#, c-format
-msgid "+--%3ld line folded "
-msgid_plural "+--%3ld lines folded "
-msgstr[0] "+--%3ld 行が折畳まれました "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: 読込バッファへ追加"
 
@@ -2819,6 +2839,10 @@ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
 
 #, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: JSONに重複キーがあります: \"%s\""
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: リスト型にカンマがありません: %s"
 
@@ -2858,7 +2882,7 @@ msgid "This Vim was not compiled with the diff feature."
 msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
 
 msgid "Attempt to open script file again: \""
-msgstr "スクリプトファイルを再び開いてみます: \""
+msgstr "スクリプトファイルを再び開こうとしました: \""
 
 msgid "Cannot open for reading: \""
 msgstr "読込用として開けません"
@@ -3039,6 +3063,9 @@ msgstr "-T <terminal>\t端末を <terminal> に設定する"
 msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
 msgstr "--not-a-term\t\t入出力が端末でないとの警告をスキップする"
 
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr "--ttyfail\t\t入出力が端末でなければ終了する"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrcの代わりに <vimrc> を使う"
 
@@ -3906,7 +3933,7 @@ msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() の引数が不十分です"
 
 msgid "E807: Expected Float argument for printf()"
-msgstr "E807: printf() の引数には浮動少数点数が期待されています"
+msgstr "E807: printf() の引数には浮動小数点数が期待されています"
 
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() の引数が多過ぎます"
@@ -4063,8 +4090,10 @@ msgstr "E662: 変更リストの先頭"
 msgid "E663: At end of changelist"
 msgstr "E663: 変更リストの末尾"
 
-msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "Vimを終了するには :quit<Enter> と入力してください"
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr ""
+"すべての変更を破棄し、Vimを終了するには  :qa!  と入力し <Enter> を押してくだ"
+"さい"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4413,9 +4442,6 @@ msgstr "入出力エラー"
 msgid "Message"
 msgstr "メッセージ"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' が 80 ではないため、外部コマンドを実行できません"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: プリンタの選択に失敗しました"
 
@@ -4685,6 +4711,12 @@ msgstr "E369: 無効な項目です: %s%%[]"
 msgid "E769: Missing ] after %s["
 msgstr "E769: %s[ の後に ] がありません"
 
+msgid "E944: Reverse range in character class"
+msgstr "E944: 文字クラスの範囲が逆です"
+
+msgid "E945: Range too large in character class"
+msgstr "E945: 文字クラスの範囲が大きすぎます"
+
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( が釣り合っていません"
@@ -4714,6 +4746,10 @@ msgstr "E69: %s%%[ の後に ] がありません"
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] が空です"
 
+#
+msgid "E65: Illegal back reference"
+msgstr "E65: 不正な後方参照です"
+
 msgid "E339: Pattern too long"
 msgstr "E339: パターンが長過ぎます"
 
@@ -4752,10 +4788,6 @@ msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c の後になにもありません"
 
 #
-msgid "E65: Illegal back reference"
-msgstr "E65: 不正な後方参照です"
-
-#
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z の後に不正な文字がありました"
 
@@ -5363,12 +5395,33 @@ msgstr "E783: MAP エントリに重複文字が存在します"
 msgid "No Syntax items defined for this buffer"
 msgstr "このバッファに定義された構文要素はありません"
 
+msgid "syntax conceal on"
+msgstr "構文の conceal は現在 on です"
+
+msgid "syntax conceal off"
+msgstr "構文の conceal は現在 off です"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: 不正な引数です: %s"
 
+msgid "syntax case ignore"
+msgstr "構文の大文字小文字は現在 ignore です"
+
+msgid "syntax case match"
+msgstr "構文の大文字小文字は現在 match です"
+
+msgid "syntax spell toplevel"
+msgstr "構文の spell は現在 toplevel です"
+
+msgid "syntax spell notoplevel"
+msgstr "構文の spell は現在 notoplevel です"
+
+msgid "syntax spell default"
+msgstr "構文の spell は現在 default です"
+
 msgid "syntax iskeyword "
-msgstr "シンタックス用 iskeyword "
+msgstr "構文用 iskeyword "
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -5579,7 +5632,7 @@ msgid "E556: at top of tag stack"
 msgstr "E556: タグスタックの先頭です"
 
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: 最初の該当タグを超えて戻ることはできません"
+msgstr "E425: 最初の該当タグを越えて戻ることはできません"
 
 #, c-format
 msgid "E426: tag not found: %s"
@@ -5595,7 +5648,7 @@ msgid "E427: There is only one matching tag"
 msgstr "E427: 該当タグが1つだけしかありません"
 
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: 最後に該当するタグを超えて進むことはできません"
+msgstr "E428: 最後の該当タグを越えて進むことはできません"
 
 #, c-format
 msgid "File \"%s\" does not exist"
@@ -5943,6 +5996,10 @@ msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction がありません"
 
 #, c-format
+msgid "W22: Text found after :endfunction: %s"
+msgstr "W22: :endfunction の後に文字があります: %s"
+
+#, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: 関数名が変数名と衝突します: %s"
 
@@ -5965,14 +6022,6 @@ msgstr "E133: 関数外に :return がありました"
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: カッコ '(' がありません: %s"
 
-#. Only MS VC 4.1 and earlier can do Win32s
-msgid ""
-"\n"
-"MS-Windows 16/32-bit GUI version"
-msgstr ""
-"\n"
-"MS-Windows 16/32 ビット GUI 版"
-
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -6256,12 +6305,6 @@ msgstr "詳細な情報は           :help register<Enter>  "
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
 
-msgid "WARNING: Windows 95/98/ME detected"
-msgstr "警告: Windows 95/98/ME を検出しました"
-
-msgid "type  :help windows95<Enter>  for info on this"
-msgstr "詳細な情報は            :help windows95<Enter>"
-
 msgid "Already only one window"
 msgstr "既にウィンドウは1つしかありません"
 
@@ -6415,6 +6458,10 @@ msgstr "E236: フォント \"%s\" は固定幅ではありません"
 msgid "E473: Internal error"
 msgstr "E473: 内部エラーです"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 内部エラーです: %s"
+
 msgid "Interrupted"
 msgstr "割込まれました"
 
@@ -6680,8 +6727,8 @@ msgstr "E592: 'winwidth' は 'winminwidth' より小さくできません"
 msgid "E80: Error while writing"
 msgstr "E80: 書込み中のエラー"
 
-msgid "Zero count"
-msgstr "ゼロカウント"
+msgid "E939: Positive count required"
+msgstr "E939: 正のカウントが必要です"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: スクリプト以外で<SID>が使われました"
@@ -6695,10 +6742,6 @@ msgstr "E463: 領域が保護されているので, 変更できません"
 msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: 内部エラーです: %s"
-
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: パターンが 'maxmempattern' 以上のメモリを使用します"
 
diff --git a/src/nvim/po/ko.UTF-8.po b/src/nvim/po/ko.UTF-8.po
index 7afa507edb..89d6a57655 100644
--- a/src/nvim/po/ko.UTF-8.po
+++ b/src/nvim/po/ko.UTF-8.po
@@ -1111,6 +1111,10 @@ msgstr "E137: Viminfo 파일의 쓰기 권한이 없습니다: %s"
 
 #: ../ex_cmds.c:1626
 #, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: 너무 많은 viminfo 임시 파일들, 가령 %s!"
+
+#, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: Viminfo 파일 %s을(를) 쓸 수 없습니다!"
 
@@ -1119,6 +1123,10 @@ msgstr "E138: Viminfo 파일 %s을(를) 쓸 수 없습니다!"
 msgid "Writing viminfo file \"%s\""
 msgstr "Viminfo 파일 \"%s\"을(를) 쓰는 중"
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: viminfo 파일명을 %s(으)로 변경할 수 없습니다!"
+
 #. Write the info:
 #: ../ex_cmds.c:1720
 #, c-format
@@ -1300,8 +1308,8 @@ msgstr "미안합니다, 도움말 파일 \"%s\"을(를) 찾을 수 없습니다
 
 #: ../ex_cmds.c:5323
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: 디렉토리가 아님: %s"
+msgid "E151: No match: %s"
+msgstr "E151: 맞지 않음: %s"
 
 #: ../ex_cmds.c:5446
 #, c-format
@@ -1325,6 +1333,10 @@ msgstr "E154: \"%s\" 태그가 %s/%s 파일에서 중복되었습니다"
 
 #: ../ex_cmds.c:5687
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: 디렉토리가 아님: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: 모르는 sign 명령: %s"
 
@@ -1452,8 +1464,16 @@ msgstr "\"%s\"을(를) 찾는 중"
 
 #: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath'에서 찾을 수 없음: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s'에서 찾을 수 없음: \"%s\""
+
+#, c-format
+msgid "W20: Required python version 2.x not supported, ignoring file: %s"
+msgstr "W20: 요구되는 파이선 버젼 2.x는 지원되지 않음, 파일을 무시: %s"
+
+#, c-format
+msgid "W21: Required python version 3.x not supported, ignoring file: %s"
+msgstr "W21: 요구되는 파이선 버젼 3.x는 지원되지 않음, 파일을 무시: %s"
 
 #: ../ex_cmds2.c:2472
 #, c-format
@@ -1609,10 +1629,10 @@ msgstr "E174: 명령이 이미 존재합니다: 바꾸려면 !을 더하세요"
 #: ../ex_docmd.c:4432
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    이름        인자 범위  완성      정의"
+"    이름        인자       주소      완성      정의"
 
 #: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
@@ -1662,6 +1682,10 @@ msgstr "E184: 그런 사용자 정의 명령 없음: %s"
 
 #: ../ex_docmd.c:5219
 #, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: 잘못된 주소 형식 값: %s"
+
+#, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: 잘못된 끝내기 값: %s"
 
@@ -1953,7 +1977,7 @@ msgstr ""
 
 #: ../ex_getln.c:5047
 msgid "Command Line"
-msgstr "명령 줄"
+msgstr "명령 행"
 
 #: ../ex_getln.c:5048
 msgid "Search String"
@@ -1965,7 +1989,10 @@ msgstr "표현"
 
 #: ../ex_getln.c:5050
 msgid "Input Line"
-msgstr "입력 줄"
+msgstr "입력 행"
+
+msgid "Debug Line"
+msgstr "디버그 행"
 
 #: ../ex_getln.c:5117
 msgid "E198: cmd_pchar beyond the command length"
@@ -3190,6 +3217,7 @@ msgstr "%-5s: %s%*s (사용법: %s)"
 #: ../if_cscope.c:1155
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -3200,13 +3228,14 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: 이 기호에 대한 할당 찾기\n"
 "       c: 이 함수를 부르는 함수들 찾기\n"
 "       d: 이 함수에 의해 불려지는 함수들 찾기\n"
 "       e: 이 egrep 패턴 찾기\n"
 "       f: 이 파일 찾기\n"
 "       g: 이 정의 찾기\n"
-"       i: 이 파일을 포함하는 파일들 찾기\n"
-"       s: 이 C 심볼 찾기\n"
+"       i: 이 파일을 #include하는 파일들 찾기\n"
+"       s: 이 C 기호 찾기\n"
 "       t: 이 문자열 찾기\n"
 
 #: ../if_cscope.c:1226
@@ -4740,6 +4769,10 @@ msgstr "E447: path에서 \"%s\" 파일을 찾을 수 없습니다"
 
 #: ../quickfix.c:359
 #, c-format
+msgid "shell returned %d"
+msgstr "쉘이 %d을(를) 돌려주었습니다"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: 형식 문자열에 %%%c이(가) 너무 많습니다"
 
@@ -5249,8 +5282,24 @@ msgstr "E770: spell 파일에 지원되지 않는 섹션"
 
 #: ../spell.c:3762
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "경고: %s 영역은 지원되지 않습니다"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug 파일이 아닌 것 같음: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: 오래된 .sug 파일, 갱신 필요: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: .sug 파일이 새 버젼의 Vim용임: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug 파일이 .spl 파일과 맞지 않음: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug 파일 읽기 에러: %s"
 
 #: ../spell.c:4550
 #, c-format
@@ -6312,7 +6361,7 @@ msgstr "by Bram Moolenaar et al."
 
 #: ../version.c:774
 msgid "Vim is open source and freely distributable"
-msgstr "빔은 소스가 열려 있고 공짜로 배포됩니다"
+msgstr "빔은 누구나 소스를 볼 수 있고 공짜로 배포됩니다"
 
 #: ../version.c:776
 msgid "Help poor children in Uganda!"
diff --git a/src/nvim/po/uk.po b/src/nvim/po/uk.po
index 2c203f808f..c66cb2973c 100644
--- a/src/nvim/po/uk.po
+++ b/src/nvim/po/uk.po
@@ -1,6 +1,8 @@
 #
 # Ukrainian Vim translation [uk]
 #
+# Original translations
+#
 # Copyright (C) 2001 Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 # Bohdan donated this work to be distributed with Vim under the Vim license.
 #
@@ -510,6 +512,9 @@ msgstr "Пошук у: %s"
 msgid "Scanning tags."
 msgstr "Пошук серед теґів."
 
+msgid "match in file"
+msgstr "збіг у файлі"
+
 msgid " Adding"
 msgstr " Додається"
 
@@ -642,6 +647,12 @@ msgstr "E107: Пропущено дужки: %s"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Змінної немає: «%s»"
 
+#. For historic reasons this error is not given for a list or dict.
+#. * E.g., the b: dict could be locked/unlocked.
+#, c-format
+msgid "E940: Cannot lock or unlock variable %s"
+msgstr "E940: Неможливо заблокувати чи розблокувати змінну %s"
+
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: Змінна має забагато вкладень щоб бути за-/відкритою."
 
@@ -1392,8 +1403,9 @@ msgstr " в одному рядку"
 msgid " on %<PRId64> lines"
 msgstr " в %<PRId64> рядках"
 
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global не можна вживати рекурсивно"
+#. will increment global_busy to break out of the loop
+msgid "E147: Cannot do :global recursive with a range"
+msgstr "E147: :global не можна вживати рекурсивно з діапазоном"
 
 msgid "E148: Regular expression missing from global"
 msgstr "E148: У global бракує зразка"
@@ -4130,6 +4142,12 @@ msgstr "E369: Некоректний елемент у %s%%[]"
 msgid "E769: Missing ] after %s["
 msgstr "E769: Бракує ] після %s["
 
+msgid "E944: Reverse range in character class"
+msgstr "E944: Зворотній діапазон у класі символів"
+
+msgid "E945: Range too large in character class"
+msgstr "E945: Завеликий діапазон у класі символів"
+
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: Немає пари %s%%("
@@ -4888,10 +4906,31 @@ msgstr "E783: Повторено символ у елементі MAP"
 msgid "No Syntax items defined for this buffer"
 msgstr "Для буфера не визначено елементів синтаксису"
 
+msgid "syntax conceal on"
+msgstr "маскування синтаксису увімк"
+
+msgid "syntax conceal off"
+msgstr "маскування синтаксису вимк"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Неправильний аргумент: %s"
 
+msgid "syntax case ignore"
+msgstr "синтаксис ігнорувати регістр"
+
+msgid "syntax case match"
+msgstr "синтаксис дотримуватися регістру"
+
+msgid "syntax spell toplevel"
+msgstr "синтаксис перевіряти всюди"
+
+msgid "syntax spell notoplevel"
+msgstr "синтаксис не перевіряти"
+
+msgid "syntax spell default"
+msgstr "синтаксис початково"
+
 msgid "syntax iskeyword "
 msgstr "синтаксис iskeyword "