Updated runtime files and translations.
diff --git a/src/po/Makefile b/src/po/Makefile
index 5e43fff..e37bd0d 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -238,7 +238,7 @@
 zh_CN.cp936.po: zh_CN.UTF-8.po
 	rm -f zh_CN.cp936.po
 	iconv -f UTF-8 -t cp936 zh_CN.UTF-8.po | \
-		sed -e 's/charset=utf-8/charset=gbk/' -e 's/# Original translations/# Generated from zh_CN.po, DO NOT EDIT/' > zh_CN.cp936.po
+		sed -e 's/charset=utf-8/charset=gbk/' -e 's/# Original translations/# Generated from zh_CN.UTF-8.po, DO NOT EDIT/' > zh_CN.cp936.po
 
 # Convert ko.UTF-8.po to create ko.po.
 ko.po: ko.UTF-8.po
diff --git a/src/po/README.txt b/src/po/README.txt
index ae5b393..a403a2f 100644
--- a/src/po/README.txt
+++ b/src/po/README.txt
@@ -102,6 +102,10 @@
 
 (4) Check:
 
+    While editing the .po file:
+        :source check.vim
+
+    From the command line:
 	vim -S check.vim xx.po
 	make xx.mo
 
diff --git a/src/po/de.po b/src/po/de.po
index 7a00c25..ac8dcee 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -12,7 +12,7 @@
 "Project-Id-Version: Vim(deutsch)\n"
 "POT-Creation-Date: 2006-04-02 11:30+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO_8859-1\n"
diff --git a/src/po/eo.po b/src/po/eo.po
index 3fb300c..188d86f 100644
--- a/src/po/eo.po
+++ b/src/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 @@
 msgid "Scanning tags."
 msgstr "Analizas etikedojn."
 
+msgid "match in file"
+msgstr "kongruo en dosiero"
+
 msgid " Adding"
 msgstr " Aldonanta"
 
@@ -523,17 +520,23 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #. 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 @@
 
 #, 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 @@
 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 @@
 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 @@
 "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 @@
 "--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 @@
 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 @@
 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 @@
 
 #, 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 @@
 
 #, 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 @@
 
 #, 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 @@
 
 #, 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 @@
 
 #, 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 @@
 
 #, 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 @@
 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 @@
 
 #, 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 @@
 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 @@
 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 @@
 
 #, 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 @@
 
 #, 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 @@
 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 @@
 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/po/fr.po b/src/po/fr.po
index 05b2fa0..2609507 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -3,20 +3,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"
@@ -480,6 +477,9 @@
 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.
@@ -583,6 +583,12 @@
 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"
 
@@ -773,12 +779,6 @@
 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"
 
@@ -826,9 +826,7 @@
 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.
@@ -839,6 +837,12 @@
 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()"
 
@@ -1136,8 +1140,9 @@
 
 # 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"
@@ -1356,6 +1361,14 @@
 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"
 
@@ -1456,6 +1469,9 @@
 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"
 
@@ -2232,12 +2248,6 @@
 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"
 
@@ -3280,8 +3290,7 @@
 "--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"
@@ -4337,8 +4346,8 @@
 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"
