changeset 14249:4543777545a3

Updated runtime and language files. commit https://github.com/vim/vim/commit/6dc819b1299e1d9f99303568772ade544d5c1322 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 3 16:42:19 2018 +0200 Updated runtime and language files.
author Christian Brabandt <cb@256bit.org>
date Tue, 03 Jul 2018 16:45:06 +0200
parents 6d5195298b47
children ca6ccee4823f
files runtime/autoload/csscomplete.vim runtime/doc/editing.txt runtime/doc/eval.txt runtime/doc/filetype.txt runtime/doc/insert.txt runtime/doc/options.txt runtime/doc/repeat.txt runtime/doc/tags runtime/doc/terminal.txt runtime/doc/tips.txt runtime/doc/todo.txt runtime/doc/version7.txt runtime/gvim.desktop runtime/indent/sas.vim runtime/lang/menu_da.latin1.vim runtime/menu.vim runtime/plugin/matchparen.vim runtime/tutor/tutor runtime/vim.desktop src/po/it.po src/po/ko.UTF-8.po src/po/ko.po src/po/pl.UTF-8.po src/po/pl.cp1250.po src/po/pl.po
diffstat 25 files changed, 1152 insertions(+), 1039 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/autoload/csscomplete.vim
+++ b/runtime/autoload/csscomplete.vim
@@ -4,7 +4,7 @@
 "           plus CSS Speech Module <http://www.w3.org/TR/css3-speech/>
 " Maintainer: Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
 " Original Author: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2016 Jan 11
+" Last Change: 2018 Jul 02
 
 let s:values = split("all additive-symbols align-content align-items align-self animation animation-delay animation-direction animation-duration animation-fill-mode animation-iteration-count animation-name animation-play-state animation-timing-function backface-visibility background background-attachment background-blend-mode background-clip background-color background-image background-origin background-position background-repeat background-size block-size border border-block-end border-block-end-color border-block-end-style border-block-end-width border-block-start border-block-start-color border-block-start-style border-block-start-width border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-collapse border-color border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-inline-end border-inline-end-color border-inline-end-style border-inline-end-width border-inline-start border-inline-start-color border-inline-start-style border-inline-start-width border-left border-left-color border-left-style border-left-width border-radius border-right border-right-color border-right-style border-right-width border-spacing border-style border-top border-top-color border-top-left-radius border-top-right-radius border-top-style border-top-width border-width bottom box-decoration-break box-shadow box-sizing break-after break-before break-inside caption-side clear clip clip-path color columns column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width content counter-increment counter-reset cue cue-before cue-after cursor direction display empty-cells fallback filter flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float font font-family font-feature-settings font-kerning font-language-override font-size font-size-adjust font-stretch font-style font-synthesis font-variant font-variant-alternates font-variant-caps font-variant-east-asian font-variant-ligatures font-variant-numeric font-variant-position font-weight grid grid-area grid-auto-columns grid-auto-flow grid-auto-position grid-auto-rows grid-column grid-column-start grid-column-end grid-row grid-row-start grid-row-end grid-template grid-template-areas grid-template-rows grid-template-columns height hyphens image-rendering image-resolution image-orientation ime-mode inline-size isolation justify-content left letter-spacing line-break line-height list-style list-style-image list-style-position list-style-type margin margin-block-end margin-block-start margin-bottom margin-inline-end margin-inline-start margin-left margin-right margin-top marks mask mask-type max-block-size max-height max-inline-size max-width max-zoom min-block-size min-height min-inline-size min-width min-zoom mix-blend-mode negative object-fit object-position offset-block-end offset-block-start offset-inline-end offset-inline-start opacity order orientation orphans outline outline-color outline-offset outline-style outline-width overflow overflow-wrap overflow-x overflow-y pad padding padding-block-end padding-block-start padding-bottom padding-inline-end padding-inline-start padding-left padding-right padding-top page-break-after page-break-before page-break-inside pause-before pause-after pause perspective perspective-origin pointer-events position prefix quotes range resize rest rest-before rest-after right ruby-align ruby-merge ruby-position scroll-behavior scroll-snap-coordinate scroll-snap-destination scroll-snap-points-x scroll-snap-points-y scroll-snap-type scroll-snap-type-x scroll-snap-type-y shape-image-threshold shape-margin shape-outside speak speak-as suffix symbols system table-layout tab-size text-align text-align-last text-combine-upright text-decoration text-decoration-color text-decoration-line text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-indent text-orientation text-overflow text-rendering text-shadow text-transform text-underline-position top touch-action transform transform-box transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-bidi unicode-range user-zoom vertical-align visibility voice-balance voice-duration voice-family voice-pitch voice-rate voice-range voice-stress voice-volume white-space widows width will-change word-break word-spacing word-wrap writing-mode z-index zoom")
 
@@ -19,7 +19,6 @@ function! csscomplete#CompleteCSS(findst
     while start >= 0 && line[start - 1] =~ '\%(\k\|-\)'
       let start -= 1
     endwhile
-    let b:after = line[compl_begin :]
     let b:compl_context = line[0:compl_begin]
     return start
   endif
@@ -37,11 +36,14 @@ function! csscomplete#CompleteCSS(findst
   " 5. if @ complete at-rule
   " 6. if ! complete important
   if exists("b:compl_context")
+    let line = getline('.')
+    let compl_begin = col('.') - 2
+    let after = line[compl_begin:]
     let line = b:compl_context
-    let after = b:after
     unlet! b:compl_context
   else
     let line = a:base
+    let after = ''
   endif
 
   let res = []
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -901,8 +901,8 @@ 4. Writing					*writing* *save-file*
 Note: When the 'write' option is off, you are not able to write any file.
 
 							*:w* *:write*
-						*E502* *E503* *E504* *E505*
-						*E512* *E514* *E667* *E796* *E949*
+					*E502* *E503* *E504* *E505*
+					*E512* *E514* *E667* *E796* *E949*
 :w[rite] [++opt]	Write the whole buffer to the current file.  This is
 			the normal way to save changes to a file.  It fails
 			when the 'readonly' option is set or when there is
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3629,6 +3629,7 @@ executable({expr})					*executable()*
 			1	exists
 			0	does not exist
 			-1	not implemented on this system
+		|exepath()| can be used to get the full path of an executable.
 
 execute({command} [, {silent}])					*execute()*
 		Execute an Ex command or commands and return the output as a
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -320,8 +320,8 @@ then Vim will load all plugins in these 
 Note that the last one is the value of $VIMRUNTIME which has been expanded.
 
 Note that when using a plugin manager or |packages| many directories will be
-added to 'runtimepath'.  These plugins earch require their own directory,
-don't put them directly in ~/.vim/plugin.
+added to 'runtimepath'.  These plugins each require their own directory, don't
+put them directly in ~/.vim/plugin.
 
 What if it looks like your plugin is not being loaded?  You can find out what
 happens when Vim starts up by using the |-V| argument: >
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1535,7 +1535,7 @@ phpFunctions.
 
 If you wish non-filetype syntax items to also be included, you can use a
 regular expression syntax (added in version 13.0 of
-autoload\syntaxcomplete.vim) to add items.  Looking at the output from
+autoload/syntaxcomplete.vim) to add items.  Looking at the output from
 ":syntax list" while editing a PHP file I can see some of these entries: >
     htmlArg,htmlTag,htmlTagName,javaScriptStatement,javaScriptGlobalObjects
 
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -8489,11 +8489,11 @@ A jump table for the options with a shor
 	final value applying to all subsequent tabs.
 
 	For example, when editing assembly language files where statements
-	start in the 8th column and comments in the 40th, it may be useful
+	start in the 9th column and comments in the 41st, it may be useful
 	to use the following: >
 		:set varsofttabstop=8,32,8
-<	This will set soft tabstops at the 8th and 40th columns, and at every
-	8th column thereafter.
+<	This will set soft tabstops with 8 and 8 + 32 spaces, and 8 more
+	for every column thereafter.
 
 	Note that the value of |'softtabstop'| will be ignored while
 	'varsofttabstop' is set.
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -265,7 +265,7 @@ For writing a Vim script, see chapter 41
 			loaded during initialization, see |load-plugins|.
 
 			Also see |pack-add|.
-			{only available when compiled with +eval}
+			{only available when compiled with |+eval|}
 
 						*:packl* *:packloadall*
 :packl[oadall][!]	Load all packages in the "start" directory under each
@@ -289,7 +289,7 @@ For writing a Vim script, see chapter 41
 			An error only causes sourcing the script where it
 			happens to be aborted, further plugins will be loaded.
 			See |packages|.