@@ -4967,6 +4976,12 @@
 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%%("
@@ -4993,6 +5008,9 @@
 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"
 
@@ -5029,9 +5047,6 @@
 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"
 
@@ -5641,10 +5656,31 @@
 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 "
 
@@ -6248,6 +6284,10 @@
 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"
 
@@ -6996,8 +7036,8 @@
 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/po/ga.po b/src/po/ga.po
index abb3565..281af86 100644
--- a/src/po/ga.po
+++ b/src/po/ga.po
@@ -6,7 +6,7 @@
 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 @@
 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 @@
 msgid "Scanning tags."
 msgstr "Clibeanna á scanadh."
 
+msgid "match in file"
+msgstr "meaitseáil sa chomhad"
+
 msgid " Adding"
 msgstr " Méadú"
 
@@ -513,6 +517,12 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 
 #, 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 @@
 
 #, 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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/po/ja.euc-jp.po b/src/po/ja.euc-jp.po
index 2f149ad..eb1e8a2 100644
--- a/src/po/ja.euc-jp.po
+++ b/src/po/ja.euc-jp.po
@@ -12,10 +12,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"
@@ -244,7 +244,8 @@
 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: ³«¤¤¤Æ¤¤¤Ê¤¤¥Á¥ã¥ó¥Í¥ë¤Ç¤¹"
@@ -430,6 +431,9 @@
 msgid "Scanning tags."
 msgstr "¥¿¥°¤ò¥¹¥­¥ã¥óÃæ."
 
+msgid "match in file"
+msgstr "¥Õ¥¡¥¤¥ëÆâ¤Î¥Þ¥Ã¥Á"
+
 msgid " Adding"
 msgstr " ÄɲÃÃæ"
 
@@ -518,6 +522,12 @@
 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: (¥¢¥ó)¥í¥Ã¥¯¤¹¤ë¤Ë¤ÏÊÑ¿ô¤ÎÆþ¤ì»Ò¤¬¿¼²á¤®¤Þ¤¹"
 
@@ -696,11 +706,6 @@
 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"
 
@@ -745,8 +750,8 @@
 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"
@@ -755,6 +760,12 @@
 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() ¤Î°ú¿ô"
 
@@ -992,8 +1003,9 @@
 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¥³¥Þ¥ó¥É¤ËÀµµ¬É½¸½¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
@@ -1179,6 +1191,14 @@
 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¥¹¥¯¥ê¥×¥È¤Î¼è¹þ¤ß"
 
@@ -1277,6 +1297,11 @@
 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: ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¤³¤Î¥³¥Þ¥ó¥É¤ÏÍøÍѤǤ­¤Þ¤»¤ó, ¤´¤á¤ó¤Ê¤µ¤¤"
 
@@ -2029,11 +2054,6 @@
 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: ÆÉ¹þ¥Ð¥Ã¥Õ¥¡¤ØÄɲÃ"
 
@@ -2818,6 +2838,10 @@
 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"
 
@@ -2857,7 +2881,7 @@
 msgstr "¤³¤ÎVim¤Ë¤Ïdiffµ¡Ç½¤¬¤¢¤ê¤Þ¤»¤ó(¥³¥ó¥Ñ¥¤¥ë»þÀßÄê)."
 
 msgid "Attempt to open script file again: \""
-msgstr "¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤òºÆ¤Ó³«¤¤¤Æ¤ß¤Þ¤¹: \""
+msgstr "¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤òºÆ¤Ó³«¤³¤¦¤È¤·¤Þ¤·¤¿: \""
 
 msgid "Cannot open for reading: \""
 msgstr "ÆÉ¹þÍѤȤ·¤Æ³«¤±¤Þ¤»¤ó"
@@ -3038,6 +3062,9 @@
 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> ¤ò»È¤¦"
 
@@ -3905,7 +3932,7 @@
 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() ¤Î°ú¿ô¤¬Â¿²á¤®¤Þ¤¹"
@@ -4062,8 +4089,10 @@
 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"
@@ -4412,9 +4441,6 @@
 msgid "Message"
 msgstr "¥á¥Ã¥»¡¼¥¸"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' ¤¬ 80 ¤Ç¤Ï¤Ê¤¤¤¿¤á¡¢³°Éô¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: ¥×¥ê¥ó¥¿¤ÎÁªÂò¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
@@ -4684,6 +4710,12 @@
 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%%( ¤¬Äà¤ê¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
@@ -4713,6 +4745,10 @@
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] ¤¬¶õ¤Ç¤¹"
 
+#
+msgid "E65: Illegal back reference"
+msgstr "E65: ÉÔÀµ¤Ê¸åÊý»²¾È¤Ç¤¹"
+
 msgid "E339: Pattern too long"
 msgstr "E339: ¥Ñ¥¿¡¼¥ó¤¬Ä¹²á¤®¤Þ¤¹"
 
@@ -4751,10 +4787,6 @@
 msgstr "E64:%s%c ¤Î¸å¤Ë¤Ê¤Ë¤â¤¢¤ê¤Þ¤»¤ó"
 
 #
-msgid "E65: Illegal back reference"
-msgstr "E65: ÉÔÀµ¤Ê¸åÊý»²¾È¤Ç¤¹"
-
-#
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿"
 
@@ -5362,12 +5394,33 @@
 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"
@@ -5578,7 +5631,7 @@
 msgstr "E556: ¥¿¥°¥¹¥¿¥Ã¥¯¤ÎÀèÆ¬¤Ç¤¹"
 
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: ºÇ½é¤Î³ºÅö¥¿¥°¤òͤ¨¤ÆÌá¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
+msgstr "E425: ºÇ½é¤Î³ºÅö¥¿¥°¤ò±Û¤¨¤ÆÌá¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
 #, c-format
 msgid "E426: tag not found: %s"
@@ -5594,7 +5647,7 @@
 msgstr "E427: ³ºÅö¥¿¥°¤¬1¤Ä¤À¤±¤·¤«¤¢¤ê¤Þ¤»¤ó"
 
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: ºÇ¸å¤Ë³ºÅö¤¹¤ë¥¿¥°¤òͤ¨¤Æ¿Ê¤à¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
+msgstr "E428: ºÇ¸å¤Î³ºÅö¥¿¥°¤ò±Û¤¨¤Æ¿Ê¤à¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
 #, c-format
 msgid "File \"%s\" does not exist"
@@ -5942,6 +5995,10 @@
 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"
 
@@ -5964,14 +6021,6 @@
 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"
@@ -6255,12 +6304,6 @@
 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¤Ä¤·¤«¤¢¤ê¤Þ¤»¤ó"
 
@@ -6414,6 +6457,10 @@
 msgid "E473: Internal error"
 msgstr "E473: ÆâÉô¥¨¥é¡¼¤Ç¤¹"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: ÆâÉô¥¨¥é¡¼¤Ç¤¹: %s"
+
 msgid "Interrupted"
 msgstr "³ä¹þ¤Þ¤ì¤Þ¤·¤¿"
 
@@ -6679,8 +6726,8 @@
 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>¤¬»È¤ï¤ì¤Þ¤·¤¿"
@@ -6694,10 +6741,6 @@
 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/po/ja.po b/src/po/ja.po
index 7d64e3f..45a7b0c 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -12,10 +12,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"
@@ -244,7 +244,8 @@
 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: 開いていないチャンネルです"
@@ -430,6 +431,9 @@
 msgid "Scanning tags."
 msgstr "タグをスキャン中."
 
+msgid "match in file"
+msgstr "ファイル内のマッチ"
+
 msgid " Adding"
 msgstr " 追加中"
 
@@ -518,6 +522,12 @@
 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: (アン)ロックするには変数の入れ子が深過ぎます"
 
@@ -696,11 +706,6 @@
 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"
 
@@ -745,8 +750,8 @@
 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"
@@ -755,6 +760,12 @@
 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() の引数"
 
@@ -992,8 +1003,9 @@
 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コマンドに正規表現が指定されていません"
@@ -1179,6 +1191,14 @@
 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スクリプトの取込み"
 
@@ -1277,6 +1297,11 @@
 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: このバージョンではこのコマンドは利用できません, ごめんなさい"
 
@@ -2029,11 +2054,6 @@
 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: 読込バッファへ追加"
 
@@ -2818,6 +2838,10 @@
 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"
 
@@ -2857,7 +2881,7 @@
 msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
 
 msgid "Attempt to open script file again: \""
-msgstr "スクリプトファイルを再び開いてみます: \""
+msgstr "スクリプトファイルを再び開こうとしました: \""
 
 msgid "Cannot open for reading: \""
 msgstr "読込用として開けません"
@@ -3038,6 +3062,9 @@
 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> を使う"
 
@@ -3905,7 +3932,7 @@
 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() の引数が多過ぎます"
@@ -4062,8 +4089,10 @@
 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"
@@ -4412,9 +4441,6 @@
 msgid "Message"
 msgstr "メッセージ"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' が 80 ではないため、外部コマンドを実行できません"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: プリンタの選択に失敗しました"
 
@@ -4684,6 +4710,12 @@
 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%%( が釣り合っていません"
@@ -4713,6 +4745,10 @@
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] が空です"
 
+#
+msgid "E65: Illegal back reference"
+msgstr "E65: 不正な後方参照です"
+
 msgid "E339: Pattern too long"
 msgstr "E339: パターンが長過ぎます"
 
@@ -4751,10 +4787,6 @@
 msgstr "E64:%s%c の後になにもありません"
 
 #
-msgid "E65: Illegal back reference"
-msgstr "E65: 不正な後方参照です"
-
-#
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z の後に不正な文字がありました"
 
@@ -5362,12 +5394,33 @@
 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"
@@ -5578,7 +5631,7 @@
 msgstr "E556: タグスタックの先頭です"
 
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: 最初の該当タグを超えて戻ることはできません"
+msgstr "E425: 最初の該当タグを越えて戻ることはできません"
 
 #, c-format
 msgid "E426: tag not found: %s"
@@ -5594,7 +5647,7 @@
 msgstr "E427: 該当タグが1つだけしかありません"
 
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: 最後に該当するタグを超えて進むことはできません"
+msgstr "E428: 最後の該当タグを越えて進むことはできません"
 
 #, c-format
 msgid "File \"%s\" does not exist"
@@ -5942,6 +5995,10 @@
 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"
 
@@ -5964,14 +6021,6 @@
 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"
@@ -6255,12 +6304,6 @@
 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つしかありません"
 
@@ -6414,6 +6457,10 @@
 msgid "E473: Internal error"
 msgstr "E473: 内部エラーです"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 内部エラーです: %s"
+
 msgid "Interrupted"
 msgstr "割込まれました"
 
@@ -6679,8 +6726,8 @@
 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>が使われました"
@@ -6694,10 +6741,6 @@
 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/po/ja.sjis.po b/src/po/ja.sjis.po
index 5b0cbd6..1bbbf85 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -12,10 +12,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"
@@ -244,7 +244,8 @@
 msgstr "E917: %s() ‚ɃR[ƒ‹ƒoƒbƒN‚ÍŽg‚¦‚Ü‚¹‚ñ"
 
 msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
-msgstr "E912: ¶‚â nl ƒ`ƒƒƒ“ƒlƒ‹‚É ch_evalexpr()/ch_sendexpr ‚ÍŽg‚¦‚Ü‚¹‚ñ"
+msgstr ""
+"E912: raw ‚â nl ƒ‚[ƒh‚̃`ƒƒƒ“ƒlƒ‹‚É ch_evalexpr()/ch_sendexpr() ‚ÍŽg‚¦‚Ü‚¹‚ñ"
 
 msgid "E906: not an open channel"
 msgstr "E906: ŠJ‚¢‚Ä‚¢‚È‚¢ƒ`ƒƒƒ“ƒlƒ‹‚Å‚·"
@@ -430,6 +431,9 @@
 msgid "Scanning tags."
 msgstr "ƒ^ƒO‚ðƒXƒLƒƒƒ“’†."
 
+msgid "match in file"
+msgstr "ƒtƒ@ƒCƒ‹“à‚̃}ƒbƒ`"
+
 msgid " Adding"
 msgstr " ’ljÁ’†"
 
@@ -518,6 +522,12 @@
 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 ‚̓ƒbƒN‚Ü‚½‚̓Aƒ“ƒƒbƒN‚Å‚«‚Ü‚¹‚ñ"
+
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: (ƒAƒ“)ƒƒbƒN‚·‚é‚ɂ͕ϐ”‚Ì“ü‚êŽq‚ª[‰ß‚¬‚Ü‚·"
 
@@ -696,11 +706,6 @@
 msgstr "&Ok"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld s: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: –¢’m‚̊֐”‚Å‚·: %s"
 
@@ -745,8 +750,8 @@
 msgid "<empty>"
 msgstr "<‹ó>"
 
-msgid "E240: No connection to Vim server"
-msgstr "E240: Vim ƒT[ƒo[‚ւ̐ڑ±‚ª‚ ‚è‚Ü‚¹‚ñ"
+msgid "E240: No connection to the X server"
+msgstr "E240: X ƒT[ƒo[‚ւ̐ڑ±‚ª‚ ‚è‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E241: Unable to send to %s"
@@ -755,6 +760,12 @@
 msgid "E277: Unable to read a server reply"
 msgstr "E277: ƒT[ƒo[‚̉ž“š‚ª‚ ‚è‚Ü‚¹‚ñ"
 
+msgid "E941: already started a server"
+msgstr "E941: ƒT[ƒo[‚Í‚·‚łɊJŽn‚µ‚Ä‚¢‚Ü‚·"
+
+msgid "E942: +clientserver feature not available"
+msgstr "E942: +clientserver ‹@”\\‚ª–³Œø‚ɂȂÁ‚Ä‚¢‚Ü‚·"
+
 msgid "remove() argument"
 msgstr "remove() ‚̈ø”"
 
@@ -992,8 +1003,9 @@
 msgid " on %ld lines"
 msgstr " (Œv %ld s“à)"
 
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global ‚ðÄ‹A“I‚ɂ͎g‚¦‚Ü‚¹‚ñ"
+#. will increment global_busy to break out of the loop
+msgid "E147: Cannot do :global recursive with a range"
+msgstr "E147: :global ‚ð”͈͕t‚«‚ōċA“I‚ɂ͎g‚¦‚Ü‚¹‚ñ"
 
 msgid "E148: Regular expression missing from global"
 msgstr "E148: globalƒRƒ}ƒ“ƒh‚ɐ³‹K•\\Œ»‚ªŽw’肳‚ê‚Ä‚¢‚Ü‚¹‚ñ"
@@ -1179,6 +1191,14 @@
 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: —v‹‚³‚ꂽpython 2.x‚͑Ήž‚µ‚Ä‚¢‚Ü‚¹‚ñAƒtƒ@ƒCƒ‹‚𖳎‹‚µ‚Ü‚·: %s"
+
+#, c-format
+msgid "W21: Required python version 3.x not supported, ignoring file: %s"
+msgstr "W21: —v‹‚³‚ꂽpython 3.x‚͑Ήž‚µ‚Ä‚¢‚Ü‚¹‚ñAƒtƒ@ƒCƒ‹‚𖳎‹‚µ‚Ü‚·: %s"
+
 msgid "Source Vim script"
 msgstr "VimƒXƒNƒŠƒvƒg‚̎捞‚Ý"
 
@@ -1277,6 +1297,11 @@
 msgid "E494: Use w or w>>"
 msgstr "E494: w ‚à‚µ‚­‚Í w>> ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢"
 
+msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
+msgstr ""
+"E943: ƒRƒ}ƒ“ƒhƒe[ƒuƒ‹‚ðXV‚·‚é•K—v‚ª‚ ‚è‚Ü‚·A'make cmdidxs' ‚ðŽÀs‚µ‚Ä‚­‚¾"
+"‚³‚¢"
+
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ‚±‚̃o[ƒWƒ‡ƒ“‚ł͂±‚̃Rƒ}ƒ“ƒh‚Í—˜—p‚Å‚«‚Ü‚¹‚ñ, ‚²‚ß‚ñ‚È‚³‚¢"
 
@@ -2029,11 +2054,6 @@
 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 s‚ªÜô‚Ü‚ê‚Ü‚µ‚½ "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: “Ǎžƒoƒbƒtƒ@‚֒ljÁ"
 
@@ -2818,6 +2838,10 @@
 msgstr "E251: VIM ŽÀ‘̂̓o˜^ƒvƒƒpƒeƒB‚ª•s³‚Å‚·. Á‹Ž‚µ‚Ü‚µ‚½!"
 
 #, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: JSON‚ɏd•¡ƒL[‚ª‚ ‚è‚Ü‚·: \"%s\""
+
+#, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: ƒŠƒXƒgŒ^‚ɃJƒ“ƒ}‚ª‚ ‚è‚Ü‚¹‚ñ: %s"
 
@@ -2857,7 +2881,7 @@
 msgstr "‚±‚ÌVim‚É‚Ídiff‹@”\\‚ª‚ ‚è‚Ü‚¹‚ñ(ƒRƒ“ƒpƒCƒ‹ŽžÝ’è)."
 
 msgid "Attempt to open script file again: \""
-msgstr "ƒXƒNƒŠƒvƒgƒtƒ@ƒCƒ‹‚ðÄ‚ÑŠJ‚¢‚Ă݂܂·: \""
+msgstr "ƒXƒNƒŠƒvƒgƒtƒ@ƒCƒ‹‚ðÄ‚ÑŠJ‚±‚¤‚Æ‚µ‚Ü‚µ‚½: \""
 
 msgid "Cannot open for reading: \""
 msgstr "“Ǎž—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñ"
@@ -3038,6 +3062,9 @@
 msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
 msgstr "--not-a-term\t\t“üo—Í‚ª’[––‚łȂ¢‚Ƃ̌x‚ðƒXƒLƒbƒv‚·‚é"
 
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr "--ttyfail\t\t“üo—Í‚ª’[––‚łȂ¯‚ê‚ΏI—¹‚·‚é"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc‚Ì‘ã‚í‚è‚É <vimrc> ‚ðŽg‚¤"
 
@@ -3905,7 +3932,7 @@
 msgstr "E766: printf() ‚̈ø”‚ª•s\\•ª‚Å‚·"
 
 msgid "E807: Expected Float argument for printf()"
-msgstr "E807: printf() ‚̈ø”‚ɂ͕‚“®­”“_”‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚Ü‚·"
+msgstr "E807: printf() ‚̈ø”‚ɂ͕‚“®¬”“_”‚ªŠú‘Ò‚³‚ê‚Ä‚¢‚Ü‚·"
 
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() ‚̈ø”‚ª‘½‰ß‚¬‚Ü‚·"
@@ -4062,8 +4089,10 @@
 msgid "E663: At end of changelist"
 msgstr "E663: •ύXƒŠƒXƒg‚Ì––”ö"
 
-msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "Vim‚ðI—¹‚·‚é‚É‚Í :quit<Enter> ‚Æ“ü—Í‚µ‚Ä‚­‚¾‚³‚¢"
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr ""
+"‚·‚ׂĂ̕ύX‚ð”jŠü‚µAVim‚ðI—¹‚·‚é‚É‚Í  :qa!  ‚Æ“ü—Í‚µ <Enter> ‚ð‰Ÿ‚µ‚Ä‚­‚¾"
+"‚³‚¢"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4412,9 +4441,6 @@
 msgid "Message"
 msgstr "ƒƒbƒZ[ƒW"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' ‚ª 80 ‚ł͂Ȃ¢‚½‚߁AŠO•”ƒRƒ}ƒ“ƒh‚ðŽÀs‚Å‚«‚Ü‚¹‚ñ"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: ƒvƒŠƒ“ƒ^‚Ì‘I‘ð‚ÉŽ¸”s‚µ‚Ü‚µ‚½"
 
@@ -4684,6 +4710,12 @@
 msgid "E769: Missing ] after %s["
 msgstr "E769: %s[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ"
 
+msgid "E944: Reverse range in character class"
+msgstr "E944: •¶ŽšƒNƒ‰ƒX‚͈̔͂ª‹t‚Å‚·"
+
+msgid "E945: Range too large in character class"
+msgstr "E945: •¶ŽšƒNƒ‰ƒX‚͈̔͂ª‘å‚«‚·‚¬‚Ü‚·"
+
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( ‚ª’ނ荇‚Á‚Ä‚¢‚Ü‚¹‚ñ"
@@ -4713,6 +4745,10 @@
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] ‚ª‹ó‚Å‚·"
 
+#
+msgid "E65: Illegal back reference"
+msgstr "E65: •s³‚ÈŒã•ûŽQÆ‚Å‚·"
+
 msgid "E339: Pattern too long"
 msgstr "E339: ƒpƒ^[ƒ“‚ª’·‰ß‚¬‚Ü‚·"
 
@@ -4751,10 +4787,6 @@
 msgstr "E64:%s%c ‚ÌŒã‚É‚È‚É‚à‚ ‚è‚Ü‚¹‚ñ"
 
 #
-msgid "E65: Illegal back reference"
-msgstr "E65: •s³‚ÈŒã•ûŽQÆ‚Å‚·"
-
-#
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½"
 
@@ -5362,12 +5394,33 @@
 msgid "No Syntax items defined for this buffer"
 msgstr "‚±‚̃oƒbƒtƒ@‚É’è‹`‚³‚ꂽ\\•¶—v‘f‚Í‚ ‚è‚Ü‚¹‚ñ"
 
+msgid "syntax conceal on"
+msgstr "\\•¶‚Ì conceal ‚ÍŒ»Ý on ‚Å‚·"
+
+msgid "syntax conceal off"
+msgstr "\\•¶‚Ì conceal ‚ÍŒ»Ý off ‚Å‚·"
+
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: •s³‚Ȉø”‚Å‚·: %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 "ƒVƒ“ƒ^ƒbƒNƒX—p iskeyword "
+msgstr "\\•¶—p iskeyword "
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -5578,7 +5631,7 @@
 msgstr "E556: ƒ^ƒOƒXƒ^ƒbƒN‚̐擪‚Å‚·"
 
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: Å‰‚ÌŠY“–ƒ^ƒO‚ð’´‚¦‚Ė߂邱‚Ƃ͂ł«‚Ü‚¹‚ñ"
+msgstr "E425: Å‰‚ÌŠY“–ƒ^ƒO‚ð‰z‚¦‚Ė߂邱‚Ƃ͂ł«‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "E426: tag not found: %s"
@@ -5594,7 +5647,7 @@
 msgstr "E427: ŠY“–ƒ^ƒO‚ª1‚‚¾‚¯‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
 
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: ÅŒã‚ÉŠY“–‚·‚éƒ^ƒO‚ð’´‚¦‚Đi‚Þ‚±‚Ƃ͂ł«‚Ü‚¹‚ñ"
+msgstr "E428: ÅŒã‚ÌŠY“–ƒ^ƒO‚ð‰z‚¦‚Đi‚Þ‚±‚Ƃ͂ł«‚Ü‚¹‚ñ"
 
 #, c-format
 msgid "File \"%s\" does not exist"
@@ -5942,6 +5995,10 @@
 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"
 
@@ -5964,14 +6021,6 @@
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: ƒJƒbƒR '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %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 ƒrƒbƒg GUI ”Å"
-
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -6255,12 +6304,6 @@
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "Ú×‚̓ƒjƒ…[‚Ì ƒwƒ‹ƒv->ƒXƒ|ƒ“ƒT[/“o˜^ ‚ðŽQÆ‚µ‚ĉº‚³‚¢"
 
-msgid "WARNING: Windows 95/98/ME detected"
-msgstr "Œx: Windows 95/98/ME ‚ðŒŸo‚µ‚Ü‚µ‚½"
-
-msgid "type  :help windows95<Enter>  for info on this"
-msgstr "Ú×‚ȏî•ñ‚Í            :help windows95<Enter>"
-
 msgid "Already only one window"
 msgstr "Šù‚ɃEƒBƒ“ƒhƒE‚Í1‚‚µ‚©‚ ‚è‚Ü‚¹‚ñ"
 
@@ -6414,6 +6457,10 @@
 msgid "E473: Internal error"
 msgstr "E473: “à•”ƒGƒ‰[‚Å‚·"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: “à•”ƒGƒ‰[‚Å‚·: %s"
+
 msgid "Interrupted"
 msgstr "Š„ž‚Ü‚ê‚Ü‚µ‚½"
 
@@ -6679,8 +6726,8 @@
 msgid "E80: Error while writing"
 msgstr "E80: ‘ž‚Ý’†‚̃Gƒ‰["
 
-msgid "Zero count"
-msgstr "ƒ[ƒƒJƒEƒ“ƒg"
+msgid "E939: Positive count required"
+msgstr "E939: ³‚̃JƒEƒ“ƒg‚ª•K—v‚Å‚·"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: ƒXƒNƒŠƒvƒgˆÈŠO‚Å<SID>‚ªŽg‚í‚ê‚Ü‚µ‚½"
@@ -6694,10 +6741,6 @@
 msgid "E744: NetBeans does not allow changes in read-only files"
 msgstr "E744: NetBeans ‚͓Ǎžê—pƒtƒ@ƒCƒ‹‚ð•ύX‚·‚邱‚Æ‚ð‹–‚µ‚Ü‚¹‚ñ"
 
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: “à•”ƒGƒ‰[‚Å‚·: %s"
-
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: ƒpƒ^[ƒ“‚ª 'maxmempattern' ˆÈã‚̃ƒ‚ƒŠ‚ðŽg—p‚µ‚Ü‚·"
 
diff --git a/src/po/ko.UTF-8.po b/src/po/ko.UTF-8.po
index 470a942..1aeecd2 100644
--- a/src/po/ko.UTF-8.po
+++ b/src/po/ko.UTF-8.po
@@ -4,12 +4,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim 7.3\n"
+"Project-Id-Version: vim 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-16 16:18+0900\n"
-"PO-Revision-Date: 2010-02-18 09:49+0900\n"
+"POT-Creation-Date: 2017-07-12 14:52+0900\n"
+"PO-Revision-Date: 2017-07-12 18:56+0900\n"
 "Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
-"Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
+"Language-Team: GTP Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,12 +35,21 @@
 msgid "[Quickfix List]"
 msgstr "[Quickfix 목록]"
 
+msgid "E855: Autocommands caused command to abort"
+msgstr "E855: Autocommand로 명령이 중단되었습니다"
+
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: 버퍼를 할당할 수 없어서 끝냅니다..."
 
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: 버퍼를 할당할 수 없어서 다른 걸 사용합니다..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: 버퍼를 등록하지 못했습니다"
+
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: 사용중인 버퍼를 삭제하려고 했습니다"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 내려진 버퍼가 없습니다"
 
@@ -71,6 +80,9 @@
 msgid "%d buffers wiped out"
 msgstr "버퍼 %d개가 완전히 지워졌습니다"
 
+msgid "E90: Cannot unload last buffer"
+msgstr "E90: 마지막 버퍼를 내릴 수 없습니다"
+
 msgid "E84: No modified buffer found"
 msgstr "E84: 바뀐 버퍼를 찾을 수 없습니다"
 
@@ -78,10 +90,6 @@
 msgid "E85: There is no listed buffer"
 msgstr "E85: 나열된 버퍼가 없습니다"
 
-#, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: 버퍼 %ld이(가) 존재하지 않습니다"
-
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 마지막 버퍼입니다"
 
@@ -94,9 +102,6 @@
 "E89: 버퍼 %ld을(를) 마지막으로 고친 뒤 저장하지 않았습니다 (덮어쓰려면 ! 더하"
 "기)"
 
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: 마지막 버퍼를 내릴 수 없습니다"
-
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 경고: 파일 이름 목록이 넘쳤습니다"
 
@@ -131,6 +136,9 @@
 msgid "[Read errors]"
 msgstr "[읽기 에러]"
 
+msgid "[RO]"
+msgstr "[읽기 전용]"
+
 msgid "[readonly]"
 msgstr "[읽기 전용]"
 
@@ -193,9 +201,100 @@
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    줄=%ld  id=%d  이름=%s"
 
+msgid "E902: Cannot connect to port"
+msgstr "E902: 포트로 연결할 수 없습니다"
+
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open()에서 gethostbyname()"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open()에서 socket()"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: 문자열이 아닌 인자를 명령으로 수신했습니다"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call의 마지막 인자는 숫자여야 합니다"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: 3번째 인자는 list여야 합니다"
+
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: %ld개 이상의 버퍼에 대해서는 diff를 할 수 없습니다"
+msgid "E905: received unknown command: %s"
+msgstr "E905: 모르는 명령 수신: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): 연결되지 않았는 데 쓰기"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): 쓰기가 실패했습니다"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s()에는 callback을 사용할 수 없습니다"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: raw 혹은 nl 채널에서 ch_evalexpr()/ch_sendexpr()을 사용할 수 없습니다"
+
+msgid "E906: not an open channel"
+msgstr "E906: 열린 채널이 아닙니다"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io 파일은 설정하려면 _name이 필요합니다"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io 버퍼는 설정하려면 in_buf나 in_name이 필요합니다"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: 버퍼가 로딩되어야 합니다: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: 파일이 모르는 방법으로 암호화되어 있습니다"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "경고: 약한 암호 방식을 사용중; :help 'cm'을 확인하세요"
+
+msgid "Enter encryption key: "
+msgstr "암호 키 입력: "
+
+msgid "Enter same key again: "
+msgstr "같은 키를 다시 입력: "
+
+msgid "Keys don't match!"
+msgstr "키가 맞지 않습니다!"
+
+msgid "[crypted]"
+msgstr "[암호화 되었습니다]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary에 콜론 누락: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary에 중복된 키: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Dictionary에 콤마 누락: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Dictionary 끝에 '}' 누락: %s"
+
+msgid "extend() argument"
+msgstr "extend() 인자"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: 키가 이미 존재함: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: 버퍼를 %ld개 이상은 비교할 수 없습니다"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: 임시 파일을 읽거나 쓸 수 없습니다"
@@ -323,6 +422,9 @@
 msgid "Scanning tags."
 msgstr "태그 찾는 중."
 
+#~ msgid "match in file"
+#~ msgstr ""
+
 msgid " Adding"
 msgstr " 더하기"
 
@@ -350,55 +452,17 @@
 msgid "match %d"
 msgstr "match %d"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ':let'에 모르는 글자"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: 목록 번호가 범위를 벗어남: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: 정의 안 된 변수: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']'이 없습니다"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s 인자는 List이어야 합니다"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s 인자는 List 혹은 Dictionary여야 합니다"
-
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Dictionary에 빈 키를 쓸 수 없습니다"
-
-msgid "E714: List required"
-msgstr "E714: List가 필요합니다"
-
-msgid "E715: Dictionary required"
-msgstr "E715: Dictionary가 필요합니다"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 함수에 너무 많은 인자 넘김: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Dictionary에 키가 없음: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: 함수 %s이(가) 이미 있습니다, 바꾸려면 !을 더하세요"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: 이미 Dictionary 항목이 있습니다"
-
-msgid "E718: Funcref required"
-msgstr "E718: Funcref가 필요합니다"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Dictionary에 [:]을 사용할 수 없습니다"
 
@@ -407,13 +471,12 @@
 msgstr "E734: %s=에 대한 잘못된 변수형"
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: 모르는 함수: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 비정상적인 변수 명: %s"
 
+msgid "E806: using Float as a String"
+msgstr "E806: Float를 String으로 사용"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: List 항목보다 적은 대상"
 
@@ -446,13 +509,15 @@
 msgstr "E690: :for 뒤에 \"in\"가 없습니다"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: 괄호 없음: %s"
-
-#, c-format
 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: 잠금(해제)하기에 변수가 너무 깊이 중첩되었습니다"
 
@@ -471,9 +536,6 @@
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Dictionary에 대한 잘못된 동작"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Funcref는 Funcref와만 비교할 수 있습니다"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Funcrefs에 대한 잘못된 동작"
 
@@ -486,6 +548,9 @@
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Funcref를 색인할 수 없습니다"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: 특수한 변수는 색인할 수 없습니다"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: 옵션 이름 없음: %s"
@@ -502,136 +567,12 @@
 msgid "E115: Missing quote: %s"
 msgstr "E115: 따옴표 없음: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: List에 콤마 누락: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: List 끝에 ']' 누락: %s"
-
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Dictionary에 콜론 누락: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Dictionary에 중복된 키: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Dictionary에 콤마 누락: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Dictionary 끝에 '}' 누락: %s"
+#~ msgid "Not enough memory to set references, garbage collection aborted!"
+#~ msgstr ""
 
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: 변수가 표시하기에 너무 깊이 중첩되었습니다"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: 함수 %s에 너무 많은 인자가 전달되었습니다"
-
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 함수 %s(으)로 잘못된 인자가 넘겨졌습니다"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 모르는 함수: %s"
-
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 함수에 적은 인자 넘김: %s"
-
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: 스크립트 콘텍스트 밖에서 <SID> 사용: %s"
-
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Dictionary없이 사전함수가 불려짐: %s"
-
-msgid "E808: Number or Float required"
-msgstr "E808: Number 혹은 Float가 필요합니다"
-
-msgid "E699: Too many arguments"
-msgstr "E699: 너무 많은 인자"
-
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete()은 입력 모드에서만 사용될 수 있습니다"
-
-#.
-#. * Yes this is ugly, I don't particularly like it either.  But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all.  See below what 'ok' and 'ync' are used for.
-#.
-msgid "&Ok"
-msgstr "확인(&O)"
-
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: 키가 이미 존재함: %s"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld 줄: "
-
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: 모르는 함수: %s"
-
-msgid ""
-"&OK\n"
-"&Cancel"
-msgstr ""
-"확인(&O)\n"
-"취소(&C)"
-
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore()가 inputsave()보다 많이 불려졌습니다"
-
-msgid "E786: Range not allowed"
-msgstr "E786: 범위가 허용되지 않습니다"
-
-msgid "E701: Invalid type for len()"
-msgstr "E701: len()에 잘못된 형"
-
-msgid "E726: Stride is zero"
-msgstr "E726: Stride가 0"
-
-msgid "E727: Start past end"
-msgstr "E727: 시작위치가 끝을 지나침"
-
-msgid "<empty>"
-msgstr "<비어있음>"
-
-msgid "E240: No connection to Vim server"
-msgstr "E240: Vim 서버에 연결되어 있지 않습니다"
-
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s(으)로 보낼 수 없습니다"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277: 서버의 응답을 읽을 수 없습니다"
-
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: 너무 많은 심볼릭 링크 (반복순환?)"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: 클라이언트로 보낼 수 없습니다"
-
-msgid "E702: Sort compare function failed"
-msgstr "E702: 정렬 비교 기능이 실패했습니다"
-
-msgid "(Invalid)"
-msgstr "(잘못되었습니다)"
-
-msgid "E677: Error writing temp file"
-msgstr "E677: 임시 파일 쓰기 에러"
-
 msgid "E805: Using a Float as a Number"
 msgstr "E805: Float를 Number로 사용"
 
@@ -644,6 +585,33 @@
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Dictionary를 Number로 사용"
 
+msgid "E910: Using a Job as a Number"
+msgstr "E910: Job을 Number로 사용하고 있습니다"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: Channel을 Number로 사용하고 있습니다"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Funcref를 Float로 사용하고 있습니다"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: String을 Float로 사용하고 있습니다"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: List를 Float로 사용하고 있습니다"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Dictionary를 Float로 사용하고 있습니다"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: 특수한 값을 Float로 사용하고 있습니다"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: Job을 Float로 사용하고 있습니다"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: Channel을 Float로 사용하고 있습니다"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: Funcref를 String으로 사용"
 
@@ -653,8 +621,12 @@
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Dictionary를 String으로 사용"
 
-msgid "E806: using Float as a String"
-msgstr "E806: Float를 String으로 사용"
+msgid "E908: using an invalid value as a String"
+msgstr "E908: 잘못된 값을 String으로 사용하고 있습니다"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: 변수 %s를 삭제할 수 없습니다"
 
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
@@ -665,14 +637,6 @@
 msgstr "E705: 변수명이 이미 있는 함수명과 충돌: %s"
 
 #, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: 변수 형 다름: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: 변수 %s를 삭제할 수 없습니다"
-
-#, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: 값이 잠겨있음: %s"
 
@@ -686,70 +650,6 @@
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: 복사하기에 변수가 너무 깊게 중첩되었습니다"
 
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 정의 안 된 함수: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '('가 없음: %s"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: 잘못된 인자: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction이 없습니다"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: 함수명이 변수명과 충돌: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 함수 %s을(를) 다시 정의할 수 없습니다: 사용중입니다"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: 함수명이 스크립트 파일명과 다름: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: 함수 이름이 필요합니다"
-
-#, c-format
-msgid "E128: Function name must start with a capital or contain a colon: %s"
-msgstr "E128: 함수 이름은 대문자로 시작하거나 콜론을 포함해야 함: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: 함수 %s을(를) 지울 수 없습니다: 사용중입니다"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: 함수를 부른 깊이가 'maxfuncdepth'보다 큽니다"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s 부르는 중"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s이(가) 중지되었습니다"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%s이(가) #%ld을(를) 돌려주었습니다"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s이(가) %s을(를) 돌려주었습니다"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s에서 계속"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return이 함수 안에 있지 않습니다"
-
 msgid ""
 "\n"
 "# global variables:\n"
@@ -764,8 +664,137 @@
 "\n"
 "\tLast set from "
 
-msgid "No old files"
-msgstr "old 파일이 없습니다"
+msgid "map() argument"
+msgstr "map() 인자"
+
+msgid "filter() argument"
+msgstr "filter() 인자"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s 인자는 List이어야 합니다"
+
+msgid "E928: String required"
+msgstr "E928: String이 필요합니다"
+
+msgid "E808: Number or Float required"
+msgstr "E808: Number 혹은 Float가 필요합니다"
+
+msgid "add() argument"
+msgstr "add() 인자"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete()은 입력 모드에서만 사용될 수 있습니다"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "확인(&O)"
+
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: 모르는 함수: %s"
+
+msgid "E922: expected a dict"
+msgstr "E922: dict가 요구됩니다"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function()의 두번째 인자는 list나 dict이어야 합니다"
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"확인(&O)\n"
+"취소(&C)"
+
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore()가 inputsave()보다 많이 불려졌습니다"
+
+msgid "insert() argument"
+msgstr "insert() 인자"
+
+msgid "E786: Range not allowed"
+msgstr "E786: 범위가 허용되지 않습니다"
+
+msgid "E916: not a valid job"
+msgstr "E916: 정상적인 job이 아닙니다"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len()에 잘못된 형"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID가 \":match\"때문에 예약됨: %ld"
+
+msgid "E726: Stride is zero"
+msgstr "E726: Stride가 0"
+
+msgid "E727: Start past end"
+msgstr "E727: 시작위치가 끝을 지나침"
+
+msgid "<empty>"
+msgstr "<비어있음>"
+
+msgid "E240: No connection to the X server"
+msgstr "E240: X 서버에 연결되어 있지 않습니다"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+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() 인자"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: 너무 많은 심볼릭 링크 (반복순환?)"
+
+msgid "reverse() argument"
+msgstr "reverse() 인자"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: 클라이언트로 보낼 수 없습니다"
+
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: 비정상적인 동작: '%s'"
+
+msgid "sort() argument"
+msgstr "sort() 인자"
+
+msgid "uniq() argument"
+msgstr "uniq() 인자"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: 정렬 비교 기능이 실패했습니다"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq 비교 함수가 실패하였습니다"
+
+msgid "(Invalid)"
+msgstr "(비정상)"
+
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: 비정상적인 submatch number: %d"
+
+msgid "E677: Error writing temp file"
+msgstr "E677: 임시 파일 쓰기 에러"
+
+msgid "E921: Invalid callback argument"
+msgstr "E921: 비정상적인 콜백 인자"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -828,6 +857,10 @@
 msgstr "E137: Viminfo 파일의 쓰기 권한이 없습니다: %s"
 
 #, 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을(를) 쓸 수 없습니다!"
 
@@ -835,6 +868,10 @@
 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:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
@@ -853,6 +890,11 @@
 msgid "Illegal starting char"
 msgstr "이상한 시작 글자"
 
+#~ msgid ""
+#~ "\n"
+#~ "# Bar lines, copied verbatim:\n"
+#~ msgstr ""
+
 msgid "Save As"
 msgstr "다른 이름으로 저장"
 
@@ -947,8 +989,9 @@
 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에서 정규표현식이 빠졌습니다"
@@ -957,6 +1000,10 @@
 msgid "Pattern found in every line: %s"
 msgstr "여러 줄에서 패턴을 찾았습니다: %s"
 
+#, c-format
+msgid "Pattern not found: %s"
+msgstr "패턴을 찾을 수 없음: %s"
+
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -982,8 +1029,8 @@
 msgstr "미안합니다, 도움말 파일 \"%s\"을(를) 찾을 수 없습니다"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: 디렉토리가 아님: %s"
+msgid "E151: No match: %s"
+msgstr "E151: 맞지 않음: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1002,6 +1049,10 @@
 msgstr "E154: \"%s\" 태그가 %s/%s 파일에서 중복되었습니다"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: 디렉토리가 아님: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: 모르는 sign 명령: %s"
 
@@ -1026,10 +1077,17 @@
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 잘못된 버퍼 이름: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: 이름없는 버퍼로는 점프할 수 없습니다"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: 잘못된 sign ID: %ld"
 
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: sign %s을(를) 바꿀 수 없습니다"
+
 msgid " (NOT FOUND)"
 msgstr " (못 찾았음)"
 
@@ -1039,6 +1097,9 @@
 msgid "[Deleted]"
 msgstr "[지워졌습니다]"
 
+msgid "No old files"
+msgstr "old 파일이 없습니다"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "디버그 상태로 들어감.  계속하려면 \"cont\"를 입력하십시오."
 
@@ -1050,6 +1111,13 @@
 msgid "cmd: %s"
 msgstr "명령: %s"
 
+msgid "frame is zero"
+msgstr "프레임이 0"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "프레임이 가장 높은 단계임: %d"
+
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "중지점: \"%s%s\" %ld 줄"
@@ -1104,8 +1172,16 @@
 msgstr "\"%s\"을(를) 찾는 중"
 
 #, 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"
 
 msgid "Source Vim script"
 msgstr "빔 스크립트 로드"
@@ -1134,8 +1210,12 @@
 msgid "finished sourcing %s"
 msgstr "%s 불러들이기 끝"
 
-#~ msgid "modeline"
-#~ msgstr ""
+#, c-format
+msgid "continuing in %s"
+msgstr "%s에서 계속"
+
+msgid "modeline"
+msgstr "modeline"
 
 msgid "--cmd argument"
 msgstr "--cmd 인자"
@@ -1200,6 +1280,9 @@
 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: 미안합니다, 그 명령은 현재 판에서 사용할 수 없습니다"
 
@@ -1225,10 +1308,10 @@
 
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    이름        인자 범위  완성      정의"
+"    이름        인자       주소      완성      정의"
 
 msgid "No user-defined commands found"
 msgstr "사용자 정의 명령을 찾을 수 없습니다"
@@ -1248,6 +1331,9 @@
 msgid "E179: argument required for -complete"
 msgstr "E179: -complete에 인자가 필요합니다"
 
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr에 인자가 필요합니다"
+
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: 잘못된 속성: %s"
@@ -1266,6 +1352,10 @@
 msgstr "E184: 그런 사용자 정의 명령 없음: %s"
 
 #, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: 잘못된 주소 형식 값: %s"
+
+#, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: 잘못된 끝내기 값: %s"
 
@@ -1279,7 +1369,7 @@
 msgstr "모름"
 
 #, c-format
-msgid "E185: Cannot find color scheme %s"
+msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: 색 스킴 %s을(를) 찾을 수 없습니다"
 
 msgid "Greetings, Vim user!"
@@ -1326,6 +1416,9 @@
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos에는 두개의 인자가 필요합니다"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() 내에서 :redir을 사용할 수 없습니다"
+
 msgid "Save Redirection"
 msgstr "리디렉션 저장"
 
@@ -1522,7 +1615,7 @@
 "# %s 히스토리 (새것부터 오래된 것 순):\n"
 
 msgid "Command Line"
-msgstr "명령 줄"
+msgstr "명령 행"
 
 msgid "Search String"
 msgstr "찾을 문자열"
@@ -1531,7 +1624,10 @@
 msgstr "표현"
 
 msgid "Input Line"
-msgstr "입력 줄"
+msgstr "입력 행"
+
+msgid "Debug Line"
+msgstr "디버그 행"
 
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar가 명령 길이를 벗어났습니다"
@@ -1594,9 +1690,6 @@
 #~ msgid "[character special]"
 #~ msgstr ""
 
-msgid "[RO]"
-msgstr "[읽기 전용]"
-
 msgid "[CR missing]"
 msgstr "[CR 없음]"
 
@@ -1609,9 +1702,6 @@
 msgid "[converted]"
 msgstr "[변환 되었습니다]"
 
-msgid "[crypted]"
-msgstr "[암호화 되었습니다]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[%ld 줄에서 변환 에러]"
@@ -1632,9 +1722,6 @@
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert'의 출력결과를 읽을 수 없습니다"
 
-msgid "E821: File is encrypted with unknown method"
-msgstr "E821: 파일이 모르는 방법으로 암호화되어 있습니다"
-
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: acwrite 버퍼에 대한 autocommand를 찾을 수 없습니다"
 
@@ -1783,11 +1870,6 @@
 msgid "%lld characters"
 msgstr "%lld 글자"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld 글자"
-
 msgid "[noeol]"
 msgstr "[noeol]"
 
@@ -1880,6 +1962,12 @@
 msgid "E367: No such group: \"%s\""
 msgstr "E367: 이런 그룹 없음: \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: 현재 그룹을 삭제할 수 없습니다"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: 사용중인 augroup을 삭제하려고 합니다"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * 뒤에 이상한 글자: %s"
@@ -1940,10 +2028,6 @@
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: 현재의 'foldmethod'으로 접기를 지울 수 없습니다"
 
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld 줄 접힘 "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: 읽혀진 버퍼에 더하기"
 
@@ -1975,6 +2059,12 @@
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: 이상한 상태"
 
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: 새로운 GUI 프로세스를 생성할 수 없습니다"
+
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: 자식 프로세스가 GUI를 시작하지 못했습니다"
+
 msgid "E229: Cannot start the GUI"
 msgstr "E229: GUI를 시작할 수 없습니다"
 
@@ -2029,6 +2119,18 @@
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: 메시지와 콜백 모두를 사용해서는 BalloonEval을 만들 수 없습니다"
 
+msgid "_Cancel"
+msgstr "취소(_C)"
+
+msgid "_Save"
+msgstr "저장(_S)"
+
+msgid "_Open"
+msgstr "열기(_O)"
+
+msgid "_OK"
+msgstr "확인(_O)"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2038,6 +2140,12 @@
 "아니오(&N)\n"
 "취소(&C)"
 
+msgid "Yes"
+msgstr "예"
+
+msgid "No"
+msgstr "아니오"
+
 msgid "Input _Methods"
 msgstr "입력 방법(_M)"
 
@@ -2071,23 +2179,23 @@
 msgid "Down"
 msgstr "아래로"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "다음 찾기"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "바꾸기"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "모두 바꾸기"
 
+msgid "_Close"
+msgstr "닫기(_C)"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "빔: 세션 관리자로부터 \"die\" 요청을 받았습니다\n"
 
-msgid "Close"
-msgstr "닫기"
+msgid "Close tab"
+msgstr "탭 닫기"
 
 msgid "New tab"
 msgstr "새 탭"
@@ -2134,20 +2242,6 @@
 msgid "&Undo"
 msgstr "취소(&U)"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: 창 제목 \"%s\"을(를) 찾을 수 없습니다"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: 지원되지 않는 인자: \"-%s\": OLE 판을 사용하십시오."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: MDI 응용프로그램 안에서 창을 열 수 없습니다"
-
-msgid "Close tab"
-msgstr "탭 닫기"
-
 msgid "Open tab..."
 msgstr "탭 열기..."
 
@@ -2165,6 +2259,17 @@
 msgid "Directory\t*.nothing\n"
 msgstr "디렉토리\t*.nothing\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: 창 제목 \"%s\"을(를) 찾을 수 없습니다"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: 지원되지 않는 인자: \"-%s\": OLE 판을 사용하십시오."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI 응용프로그램 안에서 창을 열 수 없습니다"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr ""
 "빔 E458: 색상맵 엔트리를 할당할 수 없습니다, 몇몇 색이 잘못될 수 있습니다"
@@ -2182,32 +2287,28 @@
 msgstr "글꼴 '%s'은(는) 고정넓이가 아닙니다"
 
 #, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: 글꼴셋 이름: %s\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: 글꼴셋 이름: %s"
 
 #, c-format
-msgid "Font0: %s\n"
-msgstr "글꼴0: %s\n"
+msgid "Font0: %s"
+msgstr "글꼴0: %s"
 
 #, c-format
-msgid "Font1: %s\n"
-msgstr "글꼴1: %s\n"
+msgid "Font1: %s"
+msgstr "글꼴1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "글꼴%ld 너비가 글꼴0의 두배가 아닙니다\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "글꼴%ld 너비가 글꼴0의 두배가 아닙니다"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "글꼴0 너비: %ld\n"
+msgid "Font0 width: %ld"
+msgstr "글꼴0 너비: %ld"
 
 #, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"글꼴1 너비: %ld\n"
-"\n"
+msgid "Font1 width: %ld"
+msgstr "글꼴1 너비: %ld"
 
 #~ msgid "Invalid font specification"
 #~ msgstr ""
@@ -2395,6 +2496,9 @@
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope를 fork할 수 없습니다"
 
+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection setpgid가 실패했습니다"
+
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection 실행이 실패했습니다"
 
@@ -2427,6 +2531,7 @@
 
 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"
@@ -2437,13 +2542,14 @@
 "       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"
 
 #, c-format
@@ -2495,8 +2601,8 @@
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    데이터베이스 이름                   prepend path\n"
 
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr ""
+msgid "Lua library cannot be loaded."
+msgstr "Lua 라이브러리를 로딩할 수 없습니다."
 
 msgid "cannot save undo information"
 msgstr "undo 정보를 저장할 수 없습니다"
@@ -2508,14 +2614,21 @@
 "E815: 미안합니다, 이 명령은 사용할 수 없습니다, MzScheme 라이브러리를 로딩할 "
 "수 없습니다."
 
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: 미안합니다, 이 명령은 사용할 수 없습니다, MzScheme의 racket/base "
+"모듈을 로딩할 수 없습니다."
+
 msgid "invalid expression"
 msgstr "잘못된 표현식"
 
 msgid "expressions disabled at compile time"
 msgstr "표현식을 지원하지 않도록 컴파일 되었습니다"
 
-#~ msgid "hidden option"
-#~ msgstr ""
+msgid "hidden option"
+msgstr "숨김 옵션"
 
 msgid "unknown option"
 msgstr "모르는 옵션"
@@ -2538,6 +2651,9 @@
 msgid "string cannot contain newlines"
 msgstr "문자열은 newline을 포함할 수 없습니다"
 
+#~ msgid "error converting Scheme values to Vim"
+#~ msgstr ""
+
 msgid "Vim error: ~a"
 msgstr "Vim 에러: ~a"
 
@@ -2566,27 +2682,21 @@
 "E263: 미안합니다, 이 명령은 사용할 수 없습니다, 파이썬 라이브러리를 로딩할 "
 "수 없습니다."
 
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: 미안합니다, 이 명령은 사용할 수 없습니다, 파이썬의 사이트 모듈을 "
+"로딩할 수 없습니다."
+
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python을 재귀호출할 수 없습니다"
 
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject 속성을 지울 수 없습니다"
-
-msgid "softspace must be an integer"
-msgstr "softspace는 정수여야만 합니다"
-
-msgid "invalid attribute"
-msgstr "잘못된 속성"
-
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<%p에 버퍼 객체 (삭제됨)>"
-
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: 이 Vim은 :python을 사용한 후에 :py3을 사용할 수 없습니다"
 
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr ""
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_는 String 인스턴스이어야 합니다"
 
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
@@ -2616,95 +2726,6 @@
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: 모르는 longjmp 상태 %d"
 
-msgid "Toggle implementation/definition"
-msgstr "토글 구현/정의"
-
-msgid "Show base class of"
-msgstr "...의 기본 클래스 보여주기"
-
-#~ msgid "Show overridden member function"
-#~ msgstr ""
-
-#~ msgid "Retrieve from file"
-#~ msgstr ""
-
-#~ msgid "Retrieve from project"
-#~ msgstr ""
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr ""
-
-#~ msgid "Retrieve"
-#~ msgstr ""
-
-#~ msgid "Show source of"
-#~ msgstr ""
-
-#~ msgid "Find symbol"
-#~ msgstr ""
-
-#~ msgid "Browse class"
-#~ msgstr ""
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr ""
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr ""
-
-#~ msgid "Xref refers to"
-#~ msgstr ""
-
-#~ msgid "Xref referred by"
-#~ msgstr ""
-
-#~ msgid "Xref has a"
-#~ msgstr ""
-
-#~ msgid "Xref used by"
-#~ msgstr ""
-
-#~ msgid "Show docu of"
-#~ msgstr ""
-
-#~ msgid "Generate docu for"
-#~ msgstr ""
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"SNiFF+로 연결할 수 없습니다. 환경을 확인하십시오 (sniffemacs가 $PATH에서 찾아"
-"져야 합니다).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: 읽는 중 에러. 끊김"
-
-msgid "SNiFF+ is currently "
-msgstr "SNiFF+ is currently "
-
-msgid "not "
-msgstr "not "
-
-msgid "connected"
-msgstr "connected"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: 모르는 SNiFF+ 요청: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: SNiFF+에 연결 에러"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SniFF+가 연결되지 않았습니다"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: SniFF+ 버퍼가 아닙니다"
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: 쓰는 도중 에러. 끊겼습니다"
-
 msgid "invalid buffer number"
 msgstr "잘못된 버퍼 번호"
 
@@ -2767,12 +2788,6 @@
 "E571: 미안합니다, 이 명령은 사용할 수 없습니다, Tcl 라이브러리를 로딩할 수 없"
 "습니다."
 
-msgid ""
-"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr ""
-"E281: TCL 에러: 끝내기 코드가 정수가 아닌가!? 이 문제를 vim-dev@vim.org로 알"
-"려주십시오"
-
 #, c-format
 msgid "E572: exit code %d"
 msgstr "E572: 종료 코드 %d"
@@ -2793,6 +2808,18 @@
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: 빔 인스턴스 레지스트리 속성이 잘못되어 있습니다. 지웠습니다!"
 
+#, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: JSON에 중복된 키: \"%s\""
+
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List에 콤마 누락: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List 끝에 ']' 누락: %s"
+
 msgid "Unknown option argument"
 msgstr "모르는 옵션 인자"
 
@@ -2818,12 +2845,12 @@
 msgid "netbeans is not supported with this GUI\n"
 msgstr "이 GUI는 netbeans를 지원하지 않습니다\n"
 
-msgid "This Vim was not compiled with the diff feature."
-msgstr "이 빔은 diff 기능 없이 컴파일 되었습니다."
-
 msgid "'-nb' cannot be used: not enabled at compile time\n"
 msgstr "'-nb'는 사용할 수 없음: 컴파일할 때 포함되지 않음\n"
 
+msgid "This Vim was not compiled with the diff feature."
+msgstr "이 빔은 diff 기능 없이 컴파일 되었습니다."
+
 msgid "Attempt to open script file again: \""
 msgstr "스크립트 파일을 다시 열려고 시도: \""
 
@@ -2836,6 +2863,9 @@
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: 에러: NetBeans에서 gvim 시작 실패\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: 에러: 이 버젼의 빔은 Cygwin 터미널에서 실행할 수 없습니다\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "빔: 경고: 터미널로 출력할 수 없습니다\n"
 
@@ -2921,25 +2951,28 @@
 msgstr "-f 혹은 --nofork\t포그라운드: GUI로 시작할 때 fork하지 말 것"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tVi 상태 (\"vi\"와 같음)"
+msgstr "-v\t\t\tVi 모드 (\"vi\"와 같음)"
 
 msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx 상태 (\"ex\"와 같음)"
+msgstr "-e\t\t\tEx 모드 (\"ex\"와 같음)"
+
+msgid "-E\t\t\tImproved Ex mode"
+msgstr "-E\t\t\t향상된 Ex 모드"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t조용한 (배치) 상태 (\"ex\"만)"
+msgstr "-s\t\t\t조용한 (배치) 모드 (\"ex\"만)"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff 상태 (\"vimdiff\"와 같음)"
+msgstr "-d\t\t\tDiff 모드 (\"vimdiff\"와 같음)"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t쉬운 상태 (\"evim\"과 같음, modeless)"
+msgstr "-y\t\t\t쉬운 모드 (\"evim\"과 같음, modeless)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\t읽기 전용 상태 (\"view\"와 같음)"
+msgstr "-R\t\t\t읽기 전용 모드 (\"view\"와 같음)"
 
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t제한된 상태 (\"rvim\"과 같음)"
+msgstr "-Z\t\t\t제한된 모드 (\"rvim\"과 같음)"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t수정(파일 쓰기)이 허용되지 않음"
@@ -2959,11 +2992,11 @@
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi와 호환되지 않음: 'nocompatible'"
 
-#~ msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-#~ msgstr ""
+msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
+msgstr "-V[N][fname]\t\tBe verbose [level N] [fname에 메시지 저장]"
 
 msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\t디버깅 상태"
+msgstr "-D\t\t\t디버깅 모드"
 
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t스왑 파일 없이 메모리만 사용"
@@ -2995,6 +3028,12 @@
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 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>를 사용"
 
@@ -3155,19 +3194,6 @@
 
 msgid ""
 "\n"
-"Arguments recognised by gvim (RISC OS version):\n"
-msgstr ""
-"\n"
-"gvim이 알고있는 인자 (RISC OS 판):\n"
-
-msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <숫자>\t칸에서 창 초기 너비"
-
-msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <숫자>\t줄에서 창 초기 높이"
-
-msgid ""
-"\n"
 "Arguments recognised by gvim (GTK+ version):\n"
 msgstr ""
 "\n"
@@ -3182,6 +3208,9 @@
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t빔을 다른 GTK 위젯 안에서 열음"
 
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\t표준출력에 gvim의 Window ID를 표시"
+
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <parent title>\tVim을 부모 응용 프로그램 내에서 열기"
 
@@ -3373,8 +3402,7 @@
 #, c-format
 msgid ""
 "E833: %s is encrypted and this version of Vim does not support encryption"
-msgstr ""
-"E833: %s이(가) 암호화되어 있는 데, 이 Vim은 암호화를 지원하지 않습니다"
+msgstr "E833: %s이(가) 암호화되어 있는 데, 이 Vim은 암호화를 지원하지 않습니다"
 
 #~ msgid " has been damaged (page size is smaller than minimum value).\n"
 #~ msgstr ""
@@ -3666,24 +3694,17 @@
 #. * other languages.
 msgid ""
 "\n"
-"(1) Another program may be editing the same file.\n"
-"    If this is the case, be careful not to end up with two\n"
-"    different instances of the same file when making changes.\n"
+"(1) Another program may be editing the same file.  If this is the case,\n"
+"    be careful not to end up with two different instances of the same\n"
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) 다른 프로그램이 같은 파일을 고치고 있는중일 수 있습니다.\n"
-"    만약 그렇다면 같은 파일을 두 개의 프로그램에서 고치지\n"
-"    않도록 조심하시기 바랍니다.\n"
+"    만약 그렇다면 같은 파일을 두 개의 프로그램에서 고치지 않도록\n"
+"    조심하시기 바랍니다. 종료하세요. 계속하시려면 주의하세요.\n"
 
-msgid "    Quit, or continue with caution.\n"
-msgstr "    끝내거나 위험을 감수하시려면 계속하십시오.\n"
-
-msgid ""
-"\n"
-"(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) 파일을 고치다가 죽었었습니다.\n"
+msgid "(2) An edit session for this file crashed.\n"
+msgstr "(2) 이 파일을 고치다가 죽었었습니다.\n"
 
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    만약 그렇다면 \":recover\" 혹은 \"vim -r "
@@ -3905,13 +3926,6 @@
 msgid "Beep!"
 msgstr "삑!"
 
-msgid "Vim: preserving files...\n"
-msgstr "빔: 파일 보존중...\n"
-
-#. close all memfiles, without deleting
-msgid "Vim: Finished.\n"
-msgstr "빔: 끌났습니다.\n"
-
 msgid "ERROR: "
 msgstr "에러: "
 
@@ -3957,14 +3971,8 @@
 msgid "E549: Illegal percentage"
 msgstr "E549: 이상한 백분율"
 
-msgid "Enter encryption key: "
-msgstr "암호 키 입력: "
-
-msgid "Enter same key again: "
-msgstr "같은 키를 다시 입력: "
-
-msgid "Keys don't match!"
-msgstr "키가 맞지 않습니다!"
+#~ msgid "E854: path too long for completion"
+#~ msgstr ""
 
 #, c-format
 msgid ""
@@ -3990,19 +3998,10 @@
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: path에서 더 이상의 \"%s\" 파일을 찾을 수 없습니다"
 
-msgid "Cannot connect to Netbeans #2"
-msgstr "Netbeans #2에 연결할 수 없습니다"
-
-msgid "Cannot connect to Netbeans"
-msgstr "Netbeans에 연결할 수 없습니다"
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr "E668: NetBeans 연결 정보 파일이 접근 모드가 잘못됨: \"%s\""
 
-msgid "read from Netbeans socket"
-msgstr "Netbeans 소켓에서 읽기"
-
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: 버퍼 %ld에 대한 NetBeans 연결을 잃어버렸습니다"
@@ -4013,8 +4012,9 @@
 msgid "E511: netbeans already connected"
 msgstr "E511: netbeans가 이미 연결되어 있습니다"
 
-msgid "E505: "
-msgstr "E505: "
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s은(는) 읽기 전용입니다 (덮어쓰려면 ! 더하기)"
 
 msgid "E349: No identifier under cursor"
 msgstr "E349: 커서 밑에 식별자가 없습니다"
@@ -4043,8 +4043,8 @@
 #~ msgid "E663: At end of changelist"
 #~ msgstr ""
 
-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 ":qa! 입력 후에 <엔터> 키를 누르시면 수정을 취소하고 빔을 종료합니다"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4131,37 +4131,38 @@
 msgid "E574: Unknown register type %d"
 msgstr "E574: 모르는 레지스터 형식 %d"
 
+#~ msgid ""
+#~ "E883: search pattern and expression register may not contain two or more "
+#~ "lines"
+#~ msgstr ""
+
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld 열; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Selected %s%ld of %ld 라인; %ld of %ld 단어; %ld of %ld 바이트"
+#~ msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+#~ msgstr ""
 
 #, c-format
-msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr ""
-"Selected %s%ld of %ld 라인; %ld of %ld 단어; %ld of %ld 문자; %ld of %ld 바이"
-"트"
+#~ msgid ""
+#~ "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+#~ "%lld Bytes"
+#~ msgstr ""
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s of %s; 라인 %ld of %ld; 단어 %ld of %ld; 바이트 %ld of %ld"
+#~ msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+#~ msgstr ""
 
 #, c-format
-msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
-msgstr ""
-"Col %s of %s; 라인 %ld of %ld; 단어 %ld of %ld; 문자 %ld of %ld; 바이트 %ld "
-"of %ld"
+#~ msgid ""
+#~ "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+#~ "%lld of %lld"
+#~ msgstr ""
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#~ msgid "(+%ld for BOM)"
+#~ msgstr ""
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=페이지 %N"
@@ -4178,6 +4179,9 @@
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: 모드라인에서 사용될 수 없습니다"
 
+msgid "E846: Key code not set"
+msgstr "E846: 키 코드가 설정되지 않았습니다"
+
 msgid "E521: Number required after ="
 msgstr "E521: = 뒤에 숫자가 필요합니다"
 
@@ -4188,6 +4192,10 @@
 msgid "E539: Illegal character <%s>"
 msgstr "E539: 이상한 글자 <%s>"
 
+#, c-format
+#~ msgid "For option %s"
+#~ msgstr ""
+
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term'을 빈 문자열로 설정할 수 없습니다"
 
@@ -4381,9 +4389,6 @@
 msgid "Message"
 msgstr "메시지"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns'이 80이 아니어서, 외부 명령을 실행할 수 없습니다"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: 프린터를 고르지 못했습니다"
 
@@ -4408,20 +4413,13 @@
 msgstr "E244: 잘못된 글자셋 이름 \"%s\"이(가) 글꼴 이름 \"%s\"에 있습니다"
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: 잘못된 퀄러티 이름 \"%s\"이(가) 글꼴 이름 \"%s\"에 있습니다"
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: 잘못된 글자 '%c'이(가) 글꼴 이름 \"%s\"에 있습니다"
 
-msgid "Vim: Double signal, exiting\n"
-msgstr "빔: 같은 시그널 두 번, 끝냅니다\n"
-
-#, c-format
-msgid "Vim: Caught deadly signal %s\n"
-msgstr "빔: %s 시그널을 잡았습니다\n"
-
-#, c-format
-msgid "Vim: Caught deadly signal\n"
-msgstr "빔: 죽을 시그널을 잡았습니다\n"
-
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "X 디스플레이를 여는 데 %ld msec이 걸렸습니다"
@@ -4453,12 +4451,13 @@
 "\n"
 "Could not set security context for "
 
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Cannot execute shell "
+#, c-format
+#~ msgid "Could not set security context %s for %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Could not get security context %s for %s. Removing it!"
+#~ msgstr ""
 
 msgid ""
 "\n"
@@ -4490,6 +4489,13 @@
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"Cannot execute shell "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4531,10 +4537,6 @@
 msgstr "함수 포인터를 DLL로 바꿀 수 없습니다!"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "쉘이 %d을(를) 돌려주었습니다"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "빔: %s 이벤트를 잡았습니다\n"
 
@@ -4563,6 +4565,10 @@
 msgstr "빔 경고"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "쉘이 %d을(를) 돌려주었습니다"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: 형식 문자열에 %%%c이(가) 너무 많습니다"
 
@@ -4585,6 +4591,7 @@
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: 형식 문자열에 잘못된 %%%c이(가) 있습니다"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat'이 어떤 패턴도 포함하고 있지 않습니다"
 
@@ -4594,6 +4601,15 @@
 msgid "E553: No more items"
 msgstr "E553: 더 이상의 항목이 없습니다"
 
+msgid "E924: Current window was closed"
+msgstr "E924: 현재 창이 닫혔습니다"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: 현재의 quickfix가 바뀌었습니다"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: 현재의 location list가 바뀌었습니다"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
@@ -4601,15 +4617,18 @@
 msgid " (line deleted)"
 msgstr " (줄을 지웠음)"
 
+#, c-format
+#~ msgid "%serror list %d of %d; %d errors "
+#~ msgstr ""
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: 퀵픽스 스택의 바닥입니다"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: 퀵픽스 스택의 꼭대기입니다"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "error list %d of %d; %d errors"
+#~ msgid "No entries"
+#~ msgstr ""
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 쓸 수 없음, 'buftype' 옵션이 설정되어 있습니다"
@@ -4634,18 +4653,15 @@
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: %s%%[]에 잘못된 항목"
 
-msgid "E339: Pattern too long"
-msgstr "E339: 패턴이 너무 깁니다"
-
-msgid "E50: Too many \\z("
-msgstr "E50: \\z(가 너무 많습니다"
-
 #, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s(가 너무 많습니다"
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ 뒤에 ]가 없습니다"
 
-msgid "E52: Unmatched \\z("
-msgstr "E52: 맞지 않는 \\z("
+#~ msgid "E944: Reverse range in character class"
+#~ msgstr ""
+
+#~ msgid "E945: Range too large in character class"
+#~ msgstr ""
 
 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4659,6 +4675,36 @@
 msgid "E55: Unmatched %s)"
 msgstr "E55: 맞지 않는 %s)"
 
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z(는 여기에서 허용되지 않습니다"
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 등은 여기에서 허용되지 않습니다"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ 뒤에 ]가 없습니다"
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: 빈 %s%%[]"
+
+msgid "E65: Illegal back reference"
+msgstr "E65: 이상한 후위 참조"
+
+msgid "E339: Pattern too long"
+msgstr "E339: 패턴이 너무 깁니다"
+
+msgid "E50: Too many \\z("
+msgstr "E50: \\z(가 너무 많습니다"
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: %s(가 너무 많습니다"
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: 맞지 않는 \\z("
+
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ 뒤에 잘못된 문자"
@@ -4682,27 +4728,10 @@
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c 뒤에 아무것도 없습니다"
 
-msgid "E65: Illegal back reference"
-msgstr "E65: 이상한 후위 참조"
-
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z(는 여기에서 허용되지 않습니다"
-
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 등은 여기에서 허용되지 않습니다"
-
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z 뒤에 이상한 문자"
 
 #, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ 뒤에 ]가 없습니다"
-
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: 빈 %s%%[]"
-
-#, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: %s%%[dxouU] 뒤에 이상한 문자"
 
@@ -4711,16 +4740,93 @@
 msgstr "E71: %s%% 뒤에 이상한 문자"
 
 #, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ 뒤에 ]가 없습니다"
-
-#, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...}에 구문 에러"
 
 msgid "External submatches:\n"
 msgstr "외부 submatches:\n"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA 정규표현식) %s을(를) 반복할 수 없습니다"
+
+#~ msgid ""
+#~ "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+#~ "used "
+#~ msgstr ""
+
+#~ msgid "Switching to backtracking RE engine for pattern: "
+#~ msgstr ""
+
+#~ msgid "E865: (NFA) Regexp end encountered prematurely"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E866: (NFA regexp) Misplaced %c"
+#~ msgstr ""
+
+#, c-format
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (NFA 정규표현식) 비정상적인 문자 클래스: %ld"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (NFA) 모르는 오퍼레이터 '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) 모르는 오퍼레이터 '\\%%%c'"
+
+#. should never happen
+#~ msgid "E868: Error building NFA with equivalence class!"
+#~ msgstr ""
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (NFA) 모르는 오퍼레이터 '\\@%c'"
+
+#~ msgid "E870: (NFA regexp) Error reading repetition limits"
+#~ msgstr ""
+
+#. Can't have a multi follow a multi.
+#~ msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+#~ msgstr ""
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (NFA 정규표현식) '('가 너무 많습니다"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA 정규표현식) \\z(가 너무 많습니다"
+
+#~ msgid "E873: (NFA regexp) proper termination error"
+#~ msgstr ""
+
+#~ msgid "E874: (NFA) Could not pop the stack !"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+#~ "left on stack"
+#~ msgstr ""
+
+#~ msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+#~ msgstr ""
+
+#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not open temporary log file for writing, displaying on stderr ... "
+#~ msgstr ""
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(NFA) %s을(를) 열 수 없습니다!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "임시 로그 파일을 쓰기 위해 열 수 없습니다"
+
 msgid " VREPLACE"
 msgstr " 선택치환"
 
@@ -4748,9 +4854,6 @@
 msgid " Arabic"
 msgstr " 아라비아"
 
-msgid " (lang)"
-msgstr " (언어)"
-
 msgid " (paste)"
 msgstr " (붙이기)"
 
@@ -4845,8 +4948,47 @@
 "# Last %sSearch Pattern:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: spell 파일 형식 에러"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: 맞춤법 검사가 활성화되어 있지 않습니다"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr "경고: 단어 목록 \"%s_%s.spl\" 혹은 \"%s_ascii.spl\"을 찾을 수 없습니다"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "경고: 단어 목록 \"%s.%s.spl\" 혹은 \"%s.ascii.spl\"을 찾을 수 없습니다"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: SpellFileMissing autocommand가 버퍼를 삭제했습니다"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "경고: %s 영역은 지원되지 않습니다"
+
+msgid "Sorry, no suggestions"
+msgstr "죄송, 제안할 게 없습니다"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "죄송, %ld개만 제안"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Change \"%.*s\" to:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: 철자가 바뀐적이 없습니다"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: 찾을 수 없음: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: 잘린 spell 파일"
@@ -4868,17 +5010,6 @@
 msgid "Compressing word tree..."
 msgstr "단어 트리 압축중..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: 맞춤법 검사가 활성화되어 있지 않습니다"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr "경고: 단어 목록 \"%s_%s.spl\" 혹은 \"%s_ascii.spl\"을 찾을 수 없습니다"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "경고: 단어 목록 \"%s.%s.spl\" 혹은 \"%s.ascii.spl\"을 찾을 수 없습니다"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "spell 파일 \"%s\"을(를) 읽고 있습니다"
@@ -4896,8 +5027,24 @@
 msgstr "E770: spell 파일에 지원되지 않는 섹션"
 
 #, 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"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5157,76 +5304,56 @@
 msgstr "E765: 'spellfile'에 %ld 항목이 없습니다"
 
 #, c-format
-msgid "Word removed from %s"
-msgstr "%s에서 단어 삭제됨"
+msgid "Word '%.*s' removed from %s"
+msgstr "단어 '%.*s'이(가) %s에서 제거됨"
 
 #, c-format
-msgid "Word added to %s"
-msgstr "%s에 단어 추가됨"
+msgid "Word '%.*s' added to %s"
+msgstr "단어 '%.*s'이(가) %s에 추가됨"
 
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: 단어가 spell 파일 간에 다릅니다"
 
-msgid "Sorry, no suggestions"
-msgstr "죄송, 제안할 게 없습니다"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "죄송, %ld개만 제안"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Change \"%.*s\" to:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: 철자가 바뀐적이 없습니다"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: 찾을 수 없음: %s"
-
-#, c-format
-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"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
 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 ""
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: 이런 구문 클러스터는 없습니다: %s"
 
-msgid "No Syntax items defined for this buffer"
-msgstr "이 버퍼에 대해 정의된 구문 항목이 없습니다"
-
 msgid "syncing on C-style comments"
 msgstr "C-형식 주석문에 동기맞춤"
 
@@ -5292,11 +5419,18 @@
 msgid "E397: Filename required"
 msgstr "E397: 파일이름이 필요합니다"
 
+#~ msgid "E847: Too many syntax includes"
+#~ msgstr ""
+
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' 누락: %s"
 
 #, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: ']' 뒤에 문자가 더 있음: %s]%s"
+
+#, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' 누락: %s"
 
@@ -5304,6 +5438,9 @@
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: 충분치 않은 인자: 구문 영역 %s"
 
+msgid "E848: Too many syntax clusters"
+msgstr "E848: 구문 클러스터가 너무 많습니다"
+
 msgid "E400: No cluster specified"
 msgstr "E400: 클러스터가 명시되지 않았습니다"
 
@@ -5346,6 +5483,10 @@
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: 잘못된 :syntax 하위 명령: %s"
 
+#~ msgid ""
+#~ "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+#~ msgstr ""
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim 반복 로딩"
 
@@ -5407,6 +5548,9 @@
 msgid "W18: Invalid character in group name"
 msgstr "W18: 그룹 이름에 이상한 문자"
 
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: highlight와 syntax group이 너무 많습니다"
+
 msgid "E555: at bottom of tag stack"
 msgstr "E555: 태그 스택의 끝입니다"
 
@@ -5467,6 +5611,9 @@
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: %s에 대한 태그 파일 경로가 잘렸습니다\n"
 
+msgid "Ignoring long line in tags file"
+msgstr "태그 파일의 너무 긴 라인을 무시합니다"
+
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: 태그 파일 \"%s\"에 형식 에러가 있습니다"
@@ -5483,9 +5630,6 @@
 msgid "E433: No tags file"
 msgstr "E433: 태그 파일이 없습니다"
 
-msgid "Ignoring long line in tags file"
-msgstr "태그 파일의 너무 긴 라인을 무시합니다"
-
 msgid "E434: Can't find tag pattern"
 msgstr "E434: 태그 패턴을 찾을 수 없습니다"
 
@@ -5526,6 +5670,9 @@
 "\n"
 "--- 터미널 키 ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txt을 열 수 없습니다"
+
 msgid "new shell started\n"
 msgstr "새 쉘이 시작되었습니다\n"
 
@@ -5537,8 +5684,8 @@
 
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-msgid "E834: Line count changed unexpectedly"
-msgstr "E834: 줄 갯수가 모르는 사이에 바뀌었습니다"
+msgid "E881: Line count changed unexpectedly"
+msgstr "E881: 행 갯수가 갑자기 바뀌었습니다"
 
 #. must display the prompt
 msgid "No undo possible; continue anyway"
@@ -5673,13 +5820,133 @@
 msgid "E440: undo line missing"
 msgstr "E440: undo 줄이 없습니다"
 
-#. 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 판"
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 함수 %s이(가) 이미 있습니다, 바꾸려면 !을 더하세요"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: 이미 Dictionary 항목이 있습니다"
+
+msgid "E718: Funcref required"
+msgstr "E718: Funcref가 필요합니다"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: 모르는 함수: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: 잘못된 인자: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: 중복된 인자 이름: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: 함수 %s에 너무 많은 인자가 전달되었습니다"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: 함수 %s(으)로 잘못된 인자가 넘겨졌습니다"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: 함수를 부른 깊이가 'maxfuncdepth'보다 큽니다"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s 부르는 중"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s이(가) 중지되었습니다"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s이(가) #%ld을(를) 돌려주었습니다"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s이(가) %s을(를) 돌려주었습니다"
+
+msgid "E699: Too many arguments"
+msgstr "E699: 너무 많은 인자"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: 모르는 함수: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: 함수가 삭제됨: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: 함수에 적은 인자 넘김: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: 스크립트 콘텍스트 밖에서 <SID> 사용: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Dictionary없이 사전함수가 불려짐: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: 함수 이름이 필요합니다"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: 함수 이름은 대문자 혹은 \"s:\"로 시작해야 함: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: 함수 이름은 콜론을 포함할 수 없음: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: 정의 안 된 함수: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '('가 없음: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: 여기에서 g:을 사용할 수 없습니다"
+
+#, c-format
+#~ msgid "E932: Closure function should not be at top level: %s"
+#~ msgstr ""
+
+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"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: 함수 %s을(를) 다시 정의할 수 없습니다: 사용중입니다"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 함수명이 스크립트 파일명과 다름: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: 함수 %s을(를) 지울 수 없습니다: 사용중입니다"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return이 함수 안에 있지 않습니다"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: 괄호 없음: %s"
 
 msgid ""
 "\n"
@@ -5695,9 +5962,6 @@
 "\n"
 "MS-Windows 32비트 GUI 버젼"
 
-msgid " in Win32s mode"
-msgstr " Win32s 상태"
-
 msgid " with OLE support"
 msgstr " OLE 지원"
 
@@ -5717,27 +5981,6 @@
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"MS-Windows 16비트 버젼"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"32비트 MS-DOS 버젼"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"16비트 MS-DOS 버젼"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -5759,13 +6002,6 @@
 
 msgid ""
 "\n"
-"RISC OS version"
-msgstr ""
-"\n"
-"RISC OS 버젼"
-
-msgid ""
-"\n"
 "OpenVMS version"
 msgstr ""
 "\n"
@@ -5836,6 +6072,9 @@
 msgid "without GUI."
 msgstr "GUI 없음."
 
+msgid "with GTK3 GUI."
+msgstr "GTK3 GUI."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "GTK2-GNOME GUI."
 
@@ -5899,6 +6138,9 @@
 msgid "3rd user gvimrc file: \""
 msgstr "사용자 세 번째 gvimrc 파일: \""
 
+msgid "       defaults file: \""
+msgstr "       defaults 파일: \""
+
 msgid "    system menu file: \""
 msgstr "    시스템 메뉴 파일: \""
 
@@ -5930,7 +6172,7 @@
 msgstr "by Bram Moolenaar et al."
 
 msgid "Vim is open source and freely distributable"
-msgstr "빔은 소스가 열려 있고 공짜로 배포됩니다"
+msgstr "빔은 누구나 소스를 볼 수 있고 공짜로 배포됩니다"
 
 msgid "Help poor children in Uganda!"
 msgstr "우간다에 사는 가난한 아이를 도와주세요!"
@@ -5989,12 +6231,6 @@
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "이에 대한 정보를 보려면    메뉴 도움말->Sponsor/Register"
 
-msgid "WARNING: Windows 95/98/ME detected"
-msgstr "경고: 윈도우즈 95/98/ME를 찾았음"
-
-msgid "type  :help windows95<Enter>  for info on this"
-msgstr "이에 대한 정보를 보려면    :help windows95<엔터>  입력"
-
 msgid "Already only one window"
 msgstr "이미 하나의 창만 있습니다"
 
@@ -6027,6 +6263,25 @@
 msgstr "E447: path에서 \"%s\" 파일을 찾을 수 없습니다"
 
 #, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: 비정상적인 ID: %ld (1보다 크거나 같아야 합니다)"
+
+#, c-format
+#~ msgid "E801: ID already taken: %ld"
+#~ msgstr ""
+
+msgid "List or number required"
+msgstr "List나 number가 필요합니다"
+
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: 비정상적인 ID: %ld (1보다 크거나 같아야 합니다)"
+
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID를 찾을 수 없음: %ld"
+
+#, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: %s 라이브러리를 로드할 수 없습니다"
 
@@ -6128,6 +6383,10 @@
 msgid "E473: Internal error"
 msgstr "E473: 내부 에러"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 내부 에러: %s"
+
 msgid "Interrupted"
 msgstr "중단되었습니다"
 
@@ -6256,6 +6515,9 @@
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: 마지막으로 고친 뒤 저장되지 않았습니다 (무시하려면 ! 더하기)"
 
+msgid "E37: No write since last change"
+msgstr "E37: 마지막으로 고친 뒤 저장하지 않았습니다"
+
 msgid "E38: Null argument"
 msgstr "E38: 널 인자"
 
@@ -6308,6 +6570,31 @@
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: sandbox 안에서는 변수를 설정할 수 없음: \"%s\""
 
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Dictionary에 빈 키를 쓸 수 없습니다"
+
+msgid "E715: Dictionary required"
+msgstr "E715: Dictionary가 필요합니다"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: 목록 번호가 범위를 벗어남: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 함수에 너무 많은 인자 넘김: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Dictionary에 키가 없음: %s"
+
+msgid "E714: List required"
+msgstr "E714: List가 필요합니다"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s 인자는 List 혹은 Dictionary여야 합니다"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: 에러파일 읽는 도중에 에러"
 
@@ -6365,8 +6652,8 @@
 msgid "E80: Error while writing"
 msgstr "E80: 쓰는 중에 에러"
 
-msgid "Zero count"
-msgstr "Zero count"
+#~ msgid "E939: Positive count required"
+#~ msgstr ""
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: 스크립트 콘텍스트 밖에서 <SID> 사용"
@@ -6380,16 +6667,16 @@
 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'보다 많은 메모리를 사용합니다"
 
 msgid "E749: empty buffer"
 msgstr "E749: 빈 버퍼"
 
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: 버퍼 %ld이(가) 존재하지 않습니다"
+
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: 잘못된 찾기 패턴 혹은 구분자"
 
@@ -6400,6 +6687,13 @@
 msgid "E764: Option '%s' is not set"
 msgstr "E764: 옵션 '%s'이(가) 설정되어 있지 않습니다"
 
+msgid "E850: Invalid register name"
+msgstr "E850: 잘못된 레지스터 이름"
+
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: '%s'에서 디렉토리를 못찾음: \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "처음까지 찾았음, 끝에서 계속"
 
@@ -6410,38 +6704,250 @@
 msgid "Need encryption key for \"%s\""
 msgstr "\"%s\"에 대한 암호 키가 필요합니다"
 
-msgid "writelines() requires list of strings"
-msgstr "writelines()는 문자열 목록이 필요합니다"
+msgid "empty keys are not allowed"
+msgstr "빈 키 값은 허용되지 않습니다"
+
+msgid "dictionary is locked"
+msgstr "dictionary가 잠겨있습니다"
+
+msgid "list is locked"
+msgstr "list가 잠겨있습니다"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "dictionary에 '%s' 키를 추가할 수 없습니다"
+
+#, c-format
+#~ msgid "index must be int or slice, not %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected str() or unicode() instance, but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected bytes() or str() instance, but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "expected int(), long() or something supporting coercing to long(), but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected int() or something supporting coercing to int(), but got %s"
+#~ msgstr ""
+
+msgid "value is too large to fit into C int type"
+msgstr "값이 C 정수 형식 대비하여 너무 큽니다"
+
+msgid "value is too small to fit into C int type"
+msgstr "값이 C 정수 형식 대비하여 너무 작습니다"
+
+msgid "number must be greater than zero"
+msgstr "값이 0보다 커야 합니다"
+
+msgid "number must be greater or equal to zero"
+msgstr "값이 0보다 크거나 같아야 합니다"
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject 속성을 지울 수 없습니다"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "잘못된 속성: %s"
 
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: 파이썬: I/O 객체 초기화중 에러가 생겼습니다"
 
-msgid "no such buffer"
-msgstr "그런 버퍼는 없습니다"
+msgid "failed to change directory"
+msgstr "디렉토리를 바꿀 수 없습니다"
+
+#, c-format
+#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+#~ msgstr ""
+
+#~ msgid "internal error: imp.find_module returned tuple with NULL"
+#~ msgstr ""
+
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary 속성을 삭제할 수 없습니다"
+
+msgid "cannot modify fixed dictionary"
+msgstr "fixed dictionary를 수정할 수 없습니다"
+
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "속성 %s을(를) 설정할 수 없습니다"
+
+#~ msgid "hashtab changed during iteration"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected sequence element of size 2, but got sequence of size %d"
+#~ msgstr ""
+
+#~ msgid "list constructor does not accept keyword arguments"
+#~ msgstr ""
+
+msgid "list index out of range"
+msgstr "list 색인이 범위를 벗어났습니다"
+
+#. No more suitable format specifications in python-2.3
+#, c-format
+#~ msgid "internal error: failed to get vim list item %d"
+#~ msgstr ""
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "attempt to assign sequence of size greater than %d to extended slice"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "internal error: no vim list item %d"
+#~ msgstr ""
+
+#~ msgid "internal error: not enough list items"
+#~ msgstr ""
+
+#~ msgid "internal error: failed to add item to list"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "attempt to assign sequence of size %d to extended slice of size %d"
+#~ msgstr ""
+
+#~ msgid "failed to add item to list"
+#~ msgstr ""
+
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List 속성을 삭제할 수 없습니다"
+
+#~ msgid "cannot modify fixed list"
+#~ msgstr ""
+
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "이름없는 함수 %s이(가) 존재하지 않습니다"
+
+#, c-format
+msgid "function %s does not exist"
+msgstr "함수 %s이(가) 존재하지 않습니다"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "함수 %s을(를) 실행할 수 없습니다"
+
+msgid "unable to get option value"
+msgstr "옵션 값을 얻을 수 없습니다"
+
+#~ msgid "internal error: unknown option type"
+#~ msgstr ""
+
+#~ msgid "problem while switching windows"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "unable to unset global option %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "unable to unset option %s which does not have global value"
+#~ msgstr ""
+
+msgid "attempt to refer to deleted tab page"
+msgstr "지워진 탭 페이지를 참조하려고 하였습니다"
+
+msgid "no such tab page"
+msgstr "그런 탭 페이지가 없습니다"
 
 msgid "attempt to refer to deleted window"
 msgstr "지워진 창을 참조하려고 하였습니다"
 
-msgid "readonly attribute"
-msgstr "읽기 전용 속성"
+msgid "readonly attribute: buffer"
+msgstr "읽기 전용 속성: 버퍼"
 
 msgid "cursor position outside buffer"
 msgstr "퍼서 위치가 버퍼 밖에 있습니다"
 
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<%p에 창 객체 (삭제됨)>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<%p에 창 객체 (모름)>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<창 %d>"
-
 msgid "no such window"
 msgstr "그런 창은 없습니다"
 
 msgid "attempt to refer to deleted buffer"
 msgstr "지워진 버퍼를 참조하려고 하였습니다"
+
+msgid "failed to rename buffer"
+msgstr "버퍼 이름을 변경할 수 없습니다"
+
+#~ msgid "mark name must be a single character"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected vim.Buffer object, but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "failed to switch to buffer %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected vim.Window object, but got %s"
+#~ msgstr ""
+
+#~ msgid "failed to find window in the current tab page"
+#~ msgstr ""
+
+#~ msgid "did not switch to the specified window"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected vim.TabPage object, but got %s"
+#~ msgstr ""
+
+#~ msgid "did not switch to the specified tab page"
+#~ msgstr ""
+
+#~ msgid "failed to run the code"
+#~ msgstr ""
+
+#~ msgid "E858: Eval did not return a valid python object"
+#~ msgstr ""
+
+#~ msgid "E859: Failed to convert returned python object to vim value"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "unable to convert %s to vim dictionary"
+#~ msgstr ""
+
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s을(를) vim list로 변경할 수 없습니다"
+
+#, c-format
+#~ msgid "unable to convert %s to vim structure"
+#~ msgstr ""
+
+#~ msgid "internal error: NULL reference passed"
+#~ msgstr ""
+
+#~ msgid "internal error: invalid value type"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Failed to set path hook: sys.path_hooks is not a list\n"
+#~ "You should now do the following:\n"
+#~ "- append vim.path_hook to sys.path_hooks\n"
+#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Failed to set path: sys.path is not a list\n"
+#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
+#~ msgstr ""
diff --git a/src/po/ko.po b/src/po/ko.po
index 01dbc89..ddddf34 100644
--- a/src/po/ko.po
+++ b/src/po/ko.po
@@ -4,12 +4,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim 7.3\n"
+"Project-Id-Version: vim 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-16 16:18+0900\n"
-"PO-Revision-Date: 2010-02-18 09:49+0900\n"
+"POT-Creation-Date: 2017-07-12 14:52+0900\n"
+"PO-Revision-Date: 2017-07-12 18:56+0900\n"
 "Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
-"Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
+"Language-Team: GTP Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,12 +35,21 @@
 msgid "[Quickfix List]"
 msgstr "[Quickfix ¸ñ·Ï]"
 
+msgid "E855: Autocommands caused command to abort"
+msgstr "E855: Autocommand·Î ¸í·ÉÀÌ ÁߴܵǾú½À´Ï´Ù"
+
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: ¹öÆÛ¸¦ ÇÒ´çÇÒ ¼ö ¾ø¾î¼­ ³¡³À´Ï´Ù..."
 
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: ¹öÆÛ¸¦ ÇÒ´çÇÒ ¼ö ¾ø¾î¼­ ´Ù¸¥ °É »ç¿ëÇÕ´Ï´Ù..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: ¹öÆÛ¸¦ µî·ÏÇÏÁö ¸øÇß½À´Ï´Ù"
+
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: »ç¿ëÁßÀÎ ¹öÆÛ¸¦ »èÁ¦ÇÏ·Á°í Çß½À´Ï´Ù"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: ³»·ÁÁø ¹öÆÛ°¡ ¾ø½À´Ï´Ù"
 
@@ -71,6 +80,9 @@
 msgid "%d buffers wiped out"
 msgstr "¹öÆÛ %d°³°¡ ¿ÏÀüÈ÷ Áö¿öÁ³½À´Ï´Ù"
 
+msgid "E90: Cannot unload last buffer"
+msgstr "E90: ¸¶Áö¸· ¹öÆÛ¸¦ ³»¸± ¼ö ¾ø½À´Ï´Ù"
+
 msgid "E84: No modified buffer found"
 msgstr "E84: ¹Ù²ï ¹öÆÛ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
@@ -78,10 +90,6 @@
 msgid "E85: There is no listed buffer"
 msgstr "E85: ³ª¿­µÈ ¹öÆÛ°¡ ¾ø½À´Ï´Ù"
 
-#, c-format
-msgid "E86: Buffer %ld does not exist"
-msgstr "E86: ¹öÆÛ %ldÀÌ(°¡) Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù"
-
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: ¸¶Áö¸· ¹öÆÛÀÔ´Ï´Ù"
 
@@ -94,9 +102,6 @@
 "E89: ¹öÆÛ %ldÀ»(¸¦) ¸¶Áö¸·À¸·Î °íÄ£ µÚ ÀúÀåÇÏÁö ¾Ê¾Ò½À´Ï´Ù (µ¤¾î¾²·Á¸é ! ´õÇÏ"
 "±â)"
 
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: ¸¶Áö¸· ¹öÆÛ¸¦ ³»¸± ¼ö ¾ø½À´Ï´Ù"
-
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: °æ°í: ÆÄÀÏ À̸§ ¸ñ·ÏÀÌ ³ÑÃÆ½À´Ï´Ù"
 
@@ -131,6 +136,9 @@
 msgid "[Read errors]"
 msgstr "[Àб⠿¡·¯]"
 
+msgid "[RO]"
+msgstr "[Àбâ Àü¿ë]"
+
 msgid "[readonly]"
 msgstr "[Àбâ Àü¿ë]"
 
@@ -193,9 +201,100 @@
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    ÁÙ=%ld  id=%d  À̸§=%s"
 
+msgid "E902: Cannot connect to port"
+msgstr "E902: Æ÷Æ®·Î ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open()¿¡¼­ gethostbyname()"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open()¿¡¼­ socket()"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: ¹®ÀÚ¿­ÀÌ ¾Æ´Ñ ÀÎÀÚ¸¦ ¸í·ÉÀ¸·Î ¼ö½ÅÇß½À´Ï´Ù"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/callÀÇ ¸¶Áö¸· ÀÎÀÚ´Â ¼ýÀÚ¿©¾ß ÇÕ´Ï´Ù"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: 3¹øÂ° ÀÎÀÚ´Â list¿©¾ß ÇÕ´Ï´Ù"
+
 #, c-format
-msgid "E96: Can not diff more than %ld buffers"
-msgstr "E96: %ld°³ ÀÌ»óÀÇ ¹öÆÛ¿¡ ´ëÇØ¼­´Â diff¸¦ ÇÒ ¼ö ¾ø½À´Ï´Ù"
+msgid "E905: received unknown command: %s"
+msgstr "E905: ¸ð¸£´Â ¸í·É ¼ö½Å: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): ¿¬°áµÇÁö ¾Ê¾Ò´Â µ¥ ¾²±â"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): ¾²±â°¡ ½ÇÆÐÇß½À´Ï´Ù"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s()¿¡´Â callbackÀ» »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: raw ȤÀº nl ä³Î¿¡¼­ ch_evalexpr()/ch_sendexpr()À» »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+msgid "E906: not an open channel"
+msgstr "E906: ¿­¸° ä³ÎÀÌ ¾Æ´Õ´Ï´Ù"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io ÆÄÀÏÀº ¼³Á¤ÇÏ·Á¸é _nameÀÌ ÇÊ¿äÇÕ´Ï´Ù"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io ¹öÆÛ´Â ¼³Á¤ÇÏ·Á¸é in_buf³ª in_nameÀÌ ÇÊ¿äÇÕ´Ï´Ù"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: ¹öÆÛ°¡ ·ÎµùµÇ¾î¾ß ÇÕ´Ï´Ù: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: ÆÄÀÏÀÌ ¸ð¸£´Â ¹æ¹ýÀ¸·Î ¾ÏȣȭµÇ¾î ÀÖ½À´Ï´Ù"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "°æ°í: ¾àÇÑ ¾ÏÈ£ ¹æ½ÄÀ» »ç¿ëÁß; :help 'cm'À» È®ÀÎÇϼ¼¿ä"
+
+msgid "Enter encryption key: "
+msgstr "¾ÏÈ£ Ű ÀÔ·Â: "
+
+msgid "Enter same key again: "
+msgstr "°°Àº ۸¦ ´Ù½Ã ÀÔ·Â: "
+
+msgid "Keys don't match!"
+msgstr "۰¡ ¸ÂÁö ¾Ê½À´Ï´Ù!"
+
+msgid "[crypted]"
+msgstr "[¾Ïȣȭ µÇ¾ú½À´Ï´Ù]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Dictionary¿¡ ÄÝ·Ð ´©¶ô: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Dictionary¿¡ Áߺ¹µÈ Ű: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Dictionary¿¡ ÄÞ¸¶ ´©¶ô: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Dictionary ³¡¿¡ '}' ´©¶ô: %s"
+
+msgid "extend() argument"
+msgstr "extend() ÀÎÀÚ"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: ۰¡ ÀÌ¹Ì Á¸ÀçÇÔ: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: ¹öÆÛ¸¦ %ld°³ ÀÌ»óÀº ºñ±³ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Àӽà ÆÄÀÏÀ» Àаųª ¾µ ¼ö ¾ø½À´Ï´Ù"
@@ -323,6 +422,9 @@
 msgid "Scanning tags."
 msgstr "ÅÂ±× Ã£´Â Áß."
 
+#~ msgid "match in file"
+#~ msgstr ""
+
 msgid " Adding"
 msgstr " ´õÇϱâ"
 
@@ -350,55 +452,17 @@
 msgid "match %d"
 msgstr "match %d"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ':let'¿¡ ¸ð¸£´Â ±ÛÀÚ"
 
 #, c-format
-msgid "E684: list index out of range: %ld"
-msgstr "E684: ¸ñ·Ï ¹øÈ£°¡ ¹üÀ§¸¦ ¹þ¾î³²: %ld"
-
-#, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Á¤ÀÇ ¾È µÈ º¯¼ö: %s"
 
 msgid "E111: Missing ']'"
 msgstr "E111: ']'ÀÌ ¾ø½À´Ï´Ù"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s ÀÎÀÚ´Â ListÀ̾î¾ß ÇÕ´Ï´Ù"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s ÀÎÀÚ´Â List ȤÀº Dictionary¿©¾ß ÇÕ´Ï´Ù"
-
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Dictionary¿¡ ºó ۸¦ ¾µ ¼ö ¾ø½À´Ï´Ù"
-
-msgid "E714: List required"
-msgstr "E714: List°¡ ÇÊ¿äÇÕ´Ï´Ù"
-
-msgid "E715: Dictionary required"
-msgstr "E715: Dictionary°¡ ÇÊ¿äÇÕ´Ï´Ù"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ÇÔ¼ö¿¡ ³Ê¹« ¸¹Àº ÀÎÀÚ ³Ñ±è: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Dictionary¿¡ ۰¡ ¾øÀ½: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ÇÔ¼ö %sÀÌ(°¡) ÀÌ¹Ì ÀÖ½À´Ï´Ù, ¹Ù²Ù·Á¸é !À» ´õÇϼ¼¿ä"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: ÀÌ¹Ì Dictionary Ç׸ñÀÌ ÀÖ½À´Ï´Ù"
-
-msgid "E718: Funcref required"
-msgstr "E718: Funcref°¡ ÇÊ¿äÇÕ´Ï´Ù"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Dictionary¿¡ [:]À» »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -407,13 +471,12 @@
 msgstr "E734: %s=¿¡ ´ëÇÑ À߸øµÈ º¯¼öÇü"
 
 #, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ¸ð¸£´Â ÇÔ¼ö: %s"
-
-#, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: ºñÁ¤»óÀûÀÎ º¯¼ö ¸í: %s"
 
+msgid "E806: using Float as a String"
+msgstr "E806: Float¸¦ StringÀ¸·Î »ç¿ë"
+
 msgid "E687: Less targets than List items"
 msgstr "E687: List Ç׸ñº¸´Ù ÀûÀº ´ë»ó"
 
@@ -446,13 +509,15 @@
 msgstr "E690: :for µÚ¿¡ \"in\"°¡ ¾ø½À´Ï´Ù"
 
 #, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: °ýÈ£ ¾øÀ½: %s"
-
-#, c-format
 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: Àá±Ý(ÇØÁ¦)Çϱ⿡ º¯¼ö°¡ ³Ê¹« ±íÀÌ ÁßøµÇ¾ú½À´Ï´Ù"
 
@@ -471,9 +536,6 @@
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Dictionary¿¡ ´ëÇÑ À߸øµÈ µ¿ÀÛ"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Funcref´Â Funcref¿Í¸¸ ºñ±³ÇÒ ¼ö ÀÖ½À´Ï´Ù"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Funcrefs¿¡ ´ëÇÑ À߸øµÈ µ¿ÀÛ"
 
@@ -486,6 +548,9 @@
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Funcref¸¦ »öÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Ư¼öÇÑ º¯¼ö´Â »öÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: ¿É¼Ç À̸§ ¾øÀ½: %s"
@@ -502,136 +567,12 @@
 msgid "E115: Missing quote: %s"
 msgstr "E115: µû¿ÈÇ¥ ¾øÀ½: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: List¿¡ ÄÞ¸¶ ´©¶ô: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: List ³¡¿¡ ']' ´©¶ô: %s"
-
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Dictionary¿¡ ÄÝ·Ð ´©¶ô: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Dictionary¿¡ Áߺ¹µÈ Ű: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Dictionary¿¡ ÄÞ¸¶ ´©¶ô: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Dictionary ³¡¿¡ '}' ´©¶ô: %s"
+#~ msgid "Not enough memory to set references, garbage collection aborted!"
+#~ msgstr ""
 
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: º¯¼ö°¡ Ç¥½ÃÇϱ⿡ ³Ê¹« ±íÀÌ ÁßøµÇ¾ú½À´Ï´Ù"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: ÇÔ¼ö %s¿¡ ³Ê¹« ¸¹Àº ÀÎÀÚ°¡ Àü´ÞµÇ¾ú½À´Ï´Ù"
-
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ÇÔ¼ö %s(À¸)·Î À߸øµÈ ÀÎÀÚ°¡ ³Ñ°ÜÁ³½À´Ï´Ù"
-
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ¸ð¸£´Â ÇÔ¼ö: %s"
-
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ÇÔ¼ö¿¡ ÀûÀº ÀÎÀÚ ³Ñ±è: %s"
-
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ½ºÅ©¸³Æ® ÄÜÅØ½ºÆ® ¹Û¿¡¼­ <SID> »ç¿ë: %s"
-
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Dictionary¾øÀÌ »çÀüÇÔ¼ö°¡ ºÒ·ÁÁü: %s"
-
-msgid "E808: Number or Float required"
-msgstr "E808: Number ȤÀº Float°¡ ÇÊ¿äÇÕ´Ï´Ù"
-
-msgid "E699: Too many arguments"
-msgstr "E699: ³Ê¹« ¸¹Àº ÀÎÀÚ"
-
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete()Àº ÀÔ·Â ¸ðµå¿¡¼­¸¸ »ç¿ëµÉ ¼ö ÀÖ½À´Ï´Ù"
-
-#.
-#. * Yes this is ugly, I don't particularly like it either.  But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all.  See below what 'ok' and 'ync' are used for.
-#.
-msgid "&Ok"
-msgstr "È®ÀÎ(&O)"
-
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: ۰¡ ÀÌ¹Ì Á¸ÀçÇÔ: %s"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ÁÙ: "
-
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: ¸ð¸£´Â ÇÔ¼ö: %s"
-
-msgid ""
-"&OK\n"
-"&Cancel"
-msgstr ""
-"È®ÀÎ(&O)\n"
-"Ãë¼Ò(&C)"
-
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore()°¡ inputsave()º¸´Ù ¸¹ÀÌ ºÒ·ÁÁ³½À´Ï´Ù"
-
-msgid "E786: Range not allowed"
-msgstr "E786: ¹üÀ§°¡ Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
-
-msgid "E701: Invalid type for len()"
-msgstr "E701: len()¿¡ À߸øµÈ Çü"
-
-msgid "E726: Stride is zero"
-msgstr "E726: Stride°¡ 0"
-
-msgid "E727: Start past end"
-msgstr "E727: ½ÃÀÛÀ§Ä¡°¡ ³¡À» Áö³ªÄ§"
-
-msgid "<empty>"
-msgstr "<ºñ¾îÀÖÀ½>"
-
-msgid "E240: No connection to Vim server"
-msgstr "E240: Vim ¼­¹ö¿¡ ¿¬°áµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
-
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s(À¸)·Î º¸³¾ ¼ö ¾ø½À´Ï´Ù"
-
-msgid "E277: Unable to read a server reply"
-msgstr "E277: ¼­¹öÀÇ ÀÀ´äÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
-
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: ³Ê¹« ¸¹Àº ½Éº¼¸¯ ¸µÅ© (¹Ýº¹¼øÈ¯?)"
-
-msgid "E258: Unable to send to client"
-msgstr "E258: Ŭ¶óÀÌ¾ðÆ®·Î º¸³¾ ¼ö ¾ø½À´Ï´Ù"
-
-msgid "E702: Sort compare function failed"
-msgstr "E702: Á¤·Ä ºñ±³ ±â´ÉÀÌ ½ÇÆÐÇß½À´Ï´Ù"
-
-msgid "(Invalid)"
-msgstr "(À߸øµÇ¾ú½À´Ï´Ù)"
-
-msgid "E677: Error writing temp file"
-msgstr "E677: Àӽà ÆÄÀÏ ¾²±â ¿¡·¯"
-
 msgid "E805: Using a Float as a Number"
 msgstr "E805: Float¸¦ Number·Î »ç¿ë"
 
@@ -644,6 +585,33 @@
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Dictionary¸¦ Number·Î »ç¿ë"
 
+msgid "E910: Using a Job as a Number"
+msgstr "E910: JobÀ» Number·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: ChannelÀ» Number·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Funcref¸¦ Float·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: StringÀ» Float·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: List¸¦ Float·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Dictionary¸¦ Float·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: Ư¼öÇÑ °ªÀ» Float·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: JobÀ» Float·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: ChannelÀ» Float·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: Funcref¸¦ StringÀ¸·Î »ç¿ë"
 
@@ -653,8 +621,12 @@
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Dictionary¸¦ StringÀ¸·Î »ç¿ë"
 
-msgid "E806: using Float as a String"
-msgstr "E806: Float¸¦ StringÀ¸·Î »ç¿ë"
+msgid "E908: using an invalid value as a String"
+msgstr "E908: À߸øµÈ °ªÀ» StringÀ¸·Î »ç¿ëÇϰí ÀÖ½À´Ï´Ù"
+
+#, c-format
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: º¯¼ö %s¸¦ »èÁ¦ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
@@ -665,14 +637,6 @@
 msgstr "E705: º¯¼ö¸íÀÌ ÀÌ¹Ì ÀÖ´Â ÇÔ¼ö¸í°ú Ãæµ¹: %s"
 
 #, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: º¯¼ö Çü ´Ù¸§: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: º¯¼ö %s¸¦ »èÁ¦ÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-#, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: °ªÀÌ Àá°ÜÀÖÀ½: %s"
 
@@ -686,70 +650,6 @@
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: º¹»çÇϱ⿡ º¯¼ö°¡ ³Ê¹« ±í°Ô ÁßøµÇ¾ú½À´Ï´Ù"
 
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Á¤ÀÇ ¾È µÈ ÇÔ¼ö: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '('°¡ ¾øÀ½: %s"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: À߸øµÈ ÀÎÀÚ: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunctionÀÌ ¾ø½À´Ï´Ù"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: ÇÔ¼ö¸íÀÌ º¯¼ö¸í°ú Ãæµ¹: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ÇÔ¼ö %sÀ»(¸¦) ´Ù½Ã Á¤ÀÇÇÒ ¼ö ¾ø½À´Ï´Ù: »ç¿ëÁßÀÔ´Ï´Ù"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: ÇÔ¼ö¸íÀÌ ½ºÅ©¸³Æ® ÆÄÀϸí°ú ´Ù¸§: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: ÇÔ¼ö À̸§ÀÌ ÇÊ¿äÇÕ´Ï´Ù"
-
-#, c-format
-msgid "E128: Function name must start with a capital or contain a colon: %s"
-msgstr "E128: ÇÔ¼ö À̸§Àº ´ë¹®ÀÚ·Î ½ÃÀÛÇϰųª ÄÝ·ÐÀ» Æ÷ÇÔÇØ¾ß ÇÔ: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: ÇÔ¼ö %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: »ç¿ëÁßÀÔ´Ï´Ù"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: ÇÔ¼ö¸¦ ºÎ¸¥ ±íÀ̰¡ 'maxfuncdepth'º¸´Ù Å®´Ï´Ù"
-
-#, c-format
-msgid "calling %s"
-msgstr "%s ºÎ¸£´Â Áß"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%sÀÌ(°¡) ÁßÁöµÇ¾ú½À´Ï´Ù"
-
-#, c-format
-msgid "%s returning #%ld"
-msgstr "%sÀÌ(°¡) #%ldÀ»(¸¦) µ¹·ÁÁÖ¾ú½À´Ï´Ù"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%sÀÌ(°¡) %sÀ»(¸¦) µ¹·ÁÁÖ¾ú½À´Ï´Ù"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s¿¡¼­ °è¼Ó"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :returnÀÌ ÇÔ¼ö ¾È¿¡ ÀÖÁö ¾Ê½À´Ï´Ù"
-
 msgid ""
 "\n"
 "# global variables:\n"
@@ -764,8 +664,137 @@
 "\n"
 "\tLast set from "
 
-msgid "No old files"
-msgstr "old ÆÄÀÏÀÌ ¾ø½À´Ï´Ù"
+msgid "map() argument"
+msgstr "map() ÀÎÀÚ"
+
+msgid "filter() argument"
+msgstr "filter() ÀÎÀÚ"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s ÀÎÀÚ´Â ListÀ̾î¾ß ÇÕ´Ï´Ù"
+
+msgid "E928: String required"
+msgstr "E928: StringÀÌ ÇÊ¿äÇÕ´Ï´Ù"
+
+msgid "E808: Number or Float required"
+msgstr "E808: Number ȤÀº Float°¡ ÇÊ¿äÇÕ´Ï´Ù"
+
+msgid "add() argument"
+msgstr "add() ÀÎÀÚ"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete()Àº ÀÔ·Â ¸ðµå¿¡¼­¸¸ »ç¿ëµÉ ¼ö ÀÖ½À´Ï´Ù"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "È®ÀÎ(&O)"
+
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: ¸ð¸£´Â ÇÔ¼ö: %s"
+
+msgid "E922: expected a dict"
+msgstr "E922: dict°¡ ¿ä±¸µË´Ï´Ù"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function()ÀÇ µÎ¹øÂ° ÀÎÀÚ´Â list³ª dictÀ̾î¾ß ÇÕ´Ï´Ù"
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"È®ÀÎ(&O)\n"
+"Ãë¼Ò(&C)"
+
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore()°¡ inputsave()º¸´Ù ¸¹ÀÌ ºÒ·ÁÁ³½À´Ï´Ù"
+
+msgid "insert() argument"
+msgstr "insert() ÀÎÀÚ"
+
+msgid "E786: Range not allowed"
+msgstr "E786: ¹üÀ§°¡ Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
+
+msgid "E916: not a valid job"
+msgstr "E916: Á¤»óÀûÀÎ jobÀÌ ¾Æ´Õ´Ï´Ù"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len()¿¡ À߸øµÈ Çü"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID°¡ \":match\"¶§¹®¿¡ ¿¹¾àµÊ: %ld"
+
+msgid "E726: Stride is zero"
+msgstr "E726: Stride°¡ 0"
+
+msgid "E727: Start past end"
+msgstr "E727: ½ÃÀÛÀ§Ä¡°¡ ³¡À» Áö³ªÄ§"
+
+msgid "<empty>"
+msgstr "<ºñ¾îÀÖÀ½>"
+
+msgid "E240: No connection to the X server"
+msgstr "E240: X ¼­¹ö¿¡ ¿¬°áµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+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() ÀÎÀÚ"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ³Ê¹« ¸¹Àº ½Éº¼¸¯ ¸µÅ© (¹Ýº¹¼øÈ¯?)"
+
+msgid "reverse() argument"
+msgstr "reverse() ÀÎÀÚ"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: Ŭ¶óÀÌ¾ðÆ®·Î º¸³¾ ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: ºñÁ¤»óÀûÀÎ µ¿ÀÛ: '%s'"
+
+msgid "sort() argument"
+msgstr "sort() ÀÎÀÚ"
+
+msgid "uniq() argument"
+msgstr "uniq() ÀÎÀÚ"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: Á¤·Ä ºñ±³ ±â´ÉÀÌ ½ÇÆÐÇß½À´Ï´Ù"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq ºñ±³ ÇÔ¼ö°¡ ½ÇÆÐÇÏ¿´½À´Ï´Ù"
+
+msgid "(Invalid)"
+msgstr "(ºñÁ¤»ó)"
+
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: ºñÁ¤»óÀûÀÎ submatch number: %d"
+
+msgid "E677: Error writing temp file"
+msgstr "E677: Àӽà ÆÄÀÏ ¾²±â ¿¡·¯"
+
+msgid "E921: Invalid callback argument"
+msgstr "E921: ºñÁ¤»óÀûÀÎ Äݹé ÀÎÀÚ"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -828,6 +857,10 @@
 msgstr "E137: Viminfo ÆÄÀÏÀÇ ¾²±â ±ÇÇÑÀÌ ¾ø½À´Ï´Ù: %s"
 
 #, 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À»(¸¦) ¾µ ¼ö ¾ø½À´Ï´Ù!"
 
@@ -835,6 +868,10 @@
 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:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
@@ -853,6 +890,11 @@
 msgid "Illegal starting char"
 msgstr "ÀÌ»óÇÑ ½ÃÀÛ ±ÛÀÚ"
 
+#~ msgid ""
+#~ "\n"
+#~ "# Bar lines, copied verbatim:\n"
+#~ msgstr ""
+
 msgid "Save As"
 msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå"
 
@@ -947,8 +989,9 @@
 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¿¡¼­ Á¤±ÔÇ¥Çö½ÄÀÌ ºüÁ³½À´Ï´Ù"
@@ -957,6 +1000,10 @@
 msgid "Pattern found in every line: %s"
 msgstr "¿©·¯ ÁÙ¿¡¼­ ÆÐÅÏÀ» ã¾Ò½À´Ï´Ù: %s"
 
+#, c-format
+msgid "Pattern not found: %s"
+msgstr "ÆÐÅÏÀ» ãÀ» ¼ö ¾øÀ½: %s"
+
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -982,8 +1029,8 @@
 msgstr "¹Ì¾ÈÇÕ´Ï´Ù, µµ¿ò¸» ÆÄÀÏ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: µð·ºÅ丮°¡ ¾Æ´Ô: %s"
+msgid "E151: No match: %s"
+msgstr "E151: ¸ÂÁö ¾ÊÀ½: %s"
 
 #, c-format
 msgid "E152: Cannot open %s for writing"
@@ -1002,6 +1049,10 @@
 msgstr "E154: \"%s\" űװ¡ %s/%s ÆÄÀÏ¿¡¼­ Áߺ¹µÇ¾ú½À´Ï´Ù"
 
 #, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: µð·ºÅ丮°¡ ¾Æ´Ô: %s"
+
+#, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ¸ð¸£´Â sign ¸í·É: %s"
 
@@ -1026,10 +1077,17 @@
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: À߸øµÈ ¹öÆÛ À̸§: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: À̸§¾ø´Â ¹öÆÛ·Î´Â Á¡ÇÁÇÒ ¼ö ¾ø½À´Ï´Ù"
+
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: À߸øµÈ sign ID: %ld"
 
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: sign %sÀ»(¸¦) ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
+
 msgid " (NOT FOUND)"
 msgstr " (¸ø ã¾ÒÀ½)"
 
@@ -1039,6 +1097,9 @@
 msgid "[Deleted]"
 msgstr "[Áö¿öÁ³½À´Ï´Ù]"
 
+msgid "No old files"
+msgstr "old ÆÄÀÏÀÌ ¾ø½À´Ï´Ù"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "µð¹ö±× »óÅ·Πµé¾î°¨.  °è¼ÓÇÏ·Á¸é \"cont\"¸¦ ÀÔ·ÂÇϽʽÿÀ."
 
@@ -1050,6 +1111,13 @@
 msgid "cmd: %s"
 msgstr "¸í·É: %s"
 
+msgid "frame is zero"
+msgstr "ÇÁ·¹ÀÓÀÌ 0"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "ÇÁ·¹ÀÓÀÌ °¡Àå ³ôÀº ´Ü°èÀÓ: %d"
+
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "ÁßÁöÁ¡: \"%s%s\" %ld ÁÙ"
@@ -1104,8 +1172,16 @@
 msgstr "\"%s\"À»(¸¦) ã´Â Áß"
 
 #, 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"
 
 msgid "Source Vim script"
 msgstr "ºö ½ºÅ©¸³Æ® ·Îµå"
@@ -1134,8 +1210,12 @@
 msgid "finished sourcing %s"
 msgstr "%s ºÒ·¯µéÀ̱⠳¡"
 
-#~ msgid "modeline"
-#~ msgstr ""
+#, c-format
+msgid "continuing in %s"
+msgstr "%s¿¡¼­ °è¼Ó"
+
+msgid "modeline"
+msgstr "modeline"
 
 msgid "--cmd argument"
 msgstr "--cmd ÀÎÀÚ"
@@ -1200,6 +1280,9 @@
 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: ¹Ì¾ÈÇÕ´Ï´Ù, ±× ¸í·ÉÀº ÇöÀç ÆÇ¿¡¼­ »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -1225,10 +1308,10 @@
 
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    À̸§        ÀÎÀÚ ¹üÀ§  ¿Ï¼º      Á¤ÀÇ"
+"    À̸§        ÀÎÀÚ       ÁÖ¼Ò      ¿Ï¼º      Á¤ÀÇ"
 
 msgid "No user-defined commands found"
 msgstr "»ç¿ëÀÚ Á¤ÀÇ ¸í·ÉÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù"
@@ -1248,6 +1331,9 @@
 msgid "E179: argument required for -complete"
 msgstr "E179: -complete¿¡ ÀÎÀÚ°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr¿¡ ÀÎÀÚ°¡ ÇÊ¿äÇÕ´Ï´Ù"
+
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: À߸øµÈ ¼Ó¼º: %s"
@@ -1266,6 +1352,10 @@
 msgstr "E184: ±×·± »ç¿ëÀÚ Á¤ÀÇ ¸í·É ¾øÀ½: %s"
 
 #, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: À߸øµÈ ÁÖ¼Ò Çü½Ä °ª: %s"
+
+#, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: À߸øµÈ ³¡³»±â °ª: %s"
 
@@ -1279,7 +1369,7 @@
 msgstr "¸ð¸§"
 
 #, c-format
-msgid "E185: Cannot find color scheme %s"
+msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: »ö ½ºÅ´ %sÀ»(¸¦) ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
 msgid "Greetings, Vim user!"
@@ -1326,6 +1416,9 @@
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos¿¡´Â µÎ°³ÀÇ ÀÎÀÚ°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() ³»¿¡¼­ :redirÀ» »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
+
 msgid "Save Redirection"
 msgstr "¸®µð·º¼Ç ÀúÀå"
 
@@ -1522,7 +1615,7 @@
 "# %s È÷½ºÅ丮 (»õ°ÍºÎÅÍ ¿À·¡µÈ °Í ¼ø):\n"
 
 msgid "Command Line"
-msgstr "¸í·É ÁÙ"
+msgstr "¸í·É Çà"
 
 msgid "Search String"
 msgstr "ãÀ» ¹®ÀÚ¿­"
@@ -1531,7 +1624,10 @@
 msgstr "Ç¥Çö"
 
 msgid "Input Line"
-msgstr "ÀÔ·Â ÁÙ"
+msgstr "ÀÔ·Â Çà"
+
+msgid "Debug Line"
+msgstr "µð¹ö±× Çà"
 
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar°¡ ¸í·É ±æÀ̸¦ ¹þ¾î³µ½À´Ï´Ù"
@@ -1594,9 +1690,6 @@
 #~ msgid "[character special]"
 #~ msgstr ""
 
-msgid "[RO]"
-msgstr "[Àбâ Àü¿ë]"
-
 msgid "[CR missing]"
 msgstr "[CR ¾øÀ½]"
 
@@ -1609,9 +1702,6 @@
 msgid "[converted]"
 msgstr "[º¯È¯ µÇ¾ú½À´Ï´Ù]"
 
-msgid "[crypted]"
-msgstr "[¾Ïȣȭ µÇ¾ú½À´Ï´Ù]"
-
 #, c-format
 msgid "[CONVERSION ERROR in line %ld]"
 msgstr "[%ld ÁÙ¿¡¼­ º¯È¯ ¿¡·¯]"
@@ -1632,9 +1722,6 @@
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert'ÀÇ Ãâ·Â°á°ú¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-msgid "E821: File is encrypted with unknown method"
-msgstr "E821: ÆÄÀÏÀÌ ¸ð¸£´Â ¹æ¹ýÀ¸·Î ¾ÏȣȭµÇ¾î ÀÖ½À´Ï´Ù"
-
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: acwrite ¹öÆÛ¿¡ ´ëÇÑ autocommand¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
@@ -1783,11 +1870,6 @@
 msgid "%lld characters"
 msgstr "%lld ±ÛÀÚ"
 
-#. Explicit typecast avoids warning on Mac OS X 10.6
-#, c-format
-msgid "%ld characters"
-msgstr "%ld ±ÛÀÚ"
-
 msgid "[noeol]"
 msgstr "[noeol]"
 
@@ -1880,6 +1962,12 @@
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ÀÌ·± ±×·ì ¾øÀ½: \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: ÇöÀç ±×·ìÀ» »èÁ¦ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: »ç¿ëÁßÀÎ augroupÀ» »èÁ¦ÇÏ·Á°í ÇÕ´Ï´Ù"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * µÚ¿¡ ÀÌ»óÇÑ ±ÛÀÚ: %s"
@@ -1940,10 +2028,6 @@
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: ÇöÀçÀÇ 'foldmethod'À¸·Î Á¢±â¸¦ Áö¿ï ¼ö ¾ø½À´Ï´Ù"
 
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld ÁÙ Á¢Èû "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: ÀÐÇôÁø ¹öÆÛ¿¡ ´õÇϱâ"
 
@@ -1975,6 +2059,12 @@
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: ÀÌ»óÇÑ »óÅÂ"
 
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: »õ·Î¿î GUI ÇÁ·Î¼¼½º¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: ÀÚ½Ä ÇÁ·Î¼¼½º°¡ GUI¸¦ ½ÃÀÛÇÏÁö ¸øÇß½À´Ï´Ù"
+
 msgid "E229: Cannot start the GUI"
 msgstr "E229: GUI¸¦ ½ÃÀÛÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -2029,6 +2119,18 @@
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ¸Þ½ÃÁö¿Í ÄÝ¹é ¸ðµÎ¸¦ »ç¿ëÇØ¼­´Â BalloonEvalÀ» ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
+msgid "_Cancel"
+msgstr "Ãë¼Ò(_C)"
+
+msgid "_Save"
+msgstr "ÀúÀå(_S)"
+
+msgid "_Open"
+msgstr "¿­±â(_O)"
+
+msgid "_OK"
+msgstr "È®ÀÎ(_O)"
+
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2038,6 +2140,12 @@
 "¾Æ´Ï¿À(&N)\n"
 "Ãë¼Ò(&C)"
 
+msgid "Yes"
+msgstr "¿¹"
+
+msgid "No"
+msgstr "¾Æ´Ï¿À"
+
 msgid "Input _Methods"
 msgstr "ÀÔ·Â ¹æ¹ý(_M)"
 
@@ -2071,23 +2179,23 @@
 msgid "Down"
 msgstr "¾Æ·¡·Î"
 
-#. 'Find Next' button
 msgid "Find Next"
 msgstr "´ÙÀ½ ã±â"
 
-#. 'Replace' button
 msgid "Replace"
 msgstr "¹Ù²Ù±â"
 
-#. 'Replace All' button
 msgid "Replace All"
 msgstr "¸ðµÎ ¹Ù²Ù±â"
 
+msgid "_Close"
+msgstr "´Ý±â(_C)"
+
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "ºö: ¼¼¼Ç °ü¸®ÀڷκÎÅÍ \"die\" ¿äûÀ» ¹Þ¾Ò½À´Ï´Ù\n"
 
-msgid "Close"
-msgstr "´Ý±â"
+msgid "Close tab"
+msgstr "ÅÇ ´Ý±â"
 
 msgid "New tab"
 msgstr "»õ ÅÇ"
@@ -2134,20 +2242,6 @@
 msgid "&Undo"
 msgstr "Ãë¼Ò(&U)"
 
-#, c-format
-msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: â Á¦¸ñ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø½À´Ï´Ù"
-
-#, c-format
-msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: Áö¿øµÇÁö ¾Ê´Â ÀÎÀÚ: \"-%s\": OLE ÆÇÀ» »ç¿ëÇϽʽÿÀ."
-
-msgid "E672: Unable to open window inside MDI application"
-msgstr "E672: MDI ÀÀ¿ëÇÁ·Î±×·¥ ¾È¿¡¼­ âÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
-
-msgid "Close tab"
-msgstr "ÅÇ ´Ý±â"
-
 msgid "Open tab..."
 msgstr "ÅÇ ¿­±â..."
 
@@ -2165,6 +2259,17 @@
 msgid "Directory\t*.nothing\n"
 msgstr "µð·ºÅ丮\t*.nothing\n"
 
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: â Á¦¸ñ \"%s\"À»(¸¦) ãÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: Áö¿øµÇÁö ¾Ê´Â ÀÎÀÚ: \"-%s\": OLE ÆÇÀ» »ç¿ëÇϽʽÿÀ."
+
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI ÀÀ¿ëÇÁ·Î±×·¥ ¾È¿¡¼­ âÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
+
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr ""
 "ºö E458: »ö»ó¸Ê ¿£Æ®¸®¸¦ ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù, ¸î¸î »öÀÌ À߸øµÉ ¼ö ÀÖ½À´Ï´Ù"
@@ -2182,32 +2287,28 @@
 msgstr "±Û²Ã '%s'Àº(´Â) °íÁ¤³ÐÀ̰¡ ¾Æ´Õ´Ï´Ù"
 
 #, c-format
-msgid "E253: Fontset name: %s\n"
-msgstr "E253: ±Û²Ã¼Â À̸§: %s\n"
+msgid "E253: Fontset name: %s"
+msgstr "E253: ±Û²Ã¼Â À̸§: %s"
 
 #, c-format
-msgid "Font0: %s\n"
-msgstr "±Û²Ã0: %s\n"
+msgid "Font0: %s"
+msgstr "±Û²Ã0: %s"
 
 #, c-format
-msgid "Font1: %s\n"
-msgstr "±Û²Ã1: %s\n"
+msgid "Font1: %s"
+msgstr "±Û²Ã1: %s"
 
 #, c-format
-msgid "Font%ld width is not twice that of font0\n"
-msgstr "±Û²Ã%ld ³Êºñ°¡ ±Û²Ã0ÀÇ µÎ¹è°¡ ¾Æ´Õ´Ï´Ù\n"
+msgid "Font%ld width is not twice that of font0"
+msgstr "±Û²Ã%ld ³Êºñ°¡ ±Û²Ã0ÀÇ µÎ¹è°¡ ¾Æ´Õ´Ï´Ù"
 
 #, c-format
-msgid "Font0 width: %ld\n"
-msgstr "±Û²Ã0 ³Êºñ: %ld\n"
+msgid "Font0 width: %ld"
+msgstr "±Û²Ã0 ³Êºñ: %ld"
 
 #, c-format
-msgid ""
-"Font1 width: %ld\n"
-"\n"
-msgstr ""
-"±Û²Ã1 ³Êºñ: %ld\n"
-"\n"
+msgid "Font1 width: %ld"
+msgstr "±Û²Ã1 ³Êºñ: %ld"
 
 #~ msgid "Invalid font specification"
 #~ msgstr ""
@@ -2395,6 +2496,9 @@
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope¸¦ forkÇÒ ¼ö ¾ø½À´Ï´Ù"
 
+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection setpgid°¡ ½ÇÆÐÇß½À´Ï´Ù"
+
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection ½ÇÇàÀÌ ½ÇÆÐÇß½À´Ï´Ù"
 
@@ -2427,6 +2531,7 @@
 
 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"
@@ -2437,13 +2542,14 @@
 "       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"
 
 #, c-format
@@ -2495,8 +2601,8 @@
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    µ¥ÀÌÅͺ£À̽º À̸§                   prepend path\n"
 
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr ""
+msgid "Lua library cannot be loaded."
+msgstr "Lua ¶óÀ̺귯¸®¸¦ ·ÎµùÇÒ ¼ö ¾ø½À´Ï´Ù."
 
 msgid "cannot save undo information"
 msgstr "undo Á¤º¸¸¦ ÀúÀåÇÒ ¼ö ¾ø½À´Ï´Ù"
@@ -2508,14 +2614,21 @@
 "E815: ¹Ì¾ÈÇÕ´Ï´Ù, ÀÌ ¸í·ÉÀº »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù, MzScheme ¶óÀ̺귯¸®¸¦ ·ÎµùÇÒ "
 "¼ö ¾ø½À´Ï´Ù."
 
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: ¹Ì¾ÈÇÕ´Ï´Ù, ÀÌ ¸í·ÉÀº »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù, MzSchemeÀÇ racket/base "
+"¸ðµâÀ» ·ÎµùÇÒ ¼ö ¾ø½À´Ï´Ù."
+
 msgid "invalid expression"
 msgstr "À߸øµÈ Ç¥Çö½Ä"
 
 msgid "expressions disabled at compile time"
 msgstr "Ç¥Çö½ÄÀ» Áö¿øÇÏÁö ¾Êµµ·Ï ÄÄÆÄÀÏ µÇ¾ú½À´Ï´Ù"
 
-#~ msgid "hidden option"
-#~ msgstr ""
+msgid "hidden option"
+msgstr "¼û±è ¿É¼Ç"
 
 msgid "unknown option"
 msgstr "¸ð¸£´Â ¿É¼Ç"
@@ -2538,6 +2651,9 @@
 msgid "string cannot contain newlines"
 msgstr "¹®ÀÚ¿­Àº newlineÀ» Æ÷ÇÔÇÒ ¼ö ¾ø½À´Ï´Ù"
 
+#~ msgid "error converting Scheme values to Vim"
+#~ msgstr ""
+
 msgid "Vim error: ~a"
 msgstr "Vim ¿¡·¯: ~a"
 
@@ -2566,27 +2682,21 @@
 "E263: ¹Ì¾ÈÇÕ´Ï´Ù, ÀÌ ¸í·ÉÀº »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù, ÆÄÀ̽㠶óÀ̺귯¸®¸¦ ·ÎµùÇÒ "
 "¼ö ¾ø½À´Ï´Ù."
 
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: ¹Ì¾ÈÇÕ´Ï´Ù, ÀÌ ¸í·ÉÀº »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù, ÆÄÀ̽ãÀÇ »çÀÌÆ® ¸ðµâÀ» "
+"·ÎµùÇÒ ¼ö ¾ø½À´Ï´Ù."
+
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: PythonÀ» Àç±ÍÈ£ÃâÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-msgid "can't delete OutputObject attributes"
-msgstr "OutputObject ¼Ó¼ºÀ» Áö¿ï ¼ö ¾ø½À´Ï´Ù"
-
-msgid "softspace must be an integer"
-msgstr "softspace´Â Á¤¼ö¿©¾ß¸¸ ÇÕ´Ï´Ù"
-
-msgid "invalid attribute"
-msgstr "À߸øµÈ ¼Ó¼º"
-
-#, c-format
-msgid "<buffer object (deleted) at %p>"
-msgstr "<%p¿¡ ¹öÆÛ °´Ã¼ (»èÁ¦µÊ)>"
-
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: ÀÌ VimÀº :pythonÀ» »ç¿ëÇÑ ÈÄ¿¡ :py3À» »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr ""
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_´Â String ÀνºÅϽºÀ̾î¾ß ÇÕ´Ï´Ù"
 
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
@@ -2616,95 +2726,6 @@
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ¸ð¸£´Â longjmp »óÅ %d"
 
-msgid "Toggle implementation/definition"
-msgstr "Åä±Û ±¸Çö/Á¤ÀÇ"
-
-msgid "Show base class of"
-msgstr "...ÀÇ ±âº» Ŭ·¡½º º¸¿©ÁÖ±â"
-
-#~ msgid "Show overridden member function"
-#~ msgstr ""
-
-#~ msgid "Retrieve from file"
-#~ msgstr ""
-
-#~ msgid "Retrieve from project"
-#~ msgstr ""
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr ""
-
-#~ msgid "Retrieve"
-#~ msgstr ""
-
-#~ msgid "Show source of"
-#~ msgstr ""
-
-#~ msgid "Find symbol"
-#~ msgstr ""
-
-#~ msgid "Browse class"
-#~ msgstr ""
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr ""
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr ""
-
-#~ msgid "Xref refers to"
-#~ msgstr ""
-
-#~ msgid "Xref referred by"
-#~ msgstr ""
-
-#~ msgid "Xref has a"
-#~ msgstr ""
-
-#~ msgid "Xref used by"
-#~ msgstr ""
-
-#~ msgid "Show docu of"
-#~ msgstr ""
-
-#~ msgid "Generate docu for"
-#~ msgstr ""
-
-msgid ""
-"Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-"$PATH).\n"
-msgstr ""
-"SNiFF+·Î ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù. ȯ°æÀ» È®ÀÎÇϽʽÿÀ (sniffemacs°¡ $PATH¿¡¼­ ã¾Æ"
-"Á®¾ß ÇÕ´Ï´Ù).\n"
-
-msgid "E274: Sniff: Error during read. Disconnected"
-msgstr "E274: Sniff: Àд Áß ¿¡·¯. ²÷±è"
-
-msgid "SNiFF+ is currently "
-msgstr "SNiFF+ is currently "
-
-msgid "not "
-msgstr "not "
-
-msgid "connected"
-msgstr "connected"
-
-#, c-format
-msgid "E275: Unknown SNiFF+ request: %s"
-msgstr "E275: ¸ð¸£´Â SNiFF+ ¿äû: %s"
-
-msgid "E276: Error connecting to SNiFF+"
-msgstr "E276: SNiFF+¿¡ ¿¬°á ¿¡·¯"
-
-msgid "E278: SNiFF+ not connected"
-msgstr "E278: SniFF+°¡ ¿¬°áµÇÁö ¾Ê¾Ò½À´Ï´Ù"
-
-msgid "E279: Not a SNiFF+ buffer"
-msgstr "E279: SniFF+ ¹öÆÛ°¡ ¾Æ´Õ´Ï´Ù"
-
-msgid "Sniff: Error during write. Disconnected"
-msgstr "Sniff: ¾²´Â µµÁß ¿¡·¯. ²÷°å½À´Ï´Ù"
-
 msgid "invalid buffer number"
 msgstr "À߸øµÈ ¹öÆÛ ¹øÈ£"
 
@@ -2767,12 +2788,6 @@
 "E571: ¹Ì¾ÈÇÕ´Ï´Ù, ÀÌ ¸í·ÉÀº »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù, Tcl ¶óÀ̺귯¸®¸¦ ·ÎµùÇÒ ¼ö ¾ø"
 "½À´Ï´Ù."
 
-msgid ""
-"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr ""
-"E281: TCL ¿¡·¯: ³¡³»±â Äڵ尡 Á¤¼ö°¡ ¾Æ´Ñ°¡!? ÀÌ ¹®Á¦¸¦ vim-dev@vim.org·Î ¾Ë"
-"·ÁÁֽʽÿÀ"
-
 #, c-format
 msgid "E572: exit code %d"
 msgstr "E572: Á¾·á ÄÚµå %d"
@@ -2793,6 +2808,18 @@
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: ºö ÀνºÅϽº ·¹Áö½ºÆ®¸® ¼Ó¼ºÀÌ À߸øµÇ¾î ÀÖ½À´Ï´Ù. Áö¿ü½À´Ï´Ù!"
 
+#, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: JSON¿¡ Áߺ¹µÈ Ű: \"%s\""
+
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: List¿¡ ÄÞ¸¶ ´©¶ô: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: List ³¡¿¡ ']' ´©¶ô: %s"
+
 msgid "Unknown option argument"
 msgstr "¸ð¸£´Â ¿É¼Ç ÀÎÀÚ"
 
@@ -2818,12 +2845,12 @@
 msgid "netbeans is not supported with this GUI\n"
 msgstr "ÀÌ GUI´Â netbeans¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù\n"
 
-msgid "This Vim was not compiled with the diff feature."
-msgstr "ÀÌ ºöÀº diff ±â´É ¾øÀÌ ÄÄÆÄÀÏ µÇ¾ú½À´Ï´Ù."
-
 msgid "'-nb' cannot be used: not enabled at compile time\n"
 msgstr "'-nb'´Â »ç¿ëÇÒ ¼ö ¾øÀ½: ÄÄÆÄÀÏÇÒ ¶§ Æ÷ÇÔµÇÁö ¾ÊÀ½\n"
 
+msgid "This Vim was not compiled with the diff feature."
+msgstr "ÀÌ ºöÀº diff ±â´É ¾øÀÌ ÄÄÆÄÀÏ µÇ¾ú½À´Ï´Ù."
+
 msgid "Attempt to open script file again: \""
 msgstr "½ºÅ©¸³Æ® ÆÄÀÏÀ» ´Ù½Ã ¿­·Á°í ½Ãµµ: \""
 
@@ -2836,6 +2863,9 @@
 msgid "Vim: Error: Failure to start gvim from NetBeans\n"
 msgstr "Vim: ¿¡·¯: NetBeans¿¡¼­ gvim ½ÃÀÛ ½ÇÆÐ\n"
 
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: ¿¡·¯: ÀÌ ¹öÁ¯ÀÇ ºöÀº Cygwin Å͹̳ο¡¼­ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "ºö: °æ°í: Å͹̳ηΠÃâ·ÂÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
@@ -2921,25 +2951,28 @@
 msgstr "-f ȤÀº --nofork\tÆ÷±×¶ó¿îµå: GUI·Î ½ÃÀÛÇÒ ¶§ forkÇÏÁö ¸» °Í"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tVi »óÅ (\"vi\"¿Í °°À½)"
+msgstr "-v\t\t\tVi ¸ðµå (\"vi\"¿Í °°À½)"
 
 msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx »óÅ (\"ex\"¿Í °°À½)"
+msgstr "-e\t\t\tEx ¸ðµå (\"ex\"¿Í °°À½)"
+
+msgid "-E\t\t\tImproved Ex mode"
+msgstr "-E\t\t\tÇâ»óµÈ Ex ¸ðµå"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\tÁ¶¿ëÇÑ (¹èÄ¡) »óÅ (\"ex\"¸¸)"
+msgstr "-s\t\t\tÁ¶¿ëÇÑ (¹èÄ¡) ¸ðµå (\"ex\"¸¸)"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff »óÅ (\"vimdiff\"¿Í °°À½)"
+msgstr "-d\t\t\tDiff ¸ðµå (\"vimdiff\"¿Í °°À½)"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t½¬¿î »óÅ (\"evim\"°ú °°À½, modeless)"
+msgstr "-y\t\t\t½¬¿î ¸ðµå (\"evim\"°ú °°À½, modeless)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tÀбâ Àü¿ë »óÅ (\"view\"¿Í °°À½)"
+msgstr "-R\t\t\tÀбâ Àü¿ë ¸ðµå (\"view\"¿Í °°À½)"
 
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\tÁ¦ÇÑµÈ »óÅ (\"rvim\"°ú °°À½)"
+msgstr "-Z\t\t\tÁ¦ÇÑµÈ ¸ðµå (\"rvim\"°ú °°À½)"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t¼öÁ¤(ÆÄÀÏ ¾²±â)ÀÌ Çã¿ëµÇÁö ¾ÊÀ½"
@@ -2959,11 +2992,11 @@
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi¿Í ȣȯµÇÁö ¾ÊÀ½: 'nocompatible'"
 
-#~ msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-#~ msgstr ""
+msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
+msgstr "-V[N][fname]\t\tBe verbose [level N] [fname¿¡ ¸Þ½ÃÁö ÀúÀå]"
 
 msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\tµð¹ö±ë »óÅÂ"
+msgstr "-D\t\t\tµð¹ö±ë ¸ðµå"
 
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t½º¿Ò ÆÄÀÏ ¾øÀÌ ¸Þ¸ð¸®¸¸ »ç¿ë"
@@ -2995,6 +3028,12 @@
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 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>¸¦ »ç¿ë"
 
@@ -3155,19 +3194,6 @@
 
 msgid ""
 "\n"
-"Arguments recognised by gvim (RISC OS version):\n"
-msgstr ""
-"\n"
-"gvimÀÌ ¾Ë°íÀÖ´Â ÀÎÀÚ (RISC OS ÆÇ):\n"
-
-msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <¼ýÀÚ>\tÄ­¿¡¼­ â Ãʱ⠳ʺñ"
-
-msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <¼ýÀÚ>\tÁÙ¿¡¼­ â Ãʱ⠳ôÀÌ"
-
-msgid ""
-"\n"
 "Arguments recognised by gvim (GTK+ version):\n"
 msgstr ""
 "\n"
@@ -3182,6 +3208,9 @@
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\tºöÀ» ´Ù¸¥ GTK À§Á¬ ¾È¿¡¼­ ¿­À½"
 
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tÇ¥ÁØÃâ·Â¿¡ gvimÀÇ Window ID¸¦ Ç¥½Ã"
+
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <parent title>\tVimÀ» ºÎ¸ð ÀÀ¿ë ÇÁ·Î±×·¥ ³»¿¡¼­ ¿­±â"
 
@@ -3373,8 +3402,7 @@
 #, c-format
 msgid ""
 "E833: %s is encrypted and this version of Vim does not support encryption"
-msgstr ""
-"E833: %sÀÌ(°¡) ¾ÏȣȭµÇ¾î ÀÖ´Â µ¥, ÀÌ VimÀº ¾Ïȣȭ¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
+msgstr "E833: %sÀÌ(°¡) ¾ÏȣȭµÇ¾î ÀÖ´Â µ¥, ÀÌ VimÀº ¾Ïȣȭ¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
 #~ msgid " has been damaged (page size is smaller than minimum value).\n"
 #~ msgstr ""
@@ -3666,24 +3694,17 @@
 #. * other languages.
 msgid ""
 "\n"
-"(1) Another program may be editing the same file.\n"
-"    If this is the case, be careful not to end up with two\n"
-"    different instances of the same file when making changes.\n"
+"(1) Another program may be editing the same file.  If this is the case,\n"
+"    be careful not to end up with two different instances of the same\n"
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) ´Ù¸¥ ÇÁ·Î±×·¥ÀÌ °°Àº ÆÄÀÏÀ» °íÄ¡°í ÀÖ´ÂÁßÀÏ ¼ö ÀÖ½À´Ï´Ù.\n"
-"    ¸¸¾à ±×·¸´Ù¸é °°Àº ÆÄÀÏÀ» µÎ °³ÀÇ ÇÁ·Î±×·¥¿¡¼­ °íÄ¡Áö\n"
-"    ¾Êµµ·Ï Á¶½ÉÇϽñ⠹ٶø´Ï´Ù.\n"
+"    ¸¸¾à ±×·¸´Ù¸é °°Àº ÆÄÀÏÀ» µÎ °³ÀÇ ÇÁ·Î±×·¥¿¡¼­ °íÄ¡Áö ¾Êµµ·Ï\n"
+"    Á¶½ÉÇϽñ⠹ٶø´Ï´Ù. Á¾·áÇϼ¼¿ä. °è¼ÓÇϽ÷Á¸é ÁÖÀÇÇϼ¼¿ä.\n"
 
-msgid "    Quit, or continue with caution.\n"
-msgstr "    ³¡³»°Å³ª À§ÇèÀ» °¨¼öÇϽ÷Á¸é °è¼ÓÇϽʽÿÀ.\n"
-
-msgid ""
-"\n"
-"(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) ÆÄÀÏÀ» °íÄ¡´Ù°¡ Á×¾ú¾ú½À´Ï´Ù.\n"
+msgid "(2) An edit session for this file crashed.\n"
+msgstr "(2) ÀÌ ÆÄÀÏÀ» °íÄ¡´Ù°¡ Á×¾ú¾ú½À´Ï´Ù.\n"
 
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    ¸¸¾à ±×·¸´Ù¸é \":recover\" ȤÀº \"vim -r "
@@ -3905,13 +3926,6 @@
 msgid "Beep!"
 msgstr "Ȉ!"
 
-msgid "Vim: preserving files...\n"
-msgstr "ºö: ÆÄÀÏ º¸Á¸Áß...\n"
-
-#. close all memfiles, without deleting
-msgid "Vim: Finished.\n"
-msgstr "ºö: ²ø³µ½À´Ï´Ù.\n"
-
 msgid "ERROR: "
 msgstr "¿¡·¯: "
 
@@ -3957,14 +3971,8 @@
 msgid "E549: Illegal percentage"
 msgstr "E549: ÀÌ»óÇÑ ¹éºÐÀ²"
 
-msgid "Enter encryption key: "
-msgstr "¾ÏÈ£ Ű ÀÔ·Â: "
-
-msgid "Enter same key again: "
-msgstr "°°Àº ۸¦ ´Ù½Ã ÀÔ·Â: "
-
-msgid "Keys don't match!"
-msgstr "۰¡ ¸ÂÁö ¾Ê½À´Ï´Ù!"
+#~ msgid "E854: path too long for completion"
+#~ msgstr ""
 
 #, c-format
 msgid ""
@@ -3990,19 +3998,10 @@
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: path¿¡¼­ ´õ ÀÌ»óÀÇ \"%s\" ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
-msgid "Cannot connect to Netbeans #2"
-msgstr "Netbeans #2¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
-
-msgid "Cannot connect to Netbeans"
-msgstr "Netbeans¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
-
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr "E668: NetBeans ¿¬°á Á¤º¸ ÆÄÀÏÀÌ Á¢±Ù ¸ðµå°¡ À߸øµÊ: \"%s\""
 
-msgid "read from Netbeans socket"
-msgstr "Netbeans ¼ÒÄÏ¿¡¼­ Àбâ"
-
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: ¹öÆÛ %ld¿¡ ´ëÇÑ NetBeans ¿¬°áÀ» ÀÒ¾î¹ö·È½À´Ï´Ù"
@@ -4013,8 +4012,9 @@
 msgid "E511: netbeans already connected"
 msgstr "E511: netbeans°¡ ÀÌ¹Ì ¿¬°áµÇ¾î ÀÖ½À´Ï´Ù"
 
-msgid "E505: "
-msgstr "E505: "
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %sÀº(´Â) Àбâ Àü¿ëÀÔ´Ï´Ù (µ¤¾î¾²·Á¸é ! ´õÇϱâ)"
 
 msgid "E349: No identifier under cursor"
 msgstr "E349: Ä¿¼­ ¹Ø¿¡ ½Äº°ÀÚ°¡ ¾ø½À´Ï´Ù"
@@ -4043,8 +4043,8 @@
 #~ msgid "E663: At end of changelist"
 #~ msgstr ""
 
-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 ":qa! ÀÔ·Â ÈÄ¿¡ <¿£ÅÍ> ۸¦ ´©¸£½Ã¸é ¼öÁ¤À» Ãë¼ÒÇÏ°í ºöÀ» Á¾·áÇÕ´Ï´Ù"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4131,37 +4131,38 @@
 msgid "E574: Unknown register type %d"
 msgstr "E574: ¸ð¸£´Â ·¹Áö½ºÅÍ Çü½Ä %d"
 
+#~ msgid ""
+#~ "E883: search pattern and expression register may not contain two or more "
+#~ "lines"
+#~ msgstr ""
+
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld ¿­; "
 
 #, c-format
-msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
-msgstr "Selected %s%ld of %ld ¶óÀÎ; %ld of %ld ´Ü¾î; %ld of %ld ¹ÙÀÌÆ®"
+#~ msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+#~ msgstr ""
 
 #, c-format
-msgid ""
-"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
-"Bytes"
-msgstr ""
-"Selected %s%ld of %ld ¶óÀÎ; %ld of %ld ´Ü¾î; %ld of %ld ¹®ÀÚ; %ld of %ld ¹ÙÀÌ"
-"Ʈ"
+#~ msgid ""
+#~ "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+#~ "%lld Bytes"
+#~ msgstr ""
 
 #, c-format
-msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
-msgstr "Col %s of %s; ¶óÀÎ %ld of %ld; ´Ü¾î %ld of %ld; ¹ÙÀÌÆ® %ld of %ld"
+#~ msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+#~ msgstr ""
 
 #, c-format
-msgid ""
-"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
-"%ld"
-msgstr ""
-"Col %s of %s; ¶óÀÎ %ld of %ld; ´Ü¾î %ld of %ld; ¹®ÀÚ %ld of %ld; ¹ÙÀÌÆ® %ld "
-"of %ld"
+#~ msgid ""
+#~ "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+#~ "%lld of %lld"
+#~ msgstr ""
 
 #, c-format
-msgid "(+%ld for BOM)"
-msgstr "(+%ld for BOM)"
+#~ msgid "(+%ld for BOM)"
+#~ msgstr ""
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=ÆäÀÌÁö %N"
@@ -4178,6 +4179,9 @@
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: ¸ðµå¶óÀο¡¼­ »ç¿ëµÉ ¼ö ¾ø½À´Ï´Ù"
 
+msgid "E846: Key code not set"
+msgstr "E846: Ű Äڵ尡 ¼³Á¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
+
 msgid "E521: Number required after ="
 msgstr "E521: = µÚ¿¡ ¼ýÀÚ°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
@@ -4188,6 +4192,10 @@
 msgid "E539: Illegal character <%s>"
 msgstr "E539: ÀÌ»óÇÑ ±ÛÀÚ <%s>"
 
+#, c-format
+#~ msgid "For option %s"
+#~ msgstr ""
+
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term'À» ºó ¹®ÀÚ¿­·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -4381,9 +4389,6 @@
 msgid "Message"
 msgstr "¸Þ½ÃÁö"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns'ÀÌ 80ÀÌ ¾Æ´Ï¾î¼­, ¿ÜºÎ ¸í·ÉÀ» ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
-
 msgid "E237: Printer selection failed"
 msgstr "E237: ÇÁ¸°Å͸¦ °í¸£Áö ¸øÇß½À´Ï´Ù"
 
@@ -4408,20 +4413,13 @@
 msgstr "E244: À߸øµÈ ±ÛÀڼ À̸§ \"%s\"ÀÌ(°¡) ±Û²Ã À̸§ \"%s\"¿¡ ÀÖ½À´Ï´Ù"
 
 #, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: À߸øµÈ Ä÷·¯Æ¼ À̸§ \"%s\"ÀÌ(°¡) ±Û²Ã À̸§ \"%s\"¿¡ ÀÖ½À´Ï´Ù"
+
+#, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: À߸øµÈ ±ÛÀÚ '%c'ÀÌ(°¡) ±Û²Ã À̸§ \"%s\"¿¡ ÀÖ½À´Ï´Ù"
 
-msgid "Vim: Double signal, exiting\n"
-msgstr "ºö: °°Àº ½Ã±×³Î µÎ ¹ø, ³¡³À´Ï´Ù\n"
-
-#, c-format
-msgid "Vim: Caught deadly signal %s\n"
-msgstr "ºö: %s ½Ã±×³ÎÀ» Àâ¾Ò½À´Ï´Ù\n"
-
-#, c-format
-msgid "Vim: Caught deadly signal\n"
-msgstr "ºö: Á×À» ½Ã±×³ÎÀ» Àâ¾Ò½À´Ï´Ù\n"
-
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "X µð½ºÇ÷¹À̸¦ ¿©´Â µ¥ %ld msecÀÌ °É·È½À´Ï´Ù"
@@ -4453,12 +4451,13 @@
 "\n"
 "Could not set security context for "
 
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Cannot execute shell "
+#, c-format
+#~ msgid "Could not set security context %s for %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Could not get security context %s for %s. Removing it!"
+#~ msgstr ""
 
 msgid ""
 "\n"
@@ -4490,6 +4489,13 @@
 
 msgid ""
 "\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"Cannot execute shell "
+
+msgid ""
+"\n"
 "Command terminated\n"
 msgstr ""
 "\n"
@@ -4531,10 +4537,6 @@
 msgstr "ÇÔ¼ö Æ÷ÀÎÅ͸¦ DLL·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù!"
 
 #, c-format
-msgid "shell returned %d"
-msgstr "½©ÀÌ %dÀ»(¸¦) µ¹·ÁÁÖ¾ú½À´Ï´Ù"
-
-#, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "ºö: %s À̺¥Æ®¸¦ Àâ¾Ò½À´Ï´Ù\n"
 
@@ -4563,6 +4565,10 @@
 msgstr "ºö °æ°í"
 
 #, c-format
+msgid "shell returned %d"
+msgstr "½©ÀÌ %dÀ»(¸¦) µ¹·ÁÁÖ¾ú½À´Ï´Ù"
+
+#, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: Çü½Ä ¹®ÀÚ¿­¿¡ %%%cÀÌ(°¡) ³Ê¹« ¸¹½À´Ï´Ù"
 
@@ -4585,6 +4591,7 @@
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: Çü½Ä ¹®ÀÚ¿­¿¡ À߸øµÈ %%%cÀÌ(°¡) ÀÖ½À´Ï´Ù"
 
+#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat'ÀÌ ¾î¶² ÆÐÅϵµ Æ÷ÇÔÇϰí ÀÖÁö ¾Ê½À´Ï´Ù"
 
@@ -4594,6 +4601,15 @@
 msgid "E553: No more items"
 msgstr "E553: ´õ ÀÌ»óÀÇ Ç׸ñÀÌ ¾ø½À´Ï´Ù"
 
+msgid "E924: Current window was closed"
+msgstr "E924: ÇöÀç âÀÌ ´ÝÇû½À´Ï´Ù"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: ÇöÀçÀÇ quickfix°¡ ¹Ù²î¾ú½À´Ï´Ù"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: ÇöÀçÀÇ location list°¡ ¹Ù²î¾ú½À´Ï´Ù"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
@@ -4601,15 +4617,18 @@
 msgid " (line deleted)"
 msgstr " (ÁÙÀ» Áö¿üÀ½)"
 
+#, c-format
+#~ msgid "%serror list %d of %d; %d errors "
+#~ msgstr ""
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: ÄüÇȽº ½ºÅÃÀÇ ¹Ù´ÚÀÔ´Ï´Ù"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: ÄüÇȽº ½ºÅÃÀÇ ²À´ë±âÀÔ´Ï´Ù"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "error list %d of %d; %d errors"
+#~ msgid "No entries"
+#~ msgstr ""
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: ¾µ ¼ö ¾øÀ½, 'buftype' ¿É¼ÇÀÌ ¼³Á¤µÇ¾î ÀÖ½À´Ï´Ù"
@@ -4634,18 +4653,15 @@
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: %s%%[]¿¡ À߸øµÈ Ç׸ñ"
 
-msgid "E339: Pattern too long"
-msgstr "E339: ÆÐÅÏÀÌ ³Ê¹« ±é´Ï´Ù"
-
-msgid "E50: Too many \\z("
-msgstr "E50: \\z(°¡ ³Ê¹« ¸¹½À´Ï´Ù"
-
 #, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s(°¡ ³Ê¹« ¸¹½À´Ï´Ù"
+msgid "E769: Missing ] after %s["
+msgstr "E769: %s[ µÚ¿¡ ]°¡ ¾ø½À´Ï´Ù"
 
-msgid "E52: Unmatched \\z("
-msgstr "E52: ¸ÂÁö ¾Ê´Â \\z("
+#~ msgid "E944: Reverse range in character class"
+#~ msgstr ""
+
+#~ msgid "E945: Range too large in character class"
+#~ msgstr ""
 
 #, c-format
 msgid "E53: Unmatched %s%%("
@@ -4659,6 +4675,36 @@
 msgid "E55: Unmatched %s)"
 msgstr "E55: ¸ÂÁö ¾Ê´Â %s)"
 
+msgid "E66: \\z( not allowed here"
+msgstr "E66: \\z(´Â ¿©±â¿¡¼­ Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
+
+msgid "E67: \\z1 et al. not allowed here"
+msgstr "E67: \\z1 µîÀº ¿©±â¿¡¼­ Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
+
+#, c-format
+msgid "E69: Missing ] after %s%%["
+msgstr "E69: %s%%[ µÚ¿¡ ]°¡ ¾ø½À´Ï´Ù"
+
+#, c-format
+msgid "E70: Empty %s%%[]"
+msgstr "E70: ºó %s%%[]"
+
+msgid "E65: Illegal back reference"
+msgstr "E65: ÀÌ»óÇÑ ÈÄÀ§ ÂüÁ¶"
+
+msgid "E339: Pattern too long"
+msgstr "E339: ÆÐÅÏÀÌ ³Ê¹« ±é´Ï´Ù"
+
+msgid "E50: Too many \\z("
+msgstr "E50: \\z(°¡ ³Ê¹« ¸¹½À´Ï´Ù"
+
+#, c-format
+msgid "E51: Too many %s("
+msgstr "E51: %s(°¡ ³Ê¹« ¸¹½À´Ï´Ù"
+
+msgid "E52: Unmatched \\z("
+msgstr "E52: ¸ÂÁö ¾Ê´Â \\z("
+
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ µÚ¿¡ À߸øµÈ ¹®ÀÚ"
@@ -4682,27 +4728,10 @@
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c µÚ¿¡ ¾Æ¹«°Íµµ ¾ø½À´Ï´Ù"
 
-msgid "E65: Illegal back reference"
-msgstr "E65: ÀÌ»óÇÑ ÈÄÀ§ ÂüÁ¶"
-
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z(´Â ¿©±â¿¡¼­ Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
-
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 µîÀº ¿©±â¿¡¼­ Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
-
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z µÚ¿¡ ÀÌ»óÇÑ ¹®ÀÚ"
 
 #, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ µÚ¿¡ ]°¡ ¾ø½À´Ï´Ù"
-
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: ºó %s%%[]"
-
-#, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: %s%%[dxouU] µÚ¿¡ ÀÌ»óÇÑ ¹®ÀÚ"
 
@@ -4711,16 +4740,93 @@
 msgstr "E71: %s%% µÚ¿¡ ÀÌ»óÇÑ ¹®ÀÚ"
 
 #, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ µÚ¿¡ ]°¡ ¾ø½À´Ï´Ù"
-
-#, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...}¿¡ ±¸¹® ¿¡·¯"
 
 msgid "External submatches:\n"
 msgstr "¿ÜºÎ submatches:\n"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA Á¤±ÔÇ¥Çö½Ä) %sÀ»(¸¦) ¹Ýº¹ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#~ msgid ""
+#~ "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
+#~ "used "
+#~ msgstr ""
+
+#~ msgid "Switching to backtracking RE engine for pattern: "
+#~ msgstr ""
+
+#~ msgid "E865: (NFA) Regexp end encountered prematurely"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E866: (NFA regexp) Misplaced %c"
+#~ msgstr ""
+
+#, c-format
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (NFA Á¤±ÔÇ¥Çö½Ä) ºñÁ¤»óÀûÀÎ ¹®ÀÚ Å¬·¡½º: %ld"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\z%c'"
+msgstr "E867: (NFA) ¸ð¸£´Â ¿ÀÆÛ·¹ÀÌÅÍ '\\z%c'"
+
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) ¸ð¸£´Â ¿ÀÆÛ·¹ÀÌÅÍ '\\%%%c'"
+
+#. should never happen
+#~ msgid "E868: Error building NFA with equivalence class!"
+#~ msgstr ""
+
+#, c-format
+msgid "E869: (NFA) Unknown operator '\\@%c'"
+msgstr "E869: (NFA) ¸ð¸£´Â ¿ÀÆÛ·¹ÀÌÅÍ '\\@%c'"
+
+#~ msgid "E870: (NFA regexp) Error reading repetition limits"
+#~ msgstr ""
+
+#. Can't have a multi follow a multi.
+#~ msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+#~ msgstr ""
+
+#. Too many `('
+msgid "E872: (NFA regexp) Too many '('"
+msgstr "E872: (NFA Á¤±ÔÇ¥Çö½Ä) '('°¡ ³Ê¹« ¸¹½À´Ï´Ù"
+
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA Á¤±ÔÇ¥Çö½Ä) \\z(°¡ ³Ê¹« ¸¹½À´Ï´Ù"
+
+#~ msgid "E873: (NFA regexp) proper termination error"
+#~ msgstr ""
+
+#~ msgid "E874: (NFA) Could not pop the stack !"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
+#~ "left on stack"
+#~ msgstr ""
+
+#~ msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+#~ msgstr ""
+
+#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not open temporary log file for writing, displaying on stderr ... "
+#~ msgstr ""
+
+#, c-format
+msgid "(NFA) COULD NOT OPEN %s !"
+msgstr "(NFA) %sÀ»(¸¦) ¿­ ¼ö ¾ø½À´Ï´Ù!"
+
+msgid "Could not open temporary log file for writing "
+msgstr "Àӽà ·Î±× ÆÄÀÏÀ» ¾²±â À§ÇØ ¿­ ¼ö ¾ø½À´Ï´Ù"
+
 msgid " VREPLACE"
 msgstr " ¼±ÅÃġȯ"
 
@@ -4748,9 +4854,6 @@
 msgid " Arabic"
 msgstr " ¾Æ¶óºñ¾Æ"
 
-msgid " (lang)"
-msgstr " (¾ð¾î)"
-
 msgid " (paste)"
 msgstr " (ºÙÀ̱â)"
 
@@ -4845,8 +4948,47 @@
 "# Last %sSearch Pattern:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: spell ÆÄÀÏ Çü½Ä ¿¡·¯"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: ¸ÂÃã¹ý °Ë»ç°¡ Ȱ¼ºÈ­µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr "°æ°í: ´Ü¾î ¸ñ·Ï \"%s_%s.spl\" ȤÀº \"%s_ascii.spl\"À» ãÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "°æ°í: ´Ü¾î ¸ñ·Ï \"%s.%s.spl\" ȤÀº \"%s.ascii.spl\"À» ãÀ» ¼ö ¾ø½À´Ï´Ù"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: SpellFileMissing autocommand°¡ ¹öÆÛ¸¦ »èÁ¦Çß½À´Ï´Ù"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "°æ°í: %s ¿µ¿ªÀº Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
+
+msgid "Sorry, no suggestions"
+msgstr "Á˼Û, Á¦¾ÈÇÒ °Ô ¾ø½À´Ï´Ù"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Á˼Û, %ld°³¸¸ Á¦¾È"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Change \"%.*s\" to:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: öÀÚ°¡ ¹Ù²ïÀûÀÌ ¾ø½À´Ï´Ù"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: ãÀ» ¼ö ¾øÀ½: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: À߸° spell ÆÄÀÏ"
@@ -4868,17 +5010,6 @@
 msgid "Compressing word tree..."
 msgstr "´Ü¾î Æ®¸® ¾ÐÃàÁß..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: ¸ÂÃã¹ý °Ë»ç°¡ Ȱ¼ºÈ­µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-msgstr "°æ°í: ´Ü¾î ¸ñ·Ï \"%s_%s.spl\" ȤÀº \"%s_ascii.spl\"À» ãÀ» ¼ö ¾ø½À´Ï´Ù"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "°æ°í: ´Ü¾î ¸ñ·Ï \"%s.%s.spl\" ȤÀº \"%s.ascii.spl\"À» ãÀ» ¼ö ¾ø½À´Ï´Ù"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "spell ÆÄÀÏ \"%s\"À»(¸¦) Àаí ÀÖ½À´Ï´Ù"
@@ -4896,8 +5027,24 @@
 msgstr "E770: spell ÆÄÀÏ¿¡ Áö¿øµÇÁö ¾Ê´Â ¼½¼Ç"
 
 #, 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"
 
 #, c-format
 msgid "Reading affix file %s ..."
@@ -5157,76 +5304,56 @@
 msgstr "E765: 'spellfile'¿¡ %ld Ç׸ñÀÌ ¾ø½À´Ï´Ù"
 
 #, c-format
-msgid "Word removed from %s"
-msgstr "%s¿¡¼­ ´Ü¾î »èÁ¦µÊ"
+msgid "Word '%.*s' removed from %s"
+msgstr "´Ü¾î '%.*s'ÀÌ(°¡) %s¿¡¼­ Á¦°ÅµÊ"
 
 #, c-format
-msgid "Word added to %s"
-msgstr "%s¿¡ ´Ü¾î Ãß°¡µÊ"
+msgid "Word '%.*s' added to %s"
+msgstr "´Ü¾î '%.*s'ÀÌ(°¡) %s¿¡ Ãß°¡µÊ"
 
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: ´Ü¾î°¡ spell ÆÄÀÏ °£¿¡ ´Ù¸¨´Ï´Ù"
 
-msgid "Sorry, no suggestions"
-msgstr "Á˼Û, Á¦¾ÈÇÒ °Ô ¾ø½À´Ï´Ù"
-
-#, c-format
-msgid "Sorry, only %ld suggestions"
-msgstr "Á˼Û, %ld°³¸¸ Á¦¾È"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Change \"%.*s\" to:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: öÀÚ°¡ ¹Ù²ïÀûÀÌ ¾ø½À´Ï´Ù"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: ãÀ» ¼ö ¾øÀ½: %s"
-
-#, c-format
-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"
-
 #. This should have been checked when generating the .spl
 #. * file.
 msgid "E783: duplicate char in MAP entry"
 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 ""
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ÀÌ·± ±¸¹® Ŭ·¯½ºÅÍ´Â ¾ø½À´Ï´Ù: %s"
 
-msgid "No Syntax items defined for this buffer"
-msgstr "ÀÌ ¹öÆÛ¿¡ ´ëÇØ Á¤ÀÇµÈ ±¸¹® Ç׸ñÀÌ ¾ø½À´Ï´Ù"
-
 msgid "syncing on C-style comments"
 msgstr "C-Çü½Ä ÁÖ¼®¹®¿¡ µ¿±â¸ÂÃã"
 
@@ -5292,11 +5419,18 @@
 msgid "E397: Filename required"
 msgstr "E397: ÆÄÀÏÀ̸§ÀÌ ÇÊ¿äÇÕ´Ï´Ù"
 
+#~ msgid "E847: Too many syntax includes"
+#~ msgstr ""
+
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' ´©¶ô: %s"
 
 #, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: ']' µÚ¿¡ ¹®ÀÚ°¡ ´õ ÀÖÀ½: %s]%s"
+
+#, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' ´©¶ô: %s"
 
@@ -5304,6 +5438,9 @@
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: ÃæºÐÄ¡ ¾ÊÀº ÀÎÀÚ: ±¸¹® ¿µ¿ª %s"
 
+msgid "E848: Too many syntax clusters"
+msgstr "E848: ±¸¹® Ŭ·¯½ºÅͰ¡ ³Ê¹« ¸¹½À´Ï´Ù"
+
 msgid "E400: No cluster specified"
 msgstr "E400: Ŭ·¯½ºÅͰ¡ ¸í½ÃµÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
@@ -5346,6 +5483,10 @@
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: À߸øµÈ :syntax ÇÏÀ§ ¸í·É: %s"
 
+#~ msgid ""
+#~ "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+#~ msgstr ""
+
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim ¹Ýº¹ ·Îµù"
 
@@ -5407,6 +5548,9 @@
 msgid "W18: Invalid character in group name"
 msgstr "W18: ±×·ì À̸§¿¡ ÀÌ»óÇÑ ¹®ÀÚ"
 
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: highlight¿Í syntax groupÀÌ ³Ê¹« ¸¹½À´Ï´Ù"
+
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ÅÂ±× ½ºÅÃÀÇ ³¡ÀÔ´Ï´Ù"
 
@@ -5467,6 +5611,9 @@
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: %s¿¡ ´ëÇÑ ÅÂ±× ÆÄÀÏ °æ·Î°¡ À߷ȽÀ´Ï´Ù\n"
 
+msgid "Ignoring long line in tags file"
+msgstr "ÅÂ±× ÆÄÀÏÀÇ ³Ê¹« ±ä ¶óÀÎÀ» ¹«½ÃÇÕ´Ï´Ù"
+
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: ÅÂ±× ÆÄÀÏ \"%s\"¿¡ Çü½Ä ¿¡·¯°¡ ÀÖ½À´Ï´Ù"
@@ -5483,9 +5630,6 @@
 msgid "E433: No tags file"
 msgstr "E433: ÅÂ±× ÆÄÀÏÀÌ ¾ø½À´Ï´Ù"
 
-msgid "Ignoring long line in tags file"
-msgstr "ÅÂ±× ÆÄÀÏÀÇ ³Ê¹« ±ä ¶óÀÎÀ» ¹«½ÃÇÕ´Ï´Ù"
-
 msgid "E434: Can't find tag pattern"
 msgstr "E434: ÅÂ±× ÆÐÅÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
@@ -5526,6 +5670,9 @@
 "\n"
 "--- Å͹̳ΠŰ ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txtÀ» ¿­ ¼ö ¾ø½À´Ï´Ù"
+
 msgid "new shell started\n"
 msgstr "»õ ½©ÀÌ ½ÃÀ۵Ǿú½À´Ï´Ù\n"
 
@@ -5537,8 +5684,8 @@
 
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-msgid "E834: Line count changed unexpectedly"
-msgstr "E834: ÁÙ °¹¼ö°¡ ¸ð¸£´Â »çÀÌ¿¡ ¹Ù²î¾ú½À´Ï´Ù"
+msgid "E881: Line count changed unexpectedly"
+msgstr "E881: Çà °¹¼ö°¡ °©Àڱ⠹ٲî¾ú½À´Ï´Ù"
 
 #. must display the prompt
 msgid "No undo possible; continue anyway"
@@ -5673,13 +5820,133 @@
 msgid "E440: undo line missing"
 msgstr "E440: undo ÁÙÀÌ ¾ø½À´Ï´Ù"
 
-#. 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 ÆÇ"
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: ÇÔ¼ö %sÀÌ(°¡) ÀÌ¹Ì ÀÖ½À´Ï´Ù, ¹Ù²Ù·Á¸é !À» ´õÇϼ¼¿ä"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: ÀÌ¹Ì Dictionary Ç׸ñÀÌ ÀÖ½À´Ï´Ù"
+
+msgid "E718: Funcref required"
+msgstr "E718: Funcref°¡ ÇÊ¿äÇÕ´Ï´Ù"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ¸ð¸£´Â ÇÔ¼ö: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: À߸øµÈ ÀÎÀÚ: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Áߺ¹µÈ ÀÎÀÚ À̸§: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: ÇÔ¼ö %s¿¡ ³Ê¹« ¸¹Àº ÀÎÀÚ°¡ Àü´ÞµÇ¾ú½À´Ï´Ù"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: ÇÔ¼ö %s(À¸)·Î À߸øµÈ ÀÎÀÚ°¡ ³Ñ°ÜÁ³½À´Ï´Ù"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: ÇÔ¼ö¸¦ ºÎ¸¥ ±íÀ̰¡ 'maxfuncdepth'º¸´Ù Å®´Ï´Ù"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s ºÎ¸£´Â Áß"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%sÀÌ(°¡) ÁßÁöµÇ¾ú½À´Ï´Ù"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%sÀÌ(°¡) #%ldÀ»(¸¦) µ¹·ÁÁÖ¾ú½À´Ï´Ù"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%sÀÌ(°¡) %sÀ»(¸¦) µ¹·ÁÁÖ¾ú½À´Ï´Ù"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ³Ê¹« ¸¹Àº ÀÎÀÚ"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ¸ð¸£´Â ÇÔ¼ö: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: ÇÔ¼ö°¡ »èÁ¦µÊ: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: ÇÔ¼ö¿¡ ÀûÀº ÀÎÀÚ ³Ñ±è: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: ½ºÅ©¸³Æ® ÄÜÅØ½ºÆ® ¹Û¿¡¼­ <SID> »ç¿ë: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Dictionary¾øÀÌ »çÀüÇÔ¼ö°¡ ºÒ·ÁÁü: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: ÇÔ¼ö À̸§ÀÌ ÇÊ¿äÇÕ´Ï´Ù"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: ÇÔ¼ö À̸§Àº ´ë¹®ÀÚ È¤Àº \"s:\"·Î ½ÃÀÛÇØ¾ß ÇÔ: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: ÇÔ¼ö À̸§Àº ÄÝ·ÐÀ» Æ÷ÇÔÇÒ ¼ö ¾øÀ½: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Á¤ÀÇ ¾È µÈ ÇÔ¼ö: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '('°¡ ¾øÀ½: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: ¿©±â¿¡¼­ g:À» »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+#~ msgid "E932: Closure function should not be at top level: %s"
+#~ msgstr ""
+
+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"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: ÇÔ¼ö %sÀ»(¸¦) ´Ù½Ã Á¤ÀÇÇÒ ¼ö ¾ø½À´Ï´Ù: »ç¿ëÁßÀÔ´Ï´Ù"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: ÇÔ¼ö¸íÀÌ ½ºÅ©¸³Æ® ÆÄÀϸí°ú ´Ù¸§: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: ÇÔ¼ö %sÀ»(¸¦) Áö¿ï ¼ö ¾ø½À´Ï´Ù: »ç¿ëÁßÀÔ´Ï´Ù"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :returnÀÌ ÇÔ¼ö ¾È¿¡ ÀÖÁö ¾Ê½À´Ï´Ù"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: °ýÈ£ ¾øÀ½: %s"
 
 msgid ""
 "\n"
@@ -5695,9 +5962,6 @@
 "\n"
 "MS-Windows 32ºñÆ® GUI ¹öÁ¯"
 
-msgid " in Win32s mode"
-msgstr " Win32s »óÅÂ"
-
 msgid " with OLE support"
 msgstr " OLE Áö¿ø"
 
@@ -5717,27 +5981,6 @@
 
 msgid ""
 "\n"
-"MS-Windows 16-bit version"
-msgstr ""
-"\n"
-"MS-Windows 16ºñÆ® ¹öÁ¯"
-
-msgid ""
-"\n"
-"32-bit MS-DOS version"
-msgstr ""
-"\n"
-"32ºñÆ® MS-DOS ¹öÁ¯"
-
-msgid ""
-"\n"
-"16-bit MS-DOS version"
-msgstr ""
-"\n"
-"16ºñÆ® MS-DOS ¹öÁ¯"
-
-msgid ""
-"\n"
 "MacOS X (unix) version"
 msgstr ""
 "\n"
@@ -5759,13 +6002,6 @@
 
 msgid ""
 "\n"
-"RISC OS version"
-msgstr ""
-"\n"
-"RISC OS ¹öÁ¯"
-
-msgid ""
-"\n"
 "OpenVMS version"
 msgstr ""
 "\n"
@@ -5836,6 +6072,9 @@
 msgid "without GUI."
 msgstr "GUI ¾øÀ½."
 
+msgid "with GTK3 GUI."
+msgstr "GTK3 GUI."
+
 msgid "with GTK2-GNOME GUI."
 msgstr "GTK2-GNOME GUI."
 
@@ -5899,6 +6138,9 @@
 msgid "3rd user gvimrc file: \""
 msgstr "»ç¿ëÀÚ ¼¼ ¹øÂ° gvimrc ÆÄÀÏ: \""
 
+msgid "       defaults file: \""
+msgstr "       defaults ÆÄÀÏ: \""
+
 msgid "    system menu file: \""
 msgstr "    ½Ã½ºÅÛ ¸Þ´º ÆÄÀÏ: \""
 
@@ -5930,7 +6172,7 @@
 msgstr "by Bram Moolenaar et al."
 
 msgid "Vim is open source and freely distributable"
-msgstr "ºöÀº ¼Ò½º°¡ ¿­·Á ÀÖ°í °øÂ¥·Î ¹èÆ÷µË´Ï´Ù"
+msgstr "ºöÀº ´©±¸³ª ¼Ò½º¸¦ º¼ ¼ö ÀÖ°í °øÂ¥·Î ¹èÆ÷µË´Ï´Ù"
 
 msgid "Help poor children in Uganda!"
 msgstr "¿ì°£´Ù¿¡ »ç´Â °¡³­ÇÑ ¾ÆÀ̸¦ µµ¿ÍÁÖ¼¼¿ä!"
@@ -5989,12 +6231,6 @@
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "ÀÌ¿¡ ´ëÇÑ Á¤º¸¸¦ º¸·Á¸é    ¸Þ´º µµ¿ò¸»->Sponsor/Register"
 
-msgid "WARNING: Windows 95/98/ME detected"
-msgstr "°æ°í: À©µµ¿ìÁî 95/98/ME¸¦ ã¾ÒÀ½"
-
-msgid "type  :help windows95<Enter>  for info on this"
-msgstr "ÀÌ¿¡ ´ëÇÑ Á¤º¸¸¦ º¸·Á¸é    :help windows95<¿£ÅÍ>  ÀÔ·Â"
-
 msgid "Already only one window"
 msgstr "ÀÌ¹Ì ÇϳªÀÇ Ã¢¸¸ ÀÖ½À´Ï´Ù"
 
@@ -6027,6 +6263,25 @@
 msgstr "E447: path¿¡¼­ \"%s\" ÆÄÀÏÀ» ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
 #, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: ºñÁ¤»óÀûÀÎ ID: %ld (1º¸´Ù Å©°Å³ª °°¾Æ¾ß ÇÕ´Ï´Ù)"
+
+#, c-format
+#~ msgid "E801: ID already taken: %ld"
+#~ msgstr ""
+
+msgid "List or number required"
+msgstr "List³ª number°¡ ÇÊ¿äÇÕ´Ï´Ù"
+
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: ºñÁ¤»óÀûÀÎ ID: %ld (1º¸´Ù Å©°Å³ª °°¾Æ¾ß ÇÕ´Ï´Ù)"
+
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID¸¦ ãÀ» ¼ö ¾øÀ½: %ld"
+
+#, c-format
 msgid "E370: Could not load library %s"
 msgstr "E370: %s ¶óÀ̺귯¸®¸¦ ·ÎµåÇÒ ¼ö ¾ø½À´Ï´Ù"
 
@@ -6128,6 +6383,10 @@
 msgid "E473: Internal error"
 msgstr "E473: ³»ºÎ ¿¡·¯"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: ³»ºÎ ¿¡·¯: %s"
+
 msgid "Interrupted"
 msgstr "ÁߴܵǾú½À´Ï´Ù"
 
@@ -6256,6 +6515,9 @@
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: ¸¶Áö¸·À¸·Î °íÄ£ µÚ ÀúÀåµÇÁö ¾Ê¾Ò½À´Ï´Ù (¹«½ÃÇÏ·Á¸é ! ´õÇϱâ)"
 
+msgid "E37: No write since last change"
+msgstr "E37: ¸¶Áö¸·À¸·Î °íÄ£ µÚ ÀúÀåÇÏÁö ¾Ê¾Ò½À´Ï´Ù"
+
 msgid "E38: Null argument"
 msgstr "E38: ³Î ÀÎÀÚ"
 
@@ -6308,6 +6570,31 @@
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: sandbox ¾È¿¡¼­´Â º¯¼ö¸¦ ¼³Á¤ÇÒ ¼ö ¾øÀ½: \"%s\""
 
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Dictionary¿¡ ºó ۸¦ ¾µ ¼ö ¾ø½À´Ï´Ù"
+
+msgid "E715: Dictionary required"
+msgstr "E715: Dictionary°¡ ÇÊ¿äÇÕ´Ï´Ù"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: ¸ñ·Ï ¹øÈ£°¡ ¹üÀ§¸¦ ¹þ¾î³²: %ld"
+
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: ÇÔ¼ö¿¡ ³Ê¹« ¸¹Àº ÀÎÀÚ ³Ñ±è: %s"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Dictionary¿¡ ۰¡ ¾øÀ½: %s"
+
+msgid "E714: List required"
+msgstr "E714: List°¡ ÇÊ¿äÇÕ´Ï´Ù"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s ÀÎÀÚ´Â List ȤÀº Dictionary¿©¾ß ÇÕ´Ï´Ù"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ¿¡·¯ÆÄÀÏ Àд µµÁß¿¡ ¿¡·¯"
 
@@ -6365,8 +6652,8 @@
 msgid "E80: Error while writing"
 msgstr "E80: ¾²´Â Áß¿¡ ¿¡·¯"
 
-msgid "Zero count"
-msgstr "Zero count"
+#~ msgid "E939: Positive count required"
+#~ msgstr ""
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: ½ºÅ©¸³Æ® ÄÜÅØ½ºÆ® ¹Û¿¡¼­ <SID> »ç¿ë"
@@ -6380,16 +6667,16 @@
 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'º¸´Ù ¸¹Àº ¸Þ¸ð¸®¸¦ »ç¿ëÇÕ´Ï´Ù"
 
 msgid "E749: empty buffer"
 msgstr "E749: ºó ¹öÆÛ"
 
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: ¹öÆÛ %ldÀÌ(°¡) Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù"
+
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: À߸øµÈ ã±â ÆÐÅÏ È¤Àº ±¸ºÐÀÚ"
 
@@ -6400,6 +6687,13 @@
 msgid "E764: Option '%s' is not set"
 msgstr "E764: ¿É¼Ç '%s'ÀÌ(°¡) ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
+msgid "E850: Invalid register name"
+msgstr "E850: À߸øµÈ ·¹Áö½ºÅÍ À̸§"
+
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: '%s'¿¡¼­ µð·ºÅ丮¸¦ ¸øÃ£À½: \"%s\""
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "óÀ½±îÁö ã¾ÒÀ½, ³¡¿¡¼­ °è¼Ó"
 
@@ -6410,38 +6704,250 @@
 msgid "Need encryption key for \"%s\""
 msgstr "\"%s\"¿¡ ´ëÇÑ ¾ÏÈ£ ۰¡ ÇÊ¿äÇÕ´Ï´Ù"
 
-msgid "writelines() requires list of strings"
-msgstr "writelines()´Â ¹®ÀÚ¿­ ¸ñ·ÏÀÌ ÇÊ¿äÇÕ´Ï´Ù"
+msgid "empty keys are not allowed"
+msgstr "ºó Ű °ªÀº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù"
+
+msgid "dictionary is locked"
+msgstr "dictionary°¡ Àá°ÜÀÖ½À´Ï´Ù"
+
+msgid "list is locked"
+msgstr "list°¡ Àá°ÜÀÖ½À´Ï´Ù"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "dictionary¿¡ '%s' ۸¦ Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+#~ msgid "index must be int or slice, not %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected str() or unicode() instance, but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected bytes() or str() instance, but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "expected int(), long() or something supporting coercing to long(), but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected int() or something supporting coercing to int(), but got %s"
+#~ msgstr ""
+
+msgid "value is too large to fit into C int type"
+msgstr "°ªÀÌ C Á¤¼ö Çü½Ä ´ëºñÇÏ¿© ³Ê¹« Å®´Ï´Ù"
+
+msgid "value is too small to fit into C int type"
+msgstr "°ªÀÌ C Á¤¼ö Çü½Ä ´ëºñÇÏ¿© ³Ê¹« ÀÛ½À´Ï´Ù"
+
+msgid "number must be greater than zero"
+msgstr "°ªÀÌ 0º¸´Ù Ä¿¾ß ÇÕ´Ï´Ù"
+
+msgid "number must be greater or equal to zero"
+msgstr "°ªÀÌ 0º¸´Ù Å©°Å³ª °°¾Æ¾ß ÇÕ´Ï´Ù"
+
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject ¼Ó¼ºÀ» Áö¿ï ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "À߸øµÈ ¼Ó¼º: %s"
 
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: ÆÄÀ̽ã: I/O °´Ã¼ ÃʱâÈ­Áß ¿¡·¯°¡ »ý°å½À´Ï´Ù"
 
-msgid "no such buffer"
-msgstr "±×·± ¹öÆÛ´Â ¾ø½À´Ï´Ù"
+msgid "failed to change directory"
+msgstr "µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+#~ msgstr ""
+
+#~ msgid "internal error: imp.find_module returned tuple with NULL"
+#~ msgstr ""
+
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary ¼Ó¼ºÀ» »èÁ¦ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+msgid "cannot modify fixed dictionary"
+msgstr "fixed dictionary¸¦ ¼öÁ¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "¼Ó¼º %sÀ»(¸¦) ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#~ msgid "hashtab changed during iteration"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected sequence element of size 2, but got sequence of size %d"
+#~ msgstr ""
+
+#~ msgid "list constructor does not accept keyword arguments"
+#~ msgstr ""
+
+msgid "list index out of range"
+msgstr "list »öÀÎÀÌ ¹üÀ§¸¦ ¹þ¾î³µ½À´Ï´Ù"
+
+#. No more suitable format specifications in python-2.3
+#, c-format
+#~ msgid "internal error: failed to get vim list item %d"
+#~ msgstr ""
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "attempt to assign sequence of size greater than %d to extended slice"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "internal error: no vim list item %d"
+#~ msgstr ""
+
+#~ msgid "internal error: not enough list items"
+#~ msgstr ""
+
+#~ msgid "internal error: failed to add item to list"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "attempt to assign sequence of size %d to extended slice of size %d"
+#~ msgstr ""
+
+#~ msgid "failed to add item to list"
+#~ msgstr ""
+
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List ¼Ó¼ºÀ» »èÁ¦ÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#~ msgid "cannot modify fixed list"
+#~ msgstr ""
+
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "À̸§¾ø´Â ÇÔ¼ö %sÀÌ(°¡) Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù"
+
+#, c-format
+msgid "function %s does not exist"
+msgstr "ÇÔ¼ö %sÀÌ(°¡) Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "ÇÔ¼ö %sÀ»(¸¦) ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+msgid "unable to get option value"
+msgstr "¿É¼Ç °ªÀ» ¾òÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#~ msgid "internal error: unknown option type"
+#~ msgstr ""
+
+#~ msgid "problem while switching windows"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "unable to unset global option %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "unable to unset option %s which does not have global value"
+#~ msgstr ""
+
+msgid "attempt to refer to deleted tab page"
+msgstr "Áö¿öÁø ÅÇ ÆäÀÌÁö¸¦ ÂüÁ¶ÇÏ·Á°í ÇÏ¿´½À´Ï´Ù"
+
+msgid "no such tab page"
+msgstr "±×·± ÅÇ ÆäÀÌÁö°¡ ¾ø½À´Ï´Ù"
 
 msgid "attempt to refer to deleted window"
 msgstr "Áö¿öÁø âÀ» ÂüÁ¶ÇÏ·Á°í ÇÏ¿´½À´Ï´Ù"
 
-msgid "readonly attribute"
-msgstr "Àбâ Àü¿ë ¼Ó¼º"
+msgid "readonly attribute: buffer"
+msgstr "Àбâ Àü¿ë ¼Ó¼º: ¹öÆÛ"
 
 msgid "cursor position outside buffer"
 msgstr "ÆÛ¼­ À§Ä¡°¡ ¹öÆÛ ¹Û¿¡ ÀÖ½À´Ï´Ù"
 
-#, c-format
-msgid "<window object (deleted) at %p>"
-msgstr "<%p¿¡ â °´Ã¼ (»èÁ¦µÊ)>"
-
-#, c-format
-msgid "<window object (unknown) at %p>"
-msgstr "<%p¿¡ â °´Ã¼ (¸ð¸§)>"
-
-#, c-format
-msgid "<window %d>"
-msgstr "<â %d>"
-
 msgid "no such window"
 msgstr "±×·± âÀº ¾ø½À´Ï´Ù"
 
 msgid "attempt to refer to deleted buffer"
 msgstr "Áö¿öÁø ¹öÆÛ¸¦ ÂüÁ¶ÇÏ·Á°í ÇÏ¿´½À´Ï´Ù"
+
+msgid "failed to rename buffer"
+msgstr "¹öÆÛ À̸§À» º¯°æÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#~ msgid "mark name must be a single character"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected vim.Buffer object, but got %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "failed to switch to buffer %d"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected vim.Window object, but got %s"
+#~ msgstr ""
+
+#~ msgid "failed to find window in the current tab page"
+#~ msgstr ""
+
+#~ msgid "did not switch to the specified window"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "expected vim.TabPage object, but got %s"
+#~ msgstr ""
+
+#~ msgid "did not switch to the specified tab page"
+#~ msgstr ""
+
+#~ msgid "failed to run the code"
+#~ msgstr ""
+
+#~ msgid "E858: Eval did not return a valid python object"
+#~ msgstr ""
+
+#~ msgid "E859: Failed to convert returned python object to vim value"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "unable to convert %s to vim dictionary"
+#~ msgstr ""
+
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%sÀ»(¸¦) vim list·Î º¯°æÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+#, c-format
+#~ msgid "unable to convert %s to vim structure"
+#~ msgstr ""
+
+#~ msgid "internal error: NULL reference passed"
+#~ msgstr ""
+
+#~ msgid "internal error: invalid value type"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Failed to set path hook: sys.path_hooks is not a list\n"
+#~ "You should now do the following:\n"
+#~ "- append vim.path_hook to sys.path_hooks\n"
+#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Failed to set path: sys.path is not a list\n"
+#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
+#~ msgstr ""
diff --git a/src/po/pt_BR.po b/src/po/pt_BR.po
index c03c625..a319a04 100644
--- a/src/po/pt_BR.po
+++ b/src/po/pt_BR.po
@@ -7,7 +7,7 @@
 "POT-Creation-Date: 2010-08-04 20:05-0300\n"
 "PO-Revision-Date: 2010-08-04 20:36-0300\n"
 "Last-Translator: Eduardo S. Dobay <edudobay@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <pt-br@li.org>\n"
+"Language-Team: Brazilian Portuguese\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po
index 56bd8d1..533d3fe 100644
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -1,6 +1,8 @@
 #
 # Ukrainian Vim translation [uk]
 #
+# Generated from uk.po, DO NOT EDIT
+#
 # Copyright (C) 2001 Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 # Bohdan donated this work to be distributed with Vim under the Vim license.
 #
@@ -12,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: vim 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-12 18:50+0300\n"
+"POT-Creation-Date: 2017-07-12 12:22+0300\n"
 "PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator: Àíàòîë³é Ñàõí³ê <sakhnik@gmail.com>\n"
 "Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
@@ -241,7 +243,8 @@
 msgstr "E917: Íå ìîæíà âèêîðèñòàòè çâîðîòí³é âèêëèê ó %s()"
 
 msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
-msgstr "E912: íå ìîæíà âèêîðèñòàòè ch_evalexpr()/ch_sendexpr() ç raw ÷è nl êàíàëîì"
+msgstr ""
+"E912: íå ìîæíà âèêîðèñòàòè ch_evalexpr()/ch_sendexpr() ç raw ÷è nl êàíàëîì"
 
 msgid "E906: not an open channel"
 msgstr "E906: íå â³äêðèòèé êàíàë"
@@ -433,6 +436,9 @@
 msgid "Scanning tags."
 msgstr "Ïîøóê ñåðåä ì³òîê."
 
+msgid "match in file"
+msgstr "çá³ã ó ôàéë³"
+
 msgid " Adding"
 msgstr " Äîäàºòüñÿ"
 
@@ -523,6 +529,12 @@
 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: Çì³ííà ìຠçàáàãàòî âêëàäåíü ùîá áóòè çà-/â³äêðèòîþ."
 
@@ -708,12 +720,6 @@
 msgstr "&O:Ãàðàçä"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld ðÿäê³â: "
-msgstr[1] "+-%s%3ld ðÿäê³â: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Íåâ³äîìà ôóíêö³ÿ: %s"
 
@@ -761,8 +767,8 @@
 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"
@@ -771,6 +777,12 @@
 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 â³äñóòíÿ"
+
 # msgstr "E14: "
 msgid "remove() argument"
 msgstr "àðãóìåíò remove()"
@@ -899,6 +911,14 @@
 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"
 
@@ -1157,8 +1177,9 @@
 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 áðàêóº çðàçêà"
@@ -1301,6 +1322,9 @@
 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: Âèáà÷òå, ö³º¿ êîìàíäè íåìຠó ö³é âåðñ³¿"
 
@@ -2085,12 +2109,6 @@
 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 ðÿäê³â çãîðíóòî "
-msgstr[1] "+--%3ld ðÿäê³â çãîðíóòî "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: Äîäàòè äî áóôåðà ÷èòàííÿ"
 
@@ -2893,6 +2911,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»"
+
 # msgstr "E404: "
 #, c-format
 msgid "E696: Missing comma in List: %s"
@@ -3118,6 +3140,9 @@
 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"
 
@@ -3827,7 +3852,8 @@
 "\n"
 "(1) Ìîæëèâî, ³íøà ïðîãðàìà âæå ðåäàãóº öåé ñàìèé ôàéë. ßêùî öå òàê,\n"
 "    áóäüòå îáåðåæí³, ùîá íå çàëèøèëèñÿ äâà ð³çí³ åêçåìïëÿðè\n"
-"    îäíîãî é òîãî ñàìîãî ôàéëó ï³ñëÿ çì³í.  Âèéä³òü ÷è ïðîäîâæóéòå ç îáåðåæí³ñòþ.\n"
+"    îäíîãî é òîãî ñàìîãî ôàéëó ï³ñëÿ çì³í.  Âèéä³òü ÷è ïðîäîâæóéòå ç "
+"îáåðåæí³ñòþ.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Ñåàíñ ðåäàãóâàííÿ öüîãî ôàéëó çàçíàâ êðàõó.\n"
@@ -4197,8 +4223,8 @@
 msgid "E663: At end of changelist"
 msgstr "E663: ʳíåöü ñïèñêó çì³í"
 
-msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "Óâåä³òü :quit<Enter>  ùîá âèéòè ç Vim"
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr "Óâåä³òü  :qa!  ³ íàòèñí³òü <Enter>, ùîá â³äêèíóòè âñ³ çì³íè ³ âèéòè ç Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4306,8 +4332,8 @@
 "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
 "%lld Bytes"
 msgstr ""
-"Âèáðàíî %s%ld ç %ld ðÿäê³â; %lld ç %lld ñë³â; %lld of %lld ñèìâîë³â; %lld ç %lld "
-"áàéò³â"
+"Âèáðàíî %s%ld ç %ld ðÿäê³â; %lld ç %lld ñë³â; %lld of %lld ñèìâîë³â; %lld ç "
+"%lld áàéò³â"
 
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
@@ -4318,8 +4344,8 @@
 "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
 "%lld of %lld"
 msgstr ""
-"Êîëîíêà %s ç %s; ðÿäîê %ld ç %ld; ñëîâî %lld ç %lld; ñèìâîë %lld of %lld; áàéò "
-"%lld ç %lld"
+"Êîëîíêà %s ç %s; ðÿäîê %ld ç %ld; ñëîâî %lld ç %lld; ñèìâîë %lld of %lld; "
+"áàéò %lld ç %lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4557,9 +4583,6 @@
 msgid "Message"
 msgstr "Ïîâ³äîìëåííÿ"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' íå 80, íå ìîæíà âèêîíóâàòè çîâí³øí³ êîìàíäè"
-
 # msgstr "E364: "
 msgid "E237: Printer selection failed"
 msgstr "E237: Íå âäàëîñÿ âèáðàòè ïðèíòåð"
@@ -4839,6 +4862,12 @@
 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%%("
@@ -4867,6 +4896,9 @@
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] ïîðîæí³é"
 
+msgid "E65: Illegal back reference"
+msgstr "E65: Íåêîðåêòíå çâîðîòíå ïîñèëàííÿ"
+
 # msgstr "E382: "
 msgid "E339: Pattern too long"
 msgstr "E339: Çðàçîê çàíàäòî äîâãèé"
@@ -4907,9 +4939,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"
 
@@ -5520,10 +5549,31 @@
 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 "
 
@@ -6140,6 +6190,10 @@
 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"
 
@@ -6162,16 +6216,6 @@
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Ïðîïóùåíî äóæêè: %s"
 
-# msgstr "E440: "
-# ---------------------------------------
-#. Only MS VC 4.1 and earlier can do Win32s
-msgid ""
-"\n"
-"MS-Windows 16/32-bit GUI version"
-msgstr ""
-"\n"
-"Âåðñ³ÿ ç GUI äëÿ 16/32-ðîçðÿäíî¿ Windows"
-
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -6455,12 +6499,6 @@
 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>    ³íôîðìàö³ÿ ïðî öå        "
-
 # msgstr "E444: "
 msgid "Already only one window"
 msgstr "Öå âæå ºäèíå â³êíî"
@@ -6626,6 +6664,10 @@
 msgid "E473: Internal error"
 msgstr "E473: Âíóòð³øíÿ ïîìèëêà"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Âíóòð³øíÿ ïîìèëêà: %s"
+
 msgid "Interrupted"
 msgstr "Ïåðåðâàíî"
 
@@ -6915,8 +6957,9 @@
 msgid "E80: Error while writing"
 msgstr "E80: Ïîìèëêà ï³ä ÷àñ çàïèñó"
 
-msgid "Zero count"
-msgstr "Íóëüîâà ê³ëüê³ñòü"
+# msgstr "E396: "
+msgid "E939: Positive count required"
+msgstr "E939: Ïîòð³áíà äîäàòíà ê³ëüê³ñòü"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> âèêîðèñòîâóºòüñÿ íå â êîíòåêñò³ ñêðèïòó"
@@ -6930,10 +6973,6 @@
 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/po/uk.po b/src/po/uk.po
index e12ac51..1c2d816 100644
--- a/src/po/uk.po
+++ b/src/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.
 #
@@ -12,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: vim 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-12 18:50+0300\n"
+"POT-Creation-Date: 2017-07-12 12:22+0300\n"
 "PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator: Анатолій Сахнік <sakhnik@gmail.com>\n"
 "Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
@@ -241,7 +243,8 @@
 msgstr "E917: Не можна використати зворотній виклик у %s()"
 
 msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
-msgstr "E912: не можна використати ch_evalexpr()/ch_sendexpr() з raw чи nl каналом"
+msgstr ""
+"E912: не можна використати ch_evalexpr()/ch_sendexpr() з raw чи nl каналом"
 
 msgid "E906: not an open channel"
 msgstr "E906: не відкритий канал"
@@ -433,6 +436,9 @@
 msgid "Scanning tags."
 msgstr "Пошук серед міток."
 
+msgid "match in file"
+msgstr "збіг у файлі"
+
 msgid " Adding"
 msgstr " Додається"
 
@@ -523,6 +529,12 @@
 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: Змінна має забагато вкладень щоб бути за-/відкритою."
 
@@ -708,12 +720,6 @@
 msgstr "&O:Гаразд"
 
 #, c-format
-msgid "+-%s%3ld line: "
-msgid_plural "+-%s%3ld lines: "
-msgstr[0] "+-%s%3ld рядків: "
-msgstr[1] "+-%s%3ld рядків: "
-
-#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Невідома функція: %s"
 
@@ -761,8 +767,8 @@
 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"
@@ -771,6 +777,12 @@
 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 відсутня"
+
 # msgstr "E14: "
 msgid "remove() argument"
 msgstr "аргумент remove()"
@@ -899,6 +911,14 @@
 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"
 
@@ -1157,8 +1177,9 @@
 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 бракує зразка"
@@ -1301,6 +1322,9 @@
 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: Вибачте, цієї команди немає у цій версії"
 
@@ -2085,12 +2109,6 @@
 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 рядків згорнуто "
-msgstr[1] "+--%3ld рядків згорнуто "
-
 msgid "E222: Add to read buffer"
 msgstr "E222: Додати до буфера читання"
 
@@ -2893,6 +2911,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»"
+
 # msgstr "E404: "
 #, c-format
 msgid "E696: Missing comma in List: %s"
@@ -3118,6 +3140,9 @@
 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"
 
@@ -3827,7 +3852,8 @@
 "\n"
 "(1) Можливо, інша програма вже редагує цей самий файл. Якщо це так,\n"
 "    будьте обережні, щоб не залишилися два різні екземпляри\n"
-"    одного й того самого файлу після змін.  Вийдіть чи продовжуйте з обережністю.\n"
+"    одного й того самого файлу після змін.  Вийдіть чи продовжуйте з "
+"обережністю.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Сеанс редагування цього файлу зазнав краху.\n"
@@ -4197,8 +4223,8 @@
 msgid "E663: At end of changelist"
 msgstr "E663: Кінець списку змін"
 
-msgid "Type  :quit<Enter>  to exit Vim"
-msgstr "Уведіть :quit<Enter>  щоб вийти з Vim"
+msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
+msgstr "Уведіть  :qa!  і натисніть <Enter>, щоб відкинути всі зміни і вийти з Vim"
 
 #, c-format
 msgid "1 line %sed 1 time"
@@ -4306,8 +4332,8 @@
 "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
 "%lld Bytes"
 msgstr ""
-"Вибрано %s%ld з %ld рядків; %lld з %lld слів; %lld of %lld символів; %lld з %lld "
-"байтів"
+"Вибрано %s%ld з %ld рядків; %lld з %lld слів; %lld of %lld символів; %lld з "
+"%lld байтів"
 
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
@@ -4318,8 +4344,8 @@
 "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
 "%lld of %lld"
 msgstr ""
-"Колонка %s з %s; рядок %ld з %ld; слово %lld з %lld; символ %lld of %lld; байт "
-"%lld з %lld"
+"Колонка %s з %s; рядок %ld з %ld; слово %lld з %lld; символ %lld of %lld; "
+"байт %lld з %lld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4557,9 +4583,6 @@
 msgid "Message"
 msgstr "Повідомлення"
 
-msgid "'columns' is not 80, cannot execute external commands"
-msgstr "'columns' не 80, не можна виконувати зовнішні команди"
-
 # msgstr "E364: "
 msgid "E237: Printer selection failed"
 msgstr "E237: Не вдалося вибрати принтер"
@@ -4839,6 +4862,12 @@
 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%%("
@@ -4867,6 +4896,9 @@
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] порожній"
 
+msgid "E65: Illegal back reference"
+msgstr "E65: Некоректне зворотне посилання"
+
 # msgstr "E382: "
 msgid "E339: Pattern too long"
 msgstr "E339: Зразок занадто довгий"
@@ -4907,9 +4939,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"
 
@@ -5520,10 +5549,31 @@
 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 "
 
@@ -6140,6 +6190,10 @@
 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"
 
@@ -6162,16 +6216,6 @@
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Пропущено дужки: %s"
 
-# msgstr "E440: "
-# ---------------------------------------
-#. Only MS VC 4.1 and earlier can do Win32s
-msgid ""
-"\n"
-"MS-Windows 16/32-bit GUI version"
-msgstr ""
-"\n"
-"Версія з GUI для 16/32-розрядної Windows"
-
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -6455,12 +6499,6 @@
 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>    інформація про це        "
-
 # msgstr "E444: "
 msgid "Already only one window"
 msgstr "Це вже єдине вікно"
@@ -6626,6 +6664,10 @@
 msgid "E473: Internal error"
 msgstr "E473: Внутрішня помилка"
 
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Внутрішня помилка: %s"
+
 msgid "Interrupted"
 msgstr "Перервано"
 
@@ -6915,8 +6957,9 @@
 msgid "E80: Error while writing"
 msgstr "E80: Помилка під час запису"
 
-msgid "Zero count"
-msgstr "Нульова кількість"
+# msgstr "E396: "
+msgid "E939: Positive count required"
+msgstr "E939: Потрібна додатна кількість"
 
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> використовується не в контексті скрипту"
@@ -6930,10 +6973,6 @@
 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/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index 2aa5f77..35ba8b3 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -17,8 +17,8 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-04-21 15:16+0800\n"
 "PO-Revision-Date: 2006-04-21 14:00+0800\n"
-"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
-"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Last-Translator: Yuheng Xie\n"
+"Language-Team: Simplified Chinese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 13a1891..f7f7f91 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -9,7 +9,7 @@
 #   Edyfox <edyfox@gmail.com>
 #   Yuheng Xie <elephant@linux.net.cn>
 #
-# Generated from zh_CN.po, DO NOT EDIT.
+# Generated from zh_CN.UTF-8.po, DO NOT EDIT.
 #
 msgid ""
 msgstr ""
@@ -17,8 +17,8 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-04-21 15:16+0800\n"
 "PO-Revision-Date: 2006-04-21 14:00+0800\n"
-"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
-"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Last-Translator: Yuheng Xie\n"
+"Language-Team: Simplified Chinese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=gbk\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -2894,7 +2894,8 @@
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <files>\tÈçÓпÉÄÜ£¬ÔÚ Vim ·þÎñÆ÷Éϱ༭Îļþ <files>"
 
-msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgid ""
+"--remote-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-silent <files>  ͬÉÏ£¬ÕÒ²»µ½·þÎñÆ÷ʱ²»±§Ô¹"
 
 msgid ""