-			{only available when compiled with +eval}
+			{only available when compiled with |+eval|}
 
 :scripte[ncoding] [encoding]		*:scripte* *:scriptencoding* *E167*
 			Specify the character encoding used in the script.
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5176,6 +5176,7 @@ autocmds-kept	version5.txt	/*autocmds-ke
 autocommand	autocmd.txt	/*autocommand*
 autocommand-events	autocmd.txt	/*autocommand-events*
 autocommand-pattern	autocmd.txt	/*autocommand-pattern*
+autocommands	autocmd.txt	/*autocommands*
 autoformat	change.txt	/*autoformat*
 autoload	eval.txt	/*autoload*
 autoload-functions	eval.txt	/*autoload-functions*
@@ -5762,6 +5763,7 @@ debug-vs2005	debug.txt	/*debug-vs2005*
 debug-win32	debug.txt	/*debug-win32*
 debug-windbg	debug.txt	/*debug-windbg*
 debug.txt	debug.txt	/*debug.txt*
+debugbreak()	eval.txt	/*debugbreak()*
 debugger-compilation	debugger.txt	/*debugger-compilation*
 debugger-features	debugger.txt	/*debugger-features*
 debugger-integration	debugger.txt	/*debugger-integration*
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -523,9 +523,9 @@ inspects the resulting screen state.
 
 Functions ~
 
-term_sendkeys()		send keystrokes to a terminal (not subject to tmap)
-term_wait()		wait for screen to be updated
-term_scrape()		inspect terminal screen
+|term_sendkeys()|	send keystrokes to a terminal (not subject to tmap)
+|term_wait()|		wait for screen to be updated
+|term_scrape()|		inspect terminal screen
 
 
 ==============================================================================
@@ -552,7 +552,7 @@ src/testdir/test_syntax.vim.  The main p
   characters.  This makes sure the dump is always this size.  The function
   RunVimInTerminal() takes care of this.  Pass it the arguments for the Vim
   command.
-- Send any commands to Vim using term_sendkeys().  For example: >
+- Send any commands to Vim using |term_sendkeys()|.  For example: >
 	call term_sendkeys(buf, ":echo &lines &columns\<CR>")
 - Check that the screen is now in the expected state, using
   VerifyScreenDump().  This expects the reference screen dump to be in the
@@ -580,13 +580,13 @@ Creating a screen dump ~
 							*terminal-screendump*
 
 To create the screen dump, run Vim (or any other program) in a terminal and
-make it show the desired state.  Then use the term_dumpwrite() function to
+make it show the desired state.  Then use the |term_dumpwrite()| function to
 create a screen dump file.  For example: >
 	:call term_dumpwrite(77, "mysyntax.dump")
 
 Here "77" is the buffer number of the terminal.  Use `:ls!` to see it.
 
-You can view the screen dump with term_dumpload(): >
+You can view the screen dump with |term_dumpload()|: >
 	:call term_dumpload("mysyntax.dump")
 
 To verify that Vim still shows exactly the same screen, run Vim again with
@@ -594,7 +594,7 @@ exactly the same way to show the desired
 again, using a different file name: >
 	:call term_dumpwrite(88, "test.dump")
 
-To assert that the files are exactly the same use assert_equalfile(): >
+To assert that the files are exactly the same use |assert_equalfile()|: >
 	call assert_equalfile("mysyntax.dump", "test.dump")
 
 If there are differences then v:errors will contain the error message.
@@ -603,8 +603,8 @@ If there are differences then v:errors w
 Comparing screen dumps ~
 						*terminal-diffscreendump*
 
-assert_equalfile() does not make it easy to see what is different.
-To spot the problem use term_dumpdiff(): >
+|assert_equalfile()| does not make it easy to see what is different.
+To spot the problem use |term_dumpdiff()|: >
 	call term_dumpdiff("mysyntax.dump", "test.dump")
 
 This will open a window consisting of three parts:
@@ -900,7 +900,7 @@ Vim window width						*termdebug_wide*
 To change the width of the Vim window when debugging starts, and use a
 vertical split: >
   let g:termdebug_wide = 163
-This will set &columns to 163 when :Termdebug is used.  The value is restored
+This will set &columns to 163 when `:Termdebug` is used.  The value is restored
 when quitting the debugger.
 If g:termdebug_wide is set and &columns is already larger than
 g:termdebug_wide then a vertical split will be used without changing &columns.
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -408,14 +408,13 @@ when they are not in the same location a
 ==============================================================================
 Executing shell commands in a window			*shell-window*
 
-There have been questions for the possibility to execute a shell in a window
-inside Vim.  The answer: you can't!  Including this would add a lot of code to
-Vim, which is a good reason not to do this.  After all, Vim is an editor, it
-is not supposed to do non-editing tasks.  However, to get something like this,
-you might try splitting your terminal screen or display window with the
+See |terminal|.
+
+Another solution is splitting your terminal screen or display window with the
 "splitvt" program.  You can probably find it on some ftp server.  The person
 that knows more about this is Sam Lantinga <slouken@cs.ucdavis.edu>.
-An alternative is the "window" command, found on BSD Unix systems, which
+
+Another alternative is the "window" command, found on BSD Unix systems, which
 supports multiple overlapped windows.  Or the "screen" program, found at
 www.uni-erlangen.de, which supports a stack of windows.
 
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -38,6 +38,8 @@ browser use: https://github.com/vim/vim/
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+testdir: remove use of lua.vim from makefiles and test1.in
+
 Prompt buffer:
 - Add a command line history.
 - delay next prompt until plugin gives OK?
@@ -89,8 +91,8 @@ Errors found with random data:
 More warnings from static analysis:
 https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
 
-Patch to fix duplicate entry in tagfiles() and add a test. (Dominique Pelle,
-#2979)
+Patch to fix that :cexpr no longer jumps to first error. (Yegappan 2018 Jun
+25, #3092)
 
 Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17)
 Related to bracketed paste.  I cannot reproduce it.
@@ -103,13 +105,15 @@ Pull request #2967: Allow white space in
 Patch for xterm and vt320 builtin termcap. (Kouichi Iwamoto, 2018 May 31,
 #2973)
 
+Patch for matchit and matchparen. (Christian, 2018 Jun 25)
+
 Patch to add more testing for :cd command. (Dominique Pelle, 2018 May 30,
 #2972)
 
 Whenever the file name is "~" then expand('%:p') returns $HOME. (Aidan
-Shafran, 2018 Jun 23, #3072)
-
-Patch to set w_curswant when setting the cursor in language interfaces.
+Shafran, 2018 Jun 23, #3072)  Proposed patch by Aidan, 2018 Jun 24.
+
+Patch to set w_set_curswant when setting the cursor in language interfaces.
 (David Hotham, 2018 Jun 22, #3060)
 
 Patch to make CTRL-W <CR> work properly in a quickfix window. (Jason Franklin,
@@ -169,9 +173,19 @@ Cursor in wrong position when line wraps
 
 Patch for Lua support. (Kazunobu Kuriyama, 2018 May 26)
 
+Make {skip} argument of searchpair() consistent with other places where we
+pass an expression to evaluate.  Allow passing zero for "never skip".
+
 Add an option similar to 'lazyredraw' to skip redrawing while executing a
 script or function.
 
+Universal solution to detect if t_RS is working, using cursor position.
+Koichi Iwamoto, #2126
+
+When using a menu item while the "more" prompt is displayed doesn't work well.
+E.g. after using help->version.  Have a key that ends the "more" prompt and
+does nothing otherwise?
+
 MS-Windows: write may fail if another program is reading the file.
 If 'readonly' is not set but the file appears to be readonly later, try again
 (wait a little while).
@@ -353,9 +367,6 @@ redrawn properly. (xtal8, 2017 Oct 23, #
 In an optional package the "after" directory is not scanned?
 (Renato Fabbri, 2018 Feb 22)
 
-Universal solution to detect if t_RS is working, using cursor position.
-Koichi Iwamoto, #2126
-
 Patch for Neovim concerning restoring when closing help window. (glacambre
 neovim #7431)
 
@@ -1405,9 +1416,6 @@ Patch by Thomas Tuegel, also for GTK, 20
 
 :help gives example for z?, but it does not work.  m? and t? do work.
 
-Patch to add funcref to Lua.  (Luis Carvalho, 2013 Sep 4)
-With tests: Sep 5.
-
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
@@ -4664,10 +4672,7 @@ 8   When editing "tt.gz", which is in DO
     command used dos fileformat.  Same for 'fileencoding'.
 -   Add events to autocommands:
     Error	    - When an error happens
-    NormalEnter	    - Entering Normal mode
-    ReplaceEnter    - Entering Replace mode
-    VisualEnter	    - Entering Visual mode
-    *Leave	    - Leaving a mode (in pair with the above *Enter)
+    ModeChange	    - after changing mode (before waiting for a char)
     VimLeaveCheck    - Before Vim decides to exit, so that it can be cancelled
 		      when exiting isn't a good idea.
     CursorHoldC     - CursorHold while command-line editing
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1980,7 +1980,7 @@ Appending to a register didn't insert a 
 flag to 'cpoptions' for this.
 
 Using "I" in a line with only blanks appended to the line.  This is not Vi
-compatible.  Added the 'H' flag in 'coptions' for this.
+compatible.  Added the 'H' flag in 'cpoptions' for this.
 
 When joining multiple lines the cursor would be at the last joint, but Vi
 leaves it at the position where "J" would put it.  Added the 'q' flag in
--- a/runtime/gvim.desktop
+++ b/runtime/gvim.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name=GVim
 GenericName=Text Editor
+GenericName[da]=Tekstredigering
 GenericName[de]=Texteditor
+GenericName[pl]=Edytor tekstu
 Comment=Edit text files
 Comment[af]=Redigeer tekslêers
 Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
@@ -14,7 +16,7 @@ Comment[bs]=Izmijeni tekstualne datoteke
 Comment[ca]=Edita fitxers de text
 Comment[cs]=Úprava textových souborů
 Comment[cy]=Golygu ffeiliau testun
-Comment[da]=Redigér tekstfiler
+Comment[da]=Rediger tekstfiler
 Comment[de]=Textdateien bearbeiten
 Comment[el]=Επεξεργασία αρχείων κειμένου
 Comment[en_CA]=Edit text files
@@ -50,7 +52,7 @@ Comment[nn]=Rediger tekstfiler
 Comment[no]=Rediger tekstfiler
 Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
 Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
-Comment[pl]=Edytor plików tekstowych
+Comment[pl]=Edytuj pliki tekstowe
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
--- a/runtime/indent/sas.vim
+++ b/runtime/indent/sas.vim
@@ -1,8 +1,8 @@
 " Vim indent file
 " Language:     SAS
 " Maintainer:   Zhen-Huan Hu <wildkeny@gmail.com>
-" Version:      3.0.1
-" Last Change:  Mar 13, 2017
+" Version:      3.0.3
+" Last Change:  Jun 26, 2018
 
 if exists("b:did_indent")
   finish
@@ -27,9 +27,9 @@ let s:section_run = '\v%(^|;)\s*run\s*;'
 let s:section_end = '\v%(^|;)\s*%(quit|enddata)\s*;'
 
 " Regex that captures the start of a control block (anything inside a section)
-let s:block_str = '\v<%(do>%([^;]+<%(to|over)>[^;]+)=|%(define|layout|method|select)>[^;]+|begingraph)\s*;'
+let s:block_str = '\v<%(do>%([^;]+<%(to|over|while)>[^;]+)=|%(compute|define\s+%(column|footer|header|style|table|tagset|crosstabs|statgraph)|edit|layout|method|select)>[^;]+|begingraph)\s*;'
 " Regex that captures the end of a control block (anything inside a section)
-let s:block_end = '\v<%(end|endlayout|endgraph)\s*;'
+let s:block_end = '\v<%(end|endcomp|endlayout|endgraph)\s*;'
 
 " Regex that captures the start of a macro
 let s:macro_str = '\v%(^|;)\s*\%macro>'
@@ -52,7 +52,7 @@ function! s:PrevMatch(lnum, regex)
   let prev_lnum = prevnonblank(a:lnum - 1)
   while prev_lnum > 0
     let prev_line = getline(prev_lnum)
-    if prev_line =~ a:regex
+    if prev_line =~? a:regex
       break
     else
       let prev_lnum = prevnonblank(prev_lnum - 1)
@@ -71,11 +71,11 @@ function! GetSASIndent()
     let prev_line = getline(prev_lnum)
     " Previous non-blank line contains the start of a macro/section/block
     " while not the end of a macro/section/block (at the same line)
-    if (prev_line =~ s:section_str && prev_line !~ s:section_run && prev_line !~ s:section_end) ||
-          \ (prev_line =~ s:block_str && prev_line !~ s:block_end) ||
-          \ (prev_line =~ s:macro_str && prev_line !~ s:macro_end)
-      let ind = indent(prev_lnum) + &sts
-    elseif prev_line =~ s:section_run && prev_line !~ s:section_end
+    if (prev_line =~? s:section_str && prev_line !~? s:section_run && prev_line !~? s:section_end) ||
+          \ (prev_line =~? s:block_str && prev_line !~? s:block_end) ||
+          \ (prev_line =~? s:macro_str && prev_line !~? s:macro_end)
+      let ind = indent(prev_lnum) + shiftwidth()
+    elseif prev_line =~? s:section_run && prev_line !~? s:section_end
       let prev_section_str_lnum = s:PrevMatch(v:lnum, s:section_str)
       let prev_section_end_lnum = max([
             \ s:PrevMatch(v:lnum, s:section_end),
@@ -83,9 +83,9 @@ function! GetSASIndent()
             \ s:PrevMatch(v:lnum, s:program_end)])
       " Check if the section supports run-processing
       if prev_section_end_lnum < prev_section_str_lnum &&
-            \ getline(prev_section_str_lnum) =~ '\v%(^|;)\s*proc\s+%(' .
+            \ getline(prev_section_str_lnum) =~? '\v%(^|;)\s*proc\s+%(' .
             \ join(s:run_processing_procs, '|') . ')>'
-        let ind = indent(prev_lnum) + &sts
+        let ind = indent(prev_lnum) + shiftwidth()
       else
         let ind = indent(prev_lnum)
       endif
@@ -95,26 +95,26 @@ function! GetSASIndent()
   endif
   " Re-adjustments based on the inputs of the current line
   let curr_line = getline(v:lnum)
-  if curr_line =~ s:program_end
+  if curr_line =~? s:program_end
     " End of the program
     " Same indentation as the first non-blank line
     return indent(nextnonblank(1))
-  elseif curr_line =~ s:macro_end
+  elseif curr_line =~? s:macro_end
     " Current line is the end of a macro
     " Match the indentation of the start of the macro
     return indent(s:PrevMatch(v:lnum, s:macro_str))
-  elseif curr_line =~ s:block_end && curr_line !~ s:block_str
+  elseif curr_line =~? s:block_end && curr_line !~? s:block_str
     " Re-adjust if current line is the end of a block
     " while not the beginning of a block (at the same line)
     " Returning the indent of previous block start directly
     " would not work due to nesting
-    let ind = ind - &sts
-  elseif curr_line =~ s:section_str || curr_line =~ s:section_run || curr_line =~ s:section_end
+    let ind = ind - shiftwidth()
+  elseif curr_line =~? s:section_str || curr_line =~? s:section_run || curr_line =~? s:section_end
     " Re-adjust if current line is the start/end of a section
     " since the end of a section could be inexplicit
     let prev_section_str_lnum = s:PrevMatch(v:lnum, s:section_str)
     " Check if the previous section supports run-processing
-    if getline(prev_section_str_lnum) =~ '\v%(^|;)\s*proc\s+%(' .
+    if getline(prev_section_str_lnum) =~? '\v%(^|;)\s*proc\s+%(' .
           \ join(s:run_processing_procs, '|') . ')>'
       let prev_section_end_lnum = max([
             \ s:PrevMatch(v:lnum, s:section_end),
@@ -128,7 +128,7 @@ function! GetSASIndent()
             \ s:PrevMatch(v:lnum, s:program_end)])
     endif
     if prev_section_end_lnum < prev_section_str_lnum
-      let ind = ind - &sts
+      let ind = ind - shiftwidth()
     endif
   endif
   return ind
new file mode 100644
--- /dev/null
+++ b/runtime/lang/menu_da.latin1.vim
@@ -0,0 +1,3 @@
+" Menu Translations:	Danish for iso-8859-1 encoding
+
+source <sfile>:p:h/menu_da.utf-8.vim
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -809,7 +809,7 @@ func! s:BMMunge(fname, bnum)
   let name = a:fname
   if name == ''
     if !exists("g:menutrans_no_file")
-      let g:menutrans_no_file = "[No file]"
+      let g:menutrans_no_file = "[No Name]"
     endif
     let name = g:menutrans_no_file
   else
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,6 @@
 " Vim plugin for showing matching parens
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2017 Sep 30
+" Last Change: 2018 Jun 23
 
 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
--- a/runtime/tutor/tutor
+++ b/runtime/tutor/tutor
@@ -19,7 +19,7 @@
      properly.  If you only read the text, you will forget the commands!
 
      Now, make sure that your Caps-Lock key is NOT depressed and press
-     the   j   key enough times to move the cursor so that Lesson 1.1
+     the   j   key enough times to move the cursor so that lesson 1.1
      completely fills the screen.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lesson 1.1:  MOVING THE CURSOR
@@ -36,7 +36,7 @@
   2. Hold down the down key (j) until it repeats.
      Now you know how to move to the next lesson.
 
-  3. Using the down key, move to Lesson 1.2.
+  3. Using the down key, move to lesson 1.2.
 
 NOTE: If you are ever unsure about something you typed, press <ESC> to place
       you in Normal mode.  Then retype the command you wanted.
@@ -64,7 +64,7 @@ NOTE: The cursor keys should also work. 
 NOTE:  :q! <ENTER>  discards any changes you made.  In a few lessons you
        will learn how to save the changes to a file.
 
-  5. Move the cursor down to Lesson 1.3.
+  5. Move the cursor down to lesson 1.3.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -84,7 +84,7 @@ NOTE:  :q! <ENTER>  discards any changes
 
 ---> The ccow jumpedd ovverr thhe mooon.
 
-  5. Now that the line is correct, go on to Lesson 1.4.
+  5. Now that the line is correct, go on to lesson 1.4.
 
 NOTE: As you go through this tutor, do not try to memorize, learn by usage.
 
@@ -126,7 +126,7 @@ NOTE: As you go through this tutor, do n
 
   3. As the text has been appended press <ESC> to return to Normal mode.
 
-  4. Move the cursor to the second line marked ---> and repeat 
+  4. Move the cursor to the second line marked ---> and repeat
      steps 2 and 3 to correct this sentence.
 
 ---> There is some text missing from th
@@ -152,13 +152,13 @@ NOTE: As you go through this tutor, do n
 
   3. Insert and delete text as you learned in the previous lessons.
 
-  4. Save the file with changes and exit Vim with:  :wq  <ENTER>
+  4. Save the file with changes and exit Vim with:  :wq <ENTER>
 
   5. If you have quit vimtutor in step 1 restart the vimtutor and move down to
      the following summary.
 
   6. After reading the above steps and understanding them: do it.
-  
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       Lesson 1 SUMMARY
 
@@ -180,7 +180,7 @@ NOTE: As you go through this tutor, do n
 NOTE: Pressing <ESC> will place you in Normal mode or will cancel
       an unwanted and partially completed command.
 
-Now continue with Lesson 2.
+Now continue with lesson 2.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			Lesson 2.1: DELETION COMMANDS
@@ -202,7 +202,7 @@ Now continue with Lesson 2.
 
 ---> There are a some words fun that don't belong paper in this sentence.
 
-  5. Repeat steps 3 and 4 until the sentence is correct and go to Lesson 2.2.
+  5. Repeat steps 3 and 4 until the sentence is correct and go to lesson 2.2.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -222,7 +222,7 @@ Now continue with Lesson 2.
 ---> Somebody typed the end of this line twice. end of this line twice.
 
 
-  5. Move on to Lesson 2.3 to understand what is happening.
+  5. Move on to lesson 2.3 to understand what is happening.
 
 
 
@@ -257,7 +257,7 @@ NOTE:  Pressing just the motion while in
 
    ** Typing a number before a motion repeats it that many times. **
 
-  1. Move the cursor to the start of the line marked ---> below.
+  1. Move the cursor to the start of the line below marked --->.
 
   2. Type  2w  to move the cursor two words forward.
 
@@ -269,7 +269,7 @@ NOTE:  Pressing just the motion while in
 
 ---> This is just a line with words you can move around in.
 
-  6. Move on to Lesson 2.5.
+  6. Move on to lesson 2.5.
 
 
 
@@ -286,10 +286,10 @@ NOTE:  Pressing just the motion while in
 
   1. Move the cursor to the first UPPER CASE word in the line marked --->.
 
-  2. Type  d2w  to delete the two UPPER CASE words
+  2. Type  d2w  to delete the two UPPER CASE words.
 
   3. Repeat steps 1 and 2 with a different count to delete the consecutive
-     UPPER CASE words with one command
+     UPPER CASE words with one command.
 
 --->  this ABC DE line FGHI JK LMN OP of words is Q RS TUV cleaned up.
 
@@ -338,7 +338,7 @@ NOTE:  Pressing just the motion while in
 
 ---> Fiix the errors oon thhis line and reeplace them witth undo.
 
-  8. These are very useful commands.  Now move on to the Lesson 2 Summary.
+  8. These are very useful commands.  Now move on to the lesson 2 Summary.
 
 
 
@@ -406,7 +406,7 @@ NOTE:  Pressing just the motion while in
 --->  Whan this lime was tuoed in, someone presswd some wrojg keys!
 --->  When this line was typed in, someone pressed some wrong keys!
 
-  5. Now move on to Lesson 3.3.
+  5. Now move on to lesson 3.3.
 
 NOTE: Remember that you should be learning by doing, not memorization.
 
@@ -558,7 +558,7 @@ NOTE: This is very useful in debugging a
 
   1. Move the cursor to the line below marked --->.
 
-  2. Type  :s/thee/the <ENTER> .  Note that this command only changes the
+  2. Type  :s/thee/the <ENTER>  .  Note that this command only changes the
      first occurrence of "thee" in the line.
 
   3. Now type  :s/thee/the/g .  Adding the  g  flag means to substitute
@@ -623,7 +623,7 @@ NOTE:  All  :  commands must be finished
 		      Lesson 5.2: MORE ON WRITING FILES
 
 
-     ** To save the changes made to the text, type  :w FILENAME. **
+     ** To save the changes made to the text, type  :w FILENAME  **
 
   1. Type  :!dir  or  :!ls  to get a listing of your directory.
      You already know you must hit <ENTER> after this.
@@ -638,7 +638,7 @@ NOTE:  All  :  commands must be finished
 NOTE: If you were to exit Vim and start it again with  vim TEST , the file
       would be an exact copy of the tutor when you saved it.
 
-  5. Now remove the file by typing (MS-DOS):    :!del TEST
+  5. Now remove the file by typing (Windows):   :!del TEST
 				or (Unix):	:!rm TEST
 
 
@@ -673,7 +673,7 @@ NOTE:  Pressing  v  starts Visual select
 
   1. Place the cursor just above this line.
 
-NOTE:  After executing Step 2 you will see text from Lesson 5.3.  Then move
+NOTE:  After executing Step 2 you will see text from lesson 5.3.  Then move
        DOWN to see this lesson again.
 
   2. Now retrieve your TEST file using the command   :r TEST   where TEST is
@@ -681,7 +681,7 @@ NOTE:  After executing Step 2 you will s
      The file you retrieve is placed below the cursor line.
 
   3. To verify that a file was retrieved, cursor back and notice that there
-     are now two copies of Lesson 5.3, the original and the file version.
+     are now two copies of lesson 5.3, the original and the file version.
 
 NOTE:  You can also read the output of an external command.  For example,
        :r !ls  reads the output of the ls command and puts it below the
@@ -695,7 +695,7 @@ NOTE:  You can also read the output of a
   1.  :!command  executes an external command.
 
       Some useful examples are:
-	 (MS-DOS)	  (Unix)
+	 (Windows)	  (Unix)
 	  :!dir		   :!ls		   -  shows a directory listing.
 	  :!del FILENAME   :!rm FILENAME   -  removes file FILENAME.
 
@@ -717,7 +717,7 @@ NOTE:  You can also read the output of a
 
  ** Type  o  to open a line below the cursor and place you in Insert mode. **
 
-  1. Move the cursor to the line below marked --->.
+  1. Move the cursor to the first line below marked --->.
 
   2. Type the lowercase letter  o  to open up a line BELOW the cursor and place
      you in Insert mode.
@@ -741,7 +741,7 @@ NOTE:  You can also read the output of a
 	     ** Type  a  to insert text AFTER the cursor. **
 
   1. Move the cursor to the start of the line below marked --->.
-  
+
   2. Press  e  until the cursor is on the end of  li .
 
   3. Type an  a  (lowercase) to append text AFTER the cursor.
@@ -750,7 +750,7 @@ NOTE:  You can also read the output of a
      mode.
 
   5. Use  e  to move to the next incomplete word and repeat steps 3 and 4.
-  
+
 ---> This li will allow you to pract appendi text to a line.
 ---> This line will allow you to practice appending text to a line.
 
@@ -786,10 +786,10 @@ NOTE:  Replace mode is like Insert mode,
 
 	  ** Use the  y  operator to copy text and  p  to paste it **
 
-  1. Go to the line marked with ---> below and place the cursor after "a)".
-  
+  1. Move to the line below marked ---> and place the cursor after "a)".
+
   2. Start Visual mode with  v  and move the cursor to just before "first".
-  
+
   3. Type  y  to yank (copy) the highlighted text.
 
   4. Move the cursor to the end of the next line:  j$
@@ -802,14 +802,14 @@ NOTE:  Replace mode is like Insert mode,
 --->  a) this is the first item.
       b)
 
-  NOTE: you can also use  y  as an operator;  yw  yanks one word.
+  NOTE: You can also use  y  as an operator;  yw  yanks one word.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			    Lesson 6.5: SET OPTION
 
 
 	  ** Set an option so a search or substitute ignores case **
 
-  1. Search for 'ignore' by entering:   /ignore  <ENTER>
+  1. Search for 'ignore' by entering:  /ignore <ENTER>
      Repeat several times by pressing  n .
 
   2. Set the 'ic' (Ignore case) option by entering:   :set ic
@@ -823,9 +823,9 @@ NOTE:  Replace mode is like Insert mode,
 
   6. To disable ignoring case enter:  :set noic
 
-NOTE:  To remove the highlighting of matches enter:   :nohlsearch 
+NOTE:  To remove the highlighting of matches enter:   :nohlsearch
 NOTE:  If you want to ignore case for just one search command, use  \c
-       in the phrase:  /ignore\c  <ENTER>
+       in the phrase:  /ignore\c <ENTER>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       Lesson 6 SUMMARY
 
@@ -883,7 +883,7 @@ NOTE:  If you want to ignore case for ju
 
   1. Start editing the "vimrc" file.  This depends on your system:
 	:e ~/.vimrc		for Unix
-	:e $VIM/_vimrc		for MS-Windows
+	:e $VIM/_vimrc		for Windows
 
   2. Now read the example "vimrc" file contents:
 	:r $VIMRUNTIME/vimrc_example.vim
@@ -909,7 +909,7 @@ NOTE:  If you want to ignore case for ju
 
   4. Press  CTRL-D  and Vim will show a list of commands that start with "e".
 
-  5. Press <TAB>  and Vim will complete the command name to ":edit".
+  5. Type  d<TAB>  and Vim will complete the command name to ":edit".
 
   6. Now add a space and the start of an existing file name:  :edit FIL
 
@@ -922,13 +922,13 @@ NOTE:  Completion works for many command
 			       Lesson 7 SUMMARY
 
 
-  1. Type  :help  or press <F1> or <Help>  to open a help window.
+  1. Type  :help  or press <F1> or <HELP>  to open a help window.
 
   2. Type  :help cmd  to find help on  cmd .
 
-  3. Type  CTRL-W CTRL-W  to jump to another window
+  3. Type  CTRL-W CTRL-W  to jump to another window.
 
-  4. Type  :q  to close the help window
+  4. Type  :q  to close the help window.
 
   5. Create a vimrc startup script to keep your preferred settings.
 
--- a/runtime/vim.desktop
+++ b/runtime/vim.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Name=Vim
 GenericName=Text Editor
+GenericName[da]=Tekstredigering
 GenericName[de]=Texteditor
+GenericName[pl]=Edytor tekstu
 Comment=Edit text files
 Comment[af]=Redigeer tekslêers
 Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
@@ -50,7 +52,7 @@ Comment[nn]=Rediger tekstfiler
 Comment[no]=Rediger tekstfiler
 Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
 Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
-Comment[pl]=Edytor plików tekstowych
+Comment[pl]=Edytuj pliki tekstowe
 Comment[pt]=Editar ficheiros de texto
 Comment[pt_BR]=Edite arquivos de texto
 Comment[ro]=Editare fişiere text
--- a/src/po/it.po
+++ b/src/po/it.po
@@ -1,8 +1,8 @@
 # Italian translation for Vim
 #
-# FIRST AUTHOR Antonio Colombo <azc100@gmail.com>, 2000
-# Vlad Sandrini <vlad.gently@gmail.com>
-# Luciano Montanaro <mikelima@cirulla.net>
+# Antonio Colombo <azc100@gmail.com>, 2000
+# Vlad Sandrini <vlad.gently@gmail.com>, 2002
+# Luciano Montanaro <mikelima@cirulla.net>, 2006
 #
 # Ogni commento  benvenuto...
 # Every remark is very welcome...
@@ -15,14 +15,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-19 21:17+0200\n"
-"PO-Revision-Date:  2018-06-19 22:30+0200\n"
-"Last-Translator:   Antonio Colombo   <azc100@gmail.com>\n"
+"POT-Creation-Date: 2018-06-26 09:09+0200\n"
+"PO-Revision-Date: 2018-06-26 15:33+0200\n"
+"Last-Translator: Antonio Colombo <azc100@gmail.com>\n"
 "Language-Team: Italian\n"
-"Language: It\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO_8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "E831: bf_key_init() called with empty password"
@@ -460,7 +460,6 @@ msgstr "E734: Tipo di variabile errato p
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Nome di variabile non ammesso: %s"
 
-# nuovo
 msgid "E806: using Float as a String"
 msgstr "E806: uso di un Numero-a-virgola-mobile come Stringa"
 
@@ -584,7 +583,6 @@ msgstr "E730: uso di Lista come Stringa"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: uso di Dizionario come Stringa"
 
-# nuovo
 msgid "E908: using an invalid value as a String"
 msgstr "E908: uso di un valore non valido come Stringa"
 
@@ -1300,6 +1298,9 @@ msgstr "E784: Non posso chiudere l'ultim
 msgid "Already only one tab page"
 msgstr "C' gi una linguetta sola"
 
+msgid "Edit File in new tab page"
+msgstr "Apri il File in una nuova finestra"
+
 msgid "Edit File in new window"
 msgstr "Apri il File in una nuova finestra"
 
@@ -1391,7 +1392,6 @@ msgstr ""
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: nessun numero di riga da usare per \"<slnum>\""
 
-#, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: Un nome di file nullo per '%' o '#', va bene solo con \":p:h\""
 
@@ -1877,7 +1877,7 @@ msgid ""
 "--- Autocommands ---"
 msgstr ""
 "\n"
-"--- Auto-Comandi ---"
+"--- Autocomandi ---"
 
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <buffer=%d>: numero buffer non valido"
@@ -1892,7 +1892,7 @@ msgid "E218: autocommand nesting too dee
 msgstr "E218: nidificazione dell'autocomando troppo estesa"
 
 msgid "%s Autocommands for \"%s\""
-msgstr "%s Auto comandi per \"%s\""
+msgstr "%s Autocomandi per \"%s\""
 
 msgid "Executing %s"
 msgstr "Eseguo %s"
@@ -2742,7 +2742,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"  uso:"
+"  Uso:"
 
 msgid " vim [arguments] "
 msgstr " vim [argomenti] "
@@ -3898,7 +3898,6 @@ msgstr "libero %ld righe"
 msgid " into \"%c"
 msgstr " in \"%c"
 
-#
 msgid "block of 1 line yanked%s"
 msgstr "blocco di 1 riga messo in registro%s"
 
@@ -4444,7 +4443,7 @@ msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( non consentito qui"
 
 msgid "E67: \\z1 - \\z9 not allowed here"
-msgstr "E67: \\z1 ecc. non consentiti qui"
+msgstr "E67: \\z1 - \\z9 non consentiti qui"
 
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: Manca ] dopo %s%%["
@@ -4552,8 +4551,12 @@ msgstr "E879: (NFA regexp) Troppi \\z("
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) errore di terminazione corretta"
 
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr ""
+"Non posso aprire il file temporaneo di log in scrittura, mostro su stderr... "
+
 msgid "E874: (NFA) Could not pop the stack!"
-msgstr "E874: (NFA) Impossibile riprendere lo stack !"
+msgstr "E874: (NFA) Impossibile riprendere lo stack!"
 
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
@@ -4568,22 +4571,6 @@ msgstr "E876: (NFA regexp) Non c' spazio per immagazzinare l'intero NFA "
 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Non posso allocare memoria per il zigzag di ramo!"
 
-msgid "Could not open temporary log file for writing, displaying on stderr... "
-msgstr ""
-"Non posso aprire il file temporaneo di log in scrittura, mostro su stderr... "
-
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) IMPOSSIBILE APRIRE %s !"
-
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-"Non posso aprire il file temporaneo di log in scrittura, mostro su "
-"stderr ... "
-
-msgid "Could not open temporary log file for writing "
-msgstr "Non posso aprire il log temporaneo in scrittura "
-
 msgid " VREPLACE"
 msgstr " V-SOSTITUISCI"
 
@@ -5560,6 +5547,9 @@ msgstr "E133: :return fuori da una funzi
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Mancano parentesi: %s"
 
+msgid "%s (%s, compiled %s)"
+msgstr "%s (%s, compilato %s)"
+
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
--- a/src/po/ko.UTF-8.po
+++ b/src/po/ko.UTF-8.po
@@ -1,19 +1,20 @@
 # Korean translation for Vim
 #
-# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2011
+# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2018
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim 8.0\n"
+"Project-Id-Version: vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-12 14:52+0900\n"
-"PO-Revision-Date: 2017-07-12 18:56+0900\n"
+"POT-Creation-Date: 2018-06-29 08:21+0900\n"
+"PO-Revision-Date: 2018-06-29 09:32+0900\n"
 "Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
 "Language-Team: Korean\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831: 빈 비밀번호로 bf_key_init() 함수가 불려졌습니다"
@@ -87,7 +88,6 @@ msgstr "E90: 마지막 버퍼를 내릴 수 없습니다"
 msgid "E84: No modified buffer found"
 msgstr "E84: 바뀐 버퍼를 찾을 수 없습니다"
 
-#. back where we started, didn't find anything.
 msgid "E85: There is no listed buffer"
 msgstr "E85: 나열된 버퍼가 없습니다"
 
@@ -103,6 +103,18 @@ msgstr ""
 "E89: 버퍼 %ld을(를) 마지막으로 고친 뒤 저장하지 않았습니다 (덮어쓰려면 ! 더하"
 "기)"
 
+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: Job이 아직 실행중입니다 (끝내려면 마지막에 !을 추가)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: 마지막으로 고친 뒤 저장되지 않았습니다 (무시하려면 ! 더하기)"
+
+msgid "E948: Job still running"
+msgstr "E948: Job이 아직 실행중입니다"
+
+msgid "E37: No write since last change"
+msgstr "E37: 마지막으로 고친 뒤 저장하지 않았습니다"
+
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 경고: 파일 이름 목록이 넘쳤습니다"
 
@@ -158,7 +170,6 @@ msgstr "%ld / %ld 줄 --%d%%-- 칸 "
 msgid "[No Name]"
 msgstr "[이름 없음]"
 
-#. must be a help buffer
 msgid "help"
 msgstr "도움말"
 
@@ -184,6 +195,12 @@ msgstr ""
 "\n"
 "# 버퍼 목록:\n"
 
+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382: 쓸 수 없음, 'buftype' 옵션이 설정되어 있습니다"
+
+msgid "[Prompt]"
+msgstr "[Prompt]"
+
 msgid "[Scratch]"
 msgstr "[Scratch]"
 
@@ -237,7 +254,8 @@ msgid "E917: Cannot use a callback with 
 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()을 사용할 수 없습니다"
+msgstr ""
+"E912: raw 혹은 nl 채널에서 ch_evalexpr()/ch_sendexpr()을 사용할 수 없습니다"
 
 msgid "E906: not an open channel"
 msgstr "E906: 열린 채널이 아닙니다"
@@ -351,7 +369,6 @@ msgstr "E791: 키맵 엔트리가 비어있음"
 msgid " Keyword completion (^N^P)"
 msgstr " 낱말 완성 (^N^P)"
 
-#. ctrl_x_mode == 0, ^P/^N compl.
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " ^X 모드 (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
@@ -423,16 +440,12 @@ msgstr "찾는 중: %s"
 msgid "Scanning tags."
 msgstr "태그 찾는 중."
 
-#~ msgid "match in file"
-#~ msgstr ""
+msgid "match in file"
+msgstr "match in file"
 
 msgid " Adding"
 msgstr " 더하기"
 
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
 msgid "-- Searching..."
 msgstr "-- 찾는 중..."
 
@@ -453,7 +466,6 @@ msgstr "match %d of %d"
 msgid "match %d"
 msgstr "match %d"
 
-#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ':let'에 모르는 글자"
 
@@ -513,8 +525,6 @@ msgstr "E690: :for 뒤에 \"in\"가 없습니다"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: 이런 변수 없음: \"%s\""
 
-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
 #, c-format
 msgid "E940: Cannot lock or unlock variable %s"
 msgstr "E940: 변수 %s을(를) 잠금 혹은 해제할 수 없습니다"
@@ -525,21 +535,6 @@ msgstr "E743: 잠금(해제)하기에 변수가 너무 깊이 중첩되었습니다"
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' 뒤에 ':'이 없습니다"
 
-msgid "E691: Can only compare List with List"
-msgstr "E691: List는 List와만 비교할 수 있습니다"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: List에 대한 잘못된 동작"
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: Dictionary는 Dictionary와만 비교할 수 있습니다"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: Dictionary에 대한 잘못된 동작"
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: Funcrefs에 대한 잘못된 동작"
-
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Float에 '%'는 사용할 수 없습니다"
 
@@ -568,8 +563,8 @@ msgstr "E114: 따옴표 없음: %s"
 msgid "E115: Missing quote: %s"
 msgstr "E115: 따옴표 없음: %s"
 
-#~ msgid "Not enough memory to set references, garbage collection aborted!"
-#~ msgstr ""
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr "메모리가 부족하여 가비지 콜렉션이 중단되었습니다!"
 
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: 변수가 표시하기에 너무 깊이 중첩되었습니다"
@@ -665,6 +660,21 @@ msgstr ""
 "\n"
 "\tLast set from "
 
+msgid "E691: Can only compare List with List"
+msgstr "E691: List는 List와만 비교할 수 있습니다"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: List에 대한 잘못된 동작"
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Dictionary는 Dictionary와만 비교할 수 있습니다"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: Dictionary에 대한 잘못된 동작"
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: Funcrefs에 대한 잘못된 동작"
+
 msgid "map() argument"
 msgstr "map() 인자"
 
@@ -687,15 +697,16 @@ 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 "+-%s%3ld line: "
+#msgid_plural "+-%s%3ld lines: "
+#msgstr[0] ""
+#msgstr[1] ""
+
+#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: 모르는 함수: %s"
 
@@ -797,17 +808,191 @@ msgstr "E677: 임시 파일 쓰기 에러"
 msgid "E921: Invalid callback argument"
 msgstr "E921: 비정상적인 콜백 인자"
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr "디버그 상태로 들어감.  계속하려면 \"cont\"를 입력하십시오."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "이전 값 = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "새로운 값 = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "%ld 줄: %s"
+
+#, c-format
+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 줄"
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161: 중지점을 찾을 수 없습니다: %s"
+
+msgid "No breakpoints defined"
+msgstr "중지점이 정의되어 있지 않습니다"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  %ld 줄"
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750: 먼저 \":profile start {fname}\"을 사용하세요"
+
+msgid "Save As"
+msgstr "다른 이름으로 저장"
+
+#, c-format
+msgid "Save changes to \"%s\"?"
+msgstr "\"%s\"에 바뀐 내용을 저장할까요?"
+
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: Job이 여전히 \"%s\" 버퍼에서 실행 중입니다"
+
+#, c-format
+msgid "E162: No write since last change for buffer \"%s\""
+msgstr "E162: 버퍼 \"%s\"에 나중에 바뀐 내용이 써지지 않았습니다"
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr "경고: 뜻 밖에 다른 버퍼로 들어갔습니다 (autocommand를 확인하십시오)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: 고칠 파일이 하나 밖에 없습니다"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: 첫 번째 파일 이전으로는 갈 수 없습니다"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165: 마지막 파일 뒤로는 갈 수 없습니다"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: 컴파일러가 지원되지 않음: %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "\"%s\"을(를) \"%s\"에서 찾는 중"
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "\"%s\"을(를) 찾는 중"
+
+#, c-format
+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 "빔 스크립트 로드"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "디렉토리는 source할 수 없음: \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "\"%s\"을(를) 불러 들일 수 없습니다"
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "%ld 줄: \"%s\"을(를) 불러 들일 수 없습니다"
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "\"%s\"을(를) 불러들이는 중"
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "%ld 줄: \"%s\" 불러들이는 중"
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "%s 불러들이기 끝"
+
+#, c-format
+msgid "continuing in %s"
+msgstr "%s에서 계속"
+
+msgid "modeline"
+msgstr "modeline"
+
+msgid "--cmd argument"
+msgstr "--cmd 인자"
+
+msgid "-c argument"
+msgstr "-c 인자"
+
+msgid "environment variable"
+msgstr "환경 변수"
+
+msgid "error handler"
+msgstr "에러 핸들러"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: 경고: 잘못된 줄 구분자. ^M이 없는 것 같습니다"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding이 불러들인 파일 밖에서 사용되었습니다"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish가 불러들인 파일 밖에서 사용되었습니다"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr "현재 %s언어: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197: 언어를 \"%s\"(으)로 설정할 수 없습니다"
+
+#, c-format
+msgid "<%s>%s%s  %d,  Hex %02x,  Oct %03o, Digr %s"
+msgstr "<%s>%s%s  %d,  십육진 %02x,  팔진 %03o, 이중글자 %s"
+
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  십육진 %02x,  팔진 %03o"
+msgstr "<%s>%s%s  %d,  십육진 %02x,  팔진수 %03o"
+
+#, c-format
+msgid "> %d, Hex %04x, Oct %o, Digr %s"
+msgstr "> %d, 십육진 %04x, 팔진 %o, 이중글자 %s"
+
+#, c-format
+msgid "> %d, Hex %08x, Oct %o, Digr %s"
+msgstr "> %d, 십육진 %08x, 팔진 %o, 이중글자 %s"
 
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d,  십육진 %04x,  팔진 %o"
+msgstr "> %d, 십육진 %04x, 팔진수 %o"
 
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d,  십육진 %08x,  팔진 %o"
+msgstr "> %d, 십육진 %08x, 팔진수 %o"
 
 msgid "E134: Move lines into themselves"
 msgstr "E134: 줄을 그 자신으로 이동하려고 했습니다"
@@ -846,13 +1031,12 @@ msgstr " 인포"
 msgid " marks"
 msgstr " 마크"
 
-#~ msgid " oldfiles"
-#~ msgstr ""
+msgid " oldfiles"
+msgstr " oldfiles"
 
 msgid " FAILED"
 msgstr " 실패"
 
-#. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Viminfo 파일의 쓰기 권한이 없습니다: %s"
@@ -873,7 +1057,6 @@ msgstr "Viminfo 파일 \"%s\"을(를) 쓰는 중"
 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"
 msgstr "# 이 viminfo 파일은 빔이 만든 것입니다 Vim %s.\n"
@@ -896,9 +1079,6 @@ msgstr "이상한 시작 글자"
 #~ "# Bar lines, copied verbatim:\n"
 #~ msgstr ""
 
-msgid "Save As"
-msgstr "다른 이름으로 저장"
-
 msgid "Write partial file?"
 msgstr "파일 일부만 저장할까요?"
 
@@ -990,7 +1170,6 @@ msgstr " 한 줄에서"
 msgid " on %ld lines"
 msgstr " %ld 줄에서"
 
-#. will increment global_busy to break out of the loop
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: :global은 범위로 재귀 호출 될 수 없습니다"
 
@@ -1101,152 +1280,6 @@ msgstr "[지워졌습니다]"
 msgid "No old files"
 msgstr "old 파일이 없습니다"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "디버그 상태로 들어감.  계속하려면 \"cont\"를 입력하십시오."
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "%ld 줄: %s"
-
-#, c-format
-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 줄"
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: 중지점을 찾을 수 없습니다: %s"
-
-msgid "No breakpoints defined"
-msgstr "중지점이 정의되어 있지 않습니다"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  %ld 줄"
-
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: 먼저 \":profile start {fname}\"을 사용하세요"
-
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "\"%s\"에 바뀐 내용을 저장할까요?"
-
-msgid "Untitled"
-msgstr "제목 없음"
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: 버퍼 \"%s\"에 나중에 바뀐 내용이 써지지 않았습니다"
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "경고: 뜻 밖에 다른 버퍼로 들어갔습니다 (autocommand를 확인하십시오)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: 고칠 파일이 하나 밖에 없습니다"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: 첫 번째 파일 이전으로는 갈 수 없습니다"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: 마지막 파일 뒤로는 갈 수 없습니다"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: 컴파일러가 지원되지 않음: %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "\"%s\"을(를) \"%s\"에서 찾는 중"
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "\"%s\"을(를) 찾는 중"
-
-#, c-format
-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 "빔 스크립트 로드"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "디렉토리는 source할 수 없음: \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "\"%s\"을(를) 불러 들일 수 없습니다"
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "%ld 줄: \"%s\"을(를) 불러 들일 수 없습니다"
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "\"%s\"을(를) 불러들이는 중"
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "%ld 줄: \"%s\" 불러들이는 중"
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "%s 불러들이기 끝"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s에서 계속"
-
-msgid "modeline"
-msgstr "modeline"
-
-msgid "--cmd argument"
-msgstr "--cmd 인자"
-
-msgid "-c argument"
-msgstr "-c 인자"
-
-msgid "environment variable"
-msgstr "환경 변수"
-
-msgid "error handler"
-msgstr "에러 핸들러"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: 경고: 잘못된 줄 구분자. ^M이 없는 것 같습니다"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding이 불러들인 파일 밖에서 사용되었습니다"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish가 불러들인 파일 밖에서 사용되었습니다"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "현재 %s언어: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: 언어를 \"%s\"(으)로 설정할 수 없습니다"
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Ex 상태로 전환.  Normal 상태로 가려면 \"visual\"을 입력하십시오."
 
@@ -1287,9 +1320,6 @@ msgstr "E943: 명령 테이블 갱신이 필요, 'make cmdidxs'를 실행하세요"
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: 미안합니다, 그 명령은 현재 판에서 사용할 수 없습니다"
 
-msgid "E172: Only one file name allowed"
-msgstr "E172: 오로지 하나의 파일 이름만 사용 가능합니다"
-
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "고칠 파일이 한 개 더 있습니다. 그래도 끝낼까요?"
 
@@ -1382,6 +1412,9 @@ msgstr "E784: 마지막 탭을 닫을 수 없습니다"
 msgid "Already only one tab page"
 msgstr "이미 하나의 탭만 있습니다"
 
+msgid "Edit File in new tab page"
+msgstr "새 탭에서 파일 고치기"
+
 msgid "Edit File in new window"
 msgstr "새 창에서 파일 고치기"
 
@@ -1444,7 +1477,6 @@ msgstr "E189: \"%s\"이(가) 존재합니다 (덮어쓰려면 ! 더하기)"
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: 쓰기 위한 \"%s\"을(를) 열 수 없습니다"
 
-#. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: 인자는 글자나 앞/뒤 인용 부호여야 합니다"
 
@@ -1482,13 +1514,15 @@ msgstr "E500: 빈 문자열에서 값을 구하려고 합니다"
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: 읽을 viminfo 파일을 열 수 없습니다"
 
+msgid "Untitled"
+msgstr "제목 없음"
+
 msgid "E196: No digraphs in this version"
 msgstr "E196: 이 판에는 digraph가 없습니다"
 
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' 접두사로 예외를 :throw할 수 없습니다"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "예외 thrown: %s"
@@ -1505,7 +1539,6 @@ msgstr "예외 버려짐: %s"
 msgid "%s, line %ld"
 msgstr "%s, %ld 줄"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception caught: %s"
 msgstr "예외 발생: %s"
@@ -1531,7 +1564,6 @@ msgstr "에러와 인터럽트"
 msgid "Error"
 msgstr "에러"
 
-#. if (pending & CSTP_INTERRUPT)
 msgid "Interrupt"
 msgstr "인터럽트"
 
@@ -1574,15 +1606,12 @@ msgstr "E601: :try가 너무 깊게 중첩되었습니다"
 msgid "E603: :catch without :try"
 msgstr "E603: :try없이 :catch가 있습니다"
 
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally 뒤에 :catch가 있습니다"
 
 msgid "E606: :finally without :try"
 msgstr "E606: :try없이 :finally가 있습니다"
 
-#. Give up for a multiple ":finally" and ignore it.
 msgid "E607: multiple :finally"
 msgstr "E607: 여러개의 :finally가 있습니다"
 
@@ -1675,7 +1704,6 @@ msgstr "빔: 표준입력에서 읽는 중...\n"
 msgid "Reading from stdin..."
 msgstr "표준입력에서 읽는 중..."
 
-#. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: 변환된 파일을 읽을 수가 없습니다!"
 
@@ -1762,9 +1790,6 @@ msgstr "E509: 백업파일을 만들 수 없습니다 (덮어쓰려면 ! 더하기)"
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: 백업파일을 만들 수 없습니다 (덮어쓰려면 ! 더하기)"
 
-msgid "E460: The resource fork would be lost (add ! to override)"
-msgstr "E460: The resource fork will be lost (덮어쓰려면 ! 더하기)"
-
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: 쓸 임시 파일을 찾을 수 없습니다"
 
@@ -1777,8 +1802,8 @@ msgstr "E166: 쓸 연결된 파일을 열 수 없습니다"
 msgid "E212: Can't open file for writing"
 msgstr "E212: 쓸 파일을 열 수 없습니다"
 
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync가 실패했습니다"
+msgid "E949: File changed while writing"
+msgstr "E949: 쓰는 중에 파일이 변경되었습니다"
 
 msgid "E512: Close failed"
 msgstr "E512: 닫기가 실패했습니다"
@@ -1877,9 +1902,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[불완전한 마지막 줄]"
 
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "경고: 파일이 읽은 뒤에 바뀌었습니다!!!"
 
@@ -1958,7 +1980,6 @@ msgstr "--지워짐--"
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand 자동삭제: %s <buffer=%d>"
 
-#. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: 이런 그룹 없음: \"%s\""
@@ -1981,7 +2002,6 @@ msgstr "E216: 그런 이벤트 없음: %s"
 msgid "E216: No such group or event: %s"
 msgstr "E216: 그런 그룹이나 이벤트 없음: %s"
 
-#. Highlight title
 msgid ""
 "\n"
 "--- Autocommands ---"
@@ -2029,6 +2049,12 @@ msgstr "E350: 현재의 'foldmethod'으로 접기를 만들 수 없습니다"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: 현재의 'foldmethod'으로 접기를 지울 수 없습니다"
 
+#, c-format
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+-%3ld 줄이 접혔습니다"
+msgstr[1] "+-%3ld 줄들이 접혔습니다"
+
 msgid "E222: Add to read buffer"
 msgstr "E222: 읽혀진 버퍼에 더하기"
 
@@ -2060,6 +2086,37 @@ msgstr "맵핑을 찾을 수 없습니다"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: 이상한 상태"
 
+msgid "<cannot open> "
+msgstr "<열 수 없음> "
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: 글꼴 %s을(를) 얻을 수 없습니다"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: 현재 디렉토리로 돌아갈 수 없습니다"
+
+msgid "Pathname:"
+msgstr "경로 이름:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: 현재 디렉토리를 얻을 수 없습니다"
+
+msgid "OK"
+msgstr "확인"
+
+msgid "Cancel"
+msgstr "취소"
+
+msgid "Vim dialog"
+msgstr "빔 대화상자"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "스크롤바 위젯: 썸 픽스맵의 지오미트리를 얻을 수 없습니다."
+
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: 메시지와 콜백 모두를 사용해서는 BalloonEval을 만들 수 없습니다"
+
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: 새로운 GUI 프로세스를 생성할 수 없습니다"
 
@@ -2089,37 +2146,6 @@ msgstr "E254: 색 %s을(를) 할당할 수 없습니다"
 #~ msgid "No match at cursor, finding next"
 #~ msgstr ""
 
-msgid "<cannot open> "
-msgstr "<열 수 없음> "
-
-#, c-format
-msgid "E616: vim_SelFile: can't get font %s"
-msgstr "E616: vim_SelFile: 글꼴 %s을(를) 얻을 수 없습니다"
-
-msgid "E614: vim_SelFile: can't return to current directory"
-msgstr "E614: vim_SelFile: 현재 디렉토리로 돌아갈 수 없습니다"
-
-msgid "Pathname:"
-msgstr "경로 이름:"
-
-msgid "E615: vim_SelFile: can't get current directory"
-msgstr "E615: vim_SelFile: 현재 디렉토리를 얻을 수 없습니다"
-
-msgid "OK"
-msgstr "확인"
-
-msgid "Cancel"
-msgstr "취소"
-
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "스크롤바 위젯: 썸 픽스맵의 지오미트리를 얻을 수 없습니다."
-
-msgid "Vim dialog"
-msgstr "빔 대화상자"
-
-msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: 메시지와 콜백 모두를 사용해서는 BalloonEval을 만들 수 없습니다"
-
 msgid "_Cancel"
 msgstr "취소(_C)"
 
@@ -2162,18 +2188,15 @@ msgstr "무얼 찾을까요:"
 msgid "Replace with:"
 msgstr "바꿀 문자열:"
 
-#. whole word only button
 msgid "Match whole word only"
 msgstr "똑같은 낱말만"
 
-#. match case button
 #~ msgid "Match case"
 #~ msgstr ""
 
 msgid "Direction"
 msgstr "방향"
 
-#. 'Up' and 'Down' buttons
 msgid "Up"
 msgstr "위로"
 
@@ -2246,14 +2269,12 @@ msgstr "취소(&U)"
 msgid "Open tab..."
 msgstr "탭 열기..."
 
-msgid "Find string (use '\\\\' to find  a '\\')"
+msgid "Find string (use '\\\\' to find a '\\')"
 msgstr "문자열 찾기 ('\\'를 찾으려면 '\\\\' 사용)"
 
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "문자열 찾아 바꾸기 ('\\'를 찾으려면 '\\\\' 사용)"
-
-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
+msgid "Find & Replace (use '\\\\' to find a '\\')"
+msgstr "문자열 찾아서 바꾸기 ('\\'를 찾으려면 '\\\\' 사용)"
+
 msgid "Not Used"
 msgstr "사용 않됨"
 
@@ -2311,11 +2332,11 @@ msgstr "글꼴0 너비: %ld"
 msgid "Font1 width: %ld"
 msgstr "글꼴1 너비: %ld"
 
-#~ msgid "Invalid font specification"
-#~ msgstr ""
-
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "Invalid font specification"
+msgstr "글꼴 규격이 이상합니다"
+
+msgid "&Dismiss"
+msgstr "취소(&D)"
 
 #~ msgid "no specific match"
 #~ msgstr ""
@@ -2326,7 +2347,6 @@ msgstr "Vim - 글꼴 선택기"
 msgid "Name:"
 msgstr "이름:"
 
-#. create toggle button
 #~ msgid "Show size in Points"
 #~ msgstr ""
 
@@ -2571,7 +2591,6 @@ msgstr "E261: cscope 연결 %s을(를) 찾을 수 없습니다"
 msgid "cscope connection %s closed"
 msgstr "cscope 연결 %s이(가) 닫혔습니다"
 
-#. should not reach here
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches에 심각한 에러"
 
@@ -2619,8 +2638,8 @@ msgid ""
 "E895: Sorry, this command is disabled, the MzScheme's racket/base module "
 "could not be loaded."
 msgstr ""
-"E895: 미안합니다, 이 명령은 사용할 수 없습니다, MzScheme의 racket/base "
-"모듈을 로딩할 수 없습니다."
+"E895: 미안합니다, 이 명령은 사용할 수 없습니다, MzScheme의 racket/base 모듈"
+"을 로딩할 수 없습니다."
 
 msgid "invalid expression"
 msgstr "잘못된 표현식"
@@ -2673,8 +2692,8 @@ msgstr "줄 번호가 범위를 벗어났습니다"
 msgid "not allowed in the Vim sandbox"
 msgstr "Vim sandbox에서는 허용되지 않습니다"
 
-msgid "E836: This Vim cannot execute :python after using :py3"
-msgstr "E836: 이 Vim은 :py3을 사용한 후에 :python을 사용할 수 없습니다"
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: 이 Vim은 :python을 사용한 후에 :py3을 사용할 수 없습니다"
 
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
@@ -2683,19 +2702,19 @@ msgstr ""
 "E263: 미안합니다, 이 명령은 사용할 수 없습니다, 파이썬 라이브러리를 로딩할 "
 "수 없습니다."
 
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: 이 Vim은 :py3을 사용한 후에 :python을 사용할 수 없습니다"
+
 msgid ""
 "E887: Sorry, this command is disabled, the Python's site module could not be "
 "loaded."
 msgstr ""
-"E887: 미안합니다, 이 명령은 사용할 수 없습니다, 파이썬의 사이트 모듈을 "
-"로딩할 수 없습니다."
+"E887: 미안합니다, 이 명령은 사용할 수 없습니다, 파이썬의 사이트 모듈을 로딩"
+"할 수 없습니다."
 
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python을 재귀호출할 수 없습니다"
 
-msgid "E837: This Vim cannot execute :py3 after using :python"
-msgstr "E837: 이 Vim은 :python을 사용한 후에 :py3을 사용할 수 없습니다"
-
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_는 String 인스턴스이어야 합니다"
 
@@ -2733,7 +2752,6 @@ msgstr "잘못된 버퍼 번호"
 msgid "not implemented yet"
 msgstr "아직 구현되지 않았습니다"
 
-#. ???
 msgid "cannot set line(s)"
 msgstr "줄을 설정할 수 없습니다"
 
@@ -2772,7 +2790,6 @@ msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr "콜백 명령을 등록할 수 없습니다: 버퍼/창이 이미 지워졌습니다"
 
-#. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
@@ -2836,8 +2853,8 @@ msgstr "옵션 인자 뒤에 쓰레기 값"
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "너무 많은 \"+command\" \"-c command\" 혹은 \"--cmd command\" 인자"
 
-#~ msgid "Invalid argument for"
-#~ msgstr ""
+msgid "Invalid argument for"
+msgstr "Invalid argument for"
 
 #, c-format
 msgid "%d files to edit\n"
@@ -2873,7 +2890,6 @@ msgstr "빔: 경고: 터미널로 출력할 수 없습니다\n"
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "빔: 경고: 터미널로 부터 입력받을 수 없습니다\n"
 
-#. just in case..
 msgid "pre-vimrc command line"
 msgstr "pre-vimrc 명령 행"
 
@@ -3124,6 +3140,9 @@ msgstr "--startuptime <file>\tstartup timing 메시지를 <file>에 저장"
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfo 대신 <viminfo>를 사용"
 
+#~ msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+#~ msgstr ""
+
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h 혹은 --help\t도움말(이 메시지)을 출력한 뒤 끝내기"
 
@@ -3221,11 +3240,9 @@ msgstr "--windowid <HWND>\t다른 win32 위젯 안에서 Vim 열기"
 msgid "No display"
 msgstr "디스플레이가 없습니다"
 
-#. Failed to send, abort.
 msgid ": Send failed.\n"
 msgstr ": 보내기가 실패하였습니다.\n"
 
-#. Let vim start normally.
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": 보내기 실패. 로컬에서 실행됩니다\n"
 
@@ -3246,7 +3263,6 @@ msgstr "설정된 마크가 없습니다"
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\"에 맞는 마크가 없습니다"
 
-#. Highlight title
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3254,7 +3270,6 @@ msgstr ""
 "\n"
 "마크 라인  col 파일/텍스트"
 
-#. Highlight title
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3262,7 +3277,6 @@ msgstr ""
 "\n"
 " 점프 라인  col 파일/텍스트"
 
-#. Highlight title
 #~ msgid ""
 #~ "\n"
 #~ "change line  col text"
@@ -3275,7 +3289,6 @@ msgstr ""
 "\n"
 "# 파일 마크:\n"
 
-#. Write the jumplist with -'
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3344,7 +3357,6 @@ msgstr "E298: 구역 번호 2를 얻지 못했나요?"
 msgid "E843: Error while updating swap file crypt"
 msgstr "E843: 스왑 파일을 암호화할 수 없습니다"
 
-#. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: 으윽, 스왑 파일을 잃어버렸습니다!!!"
 
@@ -3392,21 +3404,23 @@ msgstr "E307: %s은(는) 빔 스왑 파일이 아닌 것 같습니다"
 msgid " cannot be used on this computer.\n"
 msgstr " 이 컴퓨터에서는 사용될 수 없습니다.\n"
 
-#~ msgid "The file was created on "
-#~ msgstr ""
-
-#~ msgid ""
-#~ ",\n"
-#~ "or the file has been damaged."
-#~ msgstr ""
+msgid "The file was created on "
+msgstr "The file was created on "
+
+msgid ""
+",\n"
+"or the file has been damaged."
+msgstr ""
+",\n"
+"or the file has been damaged."
 
 #, c-format
 msgid ""
 "E833: %s is encrypted and this version of Vim does not support encryption"
 msgstr "E833: %s이(가) 암호화되어 있는 데, 이 Vim은 암호화를 지원하지 않습니다"
 
-#~ msgid " has been damaged (page size is smaller than minimum value).\n"
-#~ msgstr ""
+msgid " has been damaged (page size is smaller than minimum value).\n"
+msgstr " has been damaged (page size is smaller than minimum value).\n"
 
 #, c-format
 msgid "Using swap file \"%s\""
@@ -3521,7 +3535,6 @@ msgstr ""
 msgid "Using crypt key from swap file for the text file.\n"
 msgstr "텍스트 파일에 스왑파일에서 가져온 암호 키를 사용합니다.\n"
 
-#. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "스왑 파일을 찾았음:"
 
@@ -3691,8 +3704,6 @@ msgstr "While opening file \""
 msgid "      NEWER than swap file!\n"
 msgstr "      NEWER than swap file!\n"
 
-#. Some of these messages are long to allow translation to
-#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@@ -3780,7 +3791,6 @@ msgstr "E328: 메뉴가 다른 모드에서만 존재합니다"
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" 메뉴 없음"
 
-#. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
 msgstr "E792: 메뉴 이름 없음"
 
@@ -3793,8 +3803,6 @@ msgstr "E331: 메뉴바에 곧바로 메뉴 항목을 더할 수는 없습니다"
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: 구분자는 메뉴 경로의 부분이 될 수 없습니다"
 
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
 msgid ""
 "\n"
 "--- Menus ---"
@@ -3805,6 +3813,10 @@ msgstr ""
 msgid "Tear off this menu"
 msgstr "이 메뉴를 떼어냄"
 
+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: %s 모드에 대한 메뉴가 정의되어 있지 않습니다"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: 메뉴 항목 앞에는 메뉴 경로가 있어야 합니다"
 
@@ -3812,10 +3824,6 @@ msgstr "E333: 메뉴 항목 앞에는 메뉴 경로가 있어야 합니다"
 msgid "E334: Menu not found: %s"
 msgstr "E334: 메뉴를 찾을 수 없습니다: %s"
 
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s 모드에 대한 메뉴가 정의되어 있지 않습니다"
-
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: 하위 메뉴 앞에 메뉴 경로가 있어야 합니다"
 
@@ -3835,7 +3843,7 @@ msgid "E354: Invalid register name: '%s'
 msgstr "E354: 잘못된 레지스터 이름: '%s'"
 
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "메시지 관리자: Bram Moolenaar <Bram@vim.org>"
+msgstr "메시지 관리자: SungHyun Nam <goweol@gmail.com>"
 
 msgid "Interrupt: "
 msgstr "중단: "
@@ -3885,7 +3893,6 @@ msgstr "파일 저장 대화상자"
 msgid "Open File dialog"
 msgstr "파일 열기 대화상자"
 
-#. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: 미안합니다, 콘솔 상태에는 파일 브라우저가 없습니다"
 
@@ -4077,7 +4084,6 @@ msgstr "%ld lines indented "
 #~ msgid "E748: No previously used register"
 #~ msgstr ""
 
-#. must display the prompt
 msgid "cannot yank; delete anyway"
 msgstr "cannot yank; delete anyway"
 
@@ -4092,25 +4098,30 @@ msgstr "%ld lines changed"
 msgid "freeing %ld lines"
 msgstr "freeing %ld lines"
 
-msgid "block of 1 line yanked"
-msgstr "block of 1 line yanked"
-
-msgid "1 line yanked"
-msgstr "1 line yanked"
-
-#, c-format
-msgid "block of %ld lines yanked"
-msgstr "block of %ld lines yanked"
-
-#, c-format
-msgid "%ld lines yanked"
-msgstr "%ld lines yanked"
+#, c-format
+msgid " into \"%c"
+msgstr " into \"%c"
+
+#, c-format
+msgid "block of 1 line yanked%s"
+msgstr "block of 1 line yanked%s"
+
+#, c-format
+msgid "1 line yanked%s"
+msgstr "1 line yanked%s"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "block of %ld lines yanked%s"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld lines yanked%s"
 
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: %s 레지스터에 아무 것도 없습니다"
 
-#. Highlight title
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4142,32 +4153,33 @@ msgid "%ld Cols; "
 msgstr "%ld 열; "
 
 #, c-format
-#~ 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; %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 %lld of %lld; Byte %lld of %lld"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+
+#, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
+msgstr ""
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
+msgstr ""
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
+
+#, c-format
+#~ msgid "(+%lld for BOM)"
 #~ msgstr ""
 
-#, c-format
-#~ 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 ""
-
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=페이지 %N"
-
 msgid "Thanks for flying Vim"
 msgstr "빔을 날게 해 주셔서 고맙습니다"
 
@@ -4218,6 +4230,10 @@ msgstr "E835: 'fillchars' 값과 충돌이 발생합니다"
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: GTK+ 2 GUI에서는 바뀔 수 없습니다"
 
+#, c-format
+#~ msgid "E950: Cannot convert between %s and %s"
+#~ msgstr ""
+
 msgid "E524: Missing colon"
 msgstr "E524: 콜론이 없습니다"
 
@@ -4275,12 +4291,18 @@ msgstr "E541: 너무 많은 항목"
 msgid "E542: unbalanced groups"
 msgstr "E542: 균형이 안 잡힌 그룹"
 
+#~ msgid "E946: Cannot make a terminal with running job modifiable"
+#~ msgstr ""
+
 msgid "E590: A preview window already exists"
 msgstr "E590: 미리 보기 창이 이미 존재합니다"
 
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr "W17: Arabic은 UTF-8 인코딩 필요, ':set encoding=utf-8' 하세요"
 
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954: 이 환경에서는 24비트 색상이 지원되지 않습니다"
+
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: 적어도 %d 줄이 필요합니다"
@@ -4293,9 +4315,6 @@ msgstr "E594: 적어도 %d 칸이 필요합니다"
 msgid "E355: Unknown option: %s"
 msgstr "E355: 모르는 옵션: %s"
 
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: 숫자가 필요: &%s = '%s'"
@@ -4368,7 +4387,6 @@ msgstr "콘솔 상태를 바꿀 수 없습니다 ?!\n"
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: 콘솔이 아닌가??\n"
 
-#. if Vim opened a window: Executing a shell may cause crashes
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: -f 옵션이 사용된 경우 쉘을 실행할 수 없습니다"
 
@@ -4569,6 +4587,9 @@ msgstr "빔 경고"
 msgid "shell returned %d"
 msgstr "쉘이 %d을(를) 돌려주었습니다"
 
+msgid "E926: Current location list was changed"
+msgstr "E926: 현재의 location list가 바뀌었습니다"
+
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: 형식 문자열에 %%%c이(가) 너무 많습니다"
@@ -4592,7 +4613,6 @@ msgstr "E376: 형식 문자열 서두에 잘못된 %%%c이(가) 있습니다"
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: 형식 문자열에 잘못된 %%%c이(가) 있습니다"
 
-#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat'이 어떤 패턴도 포함하고 있지 않습니다"
 
@@ -4608,9 +4628,6 @@ 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: "
@@ -4619,8 +4636,8 @@ msgid " (line deleted)"
 msgstr " (줄을 지웠음)"
 
 #, c-format
-#~ msgid "%serror list %d of %d; %d errors "
-#~ msgstr ""
+msgid "%serror list %d of %d; %d errors "
+msgstr "%serror list %d of %d; %d errors "
 
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: 퀵픽스 스택의 바닥입니다"
@@ -4631,9 +4648,6 @@ msgstr "E381: 퀵픽스 스택의 꼭대기입니다"
 #~ msgid "No entries"
 #~ msgstr ""
 
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: 쓸 수 없음, 'buftype' 옵션이 설정되어 있습니다"
-
 msgid "Error file"
 msgstr "에러 파일"
 
@@ -4774,13 +4788,15 @@ msgstr "E877: (NFA 정규표현식) 비정상적인 문자 클래스: %ld"
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) 모르는 오퍼레이터 '\\z%c'"
 
+msgid "E951: \\% value too large"
+msgstr "E951: \\% 값이 너무 깁니다"
+
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) 모르는 오퍼레이터 '\\%%%c'"
 
-#. should never happen
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr ""
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Error building NFA with equivalence class!"
 
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
@@ -4789,11 +4805,9 @@ 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 정규표현식) '('가 너무 많습니다"
 
@@ -4803,8 +4817,11 @@ msgstr "E879: (NFA 정규표현식) \\z(가 너무 많습니다"
 #~ msgid "E873: (NFA regexp) proper termination error"
 #~ msgstr ""
 
-#~ msgid "E874: (NFA) Could not pop the stack!"
-#~ msgstr ""
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr "쓰기위한 임시 로그 파일을 열 수 없습니다, 표준에러(stderr)에 표시합니다..."
+
+msgid "E874: (NFA) Could not pop the stack!"
+msgstr "E874: (NFA) 스택에서 꺼낼 수 없습니다!"
 
 #~ msgid ""
 #~ "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
@@ -4817,17 +4834,6 @@ msgstr "E879: (NFA 정규표현식) \\z(가 너무 많습니다"
 #~ 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 " 선택치환"
 
@@ -4897,7 +4903,6 @@ msgstr "E386: ';' 뒤에는 '?'나 '/'가 와야 합니다"
 msgid " (includes previously listed match)"
 msgstr " (이전에 맞았던 목록 포함)"
 
-#. cursor at status line
 msgid "--- Included files "
 msgstr "--- Included files "
 
@@ -4974,8 +4979,6 @@ msgstr "죄송, 제안할 게 없습니다"
 msgid "Sorry, only %ld suggestions"
 msgstr "죄송, %ld개만 제안"
 
-#. for when 'cmdheight' > 1
-#. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Change \"%.*s\" to:"
@@ -5192,8 +5195,8 @@ msgid "E760: No word count in %s"
 msgstr "E760: %s에 단어 카운트가 없습니다"
 
 #, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "라인 %6d, 단어 %6d - %s"
+msgid "line %6d, word %6ld - %s"
+msgstr "라인 %6d, 단어 %6ld - %s"
 
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
@@ -5247,8 +5250,8 @@ msgstr "%s 라인 %d에 모르는 플래그: %s"
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "아스키 문자열이 아닌 %d개의 단어가 무시되었습니다"
 
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr ""
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: 메모리 부족, 단어 목록이 불완전할 것입니다"
 
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
@@ -5257,10 +5260,6 @@ msgstr "%d/%d 노드가 압축됨; %d (%d%%)가 남음"
 msgid "Reading back spell file..."
 msgstr "맞춤법 파일을 읽는 중..."
 
-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
 msgid "Performing soundfolding..."
 msgstr "soundfold 수행중..."
 
@@ -5283,8 +5282,9 @@ msgstr "추정된 런타임 메모리 사용량: %d 바이트"
 msgid "E751: Output file name must not have region name"
 msgstr "E751: 생성 파일명은 영역 이름과 달라야 합니다"
 
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: 최대 8개의 영역이 지원됩니다"
+#, c-format
+msgid "E754: Only up to %ld regions supported"
+msgstr "E754: 최대 %ld개의 영역이 지원됩니다"
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5315,29 +5315,27 @@ msgstr "단어 '%.*s'이(가) %s에 추가됨"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: 단어가 spell 파일 간에 다릅니다"
 
-#. 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 ""
+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 case ignore"
+msgstr "구문 대소문자 구별않함"
+
+msgid "syntax case match"
+msgstr "구문 대소문자 구별"
 
 #~ msgid "syntax spell toplevel"
 #~ msgstr ""
@@ -5348,8 +5346,8 @@ msgstr "E390: 잘못된 인자: %s"
 #~ msgid "syntax spell default"
 #~ msgstr ""
 
-#~ msgid "syntax iskeyword "
-#~ msgstr ""
+msgid "syntax iskeyword "
+msgstr "syntax iskeyword "
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -5420,8 +5418,8 @@ msgstr "E394: %s에 대한 region 항목을 찾지 못했습니다"
 msgid "E397: Filename required"
 msgstr "E397: 파일이름이 필요합니다"
 
-#~ msgid "E847: Too many syntax includes"
-#~ msgstr ""
+msgid "E847: Too many syntax includes"
+msgstr "E847: 구문 포함(include)이 너무 많습니다"
 
 #, c-format
 msgid "E789: Missing ']': %s"
@@ -5581,7 +5579,6 @@ msgstr "E428: 마지막 맞는 태그 뒤로는 갈 수 없습니다"
 msgid "File \"%s\" does not exist"
 msgstr "파일 \"%s\"이(가) 존재하지 않습니다"
 
-#. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "tag %d of %d%s"
@@ -5596,7 +5593,6 @@ msgstr "  Using tag with different case!
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: 파일 \"%s\"이(가) 존재하지 않습니다"
 
-#. Highlight title
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5627,7 +5623,6 @@ msgstr "Before byte %ld"
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: 태그 파일이 정렬되어 있지 않음: %s"
 
-#. never opened any tags file
 msgid "E433: No tags file"
 msgstr "E433: 태그 파일이 없습니다"
 
@@ -5663,7 +5658,6 @@ msgstr "E436: termcap에 \"%s\" 항목이 없습니다"
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: 터미널이 \"cm\" 기능을 지원해야 합니다"
 
-#. Highlight title
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5674,6 +5668,32 @@ msgstr ""
 msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "$VIMRUNTIME/rgb.txt을 열 수 없습니다"
 
+#, c-format
+msgid "Kill job in \"%s\"?"
+msgstr "\"%s\"의 job을 죽일까요?"
+
+msgid "Terminal"
+msgstr "Terminal"
+
+msgid "Terminal-finished"
+msgstr "Terminal-finished"
+
+msgid "active"
+msgstr "active"
+
+msgid "running"
+msgstr "running"
+
+msgid "finished"
+msgstr "finished"
+
+#, c-format
+msgid "E953: File exists: %s"
+msgstr "E953: 파일이 존재함: %s"
+
+msgid "E955: Not a terminal buffer"
+msgstr "E955: 터미널 버퍼가 아닙니다"
+
 msgid "new shell started\n"
 msgstr "새 쉘이 시작되었습니다\n"
 
@@ -5683,12 +5703,9 @@ msgstr "빔: 입력 읽는 중 에러, 끝내는중...\n"
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "빈 고르기 대신 CUT_BUFFER0을 사용했습니다"
 
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: 행 갯수가 갑자기 바뀌었습니다"
 
-#. must display the prompt
 msgid "No undo possible; continue anyway"
 msgstr "취소 불가능; 어쨌든 계속합니다"
 
@@ -5916,8 +5933,8 @@ msgid "E862: Cannot use g: here"
 msgstr "E862: 여기에서 g:을 사용할 수 없습니다"
 
 #, c-format
-#~ msgid "E932: Closure function should not be at top level: %s"
-#~ msgstr ""
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: Closure 함수는 최상위 레벨일 수 없습니다: %s"
 
 msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction이 없습니다"
@@ -5949,6 +5966,10 @@ msgstr "E133: :return이 함수 안에 있지 않습니다"
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: 괄호 없음: %s"
 
+#, c-format
+msgid "%s (%s, compiled %s)"
+msgstr "%s (%s, 빌드한 날짜 %s)"
+
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -5982,24 +6003,15 @@ msgstr ""
 
 msgid ""
 "\n"
-"MacOS X (unix) version"
-msgstr ""
-"\n"
-"MacOS X (유닉스) 버젼"
-
-msgid ""
-"\n"
-"MacOS X version"
+"macOS version"
 msgstr ""
 "\n"
-"MacOS X 버젼"
-
-msgid ""
-"\n"
-"MacOS version"
-msgstr ""
-"\n"
-"MacOS 버젼"
+"macOS 버젼"
+
+#~ msgid ""
+#~ "\n"
+#~ "macOS version w/o darwin feat."
+#~ msgstr ""
 
 msgid ""
 "\n"
@@ -6103,9 +6115,6 @@ msgstr "Carbon GUI."
 msgid "with Cocoa GUI."
 msgstr "Cocoa GUI."
 
-msgid "with (classic) GUI."
-msgstr "(클래식) GUI."
-
 msgid "  Features included (+) or not (-):\n"
 msgstr "  기능 (+: 포함됨, -: 포함 안 됨):\n"
 
@@ -6306,7 +6315,6 @@ msgstr "빔으로 Diff"
 msgid "Edit with &Vim"
 msgstr "빔으로 편집(&V)"
 
-#. Now concatenate
 msgid "Edit with existing Vim - "
 msgstr "하나의 빔으로만 편집 - "
 
@@ -6325,10 +6333,6 @@ msgstr "경로가 너무 깁니다"
 msgid "--No lines in buffer--"
 msgstr "--버퍼에 줄 없음--"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
 msgid "E470: Command aborted"
 msgstr "E470: 명령이 중지되었습니다"
 
@@ -6402,6 +6406,14 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: 잘못된 인자: %s"
 
 #, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475: 인자 %s에 잘못된 값"
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475: 인자 %s에 잘못된 값: %s"
+
+#, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: 잘못된 표현식: %s"
 
@@ -6419,6 +6431,9 @@ msgstr "E17: \"%s\"은(는) 디렉토리입니다"
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: 라이브러리 \"%s()\" 부르기 실패"
 
+msgid "E667: Fsync failed"
+msgstr "E667: Fsync가 실패했습니다"
+
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: %s 라이브러리 함수를 로드할 수 없습니다"
@@ -6513,12 +6528,6 @@ msgstr "E484: %s 파일을 열 수 없습니다"
 msgid "E485: Can't read file %s"
 msgstr "E485: %s 파일을 읽을 수 없습니다"
 
-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: 널 인자"
 
@@ -6695,6 +6704,9 @@ msgstr "E850: 잘못된 레지스터 이름"
 msgid "E919: Directory not found in '%s': \"%s\""
 msgstr "E919: '%s'에서 디렉토리를 못찾음: \"%s\""
 
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952: Autocommand가 재귀 호출되었습니다"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "처음까지 찾았음, 끝에서 계속"
 
@@ -6798,7 +6810,6 @@ msgstr "속성 %s을(를) 설정할 수 없습니다"
 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 ""
@@ -6952,3 +6963,47 @@ msgstr "%s을(를) vim list로 변경할 수 없습니다"
 #~ "Failed to set path: sys.path is not a list\n"
 #~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
 #~ msgstr ""
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Vim 매크로 파일 (*.vim)\t*.vim\n"
+"모든 파일 (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "모든 파일 (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"모든 파일 (*.*)\t*.*\n"
+"C 소스 (*.c, *.h)\t*.c;*.h\n"
+"C++ 소스 (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB 코드 (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim 파일 (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Vim 매크로 파일 (*.vim)\t*.vim\n"
+"모든 파일 (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "모든 파일 (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"모든 파일 (*)\t*\n"
+"C 소스 (*.c, *.h)\t*.c;*.h\n"
+"C++ 소스 (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim 파일 (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
--- a/src/po/ko.po
+++ b/src/po/ko.po
@@ -1,19 +1,20 @@
 # Generated from ko.UTF-8.po, DO NOT EDIT
 #
-# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2011
+# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2018
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vim 8.0\n"
+"Project-Id-Version: vim 8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-12 14:52+0900\n"
-"PO-Revision-Date: 2017-07-12 18:56+0900\n"
+"POT-Creation-Date: 2018-06-29 08:21+0900\n"
+"PO-Revision-Date: 2018-06-29 09:32+0900\n"
 "Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
 "Language-Team: Korean\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "E831: bf_key_init() called with empty password"
 msgstr "E831:  йȣ bf_key_init() Լ ҷϴ"
@@ -87,7 +88,6 @@ msgstr "E90:  ۸   ϴ"
 msgid "E84: No modified buffer found"
 msgstr "E84: ٲ ۸ ã  ϴ"
 
-#. back where we started, didn't find anything.
 msgid "E85: There is no listed buffer"
 msgstr "E85:  ۰ ϴ"
 
@@ -103,6 +103,18 @@ msgstr ""
 "E89:  %ld()  ģ   ʾҽϴ ( ! "
 ")"
 
+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: Job  Դϴ (  ! ߰)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37:  ģ   ʾҽϴ (Ϸ ! ϱ)"
+
+msgid "E948: Job still running"
+msgstr "E948: Job  Դϴ"
+
+msgid "E37: No write since last change"
+msgstr "E37:  ģ   ʾҽϴ"
+
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: :  ̸  ƽϴ"
 
@@ -158,7 +170,6 @@ msgstr "%ld / %ld  --%d%%-- ĭ "
 msgid "[No Name]"
 msgstr "[̸ ]"
 
-#. must be a help buffer
 msgid "help"
 msgstr ""
 
@@ -184,6 +195,12 @@ msgstr ""
 "\n"
 "#  :\n"
 
+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382:   , 'buftype' ɼ Ǿ ֽϴ"
+
+msgid "[Prompt]"
+msgstr "[Prompt]"
+
 msgid "[Scratch]"
 msgstr "[Scratch]"
 
@@ -237,7 +254,8 @@ msgid "E917: Cannot use a callback with 
 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()   ϴ"
+msgstr ""
+"E912: raw Ȥ nl äο ch_evalexpr()/ch_sendexpr()   ϴ"
 
 msgid "E906: not an open channel"
 msgstr "E906:  ä ƴմϴ"
@@ -351,7 +369,6 @@ msgstr "E791: Ű Ʈ "
 msgid " Keyword completion (^N^P)"
 msgstr "  ϼ (^N^P)"
 
-#. ctrl_x_mode == 0, ^P/^N compl.
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " ^X  (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
@@ -423,16 +440,12 @@ msgstr "ã : %s"
 msgid "Scanning tags."
 msgstr "± ã ."
 
-#~ msgid "match in file"
-#~ msgstr ""
+msgid "match in file"
+msgstr "match in file"
 
 msgid " Adding"
 msgstr " ϱ"
 
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
 msgid "-- Searching..."
 msgstr "-- ã ..."
 
@@ -453,7 +466,6 @@ msgstr "match %d of %d"
 msgid "match %d"
 msgstr "match %d"
 
-#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ':let' 𸣴 "
 
@@ -513,8 +525,6 @@ msgstr "E690: :for ڿ \"in\" ϴ"
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: ̷  : \"%s\""
 
-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
 #, c-format
 msgid "E940: Cannot lock or unlock variable %s"
 msgstr "E940:  %s()  Ȥ   ϴ"
@@ -525,21 +535,6 @@ msgstr "E743: ()ϱ⿡  ʹ  øǾϴ"
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' ڿ ':' ϴ"
 
-msgid "E691: Can only compare List with List"
-msgstr "E691: List List͸   ֽϴ"
-
-msgid "E692: Invalid operation for List"
-msgstr "E692: List  ߸ "
-
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: Dictionary Dictionary͸   ֽϴ"
-
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: Dictionary  ߸ "
-
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: Funcrefs  ߸ "
-
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Float '%'   ϴ"
 
@@ -568,8 +563,8 @@ msgstr "E114: ǥ : %s"
 msgid "E115: Missing quote: %s"
 msgstr "E115: ǥ : %s"
 
-#~ msgid "Not enough memory to set references, garbage collection aborted!"
-#~ msgstr ""
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr "޸𸮰 Ͽ  ݷ ߴܵǾϴ!"
 
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724:  ǥϱ⿡ ʹ  øǾϴ"
@@ -665,6 +660,21 @@ msgstr ""
 "\n"
 "\tLast set from "
 
+msgid "E691: Can only compare List with List"
+msgstr "E691: List List͸   ֽϴ"
+
+msgid "E692: Invalid operation for List"
+msgstr "E692: List  ߸ "
+
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: Dictionary Dictionary͸   ֽϴ"
+
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: Dictionary  ߸ "
+
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: Funcrefs  ߸ "
+
 msgid "map() argument"
 msgstr "map() "
 
@@ -687,15 +697,16 @@ 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 "+-%s%3ld line: "
+#msgid_plural "+-%s%3ld lines: "
+#msgstr[0] ""
+#msgstr[1] ""
+
+#, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: 𸣴 Լ: %s"
 
@@ -797,17 +808,191 @@ msgstr "E677: ӽ   "
 msgid "E921: Invalid callback argument"
 msgstr "E921:  ݹ "
 
+msgid "Entering Debug mode.  Type \"cont\" to continue."
+msgstr " · .  Ϸ \"cont\" ԷϽʽÿ."
+
+#, c-format
+msgid "Oldval = \"%s\""
+msgstr "  = \"%s\""
+
+#, c-format
+msgid "Newval = \"%s\""
+msgstr "ο  = \"%s\""
+
+#, c-format
+msgid "line %ld: %s"
+msgstr "%ld : %s"
+
+#, c-format
+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 "
+
+#, c-format
+msgid "E161: Breakpoint not found: %s"
+msgstr "E161:  ã  ϴ: %s"
+
+msgid "No breakpoints defined"
+msgstr " ǵǾ  ʽϴ"
+
+#, c-format
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  %ld "
+
+#, c-format
+msgid "%3d  expr %s"
+msgstr "%3d  expr %s"
+
+msgid "E750: First use \":profile start {fname}\""
+msgstr "E750:  \":profile start {fname}\" ϼ"
+
+msgid "Save As"
+msgstr "ٸ ̸ "
+
+#, c-format
+msgid "Save changes to \"%s\"?"
+msgstr "\"%s\" ٲ  ұ?"
+
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: Job  \"%s\" ۿ  Դϴ"
+
+#, c-format
+msgid "E162: No write since last change for buffer \"%s\""
+msgstr "E162:  \"%s\" ߿ ٲ   ʾҽϴ"
+
+msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
+msgstr ":  ۿ ٸ ۷ ϴ (autocommand ȮϽʽÿ)"
+
+msgid "E163: There is only one file to edit"
+msgstr "E163: ĥ  ϳ ۿ ϴ"
+
+msgid "E164: Cannot go before first file"
+msgstr "E164: ù °  δ   ϴ"
+
+msgid "E165: Cannot go beyond last file"
+msgstr "E165:   ڷδ   ϴ"
+
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: Ϸ  : %s"
+
+#, c-format
+msgid "Searching for \"%s\" in \"%s\""
+msgstr "\"%s\"() \"%s\" ã "
+
+#, c-format
+msgid "Searching for \"%s\""
+msgstr "\"%s\"() ã "
+
+#, c-format
+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 " ũƮ ε"
+
+#, c-format
+msgid "Cannot source a directory: \"%s\""
+msgstr "丮 source  : \"%s\""
+
+#, c-format
+msgid "could not source \"%s\""
+msgstr "\"%s\"() ҷ   ϴ"
+
+#, c-format
+msgid "line %ld: could not source \"%s\""
+msgstr "%ld : \"%s\"() ҷ   ϴ"
+
+#, c-format
+msgid "sourcing \"%s\""
+msgstr "\"%s\"() ҷ̴ "
+
+#, c-format
+msgid "line %ld: sourcing \"%s\""
+msgstr "%ld : \"%s\" ҷ̴ "
+
+#, c-format
+msgid "finished sourcing %s"
+msgstr "%s ҷ̱ "
+
+#, c-format
+msgid "continuing in %s"
+msgstr "%s "
+
+msgid "modeline"
+msgstr "modeline"
+
+msgid "--cmd argument"
+msgstr "--cmd "
+
+msgid "-c argument"
+msgstr "-c "
+
+msgid "environment variable"
+msgstr "ȯ "
+
+msgid "error handler"
+msgstr " ڵ鷯"
+
+msgid "W15: Warning: Wrong line separator, ^M may be missing"
+msgstr "W15: : ߸  . ^M   ϴ"
+
+msgid "E167: :scriptencoding used outside of a sourced file"
+msgstr "E167: :scriptencoding ҷ  ۿ Ǿϴ"
+
+msgid "E168: :finish used outside of a sourced file"
+msgstr "E168: :finish ҷ  ۿ Ǿϴ"
+
+#, c-format
+msgid "Current %slanguage: \"%s\""
+msgstr " %s: \"%s\""
+
+#, c-format
+msgid "E197: Cannot set language to \"%s\""
+msgstr "E197:  \"%s\"()   ϴ"
+
+#, c-format
+msgid "<%s>%s%s  %d,  Hex %02x,  Oct %03o, Digr %s"
+msgstr "<%s>%s%s  %d,   %02x,   %03o, ߱ %s"
+
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,   %02x,   %03o"
+msgstr "<%s>%s%s  %d,   %02x,   %03o"
+
+#, c-format
+msgid "> %d, Hex %04x, Oct %o, Digr %s"
+msgstr "> %d,  %04x,  %o, ߱ %s"
+
+#, c-format
+msgid "> %d, Hex %08x, Oct %o, Digr %s"
+msgstr "> %d,  %08x,  %o, ߱ %s"
 
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d,   %04x,   %o"
+msgstr "> %d,  %04x,  %o"
 
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d,   %08x,   %o"
+msgstr "> %d,  %08x,  %o"
 
 msgid "E134: Move lines into themselves"
 msgstr "E134:   ڽ ̵Ϸ ߽ϴ"
@@ -846,13 +1031,12 @@ msgstr " "
 msgid " marks"
 msgstr " ũ"
 
-#~ msgid " oldfiles"
-#~ msgstr ""
+msgid " oldfiles"
+msgstr " oldfiles"
 
 msgid " FAILED"
 msgstr " "
 
-#. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Viminfo    ϴ: %s"
@@ -873,7 +1057,6 @@ msgstr "Viminfo  \"%s\"()  "
 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"
 msgstr "#  viminfo    Դϴ Vim %s.\n"
@@ -896,9 +1079,6 @@ msgstr "̻  "
 #~ "# Bar lines, copied verbatim:\n"
 #~ msgstr ""
 
-msgid "Save As"
-msgstr "ٸ ̸ "
-
 msgid "Write partial file?"
 msgstr " Ϻθ ұ?"
 
@@ -990,7 +1170,6 @@ msgstr "  ٿ"
 msgid " on %ld lines"
 msgstr " %ld ٿ"
 
-#. will increment global_busy to break out of the loop
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: :global   ȣ   ϴ"
 
@@ -1101,152 +1280,6 @@ msgstr "[ϴ]"
 msgid "No old files"
 msgstr "old  ϴ"
 
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr " · .  Ϸ \"cont\" ԷϽʽÿ."
-
-#, c-format
-msgid "line %ld: %s"
-msgstr "%ld : %s"
-
-#, c-format
-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 "
-
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161:  ã  ϴ: %s"
-
-msgid "No breakpoints defined"
-msgstr " ǵǾ  ʽϴ"
-
-#, c-format
-msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  %ld "
-
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750:  \":profile start {fname}\" ϼ"
-
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "\"%s\" ٲ  ұ?"
-
-msgid "Untitled"
-msgstr " "
-
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162:  \"%s\" ߿ ٲ   ʾҽϴ"
-
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr ":  ۿ ٸ ۷ ϴ (autocommand ȮϽʽÿ)"
-
-msgid "E163: There is only one file to edit"
-msgstr "E163: ĥ  ϳ ۿ ϴ"
-
-msgid "E164: Cannot go before first file"
-msgstr "E164: ù °  δ   ϴ"
-
-msgid "E165: Cannot go beyond last file"
-msgstr "E165:   ڷδ   ϴ"
-
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: Ϸ  : %s"
-
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "\"%s\"() \"%s\" ã "
-
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "\"%s\"() ã "
-
-#, c-format
-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 " ũƮ ε"
-
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "丮 source  : \"%s\""
-
-#, c-format
-msgid "could not source \"%s\""
-msgstr "\"%s\"() ҷ   ϴ"
-
-#, c-format
-msgid "line %ld: could not source \"%s\""
-msgstr "%ld : \"%s\"() ҷ   ϴ"
-
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "\"%s\"() ҷ̴ "
-
-#, c-format
-msgid "line %ld: sourcing \"%s\""
-msgstr "%ld : \"%s\" ҷ̴ "
-
-#, c-format
-msgid "finished sourcing %s"
-msgstr "%s ҷ̱ "
-
-#, c-format
-msgid "continuing in %s"
-msgstr "%s "
-
-msgid "modeline"
-msgstr "modeline"
-
-msgid "--cmd argument"
-msgstr "--cmd "
-
-msgid "-c argument"
-msgstr "-c "
-
-msgid "environment variable"
-msgstr "ȯ "
-
-msgid "error handler"
-msgstr " ڵ鷯"
-
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: : ߸  . ^M   ϴ"
-
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding ҷ  ۿ Ǿϴ"
-
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish ҷ  ۿ Ǿϴ"
-
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr " %s: \"%s\""
-
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197:  \"%s\"()   ϴ"
-
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Ex · ȯ.  Normal ·  \"visual\" ԷϽʽÿ."
 
@@ -1287,9 +1320,6 @@ msgstr "E943:  ̺  ʿ, 'make cmdidxs' ϼ"
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ̾մϴ,    ǿ   ϴ"
 
-msgid "E172: Only one file name allowed"
-msgstr "E172:  ϳ  ̸  մϴ"
-
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "ĥ     ֽϴ. ׷ ?"
 
@@ -1382,6 +1412,9 @@ msgstr "E784:     ϴ"
 msgid "Already only one tab page"
 msgstr "̹ ϳ Ǹ ֽϴ"
 
+msgid "Edit File in new tab page"
+msgstr " ǿ  ġ"
+
 msgid "Edit File in new window"
 msgstr " â  ġ"
 
@@ -1444,7 +1477,6 @@ msgstr "E189: \"%s\"() մϴ ( ! ϱ)"
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190:   \"%s\"()   ϴ"
 
-#. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: ڴ ڳ / ο ȣ մϴ"
 
@@ -1482,13 +1514,15 @@ msgstr "E500:  ڿ  Ϸ մϴ"
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195:  viminfo    ϴ"
 
+msgid "Untitled"
+msgstr " "
+
 msgid "E196: No digraphs in this version"
 msgstr "E196:  ǿ digraph ϴ"
 
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' λ ܸ :throw  ϴ"
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception thrown: %s"
 msgstr " thrown: %s"
@@ -1505,7 +1539,6 @@ msgstr " : %s"
 msgid "%s, line %ld"
 msgstr "%s, %ld "
 
-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception caught: %s"
 msgstr " ߻: %s"
@@ -1531,7 +1564,6 @@ msgstr " ͷƮ"
 msgid "Error"
 msgstr ""
 
-#. if (pending & CSTP_INTERRUPT)
 msgid "Interrupt"
 msgstr "ͷƮ"
 
@@ -1574,15 +1606,12 @@ msgstr "E601: :try ʹ  øǾϴ"
 msgid "E603: :catch without :try"
 msgstr "E603: :try :catch ֽϴ"
 
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally ڿ :catch ֽϴ"
 
 msgid "E606: :finally without :try"
 msgstr "E606: :try :finally ֽϴ"
 
-#. Give up for a multiple ":finally" and ignore it.
 msgid "E607: multiple :finally"
 msgstr "E607:  :finally ֽϴ"
 
@@ -1675,7 +1704,6 @@ msgstr ": ǥԷ¿ д ...\n"
 msgid "Reading from stdin..."
 msgstr "ǥԷ¿ д ..."
 
-#. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: ȯ    ϴ!"
 
@@ -1762,9 +1790,6 @@ msgstr "E509:    ϴ ( ! ϱ)"
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510:    ϴ ( ! ϱ)"
 
-msgid "E460: The resource fork would be lost (add ! to override)"
-msgstr "E460: The resource fork will be lost ( ! ϱ)"
-
 msgid "E214: Can't find temp file for writing"
 msgstr "E214:  ӽ  ã  ϴ"
 
@@ -1777,8 +1802,8 @@ msgstr "E166:      ϴ"
 msgid "E212: Can't open file for writing"
 msgstr "E212:     ϴ"
 
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync ߽ϴ"
+msgid "E949: File changed while writing"
+msgstr "E949:  ߿  Ǿϴ"
 
 msgid "E512: Close failed"
 msgstr "E512: ݱⰡ ߽ϴ"
@@ -1877,9 +1902,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[ҿ  ]"
 
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr ":   ڿ ٲϴ!!!"
 
@@ -1958,7 +1980,6 @@ msgstr "----"
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand ڵ: %s <buffer=%d>"
 
-#. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ̷ ׷ : \"%s\""
@@ -1981,7 +2002,6 @@ msgstr "E216: ׷ ̺Ʈ : %s"
 msgid "E216: No such group or event: %s"
 msgstr "E216: ׷ ׷̳ ̺Ʈ : %s"
 
-#. Highlight title
 msgid ""
 "\n"
 "--- Autocommands ---"
@@ -2029,6 +2049,12 @@ msgstr "E350:  'foldmethod' ⸦   ϴ"
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351:  'foldmethod' ⸦   ϴ"
 
+#, c-format
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+-%3ld  ϴ"
+msgstr[1] "+-%3ld ٵ ϴ"
+
 msgid "E222: Add to read buffer"
 msgstr "E222:  ۿ ϱ"
 
@@ -2060,6 +2086,37 @@ msgstr " ã  ϴ"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: ̻ "
 
+msgid "<cannot open> "
+msgstr "<  > "
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: ۲ %s()   ϴ"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile:  丮 ư  ϴ"
+
+msgid "Pathname:"
+msgstr " ̸:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile:  丮   ϴ"
+
+msgid "OK"
+msgstr "Ȯ"
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Vim dialog"
+msgstr " ȭ"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "ũѹ :  Ƚ Ʈ   ϴ."
+
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: ޽ ݹ θ ؼ BalloonEval   ϴ"
+
 msgid "E851: Failed to create a new process for the GUI"
 msgstr "E851: ο GUI μ   ϴ"
 
@@ -2089,37 +2146,6 @@ msgstr "E254:  %s() Ҵ  ϴ"
 #~ msgid "No match at cursor, finding next"
 #~ msgstr ""
 
-msgid "<cannot open> "
-msgstr "<  > "
-
-#, c-format
-msgid "E616: vim_SelFile: can't get font %s"
-msgstr "E616: vim_SelFile: ۲ %s()   ϴ"
-
-msgid "E614: vim_SelFile: can't return to current directory"
-msgstr "E614: vim_SelFile:  丮 ư  ϴ"
-
-msgid "Pathname:"
-msgstr " ̸:"
-
-msgid "E615: vim_SelFile: can't get current directory"
-msgstr "E615: vim_SelFile:  丮   ϴ"
-
-msgid "OK"
-msgstr "Ȯ"
-
-msgid "Cancel"
-msgstr ""
-
-msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-msgstr "ũѹ :  Ƚ Ʈ   ϴ."
-
-msgid "Vim dialog"
-msgstr " ȭ"
-
-msgid "E232: Cannot create BalloonEval with both message and callback"
-msgstr "E232: ޽ ݹ θ ؼ BalloonEval   ϴ"
-
 msgid "_Cancel"
 msgstr "(_C)"
 
@@ -2162,18 +2188,15 @@ msgstr " ã:"
 msgid "Replace with:"
 msgstr "ٲ ڿ:"
 
-#. whole word only button
 msgid "Match whole word only"
 msgstr "Ȱ "
 
-#. match case button
 #~ msgid "Match case"
 #~ msgstr ""
 
 msgid "Direction"
 msgstr ""
 
-#. 'Up' and 'Down' buttons
 msgid "Up"
 msgstr ""
 
@@ -2246,14 +2269,12 @@ msgstr "(&U)"
 msgid "Open tab..."
 msgstr " ..."
 
-msgid "Find string (use '\\\\' to find  a '\\')"
+msgid "Find string (use '\\\\' to find a '\\')"
 msgstr "ڿ ã ('\\' ã '\\\\' )"
 
-msgid "Find & Replace (use '\\\\' to find  a '\\')"
-msgstr "ڿ ã ٲٱ ('\\' ã '\\\\' )"
-
-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
+msgid "Find & Replace (use '\\\\' to find a '\\')"
+msgstr "ڿ ãƼ ٲٱ ('\\' ã '\\\\' )"
+
 msgid "Not Used"
 msgstr " ʵ"
 
@@ -2311,11 +2332,11 @@ msgstr "۲0 ʺ: %ld"
 msgid "Font1 width: %ld"
 msgstr "۲1 ʺ: %ld"
 
-#~ msgid "Invalid font specification"
-#~ msgstr ""
-
-#~ msgid "&Dismiss"
-#~ msgstr ""
+msgid "Invalid font specification"
+msgstr "۲ ԰ ̻մϴ"
+
+msgid "&Dismiss"
+msgstr "(&D)"
 
 #~ msgid "no specific match"
 #~ msgstr ""
@@ -2326,7 +2347,6 @@ msgstr "Vim - ۲ ñ"
 msgid "Name:"
 msgstr "̸:"
 
-#. create toggle button
 #~ msgid "Show size in Points"
 #~ msgstr ""
 
@@ -2571,7 +2591,6 @@ msgstr "E261: cscope  %s() ã  ϴ"
 msgid "cscope connection %s closed"
 msgstr "cscope  %s() ϴ"
 
-#. should not reach here
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches ɰ "
 
@@ -2619,8 +2638,8 @@ msgid ""
 "E895: Sorry, this command is disabled, the MzScheme's racket/base module "
 "could not be loaded."
 msgstr ""
-"E895: ̾մϴ,     ϴ, MzScheme racket/base "
-" ε  ϴ."
+"E895: ̾մϴ,     ϴ, MzScheme racket/base "
+" ε  ϴ."
 
 msgid "invalid expression"
 msgstr "߸ ǥ"
@@ -2673,8 +2692,8 @@ msgstr " ȣ  ϴ"
 msgid "not allowed in the Vim sandbox"
 msgstr "Vim sandbox  ʽϴ"
 
-msgid "E836: This Vim cannot execute :python after using :py3"
-msgstr "E836:  Vim :py3  Ŀ :python   ϴ"
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837:  Vim :python  Ŀ :py3   ϴ"
 
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
@@ -2683,19 +2702,19 @@ msgstr ""
 "E263: ̾մϴ,     ϴ, ̽ ̺귯 ε "
 " ϴ."
 
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836:  Vim :py3  Ŀ :python   ϴ"
+
 msgid ""
 "E887: Sorry, this command is disabled, the Python's site module could not be "
 "loaded."
 msgstr ""
-"E887: ̾մϴ,     ϴ, ̽ Ʈ  "
-"ε  ϴ."
+"E887: ̾մϴ,     ϴ, ̽ Ʈ  ε"
+"  ϴ."
 
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python ȣ  ϴ"
 
-msgid "E837: This Vim cannot execute :py3 after using :python"
-msgstr "E837:  Vim :python  Ŀ :py3   ϴ"
-
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ String νϽ̾ մϴ"
 
@@ -2733,7 +2752,6 @@ msgstr "߸  ȣ"
 msgid "not implemented yet"
 msgstr "  ʾҽϴ"
 
-#. ???
 msgid "cannot set line(s)"
 msgstr "   ϴ"
 
@@ -2772,7 +2790,6 @@ msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr "ݹ    ϴ: /â ̹ ϴ"
 
-#. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
@@ -2836,8 +2853,8 @@ msgstr "ɼ  ڿ  "
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "ʹ  \"+command\" \"-c command\" Ȥ \"--cmd command\" "
 
-#~ msgid "Invalid argument for"
-#~ msgstr ""
+msgid "Invalid argument for"
+msgstr "Invalid argument for"
 
 #, c-format
 msgid "%d files to edit\n"
@@ -2873,7 +2890,6 @@ msgstr ": : ͹̳η   ϴ\n"
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr ": : ͹̳η  Է¹  ϴ\n"
 
-#. just in case..
 msgid "pre-vimrc command line"
 msgstr "pre-vimrc  "
 
@@ -3124,6 +3140,9 @@ msgstr "--startuptime <file>\tstartup timing ޽ <file> "
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfo  <viminfo> "
 
+#~ msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+#~ msgstr ""
+
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h Ȥ --help\t( ޽)   "
 
@@ -3221,11 +3240,9 @@ msgstr "--windowid <HWND>\tٸ win32  ȿ Vim "
 msgid "No display"
 msgstr "÷̰ ϴ"
 
-#. Failed to send, abort.
 msgid ": Send failed.\n"
 msgstr ": Ⱑ Ͽϴ.\n"
 
-#. Let vim start normally.
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ":  . ÿ ˴ϴ\n"
 
@@ -3246,7 +3263,6 @@ msgstr " ũ ϴ"
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" ´ ũ ϴ"
 
-#. Highlight title
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3254,7 +3270,6 @@ msgstr ""
 "\n"
 "ũ   col /ؽƮ"
 
-#. Highlight title
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3262,7 +3277,6 @@ msgstr ""
 "\n"
 "    col /ؽƮ"
 
-#. Highlight title
 #~ msgid ""
 #~ "\n"
 #~ "change line  col text"
@@ -3275,7 +3289,6 @@ msgstr ""
 "\n"
 "#  ũ:\n"
 
-#. Write the jumplist with -'
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3344,7 +3357,6 @@ msgstr "E298:  ȣ 2  ߳?"
 msgid "E843: Error while updating swap file crypt"
 msgstr "E843:   ȣȭ  ϴ"
 
-#. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ,   ҾȽϴ!!!"
 
@@ -3392,21 +3404,23 @@ msgstr "E307: %s()    ƴ  ϴ"
 msgid " cannot be used on this computer.\n"
 msgstr "  ǻͿ   ϴ.\n"
 
-#~ msgid "The file was created on "
-#~ msgstr ""
-
-#~ msgid ""
-#~ ",\n"
-#~ "or the file has been damaged."
-#~ msgstr ""
+msgid "The file was created on "
+msgstr "The file was created on "
+
+msgid ""
+",\n"
+"or the file has been damaged."
+msgstr ""
+",\n"
+"or the file has been damaged."
 
 #, c-format
 msgid ""
 "E833: %s is encrypted and this version of Vim does not support encryption"
 msgstr "E833: %s() ȣȭǾ ִ ,  Vim ȣȭ  ʽϴ"
 
-#~ msgid " has been damaged (page size is smaller than minimum value).\n"
-#~ msgstr ""
+msgid " has been damaged (page size is smaller than minimum value).\n"
+msgstr " has been damaged (page size is smaller than minimum value).\n"
 
 #, c-format
 msgid "Using swap file \"%s\""
@@ -3521,7 +3535,6 @@ msgstr ""
 msgid "Using crypt key from swap file for the text file.\n"
 msgstr "ؽƮ Ͽ Ͽ  ȣ Ű մϴ.\n"
 
-#. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "  ã:"
 
@@ -3691,8 +3704,6 @@ msgstr "While opening file \""
 msgid "      NEWER than swap file!\n"
 msgstr "      NEWER than swap file!\n"
 
-#. Some of these messages are long to allow translation to
-#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@@ -3780,7 +3791,6 @@ msgstr "E328: ޴ ٸ 忡 մϴ"
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" ޴ "
 
-#. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
 msgstr "E792: ޴ ̸ "
 
@@ -3793,8 +3803,6 @@ msgstr "E331: ޴ٿ ٷ ޴ ׸   ϴ"
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: ڴ ޴  κ   ϴ"
 
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
 msgid ""
 "\n"
 "--- Menus ---"
@@ -3805,6 +3813,10 @@ msgstr ""
 msgid "Tear off this menu"
 msgstr " ޴ "
 
+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: %s 忡  ޴ ǵǾ  ʽϴ"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: ޴ ׸ տ ޴ ΰ ־ մϴ"
 
@@ -3812,10 +3824,6 @@ msgstr "E333: ޴ ׸ տ ޴ ΰ ־ մϴ"
 msgid "E334: Menu not found: %s"
 msgstr "E334: ޴ ã  ϴ: %s"
 
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s 忡  ޴ ǵǾ  ʽϴ"
-
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336:  ޴ տ ޴ ΰ ־ մϴ"
 
@@ -3835,7 +3843,7 @@ msgid "E354: Invalid register name: '%s'
 msgstr "E354: ߸  ̸: '%s'"
 
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "޽ : Bram Moolenaar <Bram@vim.org>"
+msgstr "޽ : SungHyun Nam <goweol@gmail.com>"
 
 msgid "Interrupt: "
 msgstr "ߴ: "
@@ -3885,7 +3893,6 @@ msgstr "  ȭ"
 msgid "Open File dialog"
 msgstr "  ȭ"
 
-#. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: ̾մϴ, ܼ ¿   ϴ"
 
@@ -4077,7 +4084,6 @@ msgstr "%ld lines indented "
 #~ msgid "E748: No previously used register"
 #~ msgstr ""
 
-#. must display the prompt
 msgid "cannot yank; delete anyway"
 msgstr "cannot yank; delete anyway"
 
@@ -4092,25 +4098,30 @@ msgstr "%ld lines changed"
 msgid "freeing %ld lines"
 msgstr "freeing %ld lines"
 
-msgid "block of 1 line yanked"
-msgstr "block of 1 line yanked"
-
-msgid "1 line yanked"
-msgstr "1 line yanked"
-
-#, c-format
-msgid "block of %ld lines yanked"
-msgstr "block of %ld lines yanked"
-
-#, c-format
-msgid "%ld lines yanked"
-msgstr "%ld lines yanked"
+#, c-format
+msgid " into \"%c"
+msgstr " into \"%c"
+
+#, c-format
+msgid "block of 1 line yanked%s"
+msgstr "block of 1 line yanked%s"
+
+#, c-format
+msgid "1 line yanked%s"
+msgstr "1 line yanked%s"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "block of %ld lines yanked%s"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld lines yanked%s"
 
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: %s Ϳ ƹ ͵ ϴ"
 
-#. Highlight title
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4142,32 +4153,33 @@ msgid "%ld Cols; "
 msgstr "%ld ; "
 
 #, c-format
-#~ 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; %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 %lld of %lld; Byte %lld of %lld"
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+
+#, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
+msgstr ""
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
+msgstr ""
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
+
+#, c-format
+#~ msgid "(+%lld for BOM)"
 #~ msgstr ""
 
-#, c-format
-#~ 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 ""
-
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%= %N"
-
 msgid "Thanks for flying Vim"
 msgstr "   ּż ϴ"
 
@@ -4218,6 +4230,10 @@ msgstr "E835: 'fillchars'  浹 ߻մϴ"
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: GTK+ 2 GUI ٲ  ϴ"
 
+#, c-format
+#~ msgid "E950: Cannot convert between %s and %s"
+#~ msgstr ""
+
 msgid "E524: Missing colon"
 msgstr "E524: ݷ ϴ"
 
@@ -4275,12 +4291,18 @@ msgstr "E541: ʹ  ׸"
 msgid "E542: unbalanced groups"
 msgstr "E542:    ׷"
 
+#~ msgid "E946: Cannot make a terminal with running job modifiable"
+#~ msgstr ""
+
 msgid "E590: A preview window already exists"
 msgstr "E590: ̸  â ̹ մϴ"
 
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr "W17: Arabic UTF-8 ڵ ʿ, ':set encoding=utf-8' ϼ"
 
+msgid "E954: 24-bit colors are not supported on this environment"
+msgstr "E954:  ȯ濡 24Ʈ   ʽϴ"
+
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593:  %d  ʿմϴ"
@@ -4293,9 +4315,6 @@ msgstr "E594:  %d ĭ ʿմϴ"
 msgid "E355: Unknown option: %s"
 msgstr "E355: 𸣴 ɼ: %s"
 
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: ڰ ʿ: &%s = '%s'"
@@ -4368,7 +4387,6 @@ msgstr "ܼ ¸ ٲ  ϴ ?!\n"
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: ܼ ƴѰ??\n"
 
-#. if Vim opened a window: Executing a shell may cause crashes
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: -f ɼ      ϴ"
 
@@ -4569,6 +4587,9 @@ msgstr " "
 msgid "shell returned %d"
 msgstr " %d() ־ϴ"
 
+msgid "E926: Current location list was changed"
+msgstr "E926:  location list ٲϴ"
+
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372:  ڿ %%%c() ʹ ϴ"
@@ -4592,7 +4613,6 @@ msgstr "E376:  ڿ ο ߸ %%%c() ֽϴ"
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377:  ڿ ߸ %%%c() ֽϴ"
 
-#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat'  ϵ ϰ  ʽϴ"
 
@@ -4608,9 +4628,6 @@ 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: "
@@ -4619,8 +4636,8 @@ msgid " (line deleted)"
 msgstr " ( )"
 
 #, c-format
-#~ msgid "%serror list %d of %d; %d errors "
-#~ msgstr ""
+msgid "%serror list %d of %d; %d errors "
+msgstr "%serror list %d of %d; %d errors "
 
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: Ƚ  ٴԴϴ"
@@ -4631,9 +4648,6 @@ msgstr "E381: Ƚ  Դϴ"
 #~ msgid "No entries"
 #~ msgstr ""
 
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382:   , 'buftype' ɼ Ǿ ֽϴ"
-
 msgid "Error file"
 msgstr " "
 
@@ -4774,13 +4788,15 @@ msgstr "E877: (NFA ǥ)   Ŭ: %ld"
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) 𸣴 ۷ '\\z%c'"
 
+msgid "E951: \\% value too large"
+msgstr "E951: \\%  ʹ ϴ"
+
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) 𸣴 ۷ '\\%%%c'"
 
-#. should never happen
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr ""
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Error building NFA with equivalence class!"
 
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
@@ -4789,11 +4805,9 @@ 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 ǥ) '(' ʹ ϴ"
 
@@ -4803,8 +4817,11 @@ msgstr "E879: (NFA ǥ) \\z( ʹ ϴ"
 #~ msgid "E873: (NFA regexp) proper termination error"
 #~ msgstr ""
 
-#~ msgid "E874: (NFA) Could not pop the stack!"
-#~ msgstr ""
+msgid "Could not open temporary log file for writing, displaying on stderr... "
+msgstr " ӽ α    ϴ, ǥؿ(stderr) ǥմϴ..."
+
+msgid "E874: (NFA) Could not pop the stack!"
+msgstr "E874: (NFA) ÿ   ϴ!"
 
 #~ msgid ""
 #~ "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
@@ -4817,17 +4834,6 @@ msgstr "E879: (NFA ǥ) \\z( ʹ ϴ"
 #~ 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 " ġȯ"
 
@@ -4897,7 +4903,6 @@ msgstr "E386: ';' ڿ '?' '/' ; մϴ"
 msgid " (includes previously listed match)"
 msgstr " ( ¾Ҵ  )"
 
-#. cursor at status line
 msgid "--- Included files "
 msgstr "--- Included files "
 
@@ -4974,8 +4979,6 @@ msgstr "˼,   ϴ"
 msgid "Sorry, only %ld suggestions"
 msgstr "˼, %ld "
 
-#. for when 'cmdheight' > 1
-#. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Change \"%.*s\" to:"
@@ -5192,8 +5195,8 @@ msgid "E760: No word count in %s"
 msgstr "E760: %s ܾ īƮ ϴ"
 
 #, c-format
-msgid "line %6d, word %6d - %s"
-msgstr " %6d, ܾ %6d - %s"
+msgid "line %6d, word %6ld - %s"
+msgstr " %6d, ܾ %6ld - %s"
 
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
@@ -5247,8 +5250,8 @@ msgstr "%s  %d 𸣴 ÷: %s"
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "ƽŰ ڿ ƴ %d ܾ õǾϴ"
 
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr ""
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: ޸ , ܾ  ҿ Դϴ"
 
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
@@ -5257,10 +5260,6 @@ msgstr "%d/%d 尡 ; %d (%d%%) "
 msgid "Reading back spell file..."
 msgstr "  д ..."
 
-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
 msgid "Performing soundfolding..."
 msgstr "soundfold ..."
 
@@ -5283,8 +5282,9 @@ msgstr " Ÿ ޸ 뷮: %d Ʈ"
 msgid "E751: Output file name must not have region name"
 msgstr "E751:  ϸ  ̸ ޶ մϴ"
 
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: ִ 8  ˴ϴ"
+#, c-format
+msgid "E754: Only up to %ld regions supported"
+msgstr "E754: ִ %ld  ˴ϴ"
 
 #, c-format
 msgid "E755: Invalid region in %s"
@@ -5315,29 +5315,27 @@ msgstr "ܾ '%.*s'() %s ߰"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: ܾ spell   ٸϴ"
 
-#. 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 ""
+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 case ignore"
+msgstr " ҹ "
+
+msgid "syntax case match"
+msgstr " ҹ "
 
 #~ msgid "syntax spell toplevel"
 #~ msgstr ""
@@ -5348,8 +5346,8 @@ msgstr "E390: ߸ : %s"
 #~ msgid "syntax spell default"
 #~ msgstr ""
 
-#~ msgid "syntax iskeyword "
-#~ msgstr ""
+msgid "syntax iskeyword "
+msgstr "syntax iskeyword "
 
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -5420,8 +5418,8 @@ msgstr "E394: %s  region ׸ ã ߽ϴ"
 msgid "E397: Filename required"
 msgstr "E397: ̸ ʿմϴ"
 
-#~ msgid "E847: Too many syntax includes"
-#~ msgstr ""
+msgid "E847: Too many syntax includes"
+msgstr "E847:  (include) ʹ ϴ"
 
 #, c-format
 msgid "E789: Missing ']': %s"
@@ -5581,7 +5579,6 @@ msgstr "E428:  ´ ± ڷδ   ϴ"
 msgid "File \"%s\" does not exist"
 msgstr " \"%s\"()  ʽϴ"
 
-#. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "tag %d of %d%s"
@@ -5596,7 +5593,6 @@ msgstr "  Using tag with different case!
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429:  \"%s\"()  ʽϴ"
 
-#. Highlight title
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5627,7 +5623,6 @@ msgstr "Before byte %ld"
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: ±  ĵǾ  : %s"
 
-#. never opened any tags file
 msgid "E433: No tags file"
 msgstr "E433: ±  ϴ"
 
@@ -5663,7 +5658,6 @@ msgstr "E436: termcap \"%s\" ׸ ϴ"
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: ͹̳ \"cm\"  ؾ մϴ"
 
-#. Highlight title
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5674,6 +5668,32 @@ msgstr ""
 msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "$VIMRUNTIME/rgb.txt   ϴ"
 
+#, c-format
+msgid "Kill job in \"%s\"?"
+msgstr "\"%s\" job ϱ?"
+
+msgid "Terminal"
+msgstr "Terminal"
+
+msgid "Terminal-finished"
+msgstr "Terminal-finished"
+
+msgid "active"
+msgstr "active"
+
+msgid "running"
+msgstr "running"
+
+msgid "finished"
+msgstr "finished"
+
+#, c-format
+msgid "E953: File exists: %s"
+msgstr "E953:  : %s"
+
+msgid "E955: Not a terminal buffer"
+msgstr "E955: ͹̳ ۰ ƴմϴ"
+
 msgid "new shell started\n"
 msgstr "  ۵Ǿϴ\n"
 
@@ -5683,12 +5703,9 @@ msgstr ": Է д  , ...\n"
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "   CUT_BUFFER0 ߽ϴ"
 
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881:   ڱ ٲϴ"
 
-#. must display the prompt
 msgid "No undo possible; continue anyway"
 msgstr " Ұ; · մϴ"
 
@@ -5916,8 +5933,8 @@ msgid "E862: Cannot use g: here"
 msgstr "E862: ⿡ g:   ϴ"
 
 #, c-format
-#~ msgid "E932: Closure function should not be at top level: %s"
-#~ msgstr ""
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: Closure Լ ֻ   ϴ: %s"
 
 msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction ϴ"
@@ -5949,6 +5966,10 @@ msgstr "E133: :return Լ ȿ  ʽϴ"
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: ȣ : %s"
 
+#, c-format
+msgid "%s (%s, compiled %s)"
+msgstr "%s (%s,  ¥ %s)"
+
 msgid ""
 "\n"
 "MS-Windows 64-bit GUI version"
@@ -5982,24 +6003,15 @@ msgstr ""
 
 msgid ""
 "\n"
-"MacOS X (unix) version"
-msgstr ""
-"\n"
-"MacOS X (н) "
-
-msgid ""
-"\n"
-"MacOS X version"
+"macOS version"
 msgstr ""
 "\n"
-"MacOS X "
-
-msgid ""
-"\n"
-"MacOS version"
-msgstr ""
-"\n"
-"MacOS "
+"macOS "
+
+#~ msgid ""
+#~ "\n"
+#~ "macOS version w/o darwin feat."
+#~ msgstr ""
 
 msgid ""
 "\n"
@@ -6103,9 +6115,6 @@ msgstr "Carbon GUI."
 msgid "with Cocoa GUI."
 msgstr "Cocoa GUI."
 
-msgid "with (classic) GUI."
-msgstr "(Ŭ) GUI."
-
 msgid "  Features included (+) or not (-):\n"
 msgstr "   (+: Ե, -:   ):\n"
 
@@ -6306,7 +6315,6 @@ msgstr " Diff"
 msgid "Edit with &Vim"
 msgstr " (&V)"
 
-#. Now concatenate
 msgid "Edit with existing Vim - "
 msgstr "ϳ θ  - "
 
@@ -6325,10 +6333,6 @@ msgstr "ΰ ʹ ϴ"
 msgid "--No lines in buffer--"
 msgstr "--ۿ  --"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
 msgid "E470: Command aborted"
 msgstr "E470:  Ǿϴ"
 
@@ -6402,6 +6406,14 @@ msgid "E475: Invalid argument: %s"
 msgstr "E475: ߸ : %s"
 
 #, c-format
+msgid "E475: Invalid value for argument %s"
+msgstr "E475:  %s ߸ "
+
+#, c-format
+msgid "E475: Invalid value for argument %s: %s"
+msgstr "E475:  %s ߸ : %s"
+
+#, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: ߸ ǥ: %s"
 
@@ -6419,6 +6431,9 @@ msgstr "E17: \"%s\"() 丮Դϴ"
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: ̺귯 \"%s()\" θ "
 
+msgid "E667: Fsync failed"
+msgstr "E667: Fsync ߽ϴ"
+
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: %s ̺귯 Լ ε  ϴ"
@@ -6513,12 +6528,6 @@ msgstr "E484: %s    ϴ"
 msgid "E485: Can't read file %s"
 msgstr "E485: %s    ϴ"
 
-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:  "
 
@@ -6695,6 +6704,9 @@ msgstr "E850: ߸  ̸"
 msgid "E919: Directory not found in '%s': \"%s\""
 msgstr "E919: '%s' 丮 ã: \"%s\""
 
+msgid "E952: Autocommand caused recursive behavior"
+msgstr "E952: Autocommand  ȣǾϴ"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "ó ã,  "
 
@@ -6798,7 +6810,6 @@ msgstr "Ӽ %s()   ϴ"
 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 ""
@@ -6952,3 +6963,47 @@ msgstr "%s() vim list   ϴ"
 #~ "Failed to set path: sys.path is not a list\n"
 #~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
 #~ msgstr ""
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*.*)\t*.*\n"
+msgstr ""
+"Vim ũ  (*.vim)\t*.vim\n"
+"  (*.*)\t*.*\n"
+
+msgid "All Files (*.*)\t*.*\n"
+msgstr "  (*.*)\t*.*\n"
+
+msgid ""
+"All Files (*.*)\t*.*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB code (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"  (*.*)\t*.*\n"
+"C ҽ (*.c, *.h)\t*.c;*.h\n"
+"C++ ҽ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"VB ڵ (*.bas, *.frm)\t*.bas;*.frm\n"
+"Vim  (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+
+msgid ""
+"Vim macro files (*.vim)\t*.vim\n"
+"All Files (*)\t*\n"
+msgstr ""
+"Vim ũ  (*.vim)\t*.vim\n"
+"  (*)\t*\n"
+
+msgid "All Files (*)\t*\n"
+msgstr "  (*)\t*\n"
+
+msgid ""
+"All Files (*)\t*\n"
+"C source (*.c, *.h)\t*.c;*.h\n"
+"C++ source (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim files (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
+msgstr ""
+"  (*)\t*\n"
+"C ҽ (*.c, *.h)\t*.c;*.h\n"
+"C++ ҽ (*.cpp, *.hpp)\t*.cpp;*.hpp\n"
+"Vim  (*.vim, _vimrc, _gvimrc)\t*.vim;_vimrc;_gvimrc\n"
--- a/src/po/pl.UTF-8.po
+++ b/src/po/pl.UTF-8.po
@@ -1,5 +1,4 @@
-# translation of pl.po to Polish
-# Polish Translation for Vim
+# Polish translation for Vim
 #
 # updated 2013 for vim-7.4
 #
@@ -12,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2013-07-06 19:33+0200\n"
 "PO-Revision-Date: 2010-08-10 18:15+0200\n"
 "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
-"Language-Team: \n"
+"Language-Team: Polish\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/src/po/pl.cp1250.po
+++ b/src/po/pl.cp1250.po
@@ -1,5 +1,4 @@
-# translation of pl.po to Polish
-# Polish Translation for Vim
+# Polish translation for Vim
 #
 # updated 2013 for vim-7.4
 #
@@ -12,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2013-07-06 19:33+0200\n"
 "PO-Revision-Date: 2010-08-10 18:15+0200\n"
 "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
-"Language-Team: \n"
+"Language-Team: Polish\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp1250\n"
--- a/src/po/pl.po
+++ b/src/po/pl.po
@@ -1,5 +1,4 @@
-# translation of pl.po to Polish
-# Polish Translation for Vim
+# Polish translation for Vim
 #
 # updated 2013 for vim-7.4
 #
@@ -12,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2013-07-06 19:33+0200\n"
 "PO-Revision-Date: 2010-08-10 18:15+0200\n"
 "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
-"Language-Team: \n"
+"Language-Team: Polish\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"