diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt
index 4b1a188db1bb32eb3bb032ccd63bfd7c8ea5588d..b9536e68d5d2615fcea62bd2a9ccd5396192c2db 100644
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.0aa.  Last change: 2001 Dec 22
+*debugger.txt*  For Vim version 7.0aa.  Last change: 2005 Jan 29
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -129,7 +129,9 @@ all the above flags:
 ==============================================================================
 3. Integrated Debuggers					*debugger-integration*
 
-Currently the only fully integrated debugger/IPE/IDE is Sun's Visual WorkShop
-Integrated Programming Environment.
+One fully integrated debugger/IPE/IDE is Sun's Visual WorkShop Integrated
+Programming Environment.
+
+For Sun NetBeans support see |netbeans|.
 
  vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index 102a1157c3db931eeae12797f3ffcaaa2749dd1b..368fbd66cab14124bae409a78a5054b6ec042eb7 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -472,7 +472,7 @@ cscope within Vim to him.
 							*cscope-win32*
 For a cscope version for Win32 see: http://iamphet.nm.ru/cscope/index.html
 
-Win32 support was added by Sergey Khorev <khorev@softlab.ru>. Contact him
-if you have Win32-specific issues.
+Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>. Contact
+him if you have Win32-specific issues.
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/lang/menu_chinese_taiwan.950.vim b/runtime/lang/menu_chinese_taiwan.950.vim
index f3b285913a7ed04134f75d8644363db8da8fed26..60dc2a799eb437aa257f53ef24a813b77a144cbf 100644
--- a/runtime/lang/menu_chinese_taiwan.950.vim
+++ b/runtime/lang/menu_chinese_taiwan.950.vim
@@ -1,6 +1,6 @@
-" Menu Translations:	Traditional Chinese (for Big5 UNIX/Windows)
-" Translated By:	Hung-Teh, Lin	<piaip@csie.ntu.edu.tw>
-" Last Change:		Thu Apr 24 17:34:50 CST 2003
+" Menu Translations:	Traditional Chinese
+" Translated By:	Hung-Te Lin	<piaip@csie.ntu.edu.tw>
+" Last Change:		2005/01/28 02:51:38
 
 " {{{ Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -19,7 +19,8 @@ menutrans &User\ Manual		
 menutrans &How-to\ links	如何作\.\.\.(&H)
 menutrans &GUI			圖型界面(&G)
 menutrans &Credits		感謝(&C)
-menutrans Co&pying		版權宣告(&P)
+menutrans Co&pying		版權(&P)
+menutrans &Sponsor/Register		贊助/註冊(&S)
 menutrans O&rphans		拯救孤兒(&R)
 " ------------------------------------------------------------------------
 menutrans &Version		程式版本資訊(&V)
@@ -59,7 +60,7 @@ menutrans &Paste<Tab>"+gP		
 menutrans Put\ &Before<Tab>[p		貼到游標前(&B)<Tab>[p
 menutrans Put\ &After<Tab>]p		貼到游標後(&A)<Tab>]p
 menutrans &Delete<Tab>x			刪除(&D)<Tab>x
-menutrans &Select\ all<Tab>ggVG		全選(&S)<Tab>ggvG
+menutrans &Select\ All<Tab>ggVG		全選(&S)<Tab>ggvG
 " ------------------------------------------------------------------------
 menutrans &Find\.\.\.			尋找(&F)\.\.\.
 menutrans Find\ and\ Rep&lace\.\.\.	尋找並取代(&L)\.\.\.
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 04226d4ada27bc90eaf891278b7d3b7aab25eceb..fe36e0ce652e845ccc29d700cd4705274fe22f13 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Vim 7.0 script
 " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	January 19, 2005
-" Version:	7.0-2
+" Last Change:	January 31, 2005
+" Version:	7.0-03
 " Automatically generated keyword lists: {{{1
 
 " Quit when a syntax file was already loaded {{{2
@@ -55,7 +55,7 @@ syn match vimHLGroup contained	"Conceal"
 syn case match
 
 " Function Names {{{2
-syn keyword vimFuncName contained	add append argc argidx argv browse browsedir bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line byteidx call char2nr cindent col confirm copy count cscope_connection cursor deepcopy delete did_filetype diff_filler diff_hlID empty escape eval eventhandler executable exists expand expr8 extend filereadable filewritable filter finddir findfile fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreground function get getbufvar getchar getcharmod getcmdline getcmdpos getcwd getfontname getfperm getfsize getftime getftype getline getreg getregtype getwinposx getwinposy getwinvar glob globpath has has_key hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent index input inputdialog inputrestore inputsave inputsecret insert isdirectory join keys len libcall libcallnr line line2byte lispindent localtime map maparg mapcheck match matchend matchstr max min mode nextnonblank nr2char prevnonblank range remote_expr remote_foreground remote_peek remote_read remote_send remove rename repeat resolve reverse search searchpair server2client serverlist setbufvar setcmdpos setline setreg setwinvar simplify sort split strftime stridx string strlen strpart strridx strtrans submatch substitute synID synIDattr synIDtrans system tempname tolower toupper tr type virtcol visualmode winbufnr wincol winheight winline winnr winrestcmd winwidth 
+syn keyword vimFuncName contained	add append argc argidx argv browse browsedir bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line byteidx call char2nr cindent col confirm copy count cscope_connection cursor deepcopy delete did_filetype diff_filler diff_hlID empty escape eval eventhandler executable exists expand expr8 extend filereadable filewritable filter finddir findfile fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreground function get getbufvar getchar getcharmod getcmdline getcmdpos getcwd getfontname getfperm getfsize getftime getftype getline getreg getregtype getwinposx getwinposy getwinvar glob globpath has has_key hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent index input inputdialog inputrestore inputsave inputsecret insert isdirectory items join keys len libcall libcallnr line line2byte lispindent localtime map maparg mapcheck match matchend matchstr max min mode nextnonblank nr2char prevnonblank range remote_expr remote_foreground remote_peek remote_read remote_send remove rename repeat resolve reverse search searchpair server2client serverlist setbufvar setcmdpos setline setreg setwinvar simplify sort split strftime stridx string strlen strpart strridx strtrans submatch substitute synID synIDattr synIDtrans system tempname tolower toupper tr type values virtcol visualmode winbufnr wincol winheight winline winnr winrestcmd winwidth 
 
 "--- syntax above generated by mkvimvim ---
 " Special Vim Highlighting (not automatic) {{{1
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index a27ce520894009eb870c9b8ec0c3053315021fb6..47b1910a1bbd8c0c07e027426a3ea8151cb892f2 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -119,8 +119,6 @@ ifeq (no,$(DYNAMIC_MZSCHEME))
 MZSCHEME_LIB = -lmzsch$(MZSCHEME_VER) -lmzgc$(MZSCHEME_VER)
 # the modern MinGW can dynamically link to dlls directly.
 # point MZSCHEME_DLLS to where you put libmzschXXXXXXX.dll and libgcXXXXXXX.dll
-# c:/windows/system32 isn't a good idea, use some other dir;
-# to build you can put them in temp dir)
 ifndef MZSCHEME_DLLS
 MZSCHEME_DLLS=$(MZSCHEME)
 endif
diff --git a/src/gui.c b/src/gui.c
index ec3af281271a835ab352be6caa62c148b91b60ab..572e330f3fcadfd19278facfb65aed70e1cfafc1 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -317,6 +317,12 @@ gui_init()
 	    return;
 	}
 
+	/*
+	 * Reset 'paste'.  It's useful in the terminal, but not in the GUI.  It
+	 * breaks the Paste toolbar button.
+	 */
+	set_option_value((char_u *)"paste", 0L, NULL, 0);
+
 	/*
 	 * Set up system-wide default menus.
 	 */
diff --git a/src/gui_motif.c b/src/gui_motif.c
index 364c020be2ca8b5c90fad7b26442bcc081c0c4dd..acb9d81faabbfc1d9cc24e948cfffd27226f6464 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -878,6 +878,8 @@ gui_mch_compute_menu_height(id)
 	XtVaSetValues(menuBar, XmNheight, gui.menu_height, NULL);
 }
 
+#ifdef FEAT_TOOLBAR
+
 /*
  * Icons used by the toolbar code.
  */
@@ -950,6 +952,7 @@ get_toolbar_pixmap(menu)
 
     return xpm;
 }
+#endif /* FEAT_TOOLBAR */
 
     void
 gui_mch_add_menu_item(menu, idx)
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c
index d63cf5a427d2eff66c9ef6901aecee237e74e4a9..648eeb3183b4ae96f5c70c4330bf33c911bd4da8 100644
--- a/src/gui_xmebw.c
+++ b/src/gui_xmebw.c
@@ -24,14 +24,17 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <assert.h>
+#include <auto/config.h>
 
 #include <Xm/XmP.h>
 #include <Xm/DrawP.h>
-#ifndef LESSTIF_VERSION
+#if defined(HAVE_XM_TRAITP_H) && defined(HAVE_XM_MANAGER_H) \
+    && defined(HAVE_XM_UNHIGHLIGHT_H) && defined(HAVE_XM_XPMP_H)
 # include <Xm/TraitP.h>
 # include <Xm/Manager.h>
 # include <Xm/UnhighlightT.h>
 # include <Xm/XpmP.h>
+# define UNHIGHLIGHTT
 #else
 # include <X11/xpm.h>
 #endif
@@ -523,7 +526,7 @@ draw_unhighlight(XmEnhancedButtonWidget eb)
 
     if (XmIsManager(eb->core.parent))
     {
-#ifndef LESSTIF_VERSION
+#ifdef UNHIGHLIGHTT
 	XmSpecifyUnhighlightTrait UnhighlightT;
 
 	if (((UnhighlightT = (XmSpecifyUnhighlightTrait) XmeTraitGet((XtPointer)
diff --git a/src/gui_xmebw.h b/src/gui_xmebw.h
index 2aaf5423c3ab70c94b715f9e594db41ea1369ba2..4d9980c7f1e2354f540f647224c075aacff159f0 100644
--- a/src/gui_xmebw.h
+++ b/src/gui_xmebw.h
@@ -46,11 +46,10 @@
 # define XmNpixmapFile		"pixmapFile"
 #endif
 
-#ifndef LESSTIF_VERSION
 /*
  * Constants for labelLocation.
  */
-
+#ifdef HAVE_XM_JOINSIDET_H
 # include <Xm/JoinSideT.h>
 #else
 # define XmLEFT	    1
diff --git a/src/os_unix.c b/src/os_unix.c
index 7c5b899e5374081586c8761f8e32c654ea07ee71..abfcdcc6f5c225312d1f7fc06337c526c542f265 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4873,8 +4873,32 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
 
     /* "unset nonomatch; print -N >" plus two is 29 */
     len = STRLEN(tempname) + 29;
-    for (i = 0; i < num_pat; ++i)	/* count the length of the patterns */
+    for (i = 0; i < num_pat; ++i)
+    {
+	/* Count the length of the patterns in the same way as they are put in
+	 * "command" below. */
+#ifdef USE_SYSTEM
 	len += STRLEN(pat[i]) + 3;	/* add space and two quotes */
+#else
+	++len;				/* add space */
+	for (j = 0; pat[i][j] != NUL; )
+	    if (vim_strchr((char_u *)" '", pat[i][j]) != NULL)
+	    {
+		len += 2;		/* add two quotes */
+		while (pat[i][j] != NUL
+			&& vim_strchr((char_u *)" '", pat[i][j]) != NULL)
+		{
+		    ++len;
+		    ++j;
+		}
+	    }
+	    else
+	    {
+		++len;
+		++j;
+	    }
+#endif
+    }
     command = alloc(len);
     if (command == NULL)
     {
diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po
index 0af90e6b82efcbb48dc267659373c4cd27ecec66..3251b982943843f02f3ede3aa9c9f9ff17e4b16d 100644
--- a/src/po/zh_TW.UTF-8.po
+++ b/src/po/zh_TW.UTF-8.po
@@ -6,199 +6,220 @@
 # FIRST AUTHOR  Francis S.Lin <piaip@csie.ntu.edu.tw>, 2000
 # FIRST RELEASE Thu Jun 14 14:24:17 CST 2001
 #
-# Last update: Thu Apr 24 13:09:07 CST 2003 (6.2a)
+# Last update: 2005/01/27 07:03 (6.3)
 #
 # To update, search pattern:		/fuzzy\|^msgstr ""\(\n"\)\@!
 #
 # DO NOT USE WORDS WITH BACKSLASH ('\') AS SECOND BYTE OF BIG5 CHARS
 # EG: '���', # 閮勗�蠘��
-# 擗鞉熣�鰐�𧎚蝛�頝𡁏�朞滿鞊寞唍��䂿虞擃誩𨰹甇蹂��
-# 憓血�匧握暺惩�撱��閠�抒�鮋���嘥�苷���埝�𥪜𦉘��鍦▼頦�
+# [blacklist: 擗鞉熣�鰐�𧎚蝛�頝𡁏�朞滿鞊寞唍��䂿虞擃誩𨰹甇蹂�肶
+# [blacklist: 憡匧握暺惩�撱��閠�折���苷���坿�鍦▼頦𠺖
 # you can replace these characters with alternative words.
 # THIS WILL CAUSE INCOMPATIBLE ON gettext 0.10.36+
 #
+# Note (2005.01.27):
+#  A bug was found for UTF8 mode.
+#   > msgid "%ld fewer lines" "on %ld lines"
+#   If you don't put more (at least 2) spaces after %ld
+#   gvim/win32 will crash (no reason).
+#   So please change [銵�"] to [銵� "]
+#
+# Q. How to use UTF8 mode on Win32?
+# A. A simple configuration: 
+#   set encoding=utf-8; let $LANG='zh_TW.UTF-8'; 
+#   (set langmenu=none or ..)
+#   set termencoding=utf-8
+#   set fileencodings=ucs-bom,utf-8,japan,taiwan,prc
+#   set fileencoding=taiwan (or utf-8)
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Traditional Chinese)\n"
-"POT-Creation-Date: 2003-04-24 13:06+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-01-27 19:00+0800\n"
 "PO-Revision-Date: Mon Feb 19 22:49:21 CST 2001\n"
-"Last-Translator: Francis S.Lin <piaip@csie.ntu.edu.tw>\n"
-"Language-Team: Francis S.Lin <piaip@csie.ntu.edu.tw>, Cecil Sheng "
+"Last-Translator: Hung-Te Lin <piaip@csie.ntu.edu.tw>\n"
+"Language-Team: Hung-Te Lin <piaip@csie.ntu.edu.tw>, Cecil Sheng "
 "<b7506022@csie.ntu.edu.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buffer.c:97
+#: buffer.c:102
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: �⊥�閖�滨蔭隞颱�閧楨銵嘥�嚗屸𣪧��讠�见��..."
 
-#: buffer.c:100
+#: buffer.c:105
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: �⊥�閖�滨蔭蝺抵�嘥�嚗䔶蝙�鍂�𡖂銝��讠楨銵嘥�...."
 
-#: buffer.c:797
+#: buffer.c:808
+#, c-format
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 瘝埝�厰�𧢲𦆮隞颱�閧楨銵嘥�"
 
-#: buffer.c:799
+#: buffer.c:810
+#, c-format
 msgid "E516: No buffers were deleted"
 msgstr "E516: 瘝埝�匧⏛�膄隞颱�閧楨銵嘥�"
 
-#: buffer.c:801
+#: buffer.c:812
+#, c-format
 msgid "E517: No buffers were wiped out"
 msgstr "E517: 瘝埝�㗇��膄隞颱�閧楨銵嘥�"
 
-#: buffer.c:809
+#: buffer.c:820
 msgid "1 buffer unloaded"
 msgstr "撌脤�𧢲𦆮銝��讠楨銵嘥�"
 
-#: buffer.c:811
+#: buffer.c:822
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "撌脤�𧢲𦆮 %d �讠楨銵嘥�"
 
-#: buffer.c:816
+#: buffer.c:827
 msgid "1 buffer deleted"
 msgstr "撌脣⏛�膄銝��讠楨銵嘥�"
 
-#: buffer.c:818
+#: buffer.c:829
 #, c-format
 msgid "%d buffers deleted"
 msgstr "撌脣⏛�膄 %d �讠楨銵嘥�"
 
-#: buffer.c:823
+#: buffer.c:834
 msgid "1 buffer wiped out"
 msgstr "撌脣⏛�膄銝��讠楨銵嘥�"
 
-#: buffer.c:825
+#: buffer.c:836
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "撌脣⏛�膄 %d �讠楨銵嘥�"
 
-#: buffer.c:886
+#: buffer.c:897
 msgid "E84: No modified buffer found"
 msgstr "E84: 瘝埝�劐耨�㺿�𡒊�蝺抵�嘥�"
 
 #. back where we started, didn't find anything.
-#: buffer.c:925
+#: buffer.c:936
 msgid "E85: There is no listed buffer"
 msgstr "E85: 瘝埝�匧�堒枂��蝺抵�嘥�"
 
-#: buffer.c:937
+#: buffer.c:948
 #, c-format
-msgid "E86: Cannot go to buffer %ld"
-msgstr "E86: �⊥�訫���𥕦�蝚� %ld �讠楨銵嘥�"
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: 蝺抵�嘥� %ld 銝滚�睃銁"
 
-#: buffer.c:940
+#: buffer.c:951
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: �⊥�訫���𥕦��凒敺屸𢒰��蝺抵�嘥�"
 
-#: buffer.c:942
+#: buffer.c:953
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: �⊥�訫���𥕦��凒��漤𢒰��蝺抵�嘥�"
 
-#: buffer.c:966
+#: buffer.c:991
+#, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89: 撌脫凒�㺿�𡒊楨銵嘥� %ld 雿�撠𡁏𧊋摮䀹�� (�虾�鍂 ! 撘瑕��嘑銵�)"
 
-#: buffer.c:982
+#: buffer.c:1008
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: �⊥�閖�𧢲𦆮��敺䔶��讠楨銵嘥�"
 
-#: buffer.c:1494
+#: buffer.c:1544
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 霅血��: 瑼𥪜�漤�𤾸��"
 
-#: buffer.c:1664
+#: buffer.c:1716
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: �𪄳銝滚�蝚� %ld �讠楨銵嘥�"
 
-#: buffer.c:1890
+#: buffer.c:1947
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: �𪄳��銝��衤誑銝羓� %s"
 
-#: buffer.c:1892
+#: buffer.c:1949
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: �𪄳銝滚� %s"
 
-#: buffer.c:2297 ex_docmd.c:6479
+#: buffer.c:2344
 #, c-format
 msgid "line %ld"
 msgstr "銵� %ld"
 
-#: buffer.c:2380
+#: buffer.c:2429
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: 撌脫�厩楨銵嘥�雿輻鍂�坔�见�滚��"
 
-#: buffer.c:2673
+#: buffer.c:2724
 msgid " [Modified]"
 msgstr " [撌脖耨�㺿]"
 
-#: buffer.c:2678
+#: buffer.c:2729
 msgid "[Not edited]"
 msgstr "[�𧊋蝺刻摩]"
 
-#: buffer.c:2683
+#: buffer.c:2734
 msgid "[New file]"
 msgstr "[�鰵瑼娍�È"
 
-#: buffer.c:2684
+#: buffer.c:2735
 msgid "[Read errors]"
 msgstr "[霈���㚚𥲤隤也"
 
-#: buffer.c:2686 fileio.c:1914
+#: buffer.c:2737 fileio.c:2124
 msgid "[readonly]"
 msgstr "[�𣈲霈�]"
 
-#: buffer.c:2701
+#: buffer.c:2758
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "銵峕彍 1 --%d%%--"
 
-#: buffer.c:2703
+#: buffer.c:2760
 #, c-format
 msgid "%ld lines --%d%%--"
 msgstr "銵峕彍 %ld --%d%%--"
 
-#: buffer.c:2710
+#: buffer.c:2767
 #, c-format
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "銵� %ld/%ld --%d%%-- 甈� "
 
-#: buffer.c:2811
+#: buffer.c:2875
 msgid "[No file]"
 msgstr "[�𧊋�𦶢��䓞"
 
 #. must be a help buffer
-#: buffer.c:2851
+#: buffer.c:2915
 msgid "help"
 msgstr "[頛𥪜𨭌隤芣�筕"
 
-#: buffer.c:3405 screen.c:4943
+#: buffer.c:3474 screen.c:5079
 msgid "[help]"
 msgstr "[頛𥪜𨭌隤芣�筕"
 
-#: buffer.c:3437 screen.c:4949
+#: buffer.c:3506 screen.c:5085
 msgid "[Preview]"
 msgstr "[��鞱汗]"
 
-#: buffer.c:3708
+#: buffer.c:3786
 msgid "All"
 msgstr "�券��"
 
-#: buffer.c:3708
+#: buffer.c:3786
 msgid "Bot"
 msgstr "摨閧垢"
 
-#: buffer.c:3710
+#: buffer.c:3788
 msgid "Top"
 msgstr "��蝡�"
 
-#: buffer.c:4454
+#: buffer.c:4536
+#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -206,15 +227,15 @@ msgstr ""
 "\n"
 "# 蝺抵�嘥���𡑒”:\n"
 
-#: buffer.c:4487
+#: buffer.c:4569
 msgid "[Error List]"
 msgstr "[�𥲤隤文�𡑒”]"
 
-#: buffer.c:4500 memline.c:1501
+#: buffer.c:4582 memline.c:1521
 msgid "[No File]"
 msgstr "[�𧊋�𦶢��䓞"
 
-#: buffer.c:4803
+#: buffer.c:4895
 msgid ""
 "\n"
 "--- Signs ---"
@@ -222,149 +243,150 @@ msgstr ""
 "\n"
 "--- 蝚西�� ---"
 
-#: buffer.c:4813
+#: buffer.c:4914
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s ��蝚西��:"
 
-#: buffer.c:4819
+#: buffer.c:4920
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    銵�=%ld  id=%d  ��滨迂=%s"
 
-#: diff.c:133
+#: diff.c:139
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: �⊥�閙�磰�(diff) %ld�衤誑銝羓�蝺抵�嘥�"
 
-#: diff.c:651
+#: diff.c:713
 msgid "E97: Cannot create diffs"
 msgstr "E97: 銝滩�賢遣蝡� "
 
-#: diff.c:750
+#: diff.c:818
 msgid "Patch file"
 msgstr "Patch 瑼娍��"
 
-#: diff.c:1001
+#: diff.c:1069
 msgid "E98: Cannot read diff output"
 msgstr "E98: �⊥�閗���� diff ��頛詨枂"
 
-#: diff.c:1742
+#: diff.c:1819
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: �𤌍��滨�蝺抵�嘥�銝齿糓�銁 diff 璅∪��"
 
-#: diff.c:1754
+#: diff.c:1831
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: 瘝埝�厩楨銵嘥��銁 diff 璅∪��"
 
-#: diff.c:1762
+#: diff.c:1839
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr "E101: ��匧�拙�衤誑銝羓�蝺抵�嘥��銁 diff 璅∪�𧶏�𣬚�⊥�閙捱摰朞��鍂�𪑛銝���"
 
-#: diff.c:1785
+#: diff.c:1862
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: �𪄳銝滚�蝺抵�嘥�: \"%s\""
 
-#: diff.c:1791
+#: diff.c:1868
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: 蝺抵�嘥� \"%s\" 銝齿糓�銁 diff 璅∪��"
 
-#: digraph.c:2172
+#: digraph.c:2199
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 銴����堒��(digraph)銝凋�滩�賭蝙�鍂 Escape"
 
-#: digraph.c:2344
+#: digraph.c:2384
 msgid "E544: Keymap file not found"
 msgstr "E544: �𪄳銝滚� keymap 瑼�"
 
-#: digraph.c:2371
+#: digraph.c:2411
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: 雿輻鍂 :loadkeymap "
 
 #: edit.c:40
-msgid " Keyword completion (^N/^P)"
-msgstr " ��𣈯枤摮𡑒䌊��訫�峕�� (^N/^P)"
+msgid " Keyword completion (^N^P)"
+msgstr " ��𣈯枤摮𡑒䌊��訫�峕�� (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
 #: edit.c:41
-msgid " ^X mode (^E/^Y/^L/^]/^F/^I/^K/^D/^V/^N/^P)"
-msgstr " ^X 璅∪�� (^E/^Y/^L/^]/^F/^I/^K/^D/^N/^P)"
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^V^N^P)"
+msgstr " ^X 璅∪�� (^E^Y^L^]^F^I^K^D^N^P)"
 
 #. Scroll has it's own msgs, in it's place there is the msg for local
 #. * ctrl_x_mode = 0 (eg continue_status & CONT_LOCAL)  -- Acevedo
 #: edit.c:44
-msgid " Keyword Local completion (^N/^P)"
-msgstr " ����罸�𣈯枤摮𡑒䌊��訫�峕�� (^N/^P)"
+msgid " Keyword Local completion (^N^P)"
+msgstr " ����罸�𣈯枤摮𡑒䌊��訫�峕�� (^N^P)"
 
 #: edit.c:45
-msgid " Whole line completion (^L/^N/^P)"
-msgstr " �㟲銵諹䌊��訫�峕�� (^L/^N/^P)"
+msgid " Whole line completion (^L^N^P)"
+msgstr " �㟲銵諹䌊��訫�峕�� (^L^N^P)"
 
 #: edit.c:46
-msgid " File name completion (^F/^N/^P)"
-msgstr " 瑼𥪜�滩䌊��訫�峕�� (^F/^N/^P)"
+msgid " File name completion (^F^N^P)"
+msgstr " 瑼𥪜�滩䌊��訫�峕�� (^F^N^P)"
 
 #: edit.c:47
-msgid " Tag completion (^]/^N/^P)"
-msgstr " 璅嗵惜�䌊��訫�峕�� (^]/^N/^P)"
+msgid " Tag completion (^]^N^P)"
+msgstr " 璅嗵惜�䌊��訫�峕�� (^]^N^P)"
 
 #: edit.c:48
-msgid " Path pattern completion (^N/^P)"
-msgstr " 頝臬�𤏸䌊��訫�峕�� (^N/^P)"
+msgid " Path pattern completion (^N^P)"
+msgstr " 頝臬�𤏸䌊��訫�峕�� (^N^P)"
 
 #: edit.c:49
-msgid " Definition completion (^D/^N/^P)"
-msgstr " 摰𡁶儔�䌊��訫�峕�� (^D/^N/^P)"
+msgid " Definition completion (^D^N^P)"
+msgstr " 摰𡁶儔�䌊��訫�峕�� (^D^N^P)"
 
 #: edit.c:51
-msgid " Dictionary completion (^K/^N/^P)"
-msgstr " 摮堒�貉䌊��訫�峕�� (^K/^N/^P)"
+msgid " Dictionary completion (^K^N^P)"
+msgstr " 摮堒�貉䌊��訫�峕�� (^K^N^P)"
 
 #: edit.c:52
-msgid " Thesaurus completion (^T/^N/^P)"
-msgstr " Thesaurus �䌊��訫�峕�� (^T/^N/^P)"
+msgid " Thesaurus completion (^T^N^P)"
+msgstr " Thesaurus �䌊��訫�峕�� (^T^N^P)"
 
 #: edit.c:53
-msgid " Command-line completion (^V/^N/^P)"
-msgstr " �𦶢隞文�𡑒䌊��訫�峕�� (^V/^N/^P)"
+msgid " Command-line completion (^V^N^P)"
+msgstr " �𦶢隞文�𡑒䌊��訫�峕�� (^V^N^P)"
 
 #: edit.c:56
 msgid "Hit end of paragraph"
 msgstr "撌脣�畾菔氜蝯𣂼偏"
 
-#: edit.c:941
+#: edit.c:962
 msgid "'thesaurus' option is empty"
 msgstr "�賊� 'thesaurus' �𧊋閮剖��"
 
-#: edit.c:1145
+#: edit.c:1166
 msgid "'dictionary' option is empty"
 msgstr "�賊� 'dictionary' �𧊋閮剖��"
 
-#: edit.c:2130
+#: edit.c:2162
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "����摮堒��: %s"
 
-#: edit.c:2336
+#: edit.c:2368
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (��鍦��) Scroll (^E/^Y)"
 
-#: edit.c:2338
+#: edit.c:2370
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (��碶誨) Scroll (^E/^Y)"
 
-#: edit.c:2652
+#: edit.c:2684
 #, c-format
 msgid "Scanning: %s"
 msgstr "����銝�: %s"
 
-#: edit.c:2687
+#: edit.c:2719
+#, c-format
 msgid "Scanning tags."
 msgstr "����璅嗵惜."
 
-#: edit.c:3349
+#: edit.c:3381
 msgid " Adding"
 msgstr " 憓𧼮��"
 
@@ -372,102 +394,102 @@ msgstr " 憓𧼮��"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: edit.c:3398
+#: edit.c:3430
 msgid "-- Searching..."
 msgstr "-- ��𨅯�衤葉..."
 
-#: edit.c:3454
+#: edit.c:3486
 msgid "Back at original"
 msgstr "��𧼮�韏琿��"
 
-#: edit.c:3459
+#: edit.c:3491
 msgid "Word from other line"
 msgstr "敺𧼮ê̌銵屸�见�讠�摮� (?)"
 
-#: edit.c:3464
+#: edit.c:3496
 msgid "The only match"
 msgstr "�蘨��㗇迨��蝚血��"
 
-#: edit.c:3523
+#: edit.c:3555
 #, c-format
 msgid "match %d of %d"
 msgstr "�𪄳�� %d / %d"
 
-#: edit.c:3526
+#: edit.c:3558
 #, c-format
 msgid "match %d"
 msgstr "蝚血�� %d"
 
 #. Skip further arguments but do continue to
 #. * search for a trailing command.
-#: eval.c:889
+#: eval.c:1024
 #, c-format
 msgid "E106: Unknown variable: \"%s\""
 msgstr "E106: �𧊋摰𡁶儔��霈𦠜彍: \"%s\""
 
-#: eval.c:1185
+#: eval.c:1320
 #, c-format
 msgid "E107: Missing braces: %s"
 msgstr "E107: 蝻箏�穃�齿�厩��𡠺���: %s"
 
-#: eval.c:1290 eval.c:1304
+#: eval.c:1435 eval.c:1449
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �⊥迨霈𦠜彍: \"%s\""
 
-#: eval.c:1560
+#: eval.c:1705
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' 敺𣬚撩撠� ':'"
 
-#: eval.c:2176
+#: eval.c:2327
 msgid "E110: Missing ')'"
 msgstr "E110: 蝻箏�穃�齿�厩� \")\""
 
-#: eval.c:2233
+#: eval.c:2389
 msgid "E111: Missing ']'"
 msgstr "E111: 蝻箏�穃�齿�厩� \"]\""
 
-#: eval.c:2309
+#: eval.c:2466
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: 蝻箏�煾�賊���滨迂: %s"
 
-#: eval.c:2327
+#: eval.c:2484
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: 銝齿迤蝣箇��賊�: %s"
 
-#: eval.c:2391
+#: eval.c:2555
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: 蝻箏�穃�閗��: %s"
 
-#: eval.c:2523
+#: eval.c:2698
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: 蝻箏�穃�閗��: %s"
 
-#: eval.c:2843
+#: eval.c:3054
 #, c-format
 msgid "E116: Invalid arguments for function %s"
 msgstr "E116: �遆撘� %s ��撘閙彍銝齿迤蝣�"
 
-#: eval.c:2844
+#: eval.c:3083
 #, c-format
 msgid "E117: Unknown function: %s"
 msgstr "E117: �𧊋摰𡁶儔���遆撘�: %s"
 
-#: eval.c:2845
+#: eval.c:3084
 #, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: �遆撘� %s ��撘閙彍�𤾸��"
 
-#: eval.c:2846
+#: eval.c:3085
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
 msgstr "E119: �遆撘� %s ��撘閙彍憭芸��"
 
-#: eval.c:2847
+#: eval.c:3086
 #, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: <SID> 銝滩�賢銁 script �𧋦����碶蝙�鍂: %s"
@@ -477,16 +499,16 @@ msgstr "E120: <SID> 銝滩�賢銁 script �𧋦����碶蝙�鍂: %s"
 #. * this way has the compelling advantage that translations need not to
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #.
-#: eval.c:3465 gui.c:4238 gui_gtk.c:1991
+#: eval.c:3687 gui.c:4385 gui_gtk.c:2059
 msgid "&Ok"
 msgstr "蝣箏��(&O)"
 
-#: eval.c:4000
+#: eval.c:4226
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld 銵�: "
 
-#: eval.c:5149
+#: eval.c:5477
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -494,125 +516,130 @@ msgstr ""
 "蝣箏��(&O)\n"
 "��𡝗��(&C)"
 
-#: eval.c:5182
+#: eval.c:5517
 msgid "called inputrestore() more often than inputsave()"
 msgstr "�鐤�㙈 inputrestore() ��甈⊥彍瘥� inputsave() ��憭�"
 
-#: eval.c:6036
+#: eval.c:5977
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: 憭芸�𡁜惜��蝚西�罸����(symlink) (敺芰兛?)"
+
+#: eval.c:6626
 msgid "E240: No connection to Vim server"
 msgstr "E240: 瘝埝�㕑�� Vim Server 撱箇�钅����"
 
-#: eval.c:6133
+#: eval.c:6724
 msgid "E277: Unable to read a server reply"
 msgstr "E277: �⊥�閗���碶撩��滚膥����墧��"
 
-#: eval.c:6161
+#: eval.c:6752
 msgid "E258: Unable to send to client"
 msgstr "E258: �⊥�訫�喲���� client"
 
-#: eval.c:6209
+#: eval.c:6800
 #, c-format
 msgid "E241: Unable to send to %s"
 msgstr "E241: �⊥�訫�喲���� %s"
 
-#: eval.c:6309
+#: eval.c:6900
 msgid "(Invalid)"
 msgstr "(銝齿迤蝣�)"
 
-#: eval.c:7402
+#: eval.c:8078
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: 霈𦠜彍 %s 撠𡁏𧊋摰𡁶儔"
 
-#: eval.c:7834
+#: eval.c:8510
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 銝滚���閧�霈𦠜彍��滨迂: %s"
 
-#: eval.c:8121
+#: eval.c:8802
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: �遆撘� %s 撌脩�枏�睃銁, 隢衤蝙�鍂 ! 撘瑕���碶誨"
 
-#: eval.c:8188
+#: eval.c:8875
 #, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: �遆撘� %s 撠𡁏𧊋摰𡁶儔"
 
-#: eval.c:8201
+#: eval.c:8888
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: 蝻箏�� \"(\": %s"
 
-#: eval.c:8234
+#: eval.c:8921
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: ���彍銝齿迤蝣�: %s"
 
-#: eval.c:8313
+#: eval.c:9000
 msgid "E126: Missing :endfunction"
 msgstr "E126: 蝻箏�� :endfunction"
 
-#: eval.c:8396
+#: eval.c:9107
 #, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
 msgstr "E127: �遆撘� %s 甇�銁雿輻鍂銝哨�𣬚�⊥�閖�齿鰵摰𡁶儔"
 
-#: eval.c:8464
+#: eval.c:9177
 msgid "E129: Function name required"
 msgstr "E129: ��閬��遆撘誩�滨迂"
 
-#: eval.c:8515
+#: eval.c:9228
 #, c-format
 msgid "E128: Function name must start with a capital: %s"
 msgstr "E128: �遆撘誩�滨迂蝚砌��见�埈�滚����之撖�: %s"
 
-#: eval.c:8707
+#: eval.c:9420
 #, c-format
 msgid "E130: Undefined function: %s"
 msgstr "E130: �遆撘� %s 撠𡁏𧊋摰𡁶儔"
 
-#: eval.c:8712
+#: eval.c:9425
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: �遆撘� %s 甇�銁雿輻鍂銝哨�𣬚�⊥�訫⏛�膄"
 
-#: eval.c:8760
+#: eval.c:9473
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: �遆撘誯�噼艘�鐤�㙈撅斗彍頞��� 'maxfuncdepth'"
 
 #. always scroll up, don't overwrite
-#: eval.c:8813
+#: eval.c:9526
 #, c-format
 msgid "calling %s"
 msgstr "�鐤�㙈 %s"
 
-#: eval.c:8867
+#: eval.c:9588
 #, c-format
 msgid "%s aborted"
-msgstr "%s 鋡怠撥��銝剜𪃾�嘑銵�"
+msgstr "%s 鋡怠撥��銝剜𪃾�嘑銵� "
 
-#: eval.c:8869
+#: eval.c:9590
 #, c-format
 msgid "%s returning #%ld"
 msgstr "%s �喳�𧼮�� #%ld "
 
-#: eval.c:8872
+#: eval.c:9597
 #, c-format
 msgid "%s returning \"%s\""
 msgstr "%s �喳�𧼮�� \"%s\""
 
 #. always scroll up, don't overwrite
-#: eval.c:8888 ex_cmds2.c:2231
+#: eval.c:9613 ex_cmds2.c:2370
 #, c-format
 msgid "continuing in %s"
 msgstr "蝜潛��: %s"
 
-#: eval.c:8935
+#: eval.c:9639
 msgid "E133: :return not inside a function"
 msgstr "E133: :return 敹����銁�遆撘讛ㄐ雿輻鍂"
 
-#: eval.c:9266
+#: eval.c:9970
+#, c-format
 msgid ""
 "\n"
 "# global variables:\n"
@@ -625,80 +652,91 @@ msgstr ""
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  ���剝�脖�� %02x,  �恍�脖�� %03o"
 
-#: ex_cmds.c:433
+#: ex_cmds.c:118
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, ���剝�脖�� %04x, �恍�脖�� %o"
+
+#: ex_cmds.c:119
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, ���剝�脖�� %08x,  �恍�脖�� %o"
+
+#: ex_cmds.c:430
 msgid "E134: Move lines into themselves"
 msgstr "E134: �⊥�閙�𡃏�𣬚宏��摰��䌊撌脣��"
 
-#: ex_cmds.c:502
+#: ex_cmds.c:499
 msgid "1 line moved"
-msgstr "撌脫𨯬蝘� 1 銵�"
+msgstr "撌脫𨯬蝘� 1 銵� "
 
-#: ex_cmds.c:504
+#: ex_cmds.c:501
 #, c-format
 msgid "%ld lines moved"
-msgstr "撌脫𨯬蝘� %ld 銵�"
+msgstr "撌脫𨯬蝘� %ld 銵� "
 
-#: ex_cmds.c:909
+#: ex_cmds.c:924
 #, c-format
 msgid "%ld lines filtered"
-msgstr "撌脰�閧� %ld 銵�"
+msgstr "撌脰�閧� %ld 銵� "
 
-#: ex_cmds.c:937
+#: ex_cmds.c:952
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter* Autocommand 銝滚虾隞交凒�㺿蝺抵�嘥����批捆"
 
-#: ex_cmds.c:1022
+#: ex_cmds.c:1037
 msgid "[No write since last change]\n"
 msgstr "[�凒�鰵敺��𡁏𧊋�脣�𤊓\n"
 
-#: ex_cmds.c:1268
+#: ex_cmds.c:1283
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s �銁銵䔶葉: "
 
-#: ex_cmds.c:1273
+#: ex_cmds.c:1288
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: �𤾸�𡁻𥲤隤�, 敹賜裦瑼娍���園�㗛�典�"
 
-#: ex_cmds.c:1302
+#: ex_cmds.c:1323
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "霈���� viminfo 瑼娍�� \"%s\"%s%s%s"
 
-#: ex_cmds.c:1303
+#: ex_cmds.c:1324
 msgid " info"
 msgstr " 閮𦠜��"
 
-#: ex_cmds.c:1304
+#: ex_cmds.c:1325
 msgid " marks"
 msgstr " 璅躰��"
 
-#: ex_cmds.c:1305
+#: ex_cmds.c:1326
 msgid " FAILED"
 msgstr " 憭望��"
 
-#: ex_cmds.c:1396
+#: ex_cmds.c:1418
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Viminfo 瑼娍���⊥�訫神��: %s"
 
-#: ex_cmds.c:1521
+#: ex_cmds.c:1543
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: �⊥�訫神�� viminfo 瑼娍�� %s !"
 
-#: ex_cmds.c:1529
+#: ex_cmds.c:1551
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "撖怠�� viminfo 瑼娍�� \"%s\" 銝�"
 
 #. Write the info:
-#: ex_cmds.c:1627
+#: ex_cmds.c:1649
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# �𧋦 viminfo 瑼娍��糓�眏 Vim %s ���𤩎���.\n"
 
-#: ex_cmds.c:1629
+#: ex_cmds.c:1651
+#, c-format
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -706,47 +744,48 @@ msgstr ""
 "# 憒���𨀣�唾��䌊銵䔶耨�㺿隢讠鸌�ê̌撠誩�嚗�\n"
 "\n"
 
-#: ex_cmds.c:1631
+#: ex_cmds.c:1653
+#, c-format
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# 'encoding' �銁甇斗�𥪜遣蝡𧢲����墦n"
 
-#: ex_cmds.c:1730
+#: ex_cmds.c:1752
 msgid "Illegal starting char"
 msgstr "�⊥���韏瑕�见�堒��"
 
-#: ex_cmds.c:2075 ex_cmds.c:2340 ex_cmds2.c:744
+#: ex_cmds.c:2097 ex_cmds2.c:761
 msgid "Save As"
 msgstr "�𡖂摮䀹鰵瑼�"
 
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
-#: ex_cmds.c:2118
+#: ex_cmds.c:2140
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: �典銁�𡖂銝��讠楨銵嘥�銋蠘�匧�乩��坔�𧢲�娍��"
 
-#: ex_cmds.c:2152
+#: ex_cmds.c:2174
 msgid "Write partial file?"
 msgstr "閬�撖怠�仿�典�瑼娍���𠬍��"
 
-#: ex_cmds.c:2159
+#: ex_cmds.c:2181
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: 隢衤蝙�鍂 ! 隞亙神�仿�典�蝺抵�嘥�"
 
-#: ex_cmds.c:2274
+#: ex_cmds.c:2296
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
 msgstr "閬�閬�撖怠歇摮睃銁��瑼娍�� \"%.*s\"嚗�"
 
-#: ex_cmds.c:2345
+#: ex_cmds.c:2367
 #, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: 蝺抵�嘥� %ld 瘝埝�㗇�娍���滨迂"
 
-#: ex_cmds.c:2383
+#: ex_cmds.c:2406
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: 瑼娍��𧊋撖怠�伐���删�� 'write' �賊�鋡恍�𣈯��"
 
-#: ex_cmds.c:2403
+#: ex_cmds.c:2426
 #, c-format
 msgid ""
 "'readonly' option is set for \"%.*s\".\n"
@@ -755,68 +794,69 @@ msgstr ""
 "\"%.*s\" 撌脰身摰� 'readonly' �賊�.\n"
 "蝣箏�朞�閬�撖怠�𠬍��"
 
-#: ex_cmds.c:2568
+#: ex_cmds.c:2599
 msgid "Edit File"
 msgstr "蝺刻摩瑼娍��"
 
-#: ex_cmds.c:3137
+#: ex_cmds.c:3206
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Autocommands �誩�硋𧑐�⏛�膄�鰵蝺抵�嘥� %s"
 
-#: ex_cmds.c:3269
+#: ex_cmds.c:3340
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: :z 銝齿𦻖��烾�墧彍摮㛖����彍"
 
-#: ex_cmds.c:3354
+#: ex_cmds.c:3425
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim 銝剔�甇V蝙�鍂 shell �𦶢隞�"
 
-#: ex_cmds.c:3461
+#: ex_cmds.c:3532
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Regular expression �⊥�閧鍂摮埈�滚���� (?)"
 
-#: ex_cmds.c:3807
+#: ex_cmds.c:3878
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "��碶誨�� %s (y/n/a/q/^E/^Y)?"
 
-#: ex_cmds.c:4172
+#: ex_cmds.c:4271
 msgid "(Interrupted) "
 msgstr "(撌脖葉�𪃾) "
 
-#: ex_cmds.c:4176
+#: ex_cmds.c:4275
 msgid "1 substitution"
-msgstr "��碶誨銝�蝯�"
+msgstr "��碶誨銝�蝯� "
 
-#: ex_cmds.c:4178
+#: ex_cmds.c:4277
 #, c-format
 msgid "%ld substitutions"
-msgstr "��碶誨 %ld 蝯�"
+msgstr "��碶誨 %ld 蝯� "
 
-#: ex_cmds.c:4181
+#: ex_cmds.c:4280
 msgid " on 1 line"
-msgstr " 銝�銵䔶葉"
+msgstr "嚗𣬚���㵪�帋�銵� "
 
-#: ex_cmds.c:4183
+#: ex_cmds.c:4282
 #, c-format
 msgid " on %ld lines"
-msgstr " %ld 銵䔶葉"
+msgstr "嚗𣬚���㵪�� %ld 銵� "
 
-#: ex_cmds.c:4234
+#: ex_cmds.c:4333
 msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global �⊥�閖�噼艘�嘑銵�"
+msgstr "E147: :global �⊥�閖�噼艘�嘑銵� "
 
-#: ex_cmds.c:4269
+#: ex_cmds.c:4368
 msgid "E148: Regular expression missing from global"
 msgstr "E148: 瘝埝�劐蝙�鍂�� Regular expression (?)"
 
-#: ex_cmds.c:4318
+#: ex_cmds.c:4417
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "瘥譍�銵屸�賣𪄳銝滚�: %s"
 
-#: ex_cmds.c:4399
+#: ex_cmds.c:4498
+#, c-format
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -826,342 +866,408 @@ msgstr ""
 "# ��滢�蝯��𤜯隞��𦯀葡:\n"
 "$"
 
-#: ex_cmds.c:4503
+#: ex_cmds.c:4599
+msgid "E478: Don't panic!"
+msgstr "E478: 銝滩�撽𡁏��!"
+
+#: ex_cmds.c:4651
+#, c-format
+msgid "E661: Sorry, no '%s' help for %s"
+msgstr "E149: ��甇�, 瘝埝�厰�𨀣䲰 %s-%s ��隤芣��"
+
+#: ex_cmds.c:4654
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: ��甇�, 瘝埝�� %s ��隤芣��"
 
-#: ex_cmds.c:4537
+#: ex_cmds.c:4688
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "��甇�, �𪄳銝滚�隤芣�擧�� \"%s\""
 
-#: ex_cmds.c:5012
+#: ex_cmds.c:5191
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: %s 銝齿糓�𤌍��"
 
-#: ex_cmds.c:5040
+#: ex_cmds.c:5330
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: �⊥�蓥誑撖怠�交芋撘誯�见�� \"%s\""
 
-#: ex_cmds.c:5075
+#: ex_cmds.c:5366
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: �⊥�閗���𡝗�娍��: %s"
 
-#: ex_cmds.c:5154
+#: ex_cmds.c:5388
+#, c-format
+msgid "E670: Mix of help file encodings within a language: %s"
+msgstr "E670: ��䔶�隤噼� (%s) 銝剜�㗇毽����滚���堒��蝺函Ⅳ��隤芣�擧��"
+
+#: ex_cmds.c:5466
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s"
 msgstr "E154: 璅嗵惜(tag) \"%s\" �銁瑼娍�� %s 鋆⊿�滩��枂�𣶹憭𡁏活"
 
-#: ex_cmds.c:5261
+#: ex_cmds.c:5578
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: �𧊋摰𡁶儔�� sign command: %s"
 
-#: ex_cmds.c:5281
+#: ex_cmds.c:5598
 msgid "E156: Missing sign name"
 msgstr "E156: 蝻箏�� sign ��滨迂"
 
-#: ex_cmds.c:5327
+#: ex_cmds.c:5644
 msgid "E612: Too many signs defined"
 msgstr "E612: 撌脣�𡁶儔憭芸�� signs"
 
-#: ex_cmds.c:5394
+#: ex_cmds.c:5712
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: 銝齿迤蝣箇� sign �����: %s"
 
-#: ex_cmds.c:5425 ex_cmds.c:5611
+#: ex_cmds.c:5743 ex_cmds.c:5934
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: 銝齿迤蝣箇� sign: %s"
 
-#: ex_cmds.c:5471
+#: ex_cmds.c:5792
 msgid "E159: Missing sign number"
 msgstr "E159: 蝻箏�� sign number"
 
-#: ex_cmds.c:5551
+#: ex_cmds.c:5874
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 蝺抵�嘥���滨迂�𥲤隤�: %s"
 
-#: ex_cmds.c:5590
+#: ex_cmds.c:5913
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: Sign ID �𥲤隤�: %ld"
 
-#: ex_cmds.c:5761
+#: ex_cmds.c:5983
+msgid " (NOT FOUND)"
+msgstr " (�𪄳銝滚�) "
+
+#: ex_cmds.c:5985
+msgid " (not supported)"
+msgstr " (銝齿𣈲�螱) "
+
+#: ex_cmds.c:6084
 msgid "[Deleted]"
 msgstr "[撌脣⏛�膄]"
 
-#: ex_cmds2.c:82
+#: ex_cmds2.c:92
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "�脣�仿膄�𥲤璅∪��. 頛詨�� \"cont\" 隞亙�𧼮�甇�虜璅∪��."
 
-#: ex_cmds2.c:86 ex_docmd.c:850
+#: ex_cmds2.c:96 ex_docmd.c:968
 #, c-format
 msgid "line %ld: %s"
 msgstr "銵� %ld: %s"
 
-#: ex_cmds2.c:88
+#: ex_cmds2.c:98
 #, c-format
 msgid "cmd: %s"
 msgstr "cmd: %s"
 
-#: ex_cmds2.c:271
+#: ex_cmds2.c:290
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "\"%s%s\" 銝剜𪃾暺�: 蝚� %ld 銵�"
+msgstr "\"%s%s\" 銝剜𪃾暺�: 蝚� %ld 銵� "
 
-#: ex_cmds2.c:521
+#: ex_cmds2.c:540
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: �𪄳銝滚�銝剜𪃾暺�: %s"
 
-#: ex_cmds2.c:547
+#: ex_cmds2.c:566
 msgid "No breakpoints defined"
 msgstr "瘝埝�匧�𡁶儔銝剜𪃾暺�"
 
-#: ex_cmds2.c:552
+#: ex_cmds2.c:571
 #, c-format
 msgid "%3d  %s %s  line %ld"
-msgstr "%3d  %s %s  蝚� %ld 銵�"
+msgstr "%3d  %s %s  蝚� %ld 銵� "
 
-#: ex_cmds2.c:767
+#: ex_cmds2.c:786
 #, c-format
 msgid "Save changes to \"%.*s\"?"
 msgstr "撠��𠰴�訫�睃�脰秐 \"%.*s\"?"
 
-#: ex_cmds2.c:769 ex_docmd.c:8820
+#: ex_cmds2.c:788 ex_docmd.c:9398
 msgid "Untitled"
 msgstr "�𧊋�𦶢���"
 
-#: ex_cmds2.c:905
+#: ex_cmds2.c:915
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: 撌脫凒�㺿�𡒊楨銵嘥� \"%s\" 雿�撠𡁏𧊋摮䀹�� (�虾�鍂 ! 撘瑕��嘑銵�)"
 
-#: ex_cmds2.c:974
+#: ex_cmds2.c:984
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "瘜冽��: 撌脣���𥕦��嗅�蝺抵�嘥� (隢𧢲炎�䰻 Autocommands ��厩�⊿𥲤隤�)"
 
-#: ex_cmds2.c:1377
+#: ex_cmds2.c:1387
 msgid "E163: There is only one file to edit"
 msgstr "E163: �蘨��劐��𧢲�娍��虾蝺刻摩"
 
-#: ex_cmds2.c:1379
+#: ex_cmds2.c:1389
 msgid "E164: Cannot go before first file"
 msgstr "E164: 撌脩�枏銁蝚砌��𧢲�娍���"
 
-#: ex_cmds2.c:1381
+#: ex_cmds2.c:1391
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: 撌脩�枏銁��敺䔶��𧢲�娍���"
 
-#: ex_cmds2.c:1828
+#: ex_cmds2.c:1804
+#, c-format
+msgid "E666: compiler not supported: %s"
+msgstr "E666: 蝺刻陌�膥銝齿𣈲�螱: %s"
+
+#: ex_cmds2.c:1901
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "��𨅯�衤葉: \"%s\" -- \"%s\""
 
-#: ex_cmds2.c:1850
+#: ex_cmds2.c:1923
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "��𨅯�衤葉: \"%s\""
 
-#: ex_cmds2.c:1871
+#: ex_cmds2.c:1945
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
 msgstr "�銁 'runtimepath' 鋆⊥𪄳銝滚� \"%s\""
 
-#: ex_cmds2.c:1905
+#: ex_cmds2.c:1979
 msgid "Source Vim script"
 msgstr "�嘑銵� Vim script"
 
-#: ex_cmds2.c:2056
+#: ex_cmds2.c:2169
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "�⊥�訫嘑銵𣬚𤌍��嚗� \"%s\""
 
-#: ex_cmds2.c:2086
+#: ex_cmds2.c:2207
 #, c-format
 msgid "could not source \"%s\""
 msgstr "�⊥�訫嘑銵� \"%s\""
 
-#: ex_cmds2.c:2088
+#: ex_cmds2.c:2209
 #, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "蝚� %ld 銵�: �⊥�訫嘑銵� \"%s\""
 
-#: ex_cmds2.c:2102
+#: ex_cmds2.c:2223
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "�嘑銵� \"%s\" 銝�"
 
-#: ex_cmds2.c:2104
+#: ex_cmds2.c:2225
 #, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "蝚� %ld 銵�: 蝯鞉�笔嘑銵� %s"
 
-#: ex_cmds2.c:2229
+#: ex_cmds2.c:2368
 #, c-format
 msgid "finished sourcing %s"
 msgstr "蝯鞉�笔嘑銵� %s"
 
-#: ex_cmds2.c:2528
+#: ex_cmds2.c:2712
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: 瘜冽��: �𥲤隤斤�銵����𥪜�堒��嚗�虾�賣糓撠睲� ^M"
 
-#: ex_cmds2.c:2577
+#: ex_cmds2.c:2761
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: �銁�嘑銵� script 瑼娍���碶�滚虾雿輻鍂 :scriptencoding"
 
-#: ex_cmds2.c:2610
+#: ex_cmds2.c:2794
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: �銁�嘑銵� script 瑼娍���碶�滚虾雿輻鍂 :finish"
 
-#: ex_cmds2.c:3004
+#: ex_cmds2.c:3243
 #, c-format
 msgid "Page %d"
 msgstr "蝚� %d ��"
 
-#: ex_cmds2.c:3116
+#: ex_cmds2.c:3399
 msgid "No text to be printed"
 msgstr "瘝埝�㕑���堒㫲�������"
 
-#: ex_cmds2.c:3194
+#: ex_cmds2.c:3477
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "��堒㫲銝�: 蝚� %d �� (%d%%)"
 
-#: ex_cmds2.c:3203
+#: ex_cmds2.c:3489
 #, c-format
 msgid " Copy %d of %d"
 msgstr "銴�ˊ %d / %d"
 
-#: ex_cmds2.c:3255
+#: ex_cmds2.c:3547
 #, c-format
 msgid "Printed: %s"
 msgstr "撌脣�堒㫲: %s"
 
-#: ex_cmds2.c:3262
+#: ex_cmds2.c:3554
+#, c-format
 msgid "Printing aborted"
 msgstr "撌脣�𡝗���堒㫲"
 
-#: ex_cmds2.c:3645
+#: ex_cmds2.c:3919
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: �⊥�訫神�� PostScript 頛詨枂瑼�"
 
-#: ex_cmds2.c:4320
+#: ex_cmds2.c:4194
+#, c-format
+msgid "E624: Can't open file \"%s\""
+msgstr "E624: �⊥�閖�见���娍�� \"%s\""
+
+#: ex_cmds2.c:4204 ex_cmds2.c:4829
+#, c-format
+msgid "E457: Can't read PostScript resource file \"%s\""
+msgstr "E457: �⊥�閗���� PostScript 鞈��鞉�� \"%s\""
+
+#: ex_cmds2.c:4212
+#, c-format
+msgid "E618: file \"%s\" is not a PostScript resource file"
+msgstr "E618: 瑼娍�� \"%s\" 銝齿糓 PostScript 鞈��鞉�� "
+
+#: ex_cmds2.c:4227 ex_cmds2.c:4247 ex_cmds2.c:4262 ex_cmds2.c:4284
+#, c-format
+msgid "E619: file \"%s\" is not a supported PostScript resource file"
+msgstr "E619: 銝齿𣈲�螱 PostScript 鞈��鞉�� \"%s\""
+
+#: ex_cmds2.c:4314
+#, c-format
+msgid "E621: \"%s\" resource file has wrong version"
+msgstr "E621: \"%s\" 鞈��鞉�𠉛��𧋦�𥲤隤�"
+
+#: ex_cmds2.c:4781
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: �⊥�閖�见�� PostScript 頛詨枂瑼�"
 
-#: ex_cmds2.c:4362
+#: ex_cmds2.c:4814
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: �⊥�閖�见���娍�� \"%s\""
 
-#: ex_cmds2.c:4373
+#: ex_cmds2.c:4933
+msgid "E456: Can't find PostScript resource file \"prolog.ps\""
+msgstr "E456: �⊥�閗���� PostScript 鞈��鞉�� \"prolog.ps\""
+
+#: ex_cmds2.c:4964
 #, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: �⊥�閗���� PostScript resource 瑼� \"%s\""
+msgid "E456: Can't find PostScript resource file \"%s.ps\""
+msgstr "E456: �⊥�閗���� PostScript 鞈��鞉�� \"%s.ps\""
+
+#: ex_cmds2.c:4982
+#, c-format
+msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
+msgstr "E620:�⊥�閗�㗇�𥡝秐 \"%s\" 摮堒��蝺函Ⅳ"
 
-#: ex_cmds2.c:4576
+#: ex_cmds2.c:5107
 msgid "Sending to printer..."
 msgstr "�喲��鞈��坔��㫲銵冽��..."
 
-#: ex_cmds2.c:4580
+#: ex_cmds2.c:5111
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: �⊥�訫�堒㫲 PostScript 瑼娍��"
 
-#: ex_cmds2.c:4582
+#: ex_cmds2.c:5113
 msgid "Print job sent."
 msgstr "撌脤���枂��堒㫲撌乩�栶��"
 
-#: ex_cmds2.c:4978
+#: ex_cmds2.c:5623
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "�𤌍��滨� %s隤噼�: \"%s\""
 
-#: ex_cmds2.c:4989
+#: ex_cmds2.c:5634
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: 銝滩�質身摰朞�噼���� \"%s\""
 
-#: ex_docmd.c:486
+#: ex_docmd.c:525
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "�脣�� Ex 璅∪��. 頛詨�� \"visua\" 隞亙�𧼮�甇�虜璅∪��."
 
 #. must be at EOF
-#: ex_docmd.c:522
+#: ex_docmd.c:561
 msgid "E501: At end-of-file"
 msgstr "E501: 撌脣�瑼娍���𣂼偏"
 
-#: ex_docmd.c:624
+#: ex_docmd.c:670
 msgid "E169: Command too recursive"
 msgstr "E169: �𦶢隞日�噼艘撅斗彍�𤾸��"
 
-#: ex_docmd.c:1090
+#: ex_docmd.c:1232
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: �𧊋��娍⏛��靘见�吔�� %s"
 
-#: ex_docmd.c:1176
+#: ex_docmd.c:1320
 msgid "End of sourced file"
 msgstr "�𦶢隞斗�𠉛�鞉��"
 
-#: ex_docmd.c:1177
+#: ex_docmd.c:1321
 msgid "End of function"
 msgstr "�遆撘讐�𣂼偏"
 
-#: ex_docmd.c:1628
+#: ex_docmd.c:1910
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: 雿輻鍂��摰𡁶儔���𦶢隞斗�瘛瑟�"
 
-#: ex_docmd.c:1642
+#: ex_docmd.c:1924
 msgid "E492: Not an editor command"
 msgstr "E492: 銝齿糓蝺刻摩�膥���𦶢隞�"
 
-#: ex_docmd.c:1725
-msgid "E478: Don't panic!"
-msgstr "E478: 銝滩�撽𡁏��!"
-
-#: ex_docmd.c:1744
+#: ex_docmd.c:2031
 msgid "E493: Backwards range given"
 msgstr "E493: ����帋���穃�滚�����蝭����"
 
-#: ex_docmd.c:1753
+#: ex_docmd.c:2040
 msgid "Backwards range given, OK to swap"
 msgstr "����帋���穃�滚�����蝭���㵪�辧K to swap"
 
-#: ex_docmd.c:1864
+#: ex_docmd.c:2163
 msgid "E494: Use w or w>>"
 msgstr "E494: 隢衤蝙�鍂 w ��� w>>"
 
-#: ex_docmd.c:3446
+#: ex_docmd.c:3789
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ��甇�, �𧋦�𦶢隞文銁甇斤��𧋦銝剜�埝�匧祕雿�"
 
-#: ex_docmd.c:3624
+#: ex_docmd.c:3992
 msgid "E172: Only one file name allowed"
 msgstr "E172: �蘨�賣�劐��𧢲��"
 
-#: ex_docmd.c:4191
+#: ex_docmd.c:4572
+msgid "1 more file to edit.  Quit anyway?"
+msgstr "����劐��𧢲�娍��𧊋蝺刻摩. 蝣箏�朞��𣪧��页��"
+
+#: ex_docmd.c:4575
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "����� %d �𧢲�娍��𧊋蝺刻摩. 蝣箏�朞��𣪧��页��"
 
-#: ex_docmd.c:4198
+#: ex_docmd.c:4582
+msgid "E173: 1 more file to edit"
+msgstr "E173: ����劐��𧢲�娍��𧊋蝺刻摩 "
+
+#: ex_docmd.c:4584
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: ����� %ld �𧢲�娍��𧊋蝺刻摩"
 
-#: ex_docmd.c:4292
+#: ex_docmd.c:4679
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: �𦶢隞文歇蝬枏�睃銁, 隢衤蝙�鍂 ! 撘瑕���齿鰵摰𡁶儔"
 
-#: ex_docmd.c:4397
+#: ex_docmd.c:4790
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
@@ -1169,314 +1275,322 @@ msgstr ""
 "\n"
 "    ��滨迂        ���彍 蝭����  摰峕㟲      摰𡁶儔      "
 
-#: ex_docmd.c:4486
+#: ex_docmd.c:4879
 msgid "No user-defined commands found"
 msgstr "�𪄳銝滚�雿輻鍂��摰𡁶儔���𦶢隞�"
 
-#: ex_docmd.c:4517
+#: ex_docmd.c:4911
 msgid "E175: No attribute specified"
 msgstr "E175: 瘝埝�㗇���𡁶�撅祆��"
 
-#: ex_docmd.c:4569
+#: ex_docmd.c:4963
 msgid "E176: Invalid number of arguments"
 msgstr "E176: 銝齿迤蝣箇����彍�彍�𤌍"
 
-#: ex_docmd.c:4584
+#: ex_docmd.c:4978
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: 銝滩�賣���𡁜�拇活�彍�𤌍"
 
-#: ex_docmd.c:4594
+#: ex_docmd.c:4988
 msgid "E178: Invalid default value for count"
 msgstr "E178: �彍�𤌍����鞱身���彍銝齿迤蝣�"
 
-#: ex_docmd.c:4622
+#: ex_docmd.c:5019
 msgid "E179: argument required for complete"
 msgstr "E179: ���誘��閬����彍��滩�賢�峕��"
 
-#: ex_docmd.c:4641
+#: ex_docmd.c:5051
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: 銝滚�峕㟲����: '%s'"
 
-#: ex_docmd.c:4649
+#: ex_docmd.c:5060
+msgid "E468: Completion argument only allowed for custom completion"
+msgstr "E468: �䌊閮�鋆𨅯�峕���滚虾鋆𨅯����彍"
+
+#: ex_docmd.c:5066
+msgid "E467: Custom completion requires a function argument"
+msgstr "E467: �䌊閮�鋆𨅯�屸�閬��遆撘讐�箏��彍"
+
+#: ex_docmd.c:5077
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: 銝齿迤蝣箇�撅祆��: %s"
 
-#: ex_docmd.c:4690
+#: ex_docmd.c:5120
 msgid "E182: Invalid command name"
 msgstr "E182: ���誘��滨迂銝齿迤蝣�"
 
-#: ex_docmd.c:4705
+#: ex_docmd.c:5135
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: 雿輻鍂���䌊摰𡁏��誘敹����誑憭批神摮埈�漤�见��"
 
-#: ex_docmd.c:4774
+#: ex_docmd.c:5206
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: 瘝埝�劐蝙�鍂���䌊摰𡁶��𦶢隞歹�� %s"
 
-#: ex_docmd.c:5230
+#: ex_docmd.c:5667
 #, c-format
 msgid "E185: Cannot find color scheme %s"
 msgstr "E185: �𪄳銝滚�憿讛𠧧璅��� %s"
 
-#: ex_docmd.c:5238
+#: ex_docmd.c:5675
 msgid "Greetings, Vim user!"
 msgstr "�秄, Vim 雿輻鍂��嚗�"
 
-#: ex_docmd.c:5946
+#: ex_docmd.c:6393
 msgid "Edit File in new window"
 msgstr "�銁�鰵閬𣇉�㛖楊頛舀�娍��"
 
-#: ex_docmd.c:6219
+#: ex_docmd.c:6688
 msgid "No swap file"
 msgstr "�⊥麱摮䀹��"
 
-#: ex_docmd.c:6323
+#: ex_docmd.c:6792
 msgid "Append File"
 msgstr "����䭾�娍��"
 
-#: ex_docmd.c:6387
+#: ex_docmd.c:6856
 msgid "E186: No previous directory"
 msgstr "E186: 瘝埝�匧�滢��讠𤌍��"
 
-#: ex_docmd.c:6469
+#: ex_docmd.c:6938
 msgid "E187: Unknown"
 msgstr "E187: �⊥�閗齒霅条�璅躰��"
 
-#: ex_docmd.c:6554
+#: ex_docmd.c:7023
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize ��閬��拙�见��彍"
 
-#: ex_docmd.c:6605
+#: ex_docmd.c:7079
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "閬𣇉�𦯀�滨蔭: X %d, Y %d"
 
-#: ex_docmd.c:6610
+#: ex_docmd.c:7084
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr "E188: �銁�函�撟喳蝱銝羓�⊥�閧㬢敺𡑒�𣇉�𦯀�滨蔭"
 
-#: ex_docmd.c:6620
+#: ex_docmd.c:7094
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos ��閬��拙�见��彍"
 
-#: ex_docmd.c:6899
+#: ex_docmd.c:7372
 msgid "Save Redirection"
 msgstr "�脣�� Redirection"
 
-#: ex_docmd.c:7046
+#: ex_docmd.c:7562
 msgid "Save View"
 msgstr "�脣�� View"
 
-#: ex_docmd.c:7047
+#: ex_docmd.c:7563
 msgid "Save Session"
 msgstr "�脣�� Session"
 
-#: ex_docmd.c:7049
+#: ex_docmd.c:7565
 msgid "Save Setup"
 msgstr "�脣�䁅身摰�"
 
-#: ex_docmd.c:7200
+#: ex_docmd.c:7717
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" 撌脣�睃銁 (隢讠鍂 ! 撘瑕��嘑銵�)"
 
-#: ex_docmd.c:7205
+#: ex_docmd.c:7722
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: �⊥�蓥誑撖怠�交芋撘誯�见�� \"%s\""
 
 #. set mark
-#: ex_docmd.c:7229
+#: ex_docmd.c:7746
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: ���彍敹����糓�㘚����埈�齿�硋�穃��/敺𣬚�撘閗��"
 
-#: ex_docmd.c:7271
+#: ex_docmd.c:7788
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal �噼艘撅斗彍�擧楛"
 
-#: ex_docmd.c:7772
+#: ex_docmd.c:8306
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: 瘝埝�� '#' �虾�𤜯隞��瑼𥪜��"
 
-#: ex_docmd.c:7803
+#: ex_docmd.c:8337
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: 瘝埝�� Autocommand 瑼𥪜�滢誑��碶誨 \"<afile>\""
 
-#: ex_docmd.c:7811
+#: ex_docmd.c:8345
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: 瘝埝�� Autocommand 蝺抵�嘥���滨迂隞亙�碶誨 \"<abuf>\""
 
-#: ex_docmd.c:7822
+#: ex_docmd.c:8356
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: 瘝埝�� Autocommand 蝚血���滨迂隞亙�碶誨 \"<amatch>\""
 
-#: ex_docmd.c:7832
+#: ex_docmd.c:8366
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: 瘝埝�� :source 瑼𥪜�滢誑��碶誨 \"<sfile>\""
 
-#: ex_docmd.c:7873
+#: ex_docmd.c:8407
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: '%' ��� '#' ����𤑳征瑼𥪜�㵪��蘨�賜鍂�䲰 \":p:h\""
 
-#: ex_docmd.c:7875
+#: ex_docmd.c:8409
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: 頛詨�亦�箇征摮𦯀葡"
 
-#: ex_docmd.c:8802
+#: ex_docmd.c:9380
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: �⊥�閗���� viminfo"
 
-#: ex_docmd.c:8975
+#: ex_docmd.c:9553
 msgid "E196: No digraphs in this version"
 msgstr "E196: �𧋦���𧋦�∟�����堒��(digraph)"
 
-#: ex_eval.c:407
+#: ex_eval.c:440
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 銝滩�� :throw �鍂 'Vim' ��钅���靘见��"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:488
+#: ex_eval.c:529
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "銝笔枂靘见�吔�� %s"
 
-#: ex_eval.c:530
+#: ex_eval.c:576
 #, c-format
 msgid "Exception finished: %s"
 msgstr "靘见�𣇉�鞉���� %s"
 
-#: ex_eval.c:531
+#: ex_eval.c:577
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "撌脖���靘见�吔�� %s"
 
-#: ex_eval.c:582 ex_eval.c:620
+#: ex_eval.c:620 ex_eval.c:664
 #, c-format
 msgid "%s, line %ld"
 msgstr "%s, 銵� %ld"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:596
+#: ex_eval.c:638
 #, c-format
 msgid "Exception caught: %s"
 msgstr "�䔄��煺�见�吔��%s"
 
-#: ex_eval.c:667
+#: ex_eval.c:713
 #, c-format
 msgid "%s made pending"
 msgstr "%s �䭾�� pending"
 
-#: ex_eval.c:670
+#: ex_eval.c:716
 #, c-format
 msgid "%s resumed"
 msgstr "%s 撌脣�𧼮儔"
 
-#: ex_eval.c:674
+#: ex_eval.c:720
 #, c-format
 msgid "%s discarded"
 msgstr "%s 撌脖���"
 
-#: ex_eval.c:700
+#: ex_eval.c:746
 msgid "Exception"
 msgstr "靘见��"
 
-#: ex_eval.c:706
+#: ex_eval.c:752
 msgid "Error and interrupt"
 msgstr "�𥲤隤方��葉�𪃾"
 
-#: ex_eval.c:708 gui.c:4237
+#: ex_eval.c:754 gui.c:4384
 msgid "Error"
 msgstr "�𥲤隤�"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ex_eval.c:710
+#: ex_eval.c:756
 msgid "Interrupt"
 msgstr "銝剜𪃾"
 
-#: ex_eval.c:779
+#: ex_eval.c:830
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if 撅斗彍�擧楛"
 
-#: ex_eval.c:816
+#: ex_eval.c:867
 msgid "E580: :endif without :if"
 msgstr "E580: :endif 蝻箏�穃�齿�厩� :if"
 
-#: ex_eval.c:860
+#: ex_eval.c:911
 msgid "E581: :else without :if"
 msgstr "E581: :else 蝻箏�穃�齿�厩� :if"
 
-#: ex_eval.c:863
+#: ex_eval.c:914
 msgid "E582: :elseif without :if"
 msgstr "E582: :elseif 蝻箏�穃�齿�厩� :if"
 
-#: ex_eval.c:870
+#: ex_eval.c:921
 msgid "E583: multiple :else"
 msgstr "E583: 憭𡁻�� :else"
 
-#: ex_eval.c:873
+#: ex_eval.c:924
 msgid "E584: :elseif after :else"
 msgstr "E584: :elseif �銁 :else 銋见��"
 
-#: ex_eval.c:940
+#: ex_eval.c:991
 msgid "E585: :while nesting too deep"
 msgstr "E585: :while 撅斗彍�擧楛"
 
-#: ex_eval.c:996
+#: ex_eval.c:1047
 msgid "E586: :continue without :while"
 msgstr "E586: :continue 蝻箏�穃�齿�厩� :while"
 
-#: ex_eval.c:1036
+#: ex_eval.c:1087
 msgid "E587: :break without :while"
 msgstr "E587: :break 蝻箏�穃�齿�厩� :while"
 
-#: ex_eval.c:1235
+#: ex_eval.c:1286
 msgid "E601: :try nesting too deep"
 msgstr "E601: :if 撅斗彍�擧楛"
 
-#: ex_eval.c:1278
+#: ex_eval.c:1366
 msgid "E603: :catch without :try"
 msgstr "E603: :catch 瘝埝�� :try"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ex_eval.c:1300
+#: ex_eval.c:1388
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch �銁 :finally 銋见��"
 
-#: ex_eval.c:1418
+#: ex_eval.c:1521
 msgid "E606: :finally without :try"
 msgstr "E606: :finally 瘝埝�� :try"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ex_eval.c:1442
+#: ex_eval.c:1545
 msgid "E607: multiple :finally"
 msgstr "E607: 憭𡁻�� :finally"
 
-#: ex_eval.c:1551
+#: ex_eval.c:1654
 msgid "E602: :endtry without :try"
 msgstr "E602: :endif 蝻箏�穃�齿�厩� :if"
 
-#: ex_eval.c:1857
+#: ex_eval.c:1986
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction 敹����銁�遆撘誩�折�其蝙�鍂"
 
-#: ex_getln.c:2967
+#: ex_getln.c:3299
 msgid "tagname"
 msgstr "璅嗵惜��滨迂"
 
-#: ex_getln.c:2970
+#: ex_getln.c:3302
 msgid " kind file\n"
 msgstr "憿墧�娍�Ěn"
 
-#: ex_getln.c:4176
+#: ex_getln.c:4768
 msgid "'history' option is zero"
 msgstr "�賊� 'history' �糓�妟"
 
-#: ex_getln.c:4416
+#: ex_getln.c:5039
 #, c-format
 msgid ""
 "\n"
@@ -1485,245 +1599,257 @@ msgstr ""
 "\n"
 "# %s 甇瑕蟮閮㗛� (�鰵�����):\n"
 
-#: ex_getln.c:4417
+#: ex_getln.c:5040
 msgid "Command Line"
 msgstr "�𦶢隞文��"
 
-#: ex_getln.c:4418
+#: ex_getln.c:5041
 msgid "Search String"
 msgstr "��𨅯�见�𦯀葡"
 
-#: ex_getln.c:4419
+#: ex_getln.c:5042
 msgid "Expression"
 msgstr "�讠�堒��"
 
-#: ex_getln.c:4420
+#: ex_getln.c:5043
 msgid "Input Line"
-msgstr "頛詨�亥��"
+msgstr "頛詨�亥�� "
 
-#: ex_getln.c:4450
+#: ex_getln.c:5081
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar 頞��𤾸𦶢隞日𩑈摨�"
 
-#: ex_getln.c:4624
+#: ex_getln.c:5258
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: 撌脣⏛�膄��劐�𦦵鍂銝剔�閬𣇉�埈�𡝗麱摮睃�"
 
-#: fileio.c:373
+#: fileio.c:378
 msgid "Illegal file name"
 msgstr "銝齿迤蝣箇�瑼𥪜��"
 
-#: fileio.c:397 fileio.c:522 fileio.c:2686 fileio.c:2727
+#: fileio.c:402 fileio.c:540 fileio.c:2925 fileio.c:2966
 msgid "is a directory"
 msgstr "�糓�𤌍��"
 
-#: fileio.c:399
+#: fileio.c:404
 msgid "is not a file"
 msgstr "銝齿糓瑼娍��"
 
-#: fileio.c:544 fileio.c:3833
+#: fileio.c:562 fileio.c:4143
 msgid "[New File]"
 msgstr "[�𧊋�𦶢��䓞"
 
-#: fileio.c:566
+#: fileio.c:595
 msgid "[Permission Denied]"
 msgstr "[甈𢠃�𣂷�滩雲]"
 
-#: fileio.c:670
+#: fileio.c:706
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre Autocommand 雿輻�见�讐�⊥�閗���𡝗迨瑼�"
 
-#: fileio.c:672
+#: fileio.c:708
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *Filter* Autocommand 銝滚虾隞交凒�㺿蝺抵�嘥����批捆"
 
-#: fileio.c:693
+#: fileio.c:729
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: 敺墧�蹱�𤥁撓�亥����...\n"
 
-#: fileio.c:699
+#: fileio.c:735
 msgid "Reading from stdin..."
 msgstr "敺墧�蹱�𤥁撓�亥����..."
 
 #. Re-opening the original file failed!
-#: fileio.c:944
+#: fileio.c:1012
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: 頧㗇�偦𥲤隤�"
 
-#: fileio.c:1892
+#: fileio.c:2102
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
 
-#: fileio.c:1899
+#: fileio.c:2109
 msgid "[fifo]"
 msgstr "[fifo]"
 
-#: fileio.c:1906
+#: fileio.c:2116
 msgid "[socket]"
 msgstr "[socket]"
 
-#: fileio.c:1914
+#: fileio.c:2124
 msgid "[RO]"
 msgstr "[�𣈲霈�]"
 
-#: fileio.c:1924
+#: fileio.c:2134
 msgid "[CR missing]"
 msgstr "[蝻箏�飈R]'"
 
-#: fileio.c:1929
+#: fileio.c:2139
 msgid "[NL found]"
 msgstr "[�𪄳��NL]"
 
-#: fileio.c:1934
+#: fileio.c:2144
 msgid "[long lines split]"
 msgstr "[���𠧧�𡡞𩑈銵䀉"
 
-#: fileio.c:1940 fileio.c:3817
+#: fileio.c:2150 fileio.c:4127
 msgid "[NOT converted]"
 msgstr "[�𧊋頧㗇�𢬿"
 
-#: fileio.c:1945 fileio.c:3822
+#: fileio.c:2155 fileio.c:4132
 msgid "[converted]"
 msgstr "[撌脰�㗇�𢬿"
 
-#: fileio.c:1952 fileio.c:3847
+#: fileio.c:2162 fileio.c:4157
 msgid "[crypted]"
 msgstr "[撌脣�惩�]"
 
-#: fileio.c:1959
+#: fileio.c:2169
 msgid "[CONVERSION ERROR]"
 msgstr "頧㗇�偦𥲤隤�"
 
-#: fileio.c:1965
+#: fileio.c:2175
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
 msgstr "[銵� %ld ��劐�齿迤蝣箇�雿滚��]"
 
-#: fileio.c:1972
+#: fileio.c:2182
 msgid "[READ ERRORS]"
 msgstr "[霈���㚚𥲤隤也"
 
-#: fileio.c:2188
+#: fileio.c:2398
 msgid "Can't find temp file for conversion"
 msgstr "�𪄳銝滚�頧㗇�𤤿鍂���麱摮䀹��"
 
-#: fileio.c:2195
+#: fileio.c:2405
 msgid "Conversion with 'charconvert' failed"
 msgstr "摮堒����頧㗇�偦𥲤隤�"
 
-#: fileio.c:2198
+#: fileio.c:2408
 msgid "can't read output of 'charconvert'"
 msgstr "�⊥�閗���� 'charconvert' ��頛詨枂"
 
-#: fileio.c:2601
+#: fileio.c:2808
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: Autocommand �⏛�膄��㚚�𧢲𦆮鈭�閬�撖怠�亦�蝺抵�嘥�"
 
-#: fileio.c:2624
+#: fileio.c:2831
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: Autocommand �誩�硋𧑐�㺿霈𠹺�銵諹��"
 
-#: fileio.c:2692 fileio.c:2710
+#: fileio.c:2869
+msgid "NetBeans dissallows writes of unmodified buffers"
+msgstr "NetBeans 銝滩�賢神�枂�𧊋靽格㺿��蝺抵�嘥�"
+
+#: fileio.c:2877
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "�其遢�批捆�⊥�訫神�� Netbeans 蝺抵�嘥�"
+
+#: fileio.c:2931 fileio.c:2949
 msgid "is not a file or writable device"
 msgstr "銝齿糓瑼娍���硋虾撖怠�亦�鋆萘蔭"
 
-#: fileio.c:2762
+#: fileio.c:3001
 msgid "is read-only (add ! to override)"
 msgstr "�糓�𣈲霈�瑼� (隢衤蝙�鍂 ! 撘瑕��嘑銵�)"
 
-#: fileio.c:3065
+#: fileio.c:3347
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: �⊥�訫神�亙�嗘遢瑼� (隢衤蝙�鍂 ! 撘瑕��嘑銵�)"
 
-#: fileio.c:3077
+#: fileio.c:3359
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr "E507: �⊥�閖�𣈯�匧�嗘遢瑼� (隢衤蝙�鍂 ! 撘瑕��嘑銵�)"
 
-#: fileio.c:3079
+#: fileio.c:3361
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: �⊥�閗���𡝗�娍��誑靘𥕦�嗘遢 (隢衤蝙�鍂 ! 撘瑕��嘑銵�)"
 
-#: fileio.c:3095
+#: fileio.c:3377
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: �⊥�訫遣蝡见�嗘遢瑼� (隢衤蝙�鍂 ! 撘瑕��嘑銵�)"
 
-#: fileio.c:3198
+#: fileio.c:3480
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: �⊥�閗ˊ雿𨅯�嗘遢瑼� (隢衤蝙�鍂 ! 撘瑕��嘑銵�)"
 
-#: fileio.c:3260
+#: fileio.c:3542
 msgid "E460: The resource fork would be lost (add ! to override)"
 msgstr "E460: Resource fork ��瘨�仃 (隢衤蝙�鍂 ! 撘瑕��嘑銵�)"
 
-#: fileio.c:3361
+#: fileio.c:3652
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: �𪄳銝滚�撖怠�亦鍂���麱摮䀹��"
 
-#: fileio.c:3379
+#: fileio.c:3670
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: �⊥�閗�㗇�� (隢衤蝙�鍂 ! 撘瑕�銝滩�㗇�𥕦神��)"
 
-#: fileio.c:3414
+#: fileio.c:3705
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: �⊥�蓥誑撖怠�交芋撘誯�见�罸���鞉�娍��"
 
-#: fileio.c:3418
+#: fileio.c:3709
 msgid "E212: Can't open file for writing"
 msgstr "E212: �⊥�蓥誑撖怠�交芋撘誯�见��"
 
-#: fileio.c:3668
+#: fileio.c:3971
+msgid "E667: Fsync failed"
+msgstr "E667: Fsync �𦶢隞文嘑銵�仃���"
+
+#: fileio.c:3978
 msgid "E512: Close failed"
 msgstr "E512: ��𣈯�匧仃���"
 
-#: fileio.c:3739
+#: fileio.c:4049
 msgid "E513: write error, conversion failed"
 msgstr "E513: �⊥�訫神�� -- 頧㗇�𥕦仃���"
 
-#: fileio.c:3745
+#: fileio.c:4055
 msgid "E514: write error (file system full?)"
 msgstr "E514: 撖怠�仿𥲤隤� (瑼娍��頂蝯勗歇皛選��)"
 
-#: fileio.c:3812
+#: fileio.c:4122
 msgid " CONVERSION ERROR"
 msgstr "頧㗇�偦𥲤隤�"
 
-#: fileio.c:3828
+#: fileio.c:4138
 msgid "[Device]"
 msgstr "[鋆萘蔭]"
 
-#: fileio.c:3833
+#: fileio.c:4143
 msgid "[New]"
 msgstr "[�鰵]"
 
-#: fileio.c:3855
+#: fileio.c:4165
 msgid " [a]"
 msgstr "[a]"
 
-#: fileio.c:3855
+#: fileio.c:4165
 msgid " appended"
 msgstr " 撌脤����"
 
-#: fileio.c:3857
+#: fileio.c:4167
 msgid " [w]"
 msgstr "[w]"
 
-#: fileio.c:3857
+#: fileio.c:4167
 msgid " written"
 msgstr " 撌脣神��"
 
-#: fileio.c:3910
+#: fileio.c:4217
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: Patch 璅∪��: �⊥�訫�脣�睃�笔�𧢲�娍��"
 
-#: fileio.c:3932
+#: fileio.c:4239
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: Patch 璅∪��: �⊥�閗�𦠜凒蝛箇���笔�𧢲�娍��"
 
-#: fileio.c:3947
+#: fileio.c:4254
 msgid "E207: Can't delete backup file"
 msgstr "E207: �⊥�訫⏛�膄�嗘遢瑼�"
 
-#: fileio.c:4008
+#: fileio.c:4318
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -1731,123 +1857,127 @@ msgstr ""
 "\n"
 "霅血��: ��笔�𧢲�娍���憭望�𡝗�滚�疱n"
 
-#: fileio.c:4010
+#: fileio.c:4320
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "�銁瑼娍��迤蝣箏神�亙�滩�见嚉�𣪧��讠楊頛臬膥!"
 
-#: fileio.c:4099
+#: fileio.c:4409
 msgid "[dos]"
 msgstr "[dos]"
 
-#: fileio.c:4099
+#: fileio.c:4409
 msgid "[dos format]"
 msgstr "[dos �聢撘㒖"
 
-#: fileio.c:4106
+#: fileio.c:4416
 msgid "[mac]"
 msgstr "[mac]"
 
-#: fileio.c:4106
+#: fileio.c:4416
 msgid "[mac format]"
 msgstr "[mac �聢撘㒖"
 
-#: fileio.c:4113
+#: fileio.c:4423
 msgid "[unix]"
 msgstr "[unix]"
 
-#: fileio.c:4113
+#: fileio.c:4423
 msgid "[unix format]"
 msgstr "[unix �聢撘㒖"
 
-#: fileio.c:4140
+#: fileio.c:4450
 msgid "1 line, "
 msgstr "1 銵�, "
 
-#: fileio.c:4142
+#: fileio.c:4452
 #, c-format
 msgid "%ld lines, "
 msgstr "%ld 銵�, "
 
-#: fileio.c:4145
+#: fileio.c:4455
 msgid "1 character"
 msgstr "銝��见�堒��"
 
-#: fileio.c:4147
+#: fileio.c:4457
 #, c-format
 msgid "%ld characters"
 msgstr "%ld�见�堒��"
 
-#: fileio.c:4157
+#: fileio.c:4467
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: fileio.c:4157
+#: fileio.c:4467
 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
-#: fileio.c:4176
+#: fileio.c:4486
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "霅血��: �𧋦瑼娍��䌊銝𦠜活霈��亙��歇霈𠰴��!!!"
 
-#: fileio.c:4178
+#: fileio.c:4488
 msgid "Do you really want to write to it"
 msgstr "蝣箏�朞�撖怠�亙��"
 
-#: fileio.c:5219
+#: fileio.c:5738
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: 撖怠�交�娍�� \"%s\" �𥲤隤�"
 
-#: fileio.c:5226
+#: fileio.c:5745
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: ��𣈯�㗇�娍�� \"%s\" �𥲤隤�"
 
-#: fileio.c:5229
+#: fileio.c:5748
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: 霈���𡝗�娍�� \"%s\" �𥲤隤�"
 
-#: fileio.c:5448
+#: fileio.c:5982
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: FileChangedShell autocommand �⏛�膄蝺抵�嘥�"
 
-#: fileio.c:5456
+#: fileio.c:5989
 #, c-format
 msgid "E211: Warning: File \"%s\" no longer available"
 msgstr "E211: 霅血��: 瑼娍�� \"%s\" 撌脩�㮖�滚�睃銁"
 
-#: fileio.c:5469
+#: fileio.c:6003
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: 霅血��: 瑼娍�� \"%s\" �䌊銝𦠜活霈��亙��歇霈𠰴��, �䔶�𠉛楊頛臭葉��蝺抵�嘥�銋�凒��蓥�"
 
-#: fileio.c:5472
+#: fileio.c:6006
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: 霅血��: 瑼娍�� \"%s\" �䌊銝𦠜活霈��亙��歇霈𠰴��"
 
-#: fileio.c:5474
+#: fileio.c:6008
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: 霅血��: 瑼娍�� \"%s\" ��甈𢠃�鞱���𦠜活霈��交�銝滢�璅� (��㕑�𠰴�閖��)"
 
 # 'mode' seems better as translated to 'permission'?
-#: fileio.c:5484
+#: fileio.c:6018
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: 霅血��: 瑼娍�� \"%s\" �銁��见�讠楊頛臬����◤撱箇�衤�"
 
-#: fileio.c:5501
+#: fileio.c:6031
+msgid "See \":help W11\" for more info."
+msgstr "�脖�甇亥牧��舘�贝�� \":help W11\"��"
+
+#: fileio.c:6045
 msgid "Warning"
 msgstr "霅血��"
 
-#: fileio.c:5502
+#: fileio.c:6046
 msgid ""
 "&OK\n"
 "&Load File"
@@ -1855,38 +1985,43 @@ msgstr ""
 "蝣箏��(&O)\n"
 "頛匧�交�娍��(&L)"
 
-#: fileio.c:5600
+#: fileio.c:6152
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: �⊥�閙�硋�䠷�齿鰵頛匧�� \"%s\""
 
-#: fileio.c:5619
+#: fileio.c:6171
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: �⊥�閖�齿鰵頛匧�� \"%s\""
 
-#: fileio.c:6201
+#: fileio.c:6752
 msgid "--Deleted--"
 msgstr "--撌脣⏛�膄--"
 
 #. the group doesn't exist
-#: fileio.c:6361
+#: fileio.c:6912
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: �⊥迨蝢斤�: \"%s\""
 
-#: fileio.c:6486
+#: fileio.c:7038
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * 敺屸𢒰��劐�齿迤蝣箇�摮堒��: %s"
 
-#: fileio.c:6497
+#: fileio.c:7050
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: �⊥迨鈭衤辣: %s"
 
+#: fileio.c:7052
+#, c-format
+msgid "E216: No such group or event: %s"
+msgstr "E216: �⊥迨蝢斤���碶�衤辣: %s"
+
 #. Highlight title
-#: fileio.c:6646
+#: fileio.c:7210
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -1894,138 +2029,146 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: fileio.c:6917
+#: fileio.c:7481
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: �⊥�訫�齿���劐�衤辣�嘑銵� autocommand"
 
-#: fileio.c:6940
+#: fileio.c:7504
 msgid "No matching autocommands"
 msgstr "�𪄳銝滚�撠齿�厩� autocommand"
 
-#: fileio.c:7260
+#: fileio.c:7825
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommand 撅斗彍�擧楛"
 
-#: fileio.c:7528
+#: fileio.c:8100
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands: \"%s\""
 
-#: fileio.c:7536
+#: fileio.c:8108
 #, c-format
 msgid "Executing %s"
 msgstr "�嘑銵� %s"
 
 #. always scroll up, don't overwrite
-#: fileio.c:7604
+#: fileio.c:8176
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: fileio.c:8171
+#: fileio.c:8743
 msgid "E219: Missing {."
 msgstr "E219: 蝻箏�� {."
 
-#: fileio.c:8173
+#: fileio.c:8745
 msgid "E220: Missing }."
 msgstr "E220: 蝻箏�� }."
 
-#: fold.c:66
+#: fold.c:68
 msgid "E490: No fold found"
 msgstr "E490: �𪄳銝滚�隞颱�� fold"
 
-#: fold.c:553
+#: fold.c:593
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: �⊥�訫銁�𤌍��滨� 'foldmethod' 銝见遣蝡� fold"
 
-#: fold.c:555
+#: fold.c:595
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: �⊥�訫銁�𤌍��滨� 'foldmethod' 銝见⏛�膄 fold"
 
-#: getchar.c:246
+#: getchar.c:248
 msgid "E222: Add to read buffer"
 msgstr "E222: ��惩�亥���𣇉楨銵嘥�銝�"
 
-#: getchar.c:2146
+#: getchar.c:2208
 msgid "E223: recursive mapping"
 msgstr "E223: �噼艘 mapping"
 
-#: getchar.c:2994
+#: getchar.c:3087
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s 撌脩�𤘪�匧�典�� abbreviation 鈭�"
 
-#: getchar.c:2997
+#: getchar.c:3090
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s 撌脩�𤘪�匧�典�� mapping 鈭�"
 
-#: getchar.c:3124
+#: getchar.c:3222
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s 撌脩�𤘪�� abbreviation 鈭�"
 
-#: getchar.c:3127
+#: getchar.c:3225
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s �� mapping 撌脩�枏�睃銁"
 
-#: getchar.c:3191
+#: getchar.c:3289
 msgid "No abbreviation found"
 msgstr "�𪄳銝滚� abbreviation"
 
-#: getchar.c:3193
+#: getchar.c:3291
 msgid "No mapping found"
 msgstr "瘝埝�厰�坔�� mapping 撠齿��"
 
-#: getchar.c:4083
+#: getchar.c:4183
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: 銝齿迤蝣箇�璅∪��"
 
-#: gui.c:218
+#: gui.c:220
 msgid "E229: Cannot start the GUI"
 msgstr "E229: �⊥�訫�笔�訫�硋�讠�屸𢒰"
 
-#: gui.c:347
+#: gui.c:349
 #, c-format
 msgid "E230: Cannot read from \"%s\""
 msgstr "E230: �⊥�閗���𡝗�娍�� \"%s\""
 
 #: gui.c:472
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: �⊥�訫�笔�訫�硋�讠�屸𢒰嚗峕𪄳銝滚��虾�鍂��摮堒��"
+
+#: gui.c:477
 msgid "E231: 'guifontwide' invalid"
 msgstr "E231: 銝齿迤蝣箇� 'guifontwide'"
 
-#: gui.c:3925
+#: gui.c:547
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E559: 'imactivatekey' ���潔�齿迤蝣�"
+
+#: gui.c:4064
 #, c-format
 msgid "E254: Cannot allocate color %s"
 msgstr "E254: 銝滩�賡�滨蔭憿讛𠧧 %s"
 
-#: gui_at_fs.c:290
+#: gui_at_fs.c:300
 msgid "<cannot open> "
 msgstr "<銝滩�賡�见��>"
 
-#: gui_at_fs.c:1115
+#: gui_at_fs.c:1136
 #, c-format
 msgid "E616: vim_SelFile: can't get font %s"
 msgstr "E616: vim_SelFile: 銝滩�賭蝙�鍂 %s 摮堒��"
 
-#: gui_at_fs.c:2538
+#: gui_at_fs.c:2781
 msgid "E614: vim_SelFile: can't return to current directory"
 msgstr "E614: vim_SelFile: �⊥�訫�𧼮��𤌍��滨𤌍��"
 
-#: gui_at_fs.c:2557
+#: gui_at_fs.c:2801
 msgid "Pathname:"
 msgstr "頝臬��:"
 
-#: gui_at_fs.c:2563
+#: gui_at_fs.c:2807
 msgid "E615: vim_SelFile: can't get current directory"
 msgstr "E615: vim_SelFile: �⊥�訫�硋�㛖𤌍��滨𤌍��"
 
-#: gui_at_fs.c:2571 gui_motif.c:1619
+#: gui_at_fs.c:2815 gui_motif.c:1623
 msgid "OK"
 msgstr "蝣箏��"
 
-#: gui_at_fs.c:2571 gui_gtk.c:2625 gui_motif.c:1614 gui_motif.c:2844
+#: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
 msgid "Cancel"
 msgstr "��𡝗��"
 
@@ -2033,19 +2176,19 @@ msgstr "��𡝗��"
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "�㬢��閗遘: 銝滩�質身摰� thumb pixmap ��雿滨蔭"
 
-#: gui_athena.c:1956 gui_motif.c:1867
+#: gui_athena.c:2047 gui_motif.c:1871
 msgid "Vim dialog"
 msgstr "Vim 撠滩店���"
 
-#: gui_beval.c:91
+#: gui_beval.c:101 gui_w32.c:3978
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: 銝滩�賢�滩�𦠜�航�� callback 撱箇�� BallonEval"
 
-#: gui_gtk.c:1561
+#: gui_gtk.c:1607
 msgid "Vim dialog..."
 msgstr "Vim 撠滩店���..."
 
-#: gui_gtk.c:1992 message.c:2525
+#: gui_gtk.c:2060 message.c:2999
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2055,98 +2198,98 @@ msgstr ""
 "&N�炏\n"
 "&C��𡝗��"
 
-#: gui_gtk.c:2152
+#: gui_gtk.c:2268
 msgid "Input _Methods"
 msgstr "頛詨�交��"
 
-#: gui_gtk.c:2418 gui_motif.c:2763
+#: gui_gtk.c:2534 gui_motif.c:2768
 msgid "VIM - Search and Replace..."
 msgstr "VIM - 撠𧢲𪄳����碶誨..."
 
-#: gui_gtk.c:2426 gui_motif.c:2765
+#: gui_gtk.c:2542 gui_motif.c:2770
 msgid "VIM - Search..."
 msgstr "VIM - 撠𧢲𪄳..."
 
-#: gui_gtk.c:2458 gui_motif.c:2883
+#: gui_gtk.c:2574 gui_motif.c:2888
 msgid "Find what:"
 msgstr "��𨅯��:"
 
-#: gui_gtk.c:2478 gui_motif.c:2915
+#: gui_gtk.c:2592 gui_motif.c:2920
 msgid "Replace with:"
 msgstr "��碶誨��:"
 
 #. whole word only button
-#: gui_gtk.c:2510 gui_motif.c:3031
+#: gui_gtk.c:2624 gui_motif.c:3036
 msgid "Match whole word only"
 msgstr "�蘨��𨅯�见���函㮾��𣬚�摮�"
 
 #. match case button
-#: gui_gtk.c:2523 gui_motif.c:3043
+#: gui_gtk.c:2635 gui_motif.c:3048
 msgid "Match case"
 msgstr "蝚血��之撠誩神"
 
-#: gui_gtk.c:2535 gui_motif.c:2985
+#: gui_gtk.c:2645 gui_motif.c:2990
 msgid "Direction"
 msgstr "�䲮���"
 
 #. 'Up' and 'Down' buttons
-#: gui_gtk.c:2547 gui_motif.c:2997
+#: gui_gtk.c:2657 gui_motif.c:3002
 msgid "Up"
 msgstr "��睲��"
 
-#: gui_gtk.c:2551 gui_motif.c:3005
+#: gui_gtk.c:2661 gui_motif.c:3010
 msgid "Down"
 msgstr "��睲��"
 
-#: gui_gtk.c:2577 gui_gtk.c:2579 gui_motif.c:2787
+#: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
 msgid "Find Next"
 msgstr "�𪄳銝衤���"
 
-#: gui_gtk.c:2596 gui_gtk.c:2598 gui_motif.c:2804
+#: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
 msgid "Replace"
 msgstr "��碶誨"
 
-#: gui_gtk.c:2609 gui_gtk.c:2611 gui_motif.c:2817
+#: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
 msgid "Replace All"
 msgstr "��碶誨�券��"
 
-#: gui_gtk_x11.c:2285
+#: gui_gtk_x11.c:2327
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: �眏 Session 蝞∠��摱�𤣰�� \"die\" 閬�瘙�\n"
 
-#: gui_gtk_x11.c:3424
+#: gui_gtk_x11.c:3519
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: 銝餉�𣇉�㛖�𥟇�声n"
 
-#: gui_gtk_x11.c:4038
+#: gui_gtk_x11.c:4138
 msgid "Font Selection"
 msgstr "摮堒�钅�豢��"
 
-#: gui_gtk_x11.c:5890 ui.c:2009
+#: gui_gtk_x11.c:6035 ui.c:2120
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "雿輻鍂 CUT_BUFFER0 靘���碶誨蝛粹�豢��"
 
-#: gui_motif.c:1613 gui_motif.c:1616
+#: gui_motif.c:1617 gui_motif.c:1620
 msgid "Filter"
 msgstr "�擧蕪�膥"
 
-#: gui_motif.c:1615
+#: gui_motif.c:1619
 msgid "Directories"
 msgstr "�𤌍��"
 
-#: gui_motif.c:1617
+#: gui_motif.c:1621
 msgid "Help"
 msgstr "頛𥪜𨭌隤芣��"
 
-#: gui_motif.c:1618
+#: gui_motif.c:1622
 msgid "Files"
 msgstr "瑼娍��"
 
-#: gui_motif.c:1620
+#: gui_motif.c:1624
 msgid "Selection"
 msgstr "�豢��"
 
-#: gui_motif.c:2830
+#: gui_motif.c:2835
 msgid "Undo"
 msgstr "敺拙��"
 
@@ -2160,7 +2303,7 @@ msgstr "E610: �⊥�閖�见�� Zap 摮堒�� '%s'"
 msgid "E611: Can't use font %s"
 msgstr "E611: �⊥�蓥蝙�鍂摮堒�� %s"
 
-#: gui_riscos.c:3269
+#: gui_riscos.c:3270
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
@@ -2168,64 +2311,73 @@ msgstr ""
 "\n"
 "���枂銝剜𪃾摮鞟�见�讐�閮𦠜�臭葉.\n"
 
-#: gui_w32.c:759
+#: gui_w32.c:839
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �𪄳銝滚�璅䠷�𣬚�� \"%s\" ��閬𣇉��"
+
+#: gui_w32.c:847
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: 銝齿𣈲�螱���彍 \"-%s\"��隢讠鍂 OLE ���𧋦��"
 
-#: gui_w48.c:2029
+#: gui_w32.c:1100
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: �⊥�訫銁 MDI 蝔见�譍葉��见�蠘�𣇉��"
+
+#: gui_w48.c:2163
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "��𨅯�见�𦯀葡 (雿輻鍂 '\\\\' 靘�銵函內 '\\')"
 
-#: gui_w48.c:2054
+#: gui_w48.c:2188
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
 msgstr "��𨅯�见�𠰴�碶誨摮𦯀葡 (雿輻鍂 '\\\\' 靘�銵函內 '\\')"
 
-#: gui_x11.c:1445
+#: gui_x11.c:1537
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: �⊥�閖�滨蔭 color map ���𤌍嚗峕�劐�偦�讛𠧧��贝絲靘����芣�芰�"
 
-#: gui_x11.c:2019
+#: gui_x11.c:2118
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
 msgstr "E250: Fontset %s 瘝埝�㕑身摰𡁏迤蝣箇�摮堒�衤誑靘偦*蝷粹�嗘�𥕦�堒����:"
 
-#: gui_x11.c:2062
+#: gui_x11.c:2161
 #, c-format
 msgid "E252: Fontset name: %s"
 msgstr "E252: 摮堒�钅�(Fontset)��滨迂: %s"
 
-#: gui_x11.c:2063
+#: gui_x11.c:2162
 #, c-format
 msgid "Font '%s' is not fixed-width"
 msgstr "'%s' 銝齿糓�𤐄摰𡁜祝摨血�堒��"
 
-#: gui_x11.c:2082
+#: gui_x11.c:2181
 #, c-format
 msgid "E253: Fontset name: %s\n"
 msgstr "E253: 摮堒�钅�(Fontset)��滨迂: %s\n"
 
-#: gui_x11.c:2083
+#: gui_x11.c:2182
 #, c-format
 msgid "Font0: %s\n"
 msgstr "Font0: %s\n"
 
-#: gui_x11.c:2084
+#: gui_x11.c:2183
 #, c-format
 msgid "Font1: %s\n"
 msgstr "Font1: %s\n"
 
-#: gui_x11.c:2085
+#: gui_x11.c:2184
 #, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "摮堒��%d撖砍漲銝齿糓摮堒��0���拙�㙡n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "摮堒��%ld 撖砍漲銝齿糓 摮堒��0 ���拙�㙡n"
 
-#: gui_x11.c:2086
+#: gui_x11.c:2185
 #, c-format
 msgid "Font0 width: %ld\n"
 msgstr "摮堒��0��撖砍漲嚗�%ld\n"
 
-#: gui_x11.c:2087
+#: gui_x11.c:2186
 #, c-format
 msgid ""
 "Font1 width: %ld\n"
@@ -2238,289 +2390,306 @@ msgstr ""
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: Hangul automata �𥲤隤�"
 
-#: if_cscope.c:26
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: �鍂瘜�: cs[cope] %s"
-
-#: if_cscope.c:67
+#: if_cscope.c:77
 msgid "Add a new database"
 msgstr "�鰵憓噼���坔澈"
 
-#: if_cscope.c:69
+#: if_cscope.c:79
 msgid "Query for a pattern"
 msgstr "頛詨�� pattern"
 
-#: if_cscope.c:71
+#: if_cscope.c:81
 msgid "Show this message"
 msgstr "憿舐內甇方�𦠜��"
 
-#: if_cscope.c:73
+#: if_cscope.c:83
 msgid "Kill a connection"
 msgstr "蝯鞉�罸����"
 
-#: if_cscope.c:75
+#: if_cscope.c:85
 msgid "Reinit all connections"
 msgstr "��滩身����厰����"
 
-#: if_cscope.c:77
+#: if_cscope.c:87
 msgid "Show connections"
 msgstr "憿舐內����"
 
-#: if_cscope.c:108
+#: if_cscope.c:95
+#, c-format
+msgid "E560: Usage: cs[cope] %s"
+msgstr "E560: �鍂瘜�: cs[cope] %s"
+
+#: if_cscope.c:124
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "�坔�� cscope �𦶢隞支�齿𣈲�螱���𠧧�攟撟𦖭n"
 
-#: if_cscope.c:143
+#: if_cscope.c:175
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: �鍂瘜�: cstag <霅睃ê̌摮𡟙dent>"
 
-#: if_cscope.c:199
+#: if_cscope.c:231
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: �𪄳銝滚� tag"
 
-#: if_cscope.c:407 if_cscope.c:451
+#: if_cscope.c:409
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) �𥲤隤�: %d"
 
-#: if_cscope.c:461 if_cscope.c:468
-#, c-format
-msgid "Added cscope database %s"
-msgstr "�鰵憓� cscope 鞈��坔澈 %s"
+#: if_cscope.c:419
+msgid "E563: stat error"
+msgstr "E563: stat �𥲤隤�"
 
-#: if_cscope.c:475
+#: if_cscope.c:516
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s 銝齿糓�𤌍����� cscope 鞈��坔澈"
 
-#: if_cscope.c:559
+#: if_cscope.c:534
+#, c-format
+msgid "Added cscope database %s"
+msgstr "�鰵憓� cscope 鞈��坔澈 %s"
+
+#: if_cscope.c:589
 #, c-format
-msgid "E565: error reading cscope connection %d"
-msgstr "E565: 霈���� cscope ���� %d �𥲤隤�"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: 霈���� cscope ���� %ld �𥲤隤�"
 
-#: if_cscope.c:636
+#: if_cscope.c:694
 msgid "E561: unknown cscope search type"
 msgstr "E561: �𧊋�䰻�� cscope ��𨅯�见耦��"
 
-#: if_cscope.c:683
+#: if_cscope.c:736
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: �⊥�訫遣蝡贝�� cscope �� pipe ����"
 
-#: if_cscope.c:748
+#: if_cscope.c:753
+msgid "E622: Could not fork for cscope"
+msgstr "E622: �⊥�� fork 隞亙嘑銵� cscope "
+
+#: if_cscope.c:847 if_cscope.c:897
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection �嘑銵�仃���"
 
-#: if_cscope.c:758
+#: if_cscope.c:898
+msgid "E623: Could not spawn cscope process"
+msgstr "E623: �⊥�訫嘑銵� cscope "
+
+#: if_cscope.c:911
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: fdopen 憭望�� (to_fp)"
 
-#: if_cscope.c:760
+#: if_cscope.c:913
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fdopen 憭望�� (fr_fp)"
 
-#: if_cscope.c:788
+#: if_cscope.c:951
 msgid "E567: no cscope connections"
 msgstr "E567: 瘝埝�� cscope ����"
 
-#: if_cscope.c:858
+#: if_cscope.c:1025
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: �𪄳銝滚�蝚血�� cscope ����𨅯�� %s / %s"
 
-#: if_cscope.c:902
+#: if_cscope.c:1082
+#, c-format
+msgid "E469: invalid cscopequickfix flag %c for %c"
+msgstr "E469: cscopequickfix �� flac %c (%c) 銝齿迤蝣�"
+
+#: if_cscope.c:1152
 msgid "cscope commands:\n"
 msgstr "cscope �𦶢隞�:\n"
 
-#: if_cscope.c:905
+#: if_cscope.c:1155
+#, c-format
+msgid "%-5s: %-30s (Usage: %s)"
+msgstr "%-5s: %-30s (�鍂瘜�: %s)"
+
+#: if_cscope.c:1253
 #, c-format
-msgid "%-5s: %-30s (Usage: %s)\n"
-msgstr "%-5s: %-30s (�鍂瘜�: %s)\n"
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: �⊥�閖�见�� cscope 鞈��坔澈 %s"
 
-#: if_cscope.c:973
+#: if_cscope.c:1271
+msgid "E626: cannot get cscope database information"
+msgstr "E626: �⊥�訫�硋�� cscope 鞈��坔澈鞈���"
+
+#: if_cscope.c:1296
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ��滩��� cscope 鞈��坔澈�𧊋鋡怠�惩��"
 
-#: if_cscope.c:984
+#: if_cscope.c:1307
 msgid "E569: maximum number of cscope connections reached"
 msgstr "E569: 撌脤�𥪜� cscope ��憭折���𡁏彍�𤌍"
 
-#: if_cscope.c:1105
-msgid "E260: cscope connection not found"
-msgstr "E260: �𪄳銝滚� cscope ����"
-
-#: if_cscope.c:1108
+#: if_cscope.c:1424
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: �𪄳銝滚� cscope ���� %s"
 
-#: if_cscope.c:1144
-msgid "cscope connection closed"
-msgstr "cscope ���𡁜歇��𣈯��"
-
-#: if_cscope.c:1152
+#: if_cscope.c:1458
 #, c-format
-msgid "cscope connection %s closed\n"
-msgstr "cscope ���� %s 撌脤�𣈯�声n"
+msgid "cscope connection %s closed"
+msgstr "cscope ���� %s 撌脤�𣈯��"
 
 #. should not reach here
-#: if_cscope.c:1293
+#: if_cscope.c:1598
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches �𠂔��漤𥲤隤�"
 
-#: if_cscope.c:1344
-#, c-format
-msgid "E262: error reading cscope connection %d"
-msgstr "E262: 霈���� cscope ���� %d �𥲤隤�"
-
-#: if_cscope.c:1452
-msgid "couldn't malloc\n"
-msgstr "�⊥�蓥蝙�鍂 malloc\n"
-
-#: if_cscope.c:1457
+#: if_cscope.c:1848
 #, c-format
-msgid "Cscope tag: %s\n"
-msgstr "Cscope 璅嗵惜(tag): %s\n"
+msgid "Cscope tag: %s"
+msgstr "Cscope 璅嗵惜(tag): %s"
 
-#: if_cscope.c:1461
-msgid "   #   line"
-msgstr "   #   銵�  "
+#: if_cscope.c:1870
+msgid ""
+"\n"
+"   #   line"
+msgstr ""
+"\n"
+"   #   銵�  "
 
-#: if_cscope.c:1463
+#: if_cscope.c:1872
 msgid "filename / context / line\n"
 msgstr "瑼𥪜��     / �扳��    / 銵諹�髿n"
 
-#: if_cscope.c:1721
+#: if_cscope.c:1990
+#, c-format
+msgid "E609: Cscope error: %s"
+msgstr "E609: Csope �𥲤隤�: %s"
+
+#: if_cscope.c:2176
 msgid "All cscope databases reset"
 msgstr "��滩身����� cscope 鞈��坔澈"
 
-#: if_cscope.c:1788
+#: if_cscope.c:2244
 msgid "no cscope connections\n"
 msgstr "瘝埝�� cscope ���䨵n"
 
-#: if_cscope.c:1792
+#: if_cscope.c:2248
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    鞈��坔澈��滨迂                          prepend path\n"
 
-#: if_cscope.c:1803
-#, c-format
-msgid "%2d %-5ld  %-34s  <none>\n"
-msgstr "%2d %-5ld  %-34s  <��>\n"
-
-#: if_python.c:394
+#: if_python.c:436
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
 msgstr "E263: ��甇㚁�屸�坔�见𦶢隞斤�⊥�蓥蝙�鍂嚗釶ython 蝔见�誩澈瘝埝�㕑�匧�乓��"
 
-#: if_python.c:596
+#: if_python.c:500
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: �⊥�閖�噼艘�嘑銵� Python "
+
+#: if_python.c:701
 msgid "can't delete OutputObject attributes"
 msgstr "�⊥�訫⏛�膄 OutputObject 撅祆��"
 
-#: if_python.c:603
+#: if_python.c:708
 msgid "softspace must be an integer"
 msgstr "softspace 敹����糓�㟲�彍"
 
-#: if_python.c:611
+#: if_python.c:716
 msgid "invalid attribute"
 msgstr "銝齿迤蝣箇�撅祆��"
 
-#: if_python.c:650 if_python.c:664
+#: if_python.c:755 if_python.c:769
 msgid "writelines() requires list of strings"
 msgstr "writelines() ��閬� string list �訜���彍"
 
-#: if_python.c:790
+#: if_python.c:895
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: �⊥�訫�嘥�� I/O ��隞�"
 
-#: if_python.c:975 if_tcl.c:1402
+#: if_python.c:1080 if_tcl.c:1402
 msgid "invalid expression"
 msgstr "銝齿迤蝣箇��讠�堒��"
 
-#: if_python.c:989 if_tcl.c:1407
+#: if_python.c:1094 if_tcl.c:1407
 msgid "expressions disabled at compile time"
 msgstr "��删�箇楊霅舀�瘝埝�匧�惩�仿�讠�堒��(expression)��蝔见�讐Ⅳ嚗峕�隞亦�⊥�蓥蝙�鍂�讠�堒��"
 
-#: if_python.c:1002
+#: if_python.c:1107
 msgid "attempt to refer to deleted buffer"
 msgstr "閰血�碶蝙�鍂撌脰◤�⏛�膄�� buffer"
 
-#: if_python.c:1017 if_python.c:1058 if_python.c:1122 if_tcl.c:1214
+#: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
 msgid "line number out of range"
 msgstr "銵諹�蠘��枂蝭����"
 
-#: if_python.c:1257
+#: if_python.c:1362
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
 msgstr "<buffer ��隞� (撌脣⏛�膄): %8lX>"
 
-#: if_python.c:1348 if_tcl.c:836
+#: if_python.c:1453 if_tcl.c:836
 msgid "invalid mark name"
 msgstr "璅躰�睃�滨迂銝齿迤蝣�"
 
-#: if_python.c:1623
+#: if_python.c:1733
 msgid "no such buffer"
 msgstr "�⊥迨 buffer"
 
-#: if_python.c:1711
+#: if_python.c:1821
 msgid "attempt to refer to deleted window"
 msgstr "閰血�碶蝙�鍂撌脰◤�⏛�膄��閬𣇉��"
 
-#: if_python.c:1756
+#: if_python.c:1866
 msgid "readonly attribute"
 msgstr "�𣈲霈�撅祆��"
 
-#: if_python.c:1769
+#: if_python.c:1879
 msgid "cursor position outside buffer"
 msgstr "皜豢�坔�帋�滚銁蝺抵�嘥�銋见��"
 
-#: if_python.c:1846
+#: if_python.c:1956
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
 msgstr "<閬𣇉�㛖�隞�(撌脣⏛�膄): %.8lX>"
 
-#: if_python.c:1858
+#: if_python.c:1968
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
 msgstr "<閬𣇉�㛖�隞�(�𧊋�䰻): %.8lX>"
 
-#: if_python.c:1860
+#: if_python.c:1970
 #, c-format
 msgid "<window %d>"
 msgstr "<閬𣇉�� %d>"
 
-#: if_python.c:1936
+#: if_python.c:2046
 msgid "no such window"
 msgstr "�⊥迨閬𣇉��"
 
-#: if_python.c:2193 if_python.c:2228 if_python.c:2278 if_python.c:2346
-#: if_python.c:2466 if_python.c:2518 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
-#: if_tcl.c:873 if_tcl.c:1998
+#: if_python.c:2307 if_python.c:2341 if_python.c:2396 if_python.c:2464
+#: if_python.c:2586 if_python.c:2638 if_tcl.c:684 if_tcl.c:729 if_tcl.c:803
+#: if_tcl.c:873 if_tcl.c:1999
 msgid "cannot save undo information"
 msgstr "�⊥�訫�脣�睃儔��蠘����"
 
-#: if_python.c:2195 if_python.c:2285 if_python.c:2357
+#: if_python.c:2309 if_python.c:2403 if_python.c:2475
 msgid "cannot delete line"
-msgstr "銝滩�賢⏛�膄甇方��"
+msgstr "銝滩�賢⏛�膄甇方�� "
 
-#: if_python.c:2230 if_python.c:2373 if_tcl.c:690 if_tcl.c:2020
+#: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
 msgid "cannot replace line"
-msgstr "銝滩�賣𤜯隞�迨銵�"
+msgstr "銝滩�賣𤜯隞�迨銵� "
 
-#: if_python.c:2389 if_python.c:2468 if_python.c:2526
+#: if_python.c:2509 if_python.c:2588 if_python.c:2646
 msgid "cannot insert line"
-msgstr "銝滩�賣𤜯隞��鍦�交迨銵�"
+msgstr "銝滩�賣𤜯隞��鍦�交迨銵� "
 
-#: if_python.c:2630
+#: if_python.c:2750
 msgid "string cannot contain newlines"
-msgstr "摮𦯀葡�⊥�訫��鉄�鰵銵�"
+msgstr "摮𦯀葡�⊥�訫��鉄�鰵銵� "
 
-#: if_ruby.c:396
+#: if_ruby.c:422
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr "E266: 甇文𦶢隞斤�⊥�蓥蝙�鍂嚗𣬚�⊥�閗�匧�� Ruby 蝔见�誩澈(Library)"
 
-#: if_ruby.c:459
+#: if_ruby.c:485
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: �𧊋�䰻�� longjmp status %d"
@@ -2655,7 +2824,7 @@ msgstr "銝齿迤蝣箇��賊�"
 #. ???
 #: if_tcl.c:774
 msgid "cannot set line(s)"
-msgstr "銝滩�質身摰朞��"
+msgstr "銝滩�質身摰朞�� "
 
 #: if_tcl.c:845
 msgid "mark not set"
@@ -2668,7 +2837,7 @@ msgstr "��� %d 銵� %d"
 
 #: if_tcl.c:881
 msgid "cannot insert/append line"
-msgstr "銝滩�賣�鍦�交�㚚���䭾迨銵�"
+msgstr "銝滩�賣�鍦�交�㚚���䭾迨銵� "
 
 #: if_tcl.c:1268
 msgid "unknown flag: "
@@ -2709,32 +2878,31 @@ msgstr "�⊥�閗酉�� callback �𦶢隞�: �𪄳銝滚�蝺抵�嘥�/閬𣇉��"
 #: if_tcl.c:1724
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
-msgstr ""
-"E571: 甇文𦶢隞斤�⊥�蓥蝙�鍂, ��删�箇�⊥�閗�匧�� Tcl 蝔见�誩澈(Library)"
+msgstr "E571: 甇文𦶢隞斤�⊥�蓥蝙�鍂, ��删�箇�⊥�閗�匧�� Tcl 蝔见�誩澈(Library)"
 
 #: if_tcl.c:1886
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
 msgstr "E281: TCL �𥲤隤�: 蝯鞉�毺Ⅳ銝齿糓�㟲�彍!? 隢见𥼚��羓策 to vim-dev@vim.org"
 
-#: if_tcl.c:2006
+#: if_tcl.c:2007
 msgid "cannot get line"
-msgstr "銝滩�賢�硋�埈迨銵�"
+msgstr "銝滩�賢�硋�埈迨銵� "
 
-#: if_xcmdsrv.c:215
+#: if_xcmdsrv.c:225
 msgid "Unable to register a command server name"
 msgstr "�⊥�閗酉�𠰴𦶢隞支撩��滚膥��滨迂"
 
-#: if_xcmdsrv.c:465
+#: if_xcmdsrv.c:473
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: �⊥�閖���枂�𦶢隞文��𤌍���𧑐蝔见��"
 
-#: if_xcmdsrv.c:735
+#: if_xcmdsrv.c:747
 #, c-format
 msgid "E573: Invalid server id used: %s"
 msgstr "E573: 銝齿迤蝣箇�隡箸�滚膥 id : %s"
 
-#: if_xcmdsrv.c:1098
+#: if_xcmdsrv.c:1110
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM �� registry 閮剖�𡁻���㕑炊��撌脣⏛�膄��"
 
@@ -2755,8 +2923,8 @@ msgid "Garbage after option"
 msgstr "�⊥�閗儘隤齿迨�賊�敺𣬚��𦶢隞�: "
 
 #: main.c:68
-msgid "Too many \"+command\" or \"-c command\" arguments"
-msgstr "憭芸�� \"+command\" ��� \"-c command\" ���彍"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "憭芸�� \"+command\" �� \"-c command\" ��� \"--cmd command\" ���彍"
 
 #: main.c:70
 msgid "Invalid argument for"
@@ -2766,49 +2934,42 @@ msgstr "銝齿迤蝣箇����彍: "
 msgid "This Vim was not compiled with the diff feature."
 msgstr "�函� Vim 蝺刻陌��瘝埝�匧�惩�� diff ���賢��"
 
-#: main.c:917
+#: main.c:935
 msgid "Attempt to open script file again: \""
 msgstr "閰血�硋�齿活��见�� script 瑼�: \""
 
-#: main.c:921 main.c:928 main.c:972 memline.c:3682 memline.c:3686
-#: version.c:857 version.c:862 version.c:867 version.c:872 version.c:877
-#: version.c:882 version.c:888 version.c:892 version.c:896 version.c:901
-#: version.c:908 version.c:916 version.c:922
-msgid "\"\n"
-msgstr "\"\n"
-
-#: main.c:926
+#: main.c:944
 msgid "Cannot open for reading: \""
 msgstr "�⊥�閖�见�煺誑霈����: \""
 
-#: main.c:970
+#: main.c:988
 msgid "Cannot open for script output: \""
 msgstr "�⊥�閖�见�毺�� script 頛詨枂: \""
 
-#: main.c:1104
+#: main.c:1135
 #, c-format
 msgid "%d files to edit\n"
 msgstr "����� %d �𧢲�娍���匧�蝺刻摩\n"
 
-#: main.c:1178
+#: main.c:1236
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: 瘜冽��: 頛詨枂銝齿糓蝯�蝡舀��(�攟撟�)\n"
 
-#: main.c:1180
+#: main.c:1238
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: 瘜冽��: 頛詨�乩�齿糓蝯�蝡舀��(�枤�𥿢)\n"
 
 #. just in case..
-#: main.c:1257
+#: main.c:1306
 msgid "pre-vimrc command line"
 msgstr "vimrc ��滚𦶢隞文��"
 
-#: main.c:1292
+#: main.c:1347
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: �⊥�閗���𡝗�娍�� \"%s\""
 
-#: main.c:2313
+#: main.c:2420
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -2816,23 +2977,23 @@ msgstr ""
 "\n"
 "�䰻閰X凒憭朞���𡃏�见嘑銵�: \"vim -h\"\n"
 
-#: main.c:2346
+#: main.c:2453
 msgid "[file ..]       edit specified file(s)"
 msgstr "[瑼娍�� ..]       蝺刻摩����𡁶�瑼娍��"
 
-#: main.c:2347
+#: main.c:2454
 msgid "-               read text from stdin"
 msgstr "-               敺墧�蹱�𤥁撓��(stdin)霈���𡝗�娍��"
 
-#: main.c:2348
+#: main.c:2455
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t tag          蝺刻摩��雿輻鍂����𡁶� tag"
 
-#: main.c:2350
+#: main.c:2457
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  蝺刻摩��頛匧�亦洵銝��钅𥲤隤�"
 
-#: main.c:2359
+#: main.c:2466
 msgid ""
 "\n"
 "\n"
@@ -2842,11 +3003,11 @@ msgstr ""
 "\n"
 " �鍂瘜�:"
 
-#: main.c:2362
+#: main.c:2469
 msgid " vim [arguments] "
 msgstr "vim [���彍] "
 
-#: main.c:2366
+#: main.c:2473
 msgid ""
 "\n"
 "   or:"
@@ -2854,7 +3015,7 @@ msgstr ""
 "\n"
 "   ���:"
 
-#: main.c:2369
+#: main.c:2476
 msgid ""
 "\n"
 "\n"
@@ -2864,238 +3025,241 @@ msgstr ""
 "\n"
 "���彍:\n"
 
-#: main.c:2370
+#: main.c:2477
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\t�蘨��匧銁�嗘�见�𣬚�瑼娍��"
 
-#: main.c:2372
+#: main.c:2479
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\t銝滚�閖�贝𨯬�鍂摮堒��"
 
-#: main.c:2375
+#: main.c:2482
 msgid "-register\t\tRegister this gvim for OLE"
 msgstr "-register\t\t閮餃�� gvim �� OLE"
 
-#: main.c:2376
+#: main.c:2483
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\t��𡝗�� OLE 銝剔� gvim 閮餃��"
 
-#: main.c:2379
+#: main.c:2486
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\t雿輻鍂��硋耦��屸𢒰 (��� \"gvim\")"
 
-#: main.c:2380
+#: main.c:2487
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f  ���  --nofork\t��齿艶: 韏瑕�见�硋耦��屸𢒰��銝� fork"
 
-#: main.c:2382
+#: main.c:2489
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi 璅∪�� (��� \"vi\")"
 
-#: main.c:2383
+#: main.c:2490
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx 璅∪�� (��� \"ex\")"
 
-#: main.c:2384
+#: main.c:2491
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\t摰厰�� (batch) 璅∪�� (�蘨�質�� \"ex\" 銝�韏瑚蝙�鍂)"
 
-#: main.c:2386
+#: main.c:2493
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\tDiff 璅∪�� (��� \"vimdiff\", �虾餈����磰��拇�娍���滚�諹��)"
 
-#: main.c:2388
+#: main.c:2495
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\t蝪⊥�𤘪芋撘� (��� \"evim\", modeless)"
 
-#: main.c:2389
+#: main.c:2496
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t�𣈲霈�璅∪�� (��� \"view\")"
 
-#: main.c:2390
+#: main.c:2497
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t��𣂼�璅∪�� (��� \"rvim\")"
 
-#: main.c:2391
+#: main.c:2498
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t銝滚虾靽格㺿 (撖怠�交�娍��)"
 
-#: main.c:2392
+#: main.c:2499
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t銝滚虾靽格㺿�����"
 
-#: main.c:2393
+#: main.c:2500
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\t鈭屸�脖�齿芋撘�"
 
-#: main.c:2395
+#: main.c:2502
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp 璅∪��"
 
-#: main.c:2397
+#: main.c:2504
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\t'compatible' �喟絞 Vi �㮾摰寞芋撘�"
 
-#: main.c:2398
+#: main.c:2505
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\t'nocompatible' 銝滚���刻���喟絞 Vi �㮾摰對��虾雿輻鍂 Vim ��惩撥�賢��"
 
-#: main.c:2399
+#: main.c:2506
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose 蝑厩��"
 
-#: main.c:2400
+#: main.c:2507
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t�膄�𥲤璅∪��"
 
-#: main.c:2401
+#: main.c:2508
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t銝滢蝙�鍂�麱摮䀹��, �蘨雿輻鍂閮䀹�園��"
 
-#: main.c:2402
+#: main.c:2509
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\t��堒枂�麱摮䀹�𥪜�屸𣪧���"
 
-#: main.c:2403
+#: main.c:2510
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (��䭾�𥪜��)       \t靽桀儔銝𦠜活��齿���鞈���(Recover crashed session)"
 
-#: main.c:2404
+#: main.c:2511
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t��� -r"
 
-#: main.c:2406
+#: main.c:2513
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\t銝滢蝙�鍂 newcli 靘���见�蠘�𣇉��"
 
-#: main.c:2407
+#: main.c:2514
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\t雿輻鍂 <device> �朞撓�枂��"
 
-#: main.c:2410
+#: main.c:2517
+msgid "-A\t\t\tstart in Arabic mode"
+msgstr "-A\t\t\t��笔�閧�� Arabic 璅∪��"
+
+#: main.c:2520
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t��笔�閧�� Hebrew 璅∪��"
 
-#: main.c:2413
+#: main.c:2523
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t��笔�閧�� Farsi 璅∪��"
 
-#: main.c:2415
+#: main.c:2525
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t閮剖�𡁶�蝡舀�毺�� <terminal>"
 
-#: main.c:2416
+#: main.c:2526
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t雿輻鍂 <vimrc> ��碶誨隞颱�� .vimrc"
 
-#: main.c:2418
+#: main.c:2528
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
 msgstr "-U <gvimrc>\t\t雿輻鍂 <gvimrc> ��碶誨隞颱�� .gvimrc"
 
-#: main.c:2420
+#: main.c:2530
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\t銝滩�匧�乩遙雿� plugin"
 
-#: main.c:2421
+#: main.c:2531
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\t��见�� N �贝�𣇉�� (��鞱身�糓瘥誩�𧢲�娍�����)"
 
-#: main.c:2422
+#: main.c:2532
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t��� -o 雿�雿輻鍂���凒���𠧧"
 
-#: main.c:2423
+#: main.c:2533
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\t��笔�訫�諹歲��瑼娍���𣂼偏"
 
-#: main.c:2424
+#: main.c:2534
 msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\t��笔�訫�諹歲��蝚� <lnum> 銵�"
+msgstr "+<lnum>\t\t��笔�訫�諹歲��蝚� <lnum> 銵� "
 
-#: main.c:2426
+#: main.c:2536
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\t頛匧�乩遙雿� vimrc ��滚嘑銵� <command>"
 
-#: main.c:2428
+#: main.c:2538
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t頛匧�亦洵銝��𧢲�娍����嘑銵� <command>"
 
-#: main.c:2429
+#: main.c:2539
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t頛匧�亦洵銝��𧢲�娍���諹�匧�� Session 瑼� <session>"
 
-#: main.c:2430
+#: main.c:2540
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\t敺� <scriptin> 霈��乩���璅∪�誩𦶢隞�"
 
-#: main.c:2431
+#: main.c:2541
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t撠齿�娍�� <scriptout> �����(append)����㕑撓�亦��𦶢隞�"
 
-#: main.c:2432
+#: main.c:2542
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t撠齿�娍�� <scriptout> 撖怠�交���㕑撓�亦��𦶢隞�"
 
-#: main.c:2434
+#: main.c:2544
 msgid "-x\t\t\tEdit encrypted files"
 msgstr "-x\t\t\t蝺刻摩蝺函Ⅳ�𡒊�瑼娍��"
 
-#: main.c:2438
+#: main.c:2548
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\t撠� vim ������𡁶� X-server ����"
 
-#: main.c:2440
+#: main.c:2550
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\t銝滩����𡁜� X Server"
 
-#: main.c:2443
+#: main.c:2553
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <files>\t蝺刻摩 Vim 隡箸�滚膥銝羓� <files> 敺屸𣪧���"
 
-#: main.c:2444
+#: main.c:2554
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-silent <files>  �㮾��䕘�䔶�瘝埝�劐撩��滚膥��銝滩郎���"
 
-#: main.c:2445
+#: main.c:2555
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr "--remote-wait <files>  ��� --remote, 雿���蝑匧�蹱�娍���峕�鞟楊頛�"
 
-#: main.c:2446
+#: main.c:2556
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
-msgstr ""
-"--remote-wait-silent <files>  �㮾��䕘�䔶�瘝雴撩��滚膥��銝滩郎���"
+msgstr "--remote-wait-silent <files>  �㮾��䕘�䔶�瘝雴撩��滚膥��銝滩郎���"
 
-#: main.c:2447
+#: main.c:2557
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\t���枂 <keys> �� Vim 隡箸�滚膥銝阡𣪧���"
 
-#: main.c:2448
+#: main.c:2558
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
 msgstr "--remote-expr <expr>\t�銁隡箸�滚膥銝𠰴嘑銵� <expr> 銝血㫲�枂蝯鞉��"
 
-#: main.c:2449
+#: main.c:2559
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\t��堒枂�虾�鍂�� Vim 隡箸�滚膥��滨迂銝阡𣪧���"
 
-#: main.c:2450
+#: main.c:2560
 msgid "--servername <name>\tSend to/become the Vim server <name>"
 msgstr "--servername <name>\t���秐/��鞟�� Vim 隡箸�滚膥 <name>"
 
-#: main.c:2453
+#: main.c:2563
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t雿輻鍂 <viminfo> �屸�� .viminfo"
 
-#: main.c:2455
+#: main.c:2565
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h  ���  --help\t�㫲�枂隤芣��(銋笔停�糓�𧋦閮𦠜��)敺屸𣪧���"
 
-#: main.c:2456
+#: main.c:2566
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\t�㫲�枂���𧋦鞈��𠰴�屸𣪧���"
 
-#: main.c:2460
+#: main.c:2570
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
@@ -3103,7 +3267,15 @@ msgstr ""
 "\n"
 "gvim 隤滚�㛖����彍 (Motif ���):\n"
 
-#: main.c:2463
+#: main.c:2574
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim 隤滚�㛖����彍 (neXtaw ���):\n"
+
+#: main.c:2576
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
@@ -3111,71 +3283,71 @@ msgstr ""
 "\n"
 "gvim 隤滚�㛖����彍 (Athena ���):\n"
 
-#: main.c:2466
+#: main.c:2580
 msgid "-display <display>\tRun vim on <display>"
 msgstr "-display <display>\t�銁閬𣇉�� <display> �嘑銵� vim"
 
-#: main.c:2467
+#: main.c:2581
 msgid "-iconic\t\tStart vim iconified"
 msgstr "-iconic\t\t��笔�訫���𣇉內���(iconified)"
 
-#: main.c:2469
+#: main.c:2583
 msgid "-name <name>\t\tUse resource as if vim was <name>"
 msgstr "-name <name>\t\t霈���� Resource ����� vim ����滨迂閬𣇉�� <name>"
 
-#: main.c:2470
+#: main.c:2584
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (撠𡁏𧊋撖虫��)\n"
 
-#: main.c:2472
+#: main.c:2586
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
 msgstr "-background <color>\t閮剖�� <color> �箄�峕艶�𠧧 (銋笔虾�鍂 -bg)"
 
-#: main.c:2473
+#: main.c:2587
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
 msgstr "-foreground <color>\t閮剖�� <color> �箔�������烾�讛𠧧 (銋笔虾�鍂 -fg)"
 
-#: main.c:2474 main.c:2494
+#: main.c:2588 main.c:2608
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
 msgstr "-font <font>\t雿輻鍂 <font> �箔���摮堒�� (銋笔虾�鍂 -fn)"
 
-#: main.c:2475
+#: main.c:2589
 msgid "-boldfont <font>\tUse <font> for bold text"
 msgstr "-boldfont <font>\t雿輻鍂 <font> �箇�烾�𥪜�堒��"
 
-#: main.c:2476
+#: main.c:2590
 msgid "-italicfont <font>\tUse <font> for italic text"
 msgstr "-italicfont <font>\t雿輻鍂 <font> �箸�𣈯�𥪜�堒��"
 
-#: main.c:2477 main.c:2495
+#: main.c:2591 main.c:2609
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
 msgstr "-geometry <geom>\t雿輻鍂<geom>�箄絲憪衤�滨蔭 (銋笔虾�鍂 -geom)"
 
-#: main.c:2478
+#: main.c:2592
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
 msgstr "-borderwidth <width>\t雿輻鍂撖砍漲�� <width> ���𦠜� (銋笔虾�鍂 -bw)"
 
-#: main.c:2479
+#: main.c:2593
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr "-scrollbarwidth <width>  閮剖�𡁏㬢��閗遘撖砍漲�� <width> (銋笔虾�鍂 -sw)"
 
-#: main.c:2481
+#: main.c:2595
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
 msgstr "-menuheight <height>\t閮剖�𡁻�詨鱓��㛖�擃睃漲�� <height> (銋笔虾�鍂 -mh)"
 
-#: main.c:2483 main.c:2496
+#: main.c:2597 main.c:2610
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\t雿輻鍂��滨㮾憿舐內 (銋笔虾�鍂 -rv)"
 
-#: main.c:2484
+#: main.c:2598
 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
 msgstr "+reverse\t\t銝滢蝙�鍂��滨㮾憿舐內 (銋笔虾�鍂 +rv)"
 
-#: main.c:2485
+#: main.c:2599
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <resource>\t閮剖�𡁏���𡁶� resource"
 
-#: main.c:2488
+#: main.c:2602
 msgid ""
 "\n"
 "Arguments recognised by gvim (RISC OS version):\n"
@@ -3183,15 +3355,15 @@ msgstr ""
 "\n"
 "gvim 隤滚�㛖����彍 (RISC OS ���):\n"
 
-#: main.c:2489
+#: main.c:2603
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\t閬𣇉�堒�嘥�见�硋祝摨�"
 
-#: main.c:2490
+#: main.c:2604
 msgid "--rows <number>\tInitial height of window in rows"
 msgstr "--rows <number>\t閬𣇉�堒�嘥�见�㚚�睃漲"
 
-#: main.c:2493
+#: main.c:2607
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3199,60 +3371,60 @@ msgstr ""
 "\n"
 "gvim 隤滚�㛖����彍 (GTK+ ���):\n"
 
-#: main.c:2497
+#: main.c:2611
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\t�銁 <display> �嘑銵� vim (銋笔虾�鍂 --display)"
 
-#: main.c:2499
+#: main.c:2613
 msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\t閮剖�𡁶崕�鸌��閫坿𠧧(role)隞亙���銝餉�𣇉��"
 
-#: main.c:2501
+#: main.c:2615
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t�銁�𡖂銝��� GTK widget �折�见�� Vim"
 
-#: main.c:2503
-msgid "--help\t\tShow Gnome arguments"
-msgstr "--help\t\t憿舐內 Gnome �㮾��𨅯��彍"
+#: main.c:2618
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <parent title>\t�銁��蝔见�譍葉��见�� Vim"
 
-#: main.c:2735
+#: main.c:2856
 msgid "No display"
 msgstr "�⊿*蝷�"
 
 #. Failed to send, abort.
-#: main.c:2750
+#: main.c:2871
 msgid ": Send failed.\n"
 msgstr ": �喲��憭望�𨰜��\n"
 
 #. Let vim start normally.
-#: main.c:2756
+#: main.c:2877
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": ���枂憭望�𨰜��閰血�硋銁�𧋦�𧑐�嘑銵𨜏n"
 
-#: main.c:2794 main.c:2815
+#: main.c:2915 main.c:2936
 #, c-format
 msgid "%d of %d edited"
 msgstr "撌脩楊頛� %d/%d �𧢲�娍��"
 
-#: main.c:2837
+#: main.c:2958
 msgid "No display: Send expression failed.\n"
 msgstr "�� Display: �⊥�訫�喲���讠�堒�譌��\n"
 
-#: main.c:2849
+#: main.c:2970
 msgid ": Send expression failed.\n"
 msgstr ": �⊥�訫�喲���讠�堒�譌��\n"
 
-#: mark.c:656
+#: mark.c:709
 msgid "No marks set"
 msgstr "瘝埝�㕑身摰𡁏�躰�� (mark)"
 
-#: mark.c:658
+#: mark.c:711
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: �𪄳銝滚�蝚血�� \"%s\" ��璅躰��(mark)"
 
 #. Highlight title
-#: mark.c:669
+#: mark.c:722
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3261,7 +3433,7 @@ msgstr ""
 "璅躰�� 銵諹��  甈�  瑼娍��/�����"
 
 #. Highlight title
-#: mark.c:707
+#: mark.c:760
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3269,7 +3441,17 @@ msgstr ""
 "\n"
 " jump 銵諹��  甈�  瑼娍��/�����"
 
-#: mark.c:1072
+#. Highlight title
+#: mark.c:805
+msgid ""
+"\n"
+"change line  col text"
+msgstr ""
+"\n"
+"�㺿霈�   銵諹��  甈�  �����"
+
+#: mark.c:1281
+#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3278,7 +3460,8 @@ msgstr ""
 "# 瑼娍���躰��:\n"
 
 #. Write the jumplist with -'
-#: mark.c:1107
+#: mark.c:1316
+#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3286,7 +3469,8 @@ msgstr ""
 "\n"
 "# Jumplist (�眏�鰵�����):\n"
 
-#: mark.c:1202
+#: mark.c:1412
+#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3294,47 +3478,47 @@ msgstr ""
 "\n"
 "# 瑼娍���� Mark 閮㗛� (�眏�鰵�����):\n"
 
-#: mark.c:1285
+#: mark.c:1501
 msgid "Missing '>'"
 msgstr "蝻箏�穃�齿�厩� '>'"
 
-#: mbyte.c:403
+#: mbyte.c:467
 msgid "E543: Not a valid codepage"
 msgstr "E543: 銝齿迤蝣箇� codepage"
 
-#: mbyte.c:3879
+#: mbyte.c:4431
 msgid "E284: Cannot set IC values"
 msgstr "E284: 銝滩�質身摰� IC �彍��"
 
-#: mbyte.c:4031
+#: mbyte.c:4583
 msgid "E285: Failed to create input context"
 msgstr "E285: �⊥�訫遣蝡� input context"
 
-#: mbyte.c:4178
+#: mbyte.c:4741
 msgid "E286: Failed to open input method"
 msgstr "E286: �⊥�閖�见�蠘撓�交��"
 
-#: mbyte.c:4189
+#: mbyte.c:4752
 msgid "E287: Warning: Could not set destroy callback to IM"
 msgstr "E287: 霅血��: �⊥�閧宏�膄 IM �� callback"
 
-#: mbyte.c:4195
+#: mbyte.c:4758
 msgid "E288: input method doesn't support any style"
 msgstr "E288: 頛詨�交�蓥�齿𣈲�螱隞颱�� style"
 
-#: mbyte.c:4252
+#: mbyte.c:4815
 msgid "E289: input method doesn't support my preedit type"
 msgstr "E289: 頛詨�交�蓥�齿𣈲�螱隞颱�� style"
 
-#: mbyte.c:4326
+#: mbyte.c:4889
 msgid "E290: over-the-spot style requires fontset"
 msgstr "E290: over-the-spot ��閬�摮堒�钅�(Fontset)"
 
-#: mbyte.c:4358
+#: mbyte.c:4925
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
 msgstr "E291: 雿删� GTK+ 瘥� 1.2.3 ����𨳍���⊥�蓥蝙�鍂���见���"
 
-#: mbyte.c:4637
+#: mbyte.c:5232
 msgid "E292: Input Method Server is not running"
 msgstr "E292: 瘝埝�匧嘑銵䔶葉��頛詨�交�閧恣��蝔见��(Input Method Server)"
 
@@ -3342,23 +3526,23 @@ msgstr "E292: 瘝埝�匧嘑銵䔶葉��頛詨�交�閧恣��蝔见��(Input Method Server)"
 msgid "E293: block was not locked"
 msgstr "E293: ��憛𦠜𧊋鋡恍�硋��"
 
-#: memfile.c:989
+#: memfile.c:1010
 msgid "E294: Seek error in swap file read"
 msgstr "E294: �麱摮䀹�磰���㚚𥲤隤�"
 
-#: memfile.c:994
+#: memfile.c:1015
 msgid "E295: Read error in swap file"
 msgstr "E295: �麱摮䀹�磰���㚚𥲤隤�"
 
-#: memfile.c:1046
+#: memfile.c:1067
 msgid "E296: Seek error in swap file write"
 msgstr "E296: �麱摮䀹�𥪜神�仿𥲤隤�"
 
-#: memfile.c:1064
+#: memfile.c:1085
 msgid "E297: Write error in swap file"
 msgstr "E297: �麱摮䀹�𥪜神�仿𥲤隤�"
 
-#: memfile.c:1261
+#: memfile.c:1282
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: �麱摮䀹�𥪜歇蝬枏�睃銁! (撠誩�蝚西�罸���鞟�摰匧�冽�𤩺��!?)"
 
@@ -3375,42 +3559,42 @@ msgid "E298: Didn't get block nr 2?"
 msgstr "E298: �𪄳銝滚���憛� 2?"
 
 #. could not (re)open the swap file, what can we do????
-#: memline.c:443
+#: memline.c:444
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: �堺�堺, �麱摮䀹�𥪯�滩�衤�!!!"
 
-#: memline.c:448
+#: memline.c:449
 msgid "E302: Could not rename swap file"
 msgstr "E302: �⊥�閙㺿霈𦠜麱摮䀹�𠉛���滨迂"
 
-#: memline.c:518
+#: memline.c:519
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: �⊥�閖�见��麱摮䀹�� \"%s\", 銝滚虾�賭耨敺拐�"
 
-#: memline.c:617
+#: memline.c:618
 msgid "E304: ml_timestamp: Didn't get block 0??"
 msgstr "E304: ml_timestamp: �𪄳銝滚���憛� 0??"
 
-#: memline.c:757
+#: memline.c:758
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: �𪄳銝滚� %s ���麱摮䀹��"
 
-#: memline.c:767
+#: memline.c:768
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "隢钅�豢���㰘�雿輻鍂���麱摮䀹�� (���0 �𣪧���): "
 
-#: memline.c:812
+#: memline.c:813
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: �⊥�閖�见�� %s"
 
-#: memline.c:834
+#: memline.c:835
 msgid "Unable to read block 0 from "
 msgstr "�⊥�閗���硋�憛� 0:"
 
-#: memline.c:837
+#: memline.c:838
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3418,28 +3602,28 @@ msgstr ""
 "\n"
 "�虾�賣糓雿䭾�鍦�𡁻�𦒘遙雿蓥耨�㺿��𡝗糓 Vim ��靘�銝滚�𦠜凒�鰵�麱摮䀹��."
 
-#: memline.c:847 memline.c:864
+#: memline.c:848 memline.c:865
 msgid " cannot be used with this version of Vim.\n"
 msgstr " �⊥�訫銁�𧋦���𧋦�� Vim 銝凋蝙�鍂.\n"
 
-#: memline.c:849
+#: memline.c:850
 msgid "Use Vim version 3.0.\n"
 msgstr "雿輻鍂 Vim 3.0��\n"
 
-#: memline.c:855
+#: memline.c:856
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ��贝絲靘�銝滚�𤩺糓 Vim �麱摮䀹��"
 
-#: memline.c:868
+#: memline.c:869
 msgid " cannot be used on this computer.\n"
 msgstr " �⊥�訫銁�躰枂�𤓖�虫�𠹺蝙�鍂.\n"
 
-#: memline.c:870
+#: memline.c:871
 msgid "The file was created on "
 msgstr "�𧋦瑼娍��遣蝡𧢲䲰 "
 
-#: memline.c:874
+#: memline.c:875
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3447,77 +3631,81 @@ msgstr ""
 ",\n"
 "��𡝗糓�蹱�娍��歇蝬𤘪�齿���"
 
-#: memline.c:903
+#: memline.c:904
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "雿輻鍂�麱摮䀹�� \"%s\""
 
-#: memline.c:909
+#: memline.c:910
 #, c-format
 msgid "Original file \"%s\""
 msgstr "��笔�𧢲�� \"%s\""
 
-#: memline.c:922
+#: memline.c:923
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: 霅血��: ��笔�𧢲�娍��虾�賢歇蝬㮖耨�㺿�𦒘�"
 
-#: memline.c:963
+#: memline.c:976
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: �⊥�訫�� %s 霈���硋�憛� 1"
 
-#: memline.c:967
+#: memline.c:980
 msgid "???MANY LINES MISSING"
-msgstr "???蝻箏�穃云憭朞��"
+msgstr "???蝻箏�穃云憭朞�� "
 
-#: memline.c:983
+#: memline.c:996
 msgid "???LINE COUNT WRONG"
 msgstr "???銵諹�罸𥲤隤�"
 
-#: memline.c:990
+#: memline.c:1003
 msgid "???EMPTY BLOCK"
 msgstr "???蝛箇� BLOCK"
 
-#: memline.c:1016
+#: memline.c:1029
 msgid "???LINES MISSING"
-msgstr "???�𪄳銝滚�銝�鈭𥡝��"
+msgstr "???�𪄳銝滚�銝�鈭𥡝�� "
 
-#: memline.c:1048
+#: memline.c:1061
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ��憛� 1 ID �𥲤隤� (%s 銝齿糓�麱摮䀹��?)"
 
-#: memline.c:1053
+#: memline.c:1066
 msgid "???BLOCK MISSING"
 msgstr "???�𪄳銝滚�BLOCK"
 
-#: memline.c:1069
+#: memline.c:1082
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? 敺鮋�躰ㄐ�� ???END ���批捆�虾�賣�匧�誯��"
 
-#: memline.c:1085
+#: memline.c:1098
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? 敺鮋�躰ㄐ�� ???END ���批捆�虾�質◤�⏛�膄/��鍦�仿��"
 
 # do not translate
-#: memline.c:1105
+#: memline.c:1118
 msgid "???END"
 msgstr "???END"
 
-#: memline.c:1131
+#: memline.c:1144
 msgid "E311: Recovery Interrupted"
 msgstr "E311: 靽桀儔撌脖葉�𪃾"
 
-#: memline.c:1133
+#: memline.c:1149
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: 靽桀儔���䔄��罸𥲤隤�; 隢𧢲釣�誯�钅��� ??? ��銵�"
+msgstr "E312: 靽桀儔���䔄��罸𥲤隤�; 隢𧢲釣�誯�钅��� ??? ��銵� "
+
+#: memline.c:1151
+msgid "See \":help E312\" for more information."
+msgstr "閰喟敦隤芣�舘�贝�� \":help E312\""
 
-#: memline.c:1136
+#: memline.c:1156
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "敺拙�笔�峕��. 隢讠Ⅱ摰帋����迤撣�."
 
-#: memline.c:1137
+#: memline.c:1157
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3525,11 +3713,11 @@ msgstr ""
 "\n"
 "(雿惩虾�賣��唾���𢠃�坔�𧢲�娍��𡖂摮睃ê̌��瑼𥪜�㵪�𨜏n"
 
-#: memline.c:1138
+#: memline.c:1158
 msgid "and run diff with the original file to check for changes)\n"
 msgstr "�滚嘑銵� diff ������娍���磰�隞交炎�䰻�糓�炏��㗇㺿霈�)\n"
 
-#: memline.c:1139
+#: memline.c:1159
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
@@ -3538,51 +3726,51 @@ msgstr ""
 "\n"
 
 #. use msg() to start the scrolling properly
-#: memline.c:1195
+#: memline.c:1215
 msgid "Swap files found:"
 msgstr "�𪄳��隞乩�讠��麱摮䀹��:"
 
-#: memline.c:1373
+#: memline.c:1393
 msgid "   In current directory:\n"
 msgstr "   �銁�𤌍��滨��𤌍��:\n"
 
-#: memline.c:1375
+#: memline.c:1395
 msgid "   Using specified name:\n"
 msgstr "   Using specified name:\n"
 
-#: memline.c:1379
+#: memline.c:1399
 msgid "   In directory "
 msgstr "   �銁�𤌍�� "
 
-#: memline.c:1397
+#: memline.c:1417
 msgid "      -- none --\n"
 msgstr "      -- �� --\n"
 
-#: memline.c:1469
+#: memline.c:1489
 msgid "          owned by: "
 msgstr "            ����㕑��: "
 
-#: memline.c:1471
+#: memline.c:1491
 msgid "   dated: "
 msgstr "    �𠯫���: "
 
-#: memline.c:1475 memline.c:3689
+#: memline.c:1495 memline.c:3685
 msgid "             dated: "
 msgstr "              �𠯫���: "
 
-#: memline.c:1491
+#: memline.c:1511
 msgid "         [from Vim version 3.0]"
 msgstr "              [敺� Vim ���𧋦 3.0]"
 
-#: memline.c:1495
+#: memline.c:1515
 msgid "         [does not look like a Vim swap file]"
 msgstr "                          [銝滚�� Vim ���麱摮䀹�瑺"
 
-#: memline.c:1499
+#: memline.c:1519
 msgid "         file name: "
 msgstr "              瑼𥪜��: "
 
-#: memline.c:1505
+#: memline.c:1525
 msgid ""
 "\n"
 "          modified: "
@@ -3590,15 +3778,15 @@ msgstr ""
 "\n"
 "            靽格㺿��: "
 
-#: memline.c:1506
+#: memline.c:1526
 msgid "YES"
 msgstr "�糓"
 
-#: memline.c:1506
+#: memline.c:1526
 msgid "no"
 msgstr "�炏"
 
-#: memline.c:1510
+#: memline.c:1530
 msgid ""
 "\n"
 "         user name: "
@@ -3606,11 +3794,11 @@ msgstr ""
 "\n"
 "            雿輻鍂��: "
 
-#: memline.c:1517
+#: memline.c:1537
 msgid "   host name: "
 msgstr "    銝餅�笔�滨迂: "
 
-#: memline.c:1519
+#: memline.c:1539
 msgid ""
 "\n"
 "         host name: "
@@ -3618,7 +3806,7 @@ msgstr ""
 "\n"
 "          銝餅�笔�滨迂: "
 
-#: memline.c:1525
+#: memline.c:1545
 msgid ""
 "\n"
 "        process ID: "
@@ -3626,11 +3814,11 @@ msgstr ""
 "\n"
 "        process ID: "
 
-#: memline.c:1531
+#: memline.c:1551
 msgid " (still running)"
 msgstr " (�嘑銵䔶葉)"
 
-#: memline.c:1543
+#: memline.c:1563
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
@@ -3638,7 +3826,7 @@ msgstr ""
 "\n"
 "         [�⊥�訫銁�𧋦���𧋦�� Vim 銝𠹺蝙�鍂]"
 
-#: memline.c:1546
+#: memline.c:1566
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3646,92 +3834,92 @@ msgstr ""
 "\n"
 "         [�⊥�訫銁�𧋦�𤓖�虫�𠹺蝙�鍂]"
 
-#: memline.c:1551
+#: memline.c:1571
 msgid "         [cannot be read]"
 msgstr "         [�⊥�閗���𨭐"
 
-#: memline.c:1555
+#: memline.c:1575
 msgid "         [cannot be opened]"
 msgstr "         [�⊥�閖�见�篏"
 
-#: memline.c:1745
+#: memline.c:1765
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: �⊥�蓥�萘��, 銝滢蝙�鍂�麱摮䀹��"
 
-#: memline.c:1798
+#: memline.c:1818
 msgid "File preserved"
 msgstr "瑼娍��歇靽萘��"
 
-#: memline.c:1800
+#: memline.c:1820
 msgid "E314: Preserve failed"
 msgstr "E314: 靽萘�坔仃���"
 
-#: memline.c:1871
+#: memline.c:1891
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: �𥲤隤斤� lnum: %ld"
 
-#: memline.c:1897
+#: memline.c:1917
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
-msgstr "E316: ml_get: �𪄳銝滚�蝚� %ld 銵�"
+msgstr "E316: ml_get: �𪄳銝滚�蝚� %ld 銵� "
 
-#: memline.c:2287
+#: memline.c:2307
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ����坔�憛� id �𥲤隤� 3"
 
-#: memline.c:2367
+#: memline.c:2387
 msgid "stack_idx should be 0"
 msgstr "stack_idx ��㕑府�糓 0"
 
-#: memline.c:2429
+#: memline.c:2449
 msgid "E318: Updated too many blocks?"
 msgstr "E318: �凒�鰵憭芸�𡁜�憛�?"
 
-#: memline.c:2611
+#: memline.c:2631
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: ����坔�憛� id �𥲤隤� 4"
 
-#: memline.c:2638
+#: memline.c:2658
 msgid "deleted block 1?"
 msgstr "�⏛�膄��憛� 1?"
 
-#: memline.c:2838
+#: memline.c:2858
 #, c-format
 msgid "E320: Cannot find line %ld"
-msgstr "E320: �𪄳銝滚�蝚� %ld 銵�"
+msgstr "E320: �𪄳銝滚�蝚� %ld 銵� "
 
-#: memline.c:3081
+#: memline.c:3101
 msgid "E317: pointer block id wrong"
 msgstr "E317: ����坔�憛� id �𥲤隤�"
 
-#: memline.c:3097
+#: memline.c:3117
 msgid "pe_line_count is zero"
 msgstr "pe_line_count �粹妟"
 
-#: memline.c:3126
+#: memline.c:3146
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
 msgstr "E322: 銵諹�蠘��枂蝭����: %ld 頞��𡒊�𣂼偏"
 
-#: memline.c:3130
+#: memline.c:3150
 #, c-format
 msgid "E323: line count wrong in block %ld"
 msgstr "E323: ��憛� %ld 銵峕彍�𥲤隤�"
 
-#: memline.c:3179
+#: memline.c:3199
 msgid "Stack size increases"
 msgstr "����𠰴之撠誩�𧼮��"
 
-#: memline.c:3225
+#: memline.c:3245
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: ����坔�憛� id �𥲤 2"
 
-#: memline.c:3679
+#: memline.c:3675
 msgid "E325: ATTENTION"
 msgstr "E325: 瘜冽��"
 
-#: memline.c:3680
+#: memline.c:3676
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -3739,17 +3927,17 @@ msgstr ""
 "\n"
 "�𪄳���麱摮䀹�� \""
 
-#: memline.c:3684
+#: memline.c:3680
 msgid "While opening file \""
 msgstr "�銁��见���娍�� \""
 
-#: memline.c:3693
+#: memline.c:3689
 msgid "      NEWER than swap file!\n"
 msgstr "      瘥娍麱摮䀹�娍凒�鰵!\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
-#: memline.c:3697
+#: memline.c:3693
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.\n"
@@ -3760,11 +3948,11 @@ msgstr ""
 "(1) �虾�賣�匧𡖂銝��讠�见�譍�笔銁蝺刻摩��䔶��𧢲�娍��.\n"
 "    憒���𨀣糓�蹱見嚗諹�见�誩�銝滩��拚�𠹺�韏瑕神�伐�䔶�滨�嗡�删��𠜱��偦�賣�鞎㰘姜瘚�瘞氬��\n"
 
-#: memline.c:3698
+#: memline.c:3694
 msgid "    Quit, or continue with caution.\n"
 msgstr "    �𣪧��页�峕�𡝗糓蝜潛�𣬚楊頛胯��\n"
 
-#: memline.c:3699
+#: memline.c:3695
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
@@ -3772,23 +3960,23 @@ msgstr ""
 "\n"
 "(2) ��齿活蝺刻摩甇斗�娍��訜璈髿n"
 
-#: memline.c:3700
+#: memline.c:3696
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    憒���𨀣糓�蹱見, 隢讠鍂 \":recover\" ��� \"vim -r"
 
-#: memline.c:3702
+#: memline.c:3698
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
 "\"\n"
-"    靘���穃�硺耨�㺿鞈��� (�脖�甇亥牧��舘�讠�� \":help recovery\").\n"
+"    靘���穃�硺耨�㺿鞈��� (閰喟敦隤芣�舘�讠�� \":help recovery\").\n"
 
-#: memline.c:3703
+#: memline.c:3699
 msgid "    If you did this already, delete the swap file \""
 msgstr "    憒���𡏭府��𤑳��賢歇蝬𤘪�睲�, 隢讠凒�𦻖�⏛�膄甇斗麱摮䀹�� \""
 
-#: memline.c:3705
+#: memline.c:3701
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -3796,46 +3984,50 @@ msgstr ""
 "\"\n"
 "    隞仿�踹�滚�滨�见�甇方�𦠜��.\n"
 
-#: memline.c:3719 memline.c:3723
+#: memline.c:3715 memline.c:3719
 msgid "Swap file \""
 msgstr "�麱摮䀹�� \""
 
-#: memline.c:3720 memline.c:3726
+#: memline.c:3716 memline.c:3722
 msgid "\" already exists!"
 msgstr "\" 撌脩�枏�睃銁鈭�!"
 
-#: memline.c:3729
+#: memline.c:3725
 msgid "VIM - ATTENTION"
 msgstr "VIM - 瘜冽��"
 
-#: memline.c:3731
+#: memline.c:3727
 msgid "Swap file already exists!"
 msgstr "�麱摮䀹�𥪜歇蝬枏�睃銁!"
 
-#: memline.c:3735
+#: memline.c:3731
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
-"&Quit"
+"&Quit\n"
+"&Abort"
 msgstr ""
 "隞亙𣈲霈��䲮撘誯�见��(&O)\n"
 "�凒�𦻖蝺刻摩(&E)\n"
 "靽桀儔(&R)\n"
-"�𣪧���(&Q)"
+"�𣪧���(&Q)\n"
+"頝喳枂(&A)"
 
-#: memline.c:3737
+#: memline.c:3733
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
 "&Recover\n"
 "&Quit\n"
+"&Abort\n"
 "&Delete it"
 msgstr ""
 "隞亙𣈲霈��䲮撘誯�见��(&O)\n"
 "�凒�𦻖蝺刻摩(&E)\n"
 "靽桀儔(&R)\n"
 "�𣪧���(&Q)\n"
+"頝喳枂(&A)\n"
 "�⏛�膄�麱摮䀹��(&D)"
 
 #: memline.c:3790
@@ -3854,21 +4046,21 @@ msgstr "E328: �詨鱓�蘨�賢銁�嗅�璅∪�譍葉雿輻鍂"
 msgid "E329: No menu of that name"
 msgstr "E329: 瘝埝�厰��見���詨鱓"
 
-#: menu.c:509
+#: menu.c:525
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: �詨鱓頝臬�睲�滩�賣���穃�鞾�詨鱓"
 
-#: menu.c:548
+#: menu.c:564
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: 銝滩�賜凒�𦻖��𢠃�賊���惩��詨鱓��𦯀葉"
 
-#: menu.c:554
+#: menu.c:570
 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
-#: menu.c:1079
+#: menu.c:1097
 msgid ""
 "\n"
 "--- Menus ---"
@@ -3876,81 +4068,81 @@ msgstr ""
 "\n"
 "--- �詨鱓 ---"
 
-#: menu.c:1996
+#: menu.c:2019
 msgid "Tear off this menu"
 msgstr "����𧢲迨�詨鱓"
 
-#: menu.c:2061
+#: menu.c:2084
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: �詨鱓頝臬�穃�������睲��钅�賊�"
 
-#: menu.c:2081
+#: menu.c:2104
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: [�詨鱓] �𪄳銝滚� %s"
 
-#: menu.c:2150
+#: menu.c:2173
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s 璅∪�𤩺𧊋摰𡁶儔�詨鱓"
 
-#: menu.c:2188
+#: menu.c:2211
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: �詨鱓頝臬�穃�������穃�鞾�詨鱓"
 
-#: menu.c:2209
+#: menu.c:2232
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: �𪄳銝滚��詨鱓 - 隢𧢲炎�䰻�詨鱓��滨迂"
 
-#: message.c:509
+#: message.c:414
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "��閧� %s ���䔄��罸𥲤隤�:"
 
-#: message.c:525
+#: message.c:440
 #, c-format
 msgid "line %4ld:"
 msgstr "銵� %4ld:"
 
-#: message.c:565
+#: message.c:647
 msgid "[string too long]"
 msgstr "[甇方�屸�𡡞𩑈]"
 
-#: message.c:711
+#: message.c:797
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
 msgstr ""
 "甇��𥪯葉����𦠜�舐雁霅瑁��: Francis S.Lin <piaip@csie.ntu.edu."
 "tw>,                                 Cecil Sheng   <b7506022@csie.ntu.edu.tw>"
 
-#: message.c:935
+#: message.c:1025
 msgid "Interrupt: "
 msgstr "撌脖葉�𪃾: "
 
-#: message.c:938
+#: message.c:1028
 msgid "Hit ENTER to continue"
 msgstr "隢𧢲�� ENTER 蝜潛��"
 
-#: message.c:940
+#: message.c:1030
 msgid "Hit ENTER or type command to continue"
 msgstr "隢𧢲�� ENTER ��硋�嗅��𦶢隞支誑蝜潛��"
 
-#: message.c:2028
+#: message.c:2351
 msgid "-- More --"
 msgstr "-- 撠𡁏�� --"
 
-#: message.c:2031
+#: message.c:2354
 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
 msgstr " (RET/BS: ��睲��/��睲�𠹺�銵�, 蝛箇蒾�枤/b: 銝���, d/u: ��𢠃�, q: �𣪧���)"
 
-#: message.c:2032
+#: message.c:2355
 msgid " (RET: line, SPACE: page, d: half page, q: quit)"
 msgstr " (RET: ��睲�衤�銵�, 蝛箇蒾�枤: 銝���, d: ��𢠃�, q: �𣪧���)"
 
-#: message.c:2508 message.c:2523
+#: message.c:2982 message.c:2997
 msgid "Question"
 msgstr "��誯��"
 
-#: message.c:2510
+#: message.c:2984
 msgid ""
 "&Yes\n"
 "&No"
@@ -3958,7 +4150,7 @@ msgstr ""
 "&Y�糓\n"
 "&N�炏"
 
-#: message.c:2543
+#: message.c:3017
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -3972,59 +4164,60 @@ msgstr ""
 "&D�券�其�滚�娫n"
 "&C��𡝗��"
 
-#: message.c:2584
+#: message.c:3058
 msgid "Save File dialog"
 msgstr "摮䀹��"
 
-#: message.c:2586
+#: message.c:3060
 msgid "Open File dialog"
 msgstr "��𧢲��"
 
 #. TODO: non-GUI file selector here
-#: message.c:2657
+#: message.c:3131
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: 銝餅綉�蝱(Console)璅∪�𤩺�瘝埝�㗇�娍���讛汗�膥(file browser)"
 
-#: misc1.c:2477
+#: misc1.c:2773
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: 瘜冽��: 雿䭾迤�銁靽格㺿銝��见𣈲霈�瑼�"
 
-#: misc1.c:2712
+#: misc1.c:3021
 msgid "1 more line"
-msgstr "����劐�銵�"
+msgstr "����劐�銵� "
 
-#: misc1.c:2714
+#: misc1.c:3023
 msgid "1 line less"
-msgstr "撠烐䲰銝�銵�"
+msgstr "撠烐䲰銝�銵� "
 
-#: misc1.c:2719
+#: misc1.c:3028
 #, c-format
 msgid "%ld more lines"
-msgstr " ����� %ld 銵�"
+msgstr "����� %ld 銵� "
 
-#: misc1.c:2721
+#: misc1.c:3030
 #, c-format
 msgid "%ld fewer lines"
-msgstr "�蘨�� %ld 銵�"
+msgstr "�蘨�� %ld 銵� "
 
-#: misc1.c:2724
+#: misc1.c:3033
 msgid " (Interrupted)"
 msgstr " (撌脖葉�𪃾)"
 
-#: misc1.c:6348
+#: misc1.c:7588
 msgid "Vim: preserving files...\n"
 msgstr "Vim: 靽萘�蹱�娍��葉...\n"
 
 #. close all memfiles, without deleting
-#: misc1.c:6358
+#: misc1.c:7598
 msgid "Vim: Finished.\n"
 msgstr "Vim: 蝯鞉��.\n"
 
-#: misc2.c:670 misc2.c:686
+#: misc2.c:695 misc2.c:711
+#, c-format
 msgid "ERROR: "
 msgstr "�𥲤隤�: "
 
-#: misc2.c:690
+#: misc2.c:715
 #, c-format
 msgid ""
 "\n"
@@ -4033,7 +4226,7 @@ msgstr ""
 "\n"
 "[bytes] �券�� alloc-freed %lu-%lu, 雿輻鍂銝� %lu, peak 雿輻鍂 %lu\n"
 
-#: misc2.c:692
+#: misc2.c:717
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
@@ -4042,194 +4235,220 @@ msgstr ""
 "[�鐤�㙈] �券�� re/malloc(): %lu, �券�� free()': %lu\n"
 "\n"
 
-#: misc2.c:747
+#: misc2.c:772
 msgid "E340: Line is becoming too long"
 msgstr "E340: 甇方�屸�𡡞𩑈"
 
-#: misc2.c:791
+#: misc2.c:816
 #, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
 msgstr "E341: �折�券𥲤隤�: lalloc(%ld, )"
 
-#: misc2.c:899
+#: misc2.c:924
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
 msgstr "E342: 閮䀹�園�𥪯�滩雲! (��𡑒岫�滨蔭 %lu 雿滚��蝯�)"
 
-#: misc2.c:2564
+#: misc2.c:2594
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "�鐤�㙈 shell �嘑銵�: \"%s\""
 
-#: misc2.c:2785
+#: misc2.c:2816
 msgid "E545: Missing colon"
 msgstr "E545: 蝻箏�� colon"
 
-#: misc2.c:2787 misc2.c:2814
+#: misc2.c:2818 misc2.c:2845
 msgid "E546: Illegal mode"
 msgstr "E546: 銝齿迤蝣箇�璅∪��"
 
-#: misc2.c:2853
+#: misc2.c:2884
 msgid "E547: Illegal mouseshape"
 msgstr "E547: 銝齿迤蝣箇�皛煾�惩耦��"
 
-#: misc2.c:2893
+#: misc2.c:2924
 msgid "E548: digit expected"
 msgstr "E548: ��㕑府閬���㗇彍摮�"
 
-#: misc2.c:2898
+#: misc2.c:2929
 msgid "E549: Illegal percentage"
 msgstr "E549: 銝齿迤蝣箇��蓡��瘥�"
 
-#: misc2.c:3208
+#: misc2.c:3239
 msgid "Enter encryption key: "
 msgstr "頛詨�亙�蝣�: "
 
-#: misc2.c:3209
+#: misc2.c:3240
 msgid "Enter same key again: "
 msgstr "隢见�滩撓�乩�甈�: "
 
-#: misc2.c:3219
+#: misc2.c:3250
 msgid "Keys don't match!"
 msgstr "�拇活頛詨�亙�蝣潔�滨㮾���!"
 
-#: misc2.c:3768
+#: misc2.c:3799
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
 "followed by '%s'."
 msgstr "E343: 銝齿迤蝣箇�頝臬��: '**[number]' 敹���閬��銁頝臬�𤑳�𣂼偏��𤥁��𦻖��� '%s'"
 
-#: misc2.c:5044
+#: misc2.c:5078
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath 銝剜�埝�厩𤌍�� \"%s\""
 
-#: misc2.c:5047
+#: misc2.c:5081
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: �銁頝臬�睲葉�𪄳銝滚�瑼娍�� \"%s\""
 
-#: misc2.c:5053
+#: misc2.c:5087
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: �銁頝臬�睲葉�𪄳銝滚��凒憭𡁶�瑼娍�� \"%s\""
 
-#: misc2.c:5056
+#: misc2.c:5090
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: �銁頝臬�睲葉�𪄳銝滚��凒憭𡁶�瑼娍�� \"%s\""
 
-#: misc2.c:5290
+#: misc2.c:5324
 msgid "E550: Missing colon"
 msgstr "E550: 蝻箏�� colon"
 
-#: misc2.c:5302
+#: misc2.c:5336
 msgid "E551: Illegal component"
 msgstr "E551: 銝齿迤蝣箇�璅∪��"
 
-#: misc2.c:5310
+#: misc2.c:5344
 msgid "E552: digit expected"
 msgstr "E552: ��㕑府閬���㗇彍摮�"
 
 #. Get here when the server can't be found.
-#: netbeans.c:283
+#: netbeans.c:396
 msgid "Cannot connect to Netbeans #2"
 msgstr "�⊥�閖��𦻖�� Netbeans #2"
 
-#: netbeans.c:291
+#: netbeans.c:404
 msgid "Cannot connect to Netbeans"
 msgstr "�⊥�閖��𦻖�� Netbeans"
 
-#: netbeans.c:565
+#: netbeans.c:450
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: NetBeans ���朞���𦠜�娍��: \"%s\" 摮睃�𡝗芋撘譍�齿迤蝣�"
+
+#: netbeans.c:749
 msgid "read from Netbeans socket"
 msgstr "�眏 Netbeans socket 霈����"
 
-#: normal.c:2913
+#: netbeans.c:1643
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: 蝺抵�嘥� %ld ��� NetBeans �����𡁜歇銝剜𪃾"
+
+#: normal.c:2983
 msgid "Warning: terminal cannot highlight"
 msgstr "瘜冽��: 雿删�蝯�蝡舀�毺�⊥�閖*蝷粹�䀝漁摨�"
 
-#: normal.c:3128
+#: normal.c:3279
 msgid "E348: No string under cursor"
 msgstr "E348: 皜豢�躰�閙�埝�匧�𦯀葡"
 
-#: normal.c:3130
+#: normal.c:3281
 msgid "E349: No identifier under cursor"
 msgstr "E349: 皜豢�躰�閙�埝�㕑�睃ê̌摮�"
 
-#: normal.c:4348
+#: normal.c:4522
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: �⊥�訫銁�𤌍��滨� 'foldmethod' 銝见⏛�膄 fold"
 
-#: ops.c:295
+#: normal.c:6743
+msgid "E664: changelist is empty"
+msgstr "E664: 霈𦠜凒��𡑒”�糓蝛箇�"
+
+#: normal.c:6745
+msgid "E662: At start of changelist"
+msgstr "E662: 撌脣銁霈𦠜凒��𡑒”����钅�"
+
+#: normal.c:6747
+msgid "E663: At end of changelist"
+msgstr "E663: 撌脣銁霈𦠜凒��𡑒”��蝯𣂼偏"
+
+#: normal.c:8009
+msgid "Type  :quit<Enter>  to exit Vim"
+msgstr "閬��𣪧��� Vim 隢贝撓�� :quit<Enter> "
+
+#: ops.c:294
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "銝�銵� %s �� 銝�甈�"
 
-#: ops.c:297
+#: ops.c:296
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "銝�銵� %s �� %d 甈�"
 
-#: ops.c:302
+#: ops.c:301
 #, c-format
 msgid "%ld lines %sed 1 time"
 msgstr "%ld 銵� %s �� 銝�甈�"
 
-#: ops.c:305
+#: ops.c:304
 #, c-format
 msgid "%ld lines %sed %d times"
 msgstr "%ld 銵� %s �� %d 甈�"
 
-#: ops.c:663
+#: ops.c:662
 #, c-format
 msgid "%ld lines to indent... "
-msgstr "蝮格�� %ld 銵�..."
+msgstr "蝮格�� %ld 銵�... "
 
-#: ops.c:713
+#: ops.c:712
 msgid "1 line indented "
 msgstr "銝�銵�歇蝮格��"
 
-#: ops.c:715
+#: ops.c:714
 #, c-format
 msgid "%ld lines indented "
-msgstr "撌脩葬��� %ld 銵�"
+msgstr "撌脩葬��� %ld 銵� "
 
 #. must display the prompt
-#: ops.c:1645
+#: ops.c:1688
 msgid "cannot yank; delete anyway"
 msgstr "�⊥�訫�銝�; �凒�𦻖�⏛�膄"
 
-#: ops.c:2152
+#: ops.c:2274
 msgid "1 line changed"
 msgstr " 1 銵� ~ed"
 
-#: ops.c:2154
+#: ops.c:2276
 #, c-format
 msgid "%ld lines changed"
-msgstr " %ld 銵� ~ed"
+msgstr "撌脫㺿霈� %ld 銵� "
 
-#: ops.c:2538
+#: ops.c:2660
 #, c-format
 msgid "freeing %ld lines"
-msgstr "��𧢲𦆮 %ld 銵䔶葉"
+msgstr "��𧢲𦆮 %ld 銵䔶葉 "
 
-#: ops.c:2819
+#: ops.c:2941
 msgid "1 line yanked"
-msgstr "撌脰��ˊ 1 銵�"
+msgstr "撌脰��ˊ 1 銵� "
 
-#: ops.c:2821
+#: ops.c:2943
 #, c-format
 msgid "%ld lines yanked"
-msgstr "撌脰��ˊ %ld 銵�"
+msgstr "撌脰��ˊ %ld 銵� "
 
-#: ops.c:3106
+#: ops.c:3228
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: �麱摮睃膥 %s 鋆⊥�埝�㗇𨭬镼�"
 
 #. Highlight title
-#: ops.c:3664
+#: ops.c:3779
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4237,11 +4456,12 @@ msgstr ""
 "\n"
 "--- �麱摮睃膥 ---"
 
-#: ops.c:4873
+#: ops.c:5088
 msgid "Illegal register name"
 msgstr "銝齿迤蝣箇��麱摮睃膥��滨迂"
 
-#: ops.c:4959
+#: ops.c:5176
+#, c-format
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4249,58 +4469,58 @@ msgstr ""
 "\n"
 "# �麱摮睃膥:\n"
 
-#: ops.c:4992
+#: ops.c:5226
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: �𧊋�䰻��閮餃�𠰴�𧢲��: %d"
 
-#: ops.c:5412
+#: ops.c:5711
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: �麱摮睃膥��滨迂�𥲤隤�: '%s'"
 
-#: ops.c:5750
+#: ops.c:6071
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld 甈�; "
 
-#: ops.c:5757
+#: ops.c:6078
 #, c-format
 msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
 msgstr "�豢��� %s%ld/%ld 銵�; %ld/%ld 摮�(Word); %ld/%ld 摮堒��(Bytes)"
 
-#: ops.c:5773
+#: ops.c:6094
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
 msgstr "甈� %s/%s; 銵� %ld/%ld; 摮�(Word) %ld/%ld; 摮堒��(Byte) %ld/%ld"
 
-#: ops.c:5784
+#: ops.c:6105
 #, c-format
 msgid "(+%ld for BOM)"
 msgstr "(+%ld for BOM)"
 
-#: option.c:1579
+#: option.c:1643
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=蝚� %N ��"
 
 # ? what's this for?
-#: option.c:2012
+#: option.c:2092
 msgid "Thanks for flying Vim"
 msgstr "�蠘�脲�冽�𤤿鍂 Vim"
 
-#: option.c:3250 option.c:3357
+#: option.c:3419 option.c:3535
 msgid "E518: Unknown option"
 msgstr "E518: 銝齿迤蝣箇��賊�"
 
-#: option.c:3263
+#: option.c:3432
 msgid "E519: Option not supported"
 msgstr "E519: 銝齿𣈲�螱閰脤�賊�"
 
-#: option.c:3288
+#: option.c:3457
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: 銝滩�賢銁 Modeline 鋆∪枂�𣶹"
 
-#: option.c:3344
+#: option.c:3522
 msgid ""
 "\n"
 "\tLast set from "
@@ -4308,134 +4528,138 @@ msgstr ""
 "\n"
 "\t銝𦠜活閮剖��: "
 
-#: option.c:3483
+#: option.c:3661
 msgid "E521: Number required after ="
 msgstr "E521: = 敺屸�閬���㗇彍摮�"
 
-#: option.c:3797 option.c:4413
+#: option.c:3989 option.c:4619
 msgid "E522: Not found in termcap"
 msgstr "E522: Termcap 鋆⊿𢒰�𪄳銝滚�"
 
-#: option.c:3863
+#: option.c:4064
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: 銝齿迤蝣箇�摮堒�� <%s>"
 
-#: option.c:4405
+#: option.c:4611
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: �⊥�閗身摰� 'term' �箇征摮𦯀葡"
 
-#: option.c:4408
+#: option.c:4614
 msgid "E530: Cannot change term in GUI"
 msgstr "E530: �銁��硋�讠�屸𢒰銝剔�⊥�訫���� term"
 
-#: option.c:4410
+#: option.c:4616
 msgid "E531: Use \":gui\" to start the GUI"
 msgstr "E531: 頛詨�� \":gui\" 靘���笔�訫�硋耦��屸𢒰"
 
-#: option.c:4431
+#: option.c:4645
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' 頝� 'patchmode' �糓銝�璅��"
 
-#: option.c:4616
+#: option.c:4860
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: �銁��硋�讠�屸𢒰銝剔�⊥�訫���� term"
 
-#: option.c:4748
+#: option.c:5016
 msgid "E524: Missing colon"
 msgstr "E524: 蝻箏�� colon"
 
-#: option.c:4750
+#: option.c:5018
 msgid "E525: Zero length string"
 msgstr "E525: �妟�𩑈摨血�𦯀葡"
 
-#: option.c:4818
+#: option.c:5086
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> 敺𣬚撩撠烐彍摮�"
 
-#: option.c:4832
+#: option.c:5100
 msgid "E527: Missing comma"
 msgstr "E527: 蝻箏�煾�𡑒��"
 
-#: option.c:4839
+#: option.c:5107
 msgid "E528: Must specify a ' value"
 msgstr "E528: 敹�������帋��� ' ��"
 
-#: option.c:4880
+#: option.c:5148
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: �批鉄�⊥�閖*蝷箇�摮堒��"
 
-#: option.c:4929
+#: option.c:5197
 msgid "E596: Invalid font(s)"
 msgstr "E596: 銝齿迤蝣箇�摮堒��"
 
-#: option.c:4937
+#: option.c:5205
 msgid "E597: can't select fontset"
 msgstr "E597: �⊥�蓥蝙�鍂摮堒�钅�(Fontset)"
 
-#: option.c:4939
+#: option.c:5207
 msgid "E598: Invalid fontset"
 msgstr "E598: 銝齿迤蝣箇�摮堒�钅�(Fontset)"
 
-#: option.c:4946
+#: option.c:5214
 msgid "E533: can't select wide font"
 msgstr "E533: �⊥�蓥蝙�鍂閮剖�𡁶�銝剜���堒��(Widefont)"
 
-#: option.c:4948
+#: option.c:5216
 msgid "E534: Invalid wide font"
 msgstr "E534: 銝齿迤蝣箇�摮堒��(Widefont)"
 
-#: option.c:5218
+#: option.c:5486
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: <%c> 敺峕�劐�齿迤蝣箇�摮堒��"
 
-#: option.c:5322
+#: option.c:5597
 msgid "E536: comma required"
 msgstr "E536: ��閬��𡑒��"
 
-#: option.c:5330
+#: option.c:5607
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' 敹����糓蝛箇蒾��硋��鉄 %s"
 
-#: option.c:5377
+#: option.c:5682
 msgid "E538: No mouse support"
 msgstr "E538: 銝齿𣈲�螱皛煾��"
 
-#: option.c:5645
+#: option.c:5950
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: 瘝埝�厩�鞉�毺��讠�堒��: "
 
-#: option.c:5649
+#: option.c:5954
 msgid "E541: too many items"
 msgstr "E541: 憭芸�𡁻��𤌍"
 
-#: option.c:5651
+#: option.c:5956
 msgid "E542: unbalanced groups"
 msgstr "E542: 銝滚�滨迂�� group"
 
-#: option.c:5872
+#: option.c:6196
 msgid "E590: A preview window already exists"
 msgstr "E590: ��鞱�𣇉�閬𣇉�堒歇蝬枏�睃銁鈭�"
 
-#: option.c:6346
+#: option.c:6453
+msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
+msgstr "W17: Arabic ��閬� UTF-8, 隢见嘑銵� ':set encoding=utf-8'"
+
+#: option.c:6786
 #, c-format
 msgid "E593: Need at least %d lines"
-msgstr "E593: �秐撠煾�閬� %d 銵�"
+msgstr "E593: �秐撠煾�閬� %d 銵� "
 
-#: option.c:6355
+#: option.c:6796
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: �秐撠煾�閬� %d 甈�"
 
-#: option.c:6660
+#: option.c:7103
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: 銝齿迤蝣箇��賊�: %s"
 
-#: option.c:6769
+#: option.c:7223
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4443,7 +4667,7 @@ msgstr ""
 "\n"
 "--- 蝯�蝡舀�毺Ⅳ ---"
 
-#: option.c:6771
+#: option.c:7225
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4451,7 +4675,7 @@ msgstr ""
 "\n"
 "--- Global �賊��� ---"
 
-#: option.c:6773
+#: option.c:7227
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4459,7 +4683,7 @@ msgstr ""
 "\n"
 "--- Local �賊��� ---"
 
-#: option.c:6775
+#: option.c:7229
 msgid ""
 "\n"
 "--- Options ---"
@@ -4467,152 +4691,153 @@ msgstr ""
 "\n"
 "--- �賊� ---"
 
-#: option.c:7467
+#: option.c:7935
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp �𥲤隤�"
 
-#: option.c:8425
+#: option.c:8906
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': �𪄳銝滚� %s 撠齿�厩�摮堒��"
 
-#: option.c:8459
+#: option.c:8940
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': ����笔�峕�匧�𡁻�条�摮堒��: %s"
 
-#: os_amiga.c:273
+#: os_amiga.c:280
 msgid "cannot open "
 msgstr "銝滩�賡�见��"
 
-#: os_amiga.c:307
+#: os_amiga.c:314
 msgid "VIM: Can't open window!\n"
 msgstr "VIM: �⊥�閖�见�蠘�𣇉��!\n"
 
-#: os_amiga.c:329
+#: os_amiga.c:338
 msgid "Need Amigados version 2.04 or later\n"
 msgstr "��閬� Amigados ���𧋦 2.04 隞乩�蹾n"
 
-#: os_amiga.c:335
+#: os_amiga.c:344
 #, c-format
 msgid "Need %s version %ld\n"
 msgstr "��閬� %s ���𧋦 %ld\n"
 
-#: os_amiga.c:407
+#: os_amiga.c:416
 msgid "Cannot open NIL:\n"
 msgstr "�⊥�閖�见�� NIL:\n"
 
-#: os_amiga.c:418
+#: os_amiga.c:427
 msgid "Cannot create "
 msgstr "銝滩�賢遣蝡� "
 
-#: os_amiga.c:896
+#: os_amiga.c:905
 #, c-format
 msgid "Vim exiting with %d\n"
 msgstr "Vim 蝯鞉�笔�喳�𧼮��: %d\n"
 
-#: os_amiga.c:928
+#: os_amiga.c:941
 msgid "cannot change console mode ?!\n"
 msgstr "�⊥�訫���𥕢蜓�綉�蝱(console)璅∪�� !?\n"
 
-#: os_amiga.c:994
+#: os_amiga.c:1012
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: 銝齿糓銝餅綉�蝱(console)??\n"
 
 #. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1143
+#: os_amiga.c:1161
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: 銝滩�賜鍂 -f �賊��嘑銵� shell"
 
-#: os_amiga.c:1184 os_amiga.c:1274
+#: os_amiga.c:1202 os_amiga.c:1292
 msgid "Cannot execute "
 msgstr "銝滩�賢嘑銵� "
 
-#: os_amiga.c:1187 os_amiga.c:1284
+#: os_amiga.c:1205 os_amiga.c:1302
 msgid "shell "
 msgstr "shell "
 
-#: os_amiga.c:1207 os_amiga.c:1309
+#: os_amiga.c:1225 os_amiga.c:1327
 msgid " returned\n"
 msgstr " 撌脰�𥪜�疱n"
 
-#: os_amiga.c:1450
+#: os_amiga.c:1468
 msgid "ANCHOR_BUF_SIZE too small."
 msgstr "ANCHOR_BUF_SIZE 憭芸��"
 
-#: os_amiga.c:1454
+#: os_amiga.c:1472
 msgid "I/O ERROR"
 msgstr "I/O �𥲤隤�"
 
-#: os_mswin.c:515
+#: os_mswin.c:548
 msgid "...(truncated)"
 msgstr "...(撌脣����)"
 
-#: os_mswin.c:617
+#: os_mswin.c:650
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' 銝齿糓 80, �⊥�訫嘑銵��㚚�典𦶢隞�"
 
-#: os_mswin.c:1802
+#: os_mswin.c:1982
 msgid "E237: Printer selection failed"
 msgstr "E237: �⊥�閖�豢��迨�㫲銵冽��"
 
-#: os_mswin.c:1842
+#: os_mswin.c:2022
 #, c-format
 msgid "to %s on %s"
 msgstr "�� %s on %s"
 
-#: os_mswin.c:1857
+#: os_mswin.c:2037
 #, c-format
 msgid "E613: Unknown printer font: %s"
 msgstr "E613: 銝齿迤蝣箇��㫲銵冽�笔�堒��: %s"
 
-#: os_mswin.c:1907 os_mswin.c:1917
+#: os_mswin.c:2086 os_mswin.c:2096
 #, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: ��堒㫲�𥲤隤�: %s"
 
-#: os_mswin.c:1918
+#: os_mswin.c:2097
 msgid "Unknown"
 msgstr "�𧊋�䰻"
 
-#: os_mswin.c:1945
+#: os_mswin.c:2124
 #, c-format
 msgid "Printing '%s'"
 msgstr "��堒㫲銝�: '%s'"
 
-#: os_mswin.c:3033
+#: os_mswin.c:3213
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
 msgstr "E244: 摮堒���� \"%s\" �⊥�訫�齿�匧�堒�胬"%s\""
 
-#: os_mswin.c:3041
+#: os_mswin.c:3221
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: 銝齿迤蝣箇�摮堒�� '%c' �枂�𣶹�銁摮堒�见�滨迂 \"%s\" ��"
 
-#: os_riscos.c:1258
+#: os_riscos.c:1259
 msgid "E366: Invalid 'osfiletype' option - using Text"
 msgstr "E366: 銝齿迤蝣箇� 'filetype' �賊� - 雿輻鍂蝝娍���埈芋撘�"
 
-#: os_unix.c:871
+#: os_unix.c:927
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: ��䠷�峥ignal, �𣪧��衤葉\n"
 
-#: os_unix.c:877
+#: os_unix.c:933
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: CVim: ��娍⏛��靽∟��(signal) %s\n"
 
-#: os_unix.c:880
+#: os_unix.c:936
+#, c-format
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: ��娍⏛���稲�𦶢��靽∟��(deadly signale)\n"
 
-#: os_unix.c:1143
+#: os_unix.c:1199
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "��见�� X Window �埈� %ld msec"
 
-#: os_unix.c:1170
+#: os_unix.c:1226
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4620,15 +4845,15 @@ msgstr ""
 "\n"
 "Vim: X �𥲤隤么n"
 
-#: os_unix.c:1276
+#: os_unix.c:1338
 msgid "Testing the X display failed"
 msgstr "皜祈岫 X Window 憭望��"
 
-#: os_unix.c:1415
+#: os_unix.c:1477
 msgid "Opening the X display timed out"
 msgstr "��见�� X Window �暹�"
 
-#: os_unix.c:3145 os_unix.c:3825
+#: os_unix.c:3234 os_unix.c:3914
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -4636,7 +4861,7 @@ msgstr ""
 "\n"
 "銝滩�賢嘑銵� shell"
 
-#: os_unix.c:3193
+#: os_unix.c:3282
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
@@ -4644,7 +4869,7 @@ msgstr ""
 "\n"
 "銝滩�賢嘑銵� shell sh\n"
 
-#: os_unix.c:3197 os_unix.c:3831
+#: os_unix.c:3286 os_unix.c:3920
 msgid ""
 "\n"
 "shell returned "
@@ -4652,7 +4877,7 @@ msgstr ""
 "\n"
 "Shell 撌脰�𥪜��"
 
-#: os_unix.c:3332
+#: os_unix.c:3421
 msgid ""
 "\n"
 "Cannot create pipes\n"
@@ -4660,7 +4885,7 @@ msgstr ""
 "\n"
 "銝滩�賢遣蝡� pipe 蝞∠�䨵n"
 
-#: os_unix.c:3347
+#: os_unix.c:3436
 msgid ""
 "\n"
 "Cannot fork\n"
@@ -4668,7 +4893,7 @@ msgstr ""
 "\n"
 "銝滩�� fork\n"
 
-#: os_unix.c:3838
+#: os_unix.c:3927
 msgid ""
 "\n"
 "Command terminated\n"
@@ -4676,53 +4901,78 @@ msgstr ""
 "\n"
 "�𦶢隞文歇蝯�蝯𪀔n"
 
-#: os_unix.c:5398
+#: os_unix.c:4191 os_unix.c:4316 os_unix.c:5982
+msgid "XSMP lost ICE connection"
+msgstr "XSMP 憭勗縧 ICE ����"
+
+#: os_unix.c:5565
 msgid "Opening the X display failed"
 msgstr "��见�� X Window 憭望��"
 
+#: os_unix.c:5887
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP 甇�銁��閧��䌊��穃�脣�䁅�瘙�"
+
+#: os_unix.c:6006
+msgid "XSMP opening connection"
+msgstr "��见�� XSMP ���帋葉"
+
+#: os_unix.c:6025
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE ���𡁶𧙗��见仃���"
+
+#: os_unix.c:6045
+#, c-format
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection 憭望��: %s"
+
 #: os_vms_mms.c:59
 msgid "At line"
 msgstr "�銁銵諹�� "
 
-#: os_w32exe.c:169
-msgid "Could not load vim32.dll!"
-msgstr "�⊥�閗�匧�� vim32.dll嚗�"
+#: os_w32exe.c:65
+msgid "Could not allocate memory for command line."
+msgstr "�⊥�閧�箏𦶢隞文�烾�滨蔭閮䀹�園�𢛵��"
 
-#: os_w32exe.c:169 os_w32exe.c:179
+#: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
 msgid "VIM Error"
 msgstr "VIM �𥲤隤�"
 
-#: os_w32exe.c:179
+#: os_w32exe.c:89
+msgid "Could not load vim32.dll!"
+msgstr "�⊥�閗�匧�� vim32.dll嚗�"
+
+#: os_w32exe.c:99
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "銝滩�賭耨甇�遆撘𤩺���坔� DLL!"
 
-#: os_win16.c:583 os_win32.c:3047
+#: os_win16.c:342 os_win32.c:3248
 #, c-format
 msgid "shell returned %d"
 msgstr "Shell �喳�𧼮�� %d"
 
-#: os_win32.c:2505
+#: os_win32.c:2706
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: ��娍⏛�� %s \n"
 
-#: os_win32.c:2507
+#: os_win32.c:2708
 msgid "close"
 msgstr "��𣈯��"
 
-#: os_win32.c:2509
+#: os_win32.c:2710
 msgid "logoff"
 msgstr "�蒈�枂"
 
-#: os_win32.c:2510
+#: os_win32.c:2711
 msgid "shutdown"
 msgstr "��𨀣��"
 
-#: os_win32.c:3000
+#: os_win32.c:3201
 msgid "E371: Command not found"
 msgstr "E371: �𪄳銝滚��𦶢隞�"
 
-#: os_win32.c:3013
+#: os_win32.c:3214
 msgid ""
 "VIMRUN.EXE not found in your $PATH.\n"
 "External commands will not pause after completion.\n"
@@ -4732,7 +4982,7 @@ msgstr ""
 "憭㚚�典𦶢隞文嘑銵��𣬚佅敺����齿��麱��.\n"
 "�脖�甇亥牧��舘�见嘑銵� :help win32-vimrun "
 
-#: os_win32.c:3016
+#: os_win32.c:3217
 msgid "Vim Warning"
 msgstr "Vim 霅血��"
 
@@ -4769,37 +5019,37 @@ msgstr "E377: �聢撘誩�硋�𦯀葡鋆⊥�劐�齿迤蝣箇� %%%c "
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' �𧊋閮剖��"
 
-#: quickfix.c:497
+#: quickfix.c:501
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �𪄳銝滚��𤌍����滨迂��𡝗糓蝛箇��𤌍����滨迂"
 
-#: quickfix.c:979
+#: quickfix.c:990
 msgid "E553: No more items"
 msgstr "E553: 瘝埝�匧�嗅����𤌍"
 
-#: quickfix.c:1200
+#: quickfix.c:1229
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d / %d)%s%s: "
 
-#: quickfix.c:1202
+#: quickfix.c:1231
 msgid " (line deleted)"
 msgstr " (銵�歇�⏛�膄)"
 
-#: quickfix.c:1412
+#: quickfix.c:1444
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: Quickfix ����羓�𣂼偏"
 
-#: quickfix.c:1421
+#: quickfix.c:1453
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Quickfix ����𢠃�蝡�"
 
-#: quickfix.c:1433
+#: quickfix.c:1465
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "�𥲤隤文�𡑒” %d/%d; �望�� %d ���𥲤隤�"
 
-#: quickfix.c:1904
+#: quickfix.c:1943
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: �⊥�訫神�伐��'buftype' �賊�撌脰身摰�"
 
@@ -4808,303 +5058,315 @@ msgstr "E382: �⊥�訫神�伐��'buftype' �賊�撌脰身摰�"
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: 銝齿迤蝣箇����𤌍嚗� %s%%[]"
 
-#: regexp.c:826
+#: regexp.c:838
 msgid "E339: Pattern too long"
 msgstr "E339: ��滚�堒云�𩑈"
 
-#: regexp.c:995
+#: regexp.c:1009
 msgid "E50: Too many \\z("
 msgstr "E50: 憭芸�� \\z("
 
-#: regexp.c:1006
+#: regexp.c:1020
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: 憭芸�� %s("
 
-#: regexp.c:1063
+#: regexp.c:1077
 msgid "E52: Unmatched \\z("
 msgstr "E52: �∪�齿�厩� \\z("
 
-#: regexp.c:1067
+#: regexp.c:1081
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: �∪�齿�厩� %s%%("
 
-#: regexp.c:1069
+#: regexp.c:1083
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: �∪�齿�厩� %s("
 
-#: regexp.c:1074
+#: regexp.c:1088
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: �∪�齿�厩� %s)"
 
-#: regexp.c:1237
+#: regexp.c:1258
 #, c-format
 msgid "E56: %s* operand could be empty"
 msgstr "E56: %s* �讠�堒���虾隞交糓蝛箇�"
 
-#: regexp.c:1240
+#: regexp.c:1261
 #, c-format
 msgid "E57: %s+ operand could be empty"
 msgstr "E56: %s+ �讠�堒���虾隞交糓蝛箇�"
 
-#: regexp.c:1294
+#: regexp.c:1316
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: 敺屸𢒰��劐�齿迤蝣箇�摮堒��: %s@"
 
-#: regexp.c:1319
+#: regexp.c:1344
 #, c-format
 msgid "E58: %s{ operand could be empty"
 msgstr "E58: %s{ �讠�堒���虾隞交糓蝛箇�"
 
-#: regexp.c:1329
+#: regexp.c:1354
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: 憭芸�朞���𦦵� %s{...}s"
 
-#: regexp.c:1345
+#: regexp.c:1370
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: 撌Y� %s*"
 
-#: regexp.c:1348
+#: regexp.c:1373
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62: 撌Y� %s%c"
 
-#: regexp.c:1466
+#: regexp.c:1491
 msgid "E63: invalid use of \\_"
 msgstr "E63: 銝齿迤蝣箇�雿輻鍂 \\_"
 
-#: regexp.c:1511
+#: regexp.c:1536
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c 瘝埝�㗇𦻖�𨭬镼�"
 
-#: regexp.c:1567
+#: regexp.c:1592
 msgid "E65: Illegal back reference"
 msgstr "E65: 銝齿迤蝣箇���滚�穃���"
 
-#: regexp.c:1580
+#: regexp.c:1605
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( 銝滩�賢銁甇文枂�𣶹"
 
-#: regexp.c:1599
+#: regexp.c:1624
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 et al. 銝滩�賢銁甇文枂�𣶹"
 
-#: regexp.c:1610
+#: regexp.c:1635
 msgid "E68: Invalid character after \\z"
 msgstr "E68: 敺屸𢒰��劐�齿迤蝣箇�摮堒��: \\z"
 
-#: regexp.c:1659
+#: regexp.c:1684
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ 敺𣬚撩撠� ]"
 
-#: regexp.c:1675
+#: regexp.c:1700
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: 蝛箇� %s%%[]"
 
-#: regexp.c:1735
+#: regexp.c:1760
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: 敺屸𢒰��劐�齿迤蝣箇�摮堒��: %s%%"
 
-#: regexp.c:2530
+#: regexp.c:2557
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: 隤墧�閖𥲤隤�: %s{...}"
 
-#: regexp.c:2777
+#: regexp.c:2863 regexp.c:3016
 msgid "E361: Crash intercepted; regexp too complex?"
 msgstr "E361: �⊥�訫嘑銵�; regular expression 憭芾����?"
 
-#: regexp.c:2912
+#: regexp.c:3004 regexp.c:3013
 msgid "E363: pattern caused out-of-stack error"
 msgstr "E363: regular expression �䭾�𣂼���羓鍂�厩��𥲤隤�"
 
-#: regexp.c:3148
+#: regexp.c:3258
 msgid "External submatches:\n"
 msgstr "憭㚚�函泵���:\n"
 
-#: screen.c:2103
+#: screen.c:2184
 #, c-format
 msgid "+--%3ld lines folded "
-msgstr "+--撌� fold %3ld 銵�"
+msgstr "+--撌� fold %3ld 銵� "
 
-#: screen.c:7785
+#: screen.c:8000
 msgid " VREPLACE"
 msgstr " V-��碶誨"
 
-#: screen.c:7789
+#: screen.c:8004
 msgid " REPLACE"
 msgstr " ��碶誨"
 
-#: screen.c:7794
+#: screen.c:8009
 msgid " REVERSE"
 msgstr " ��滩��"
 
-#: screen.c:7796
+#: screen.c:8011
 msgid " INSERT"
 msgstr " ��鍦��"
 
-#: screen.c:7799
+#: screen.c:8014
 msgid " (insert)"
 msgstr " (��鍦��)"
 
-#: screen.c:7801
+#: screen.c:8016
 msgid " (replace)"
 msgstr " (��碶誨)"
 
-#: screen.c:7803
+#: screen.c:8018
 msgid " (vreplace)"
 msgstr " (v-��碶誨)"
 
-#: screen.c:7806
+#: screen.c:8021
 msgid " Hebrew"
 msgstr " Hebrew"
 
-#: screen.c:7814
+#: screen.c:8032
+msgid " Arabic"
+msgstr " Arabic"
+
+#: screen.c:8035
 msgid " (lang)"
 msgstr " (隤噼�)"
 
-#: screen.c:7817
+#: screen.c:8039
 msgid " (paste)"
 msgstr " (鞎潔��)"
 
-#: screen.c:7823
-msgid " SELECT"
+#: screen.c:8052
+msgid " VISUAL"
 msgstr " �詨��"
 
-#: screen.c:7825
-msgid " VISUAL"
+#: screen.c:8053
+msgid " VISUAL LINE"
+msgstr " [銵䀉 "
+
+#: screen.c:8054
+msgid " VISUAL BLOCK"
+msgstr " [��憛𠺖 "
+
+#: screen.c:8055
+msgid " SELECT"
 msgstr " �詨��"
 
-#: screen.c:7827
-msgid " BLOCK"
-msgstr " ��憛�"
+#: screen.c:8056
+msgid " SELECT LINE"
+msgstr " �詨�𤥁�� "
 
-#: screen.c:7829
-msgid " LINE"
-msgstr " 銵屸�詨��"
+#: screen.c:8057
+msgid " SELECT BLOCK"
+msgstr " �詨�硋�憛�"
 
-#: screen.c:7842 screen.c:7902
+#: screen.c:8072 screen.c:8135
 msgid "recording"
 msgstr "閮㗛�銝�"
 
-#: search.c:36
+#: search.c:37
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "撌脫�𨅯�见�瑼娍���钅�嚗𥕦�滚�䂿�𣂼偏蝜潛�峕�𨅯��"
 
-#: search.c:37
+#: search.c:38
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "撌脫�𨅯�见�瑼娍���𣂼偏嚗𥕦�滚�鮋�钅�蝜潛�峕�𨅯��"
 
-#: search.c:455
+#: search.c:526
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: �𥲤隤斤���𨅯�见�𦯀葡: %s"
 
-#: search.c:782
+#: search.c:853
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: 撌脫�𨅯�见�瑼娍���钅�隞齿𪄳銝滚� %s"
 
-#: search.c:784
+#: search.c:856
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: 撌脫�𨅯�见�瑼娍���𣂼偏隞齿𪄳銝滚� %s"
 
-#: search.c:1157
+#: search.c:1249
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: �銁 ';' 敺屸𢒰��㕑府��� '?' ��� '/'"
 
-#: search.c:3567
+#: search.c:3768
 msgid " (includes previously listed match)"
 msgstr " (���𡠺��齿活��堒枂蝚血���)"
 
 #. cursor at status line
-#: search.c:3587
+#: search.c:3788
 msgid "--- Included files "
 msgstr "--- 撘訫�交�娍�� "
 
-#: search.c:3589
+#: search.c:3790
 msgid "not found "
 msgstr "�𪄳銝滚� "
 
-#: search.c:3590
+#: search.c:3791
 msgid "in path ---\n"
 msgstr "---\n"
 
-#: search.c:3629
+#: search.c:3848
 msgid "  (Already listed)"
 msgstr "  (撌脣�堒枂)"
 
-#: search.c:3631
+#: search.c:3850
 msgid "  NOT FOUND"
 msgstr "  �𪄳銝滚�"
 
-#: search.c:3683
+#: search.c:3902
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "��𨅯�见�訫�交�娍��: %s"
 
-#: search.c:3901
+#: search.c:4120
 msgid "E387: Match is on current line"
 msgstr "E387: �𤌍��齿��銁銵䔶葉��劐��龪��"
 
-#: search.c:4041
+#: search.c:4263
 msgid "All included files were found"
 msgstr "����匧�訫�交�娍���賢歇�𪄳��"
 
-#: search.c:4043
+#: search.c:4265
 msgid "No included files"
 msgstr "瘝埝�匧�訫�交�娍��"
 
-#: search.c:4059
+#: search.c:4281
 msgid "E388: Couldn't find definition"
 msgstr "E388: �𪄳銝滚�摰𡁶儔"
 
-#: search.c:4061
+#: search.c:4283
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �𪄳銝滚� pattern"
 
-#: syntax.c:3015
+#: syntax.c:3050
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: ���彍銝齿迤蝣�: %s"
 
-#: syntax.c:3195
+#: syntax.c:3230
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: �⊥迨 syntax cluster: \"%s\""
 
-#: syntax.c:3359
+#: syntax.c:3394
 msgid "No Syntax items defined for this buffer"
 msgstr "�坔�讠楨銵嘥�瘝埝�匧�𡁶儔隞颱�閗�墧��"
 
-#: syntax.c:3367
+#: syntax.c:3402
 msgid "syncing on C-style comments"
 msgstr "C隤噼�撘讛酉閫��峕郊��碶葉"
 
-#: syntax.c:3375
+#: syntax.c:3410
 msgid "no syncing"
 msgstr "瘝埝�匧�峕郊���"
 
-#: syntax.c:3378
+#: syntax.c:3413
 msgid "syncing starts "
 msgstr "��峕郊��㚚�见��"
 
-#: syntax.c:3380 syntax.c:3455
+#: syntax.c:3415 syntax.c:3490
 msgid " lines before top line"
 msgstr "銵諹�蠘��枂蝭����"
 
-#: syntax.c:3385
+#: syntax.c:3420
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5112,7 +5374,7 @@ msgstr ""
 "\n"
 "--- 隤墧�訫�峕郊��隞� (Syntax sync items) ---"
 
-#: syntax.c:3390
+#: syntax.c:3425
 msgid ""
 "\n"
 "syncing on items"
@@ -5120,7 +5382,7 @@ msgstr ""
 "\n"
 "��峕郊��碶葉:"
 
-#: syntax.c:3396
+#: syntax.c:3431
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5128,177 +5390,187 @@ msgstr ""
 "\n"
 "--- 隤墧�閖��𤌍 ---"
 
-#: syntax.c:3419
+#: syntax.c:3454
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: �⊥迨 syntax cluster: \"%s\""
 
-#: syntax.c:3445
+#: syntax.c:3480
 msgid "minimal "
 msgstr "��撠�"
 
-#: syntax.c:3452
+#: syntax.c:3487
 msgid "maximal "
 msgstr "��憭�"
 
-#: syntax.c:3464
+#: syntax.c:3499
 msgid "; match "
 msgstr "; 蝚血�� "
 
-#: syntax.c:3466
+#: syntax.c:3501
 msgid " line breaks"
-msgstr "�𪃾銵�"
+msgstr "�𪃾銵� "
 
-#: syntax.c:4100
+#: syntax.c:4135
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: 雿輻鍂鈭�銝齿迤蝣箇����彍"
 
-#: syntax.c:4124
+#: syntax.c:4159
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: �𪄳銝滚� %s �� region item"
 
-#: syntax.c:4152
+#: syntax.c:4187
 msgid "E395: contains argument not accepted here"
 msgstr "E395: 雿輻鍂鈭�銝齿迤蝣箇����彍"
 
-#: syntax.c:4163
+#: syntax.c:4198
 msgid "E396: containedin argument not accepted here"
 msgstr "E396: 雿輻鍂鈭�銝齿迤蝣箇����彍"
 
-#: syntax.c:4241
+#: syntax.c:4276
 msgid "E397: Filename required"
 msgstr "E397: ��閬�瑼娍���滨迂"
 
-#: syntax.c:4579
+#: syntax.c:4614
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: 蝻箏�� \"=\": %s"
 
-#: syntax.c:4737
+#: syntax.c:4772
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: syntax region %s ��撘閙彍憭芸��"
 
-#: syntax.c:5068
+#: syntax.c:5103
 msgid "E400: No cluster specified"
 msgstr "E400: 瘝埝�㗇���𡁶�撅祆��"
 
-#: syntax.c:5105
+#: syntax.c:5140
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: �𪄳銝滚�����𠉛泵���: %s"
 
-#: syntax.c:5180
+#: syntax.c:5215
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: '%s' 敺屸𢒰���𨭬镼輻�⊥�閗儘霅�"
 
-#: syntax.c:5270
+#: syntax.c:5305
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: 隤墧�訫�峕郊: ��𦻖銵𣬚泵��蠘◤����帋��拇活"
 
-#: syntax.c:5327
+#: syntax.c:5362
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: ���彍銝齿迤蝣�: %s"
 
-#: syntax.c:5377
+#: syntax.c:5412
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: 蝻箏�𤑳㮾蝑厩泵���: %s"
 
-#: syntax.c:5383
+#: syntax.c:5418
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: 蝛箇蒾���彍: %s"
 
-#: syntax.c:5410
+#: syntax.c:5445
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s 銝滩�賢銁甇文枂�𣶹"
 
-#: syntax.c:5417
+#: syntax.c:5452
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s 敹����糓��𡑒”鋆∠�蝚砌���"
 
-#: syntax.c:5487
+#: syntax.c:5522
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: 銝齿迤蝣箇�蝢斤���滨迂: %s"
 
-#: syntax.c:5720
+#: syntax.c:5755
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: 銝齿迤蝣箇� :syntax 摮𣂼𦶢隞�: %s"
 
-#: syntax.c:6099
+#: syntax.c:6136
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: �𪄳銝滚� highlight group: %s"
 
-#: syntax.c:6123
+#: syntax.c:6160
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: ���彍憭芸��: \":highlight link %s\""
 
-#: syntax.c:6130
+#: syntax.c:6167
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: ���彍�𤾸��: \":highlight link %s\""
 
-#: syntax.c:6150
+#: syntax.c:6187
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: 撌脰身摰𡁶黎蝯�, 敹賜裦 highlight link"
 
-#: syntax.c:6279
+#: syntax.c:6316
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: 銝滩府��厩�蝑㕑��: %s"
 
-#: syntax.c:6315
+#: syntax.c:6352
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: 蝻箏�𤑳㮾蝑厩泵���: %s"
 
-#: syntax.c:6337
+#: syntax.c:6380
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: 蝻箏�穃��彍: %s"
 
-#: syntax.c:6374
+#: syntax.c:6417
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: 銝滚���閧���: %s"
 
-#: syntax.c:6493
+#: syntax.c:6536
 msgid "E419: FG color unknown"
 msgstr "E419: �𥲤隤斤���齿艶憿讛𠧧"
 
-#: syntax.c:6504
+#: syntax.c:6547
 msgid "E420: BG color unknown"
 msgstr "E420: �𥲤隤斤��峕艶憿讛𠧧"
 
-#: syntax.c:6565
+#: syntax.c:6608
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: �𥲤隤斤�憿讛𠧧��滨迂��𡝗彍��: %s"
 
-#: syntax.c:6771
+#: syntax.c:6814
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: 蝯�蝡舀�毺Ⅳ憭芷𩑈: %s"
 
-#: syntax.c:6818
+#: syntax.c:6861
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: ���彍銝齿迤蝣�: %s"
 
-#: syntax.c:7347
+#: syntax.c:7390
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: 雿輻鍂鈭��𤾸�𡁶㮾�㺭��擃䀝漁摨血惇��"
 
+#: syntax.c:7911
+msgid "E669: Unprintable character in group name"
+msgstr "E669: 蝢斤���滨迂銝剜�厩�⊥�訫�堒㫲��摮堒��"
+
+#. This is an error, but since there previously was no check only
+#. * give a warning.
+#: syntax.c:7918
+msgid "W18: Invalid character in group name"
+msgstr "W18: 蝢斤���滨迂銝剜�劐�齿迤蝣箇�摮堒��"
+
 #: tag.c:90
 msgid "E555: at bottom of tag stack"
 msgstr "E555: 璅嗵惜(tag)����羓�𣂼偏"
@@ -5307,20 +5579,20 @@ msgstr "E555: 璅嗵惜(tag)����羓�𣂼偏"
 msgid "E556: at top of tag stack"
 msgstr "E556: 璅嗵惜(tag)����𢠃�钅�"
 
-#: tag.c:392
+#: tag.c:412
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: 撌脩�枏銁����漤𢒰��璅嗵惜(tag)鈭�"
 
-#: tag.c:512
+#: tag.c:550
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: �𪄳銝滚�璅嗵惜(tag): %s"
 
-#: tag.c:545
+#: tag.c:583
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: tag.c:548
+#: tag.c:586
 msgid "file\n"
 msgstr "瑼娍�Ěn"
 
@@ -5328,44 +5600,44 @@ msgstr "瑼娍�Ěn"
 #. * Ask to select a tag from the list.
 #. * When using ":silent" assume that <CR> was entered.
 #.
-#: tag.c:706
+#: tag.c:744
 msgid "Enter nr of choice (<CR> to abort): "
 msgstr "頛詨�� nr ��㚚�豢�� (<CR> �𣪧���): "
 
-#: tag.c:746
+#: tag.c:784
 msgid "E427: There is only one matching tag"
 msgstr "E427: �蘨��㗇迨��蝚血��"
 
-#: tag.c:748
+#: tag.c:786
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: 撌梁�枏銁��敺䔶��讠泵���� tag 鈭�"
 
-#: tag.c:768
+#: tag.c:810
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "瑼娍�� \"%s\" 銝滚�睃銁"
 
 #. Give an indication of the number of matching tags
-#: tag.c:780
+#: tag.c:823
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "�𪄳�� tag: %d/%d%s"
 
-#: tag.c:783
+#: tag.c:826
 msgid " or more"
 msgstr " ��𡝗凒憭�"
 
-#: tag.c:785
+#: tag.c:828
 msgid "  Using tag with different case!"
 msgstr "  隞乩�滚��之撠誩神靘�雿輻鍂 tag!"
 
-#: tag.c:828
+#: tag.c:872
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: 瑼娍�� \"%s\" 銝滚�睃銁"
 
 #. Highlight title
-#: tag.c:897
+#: tag.c:941
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5373,83 +5645,75 @@ msgstr ""
 "\n"
 "  # �� tag         敺�   銵�    �銁 瑼娍��/�����"
 
-#: tag.c:1144
-msgid "Linear tag search"
-msgstr "蝺𡁏�扳�𨅯�𧢲�嗵惜 (Tags)"
-
-#: tag.c:1146
-msgid "Binary tag search"
-msgstr "鈭����𨅯��(Binary search) 璅嗵惜(Tags)"
-
-#: tag.c:1172
+#: tag.c:1363
 #, c-format
 msgid "Searching tags file %s"
 msgstr "��𨅯�� tag 瑼娍�� \"%s\""
 
-#: tag.c:1356
+#: tag.c:1550
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Tag 瑼娍��楝敺𤏸◤�⏛�𪃾�� %s\n"
 
-#: tag.c:1858
+#: tag.c:2203
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Tag 瑼� \"%s\" �聢撘誯𥲤隤�"
 
-#: tag.c:1862
+#: tag.c:2207
 #, c-format
 msgid "Before byte %ld"
 msgstr "�銁 %ld 雿滚��銋见��"
 
-#: tag.c:1883
+#: tag.c:2240
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Tag 瑼娍��𧊋��鍦��: %s"
 
 #. never opened any tags file
-#: tag.c:1922
+#: tag.c:2280
 msgid "E433: No tags file"
 msgstr "E433: 瘝埝�� tag 瑼�"
 
-#: tag.c:2600
+#: tag.c:3016
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �𪄳銝滚� tag"
 
-#: tag.c:2611
+#: tag.c:3027
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: �𪄳銝滚� tag, �鍂��𦦵�!"
 
-#: term.c:1745
+#: term.c:1759
 msgid "' not known. Available builtin terminals are:"
 msgstr "' �⊥�閗�匧�乓���虾�鍂���批遣蝯�蝡舀�笔耦撘𤩺��:"
 
-#: term.c:1769
+#: term.c:1783
 msgid "defaulting to '"
 msgstr "��鞱身: '"
 
-#: term.c:2127
+#: term.c:2141
 msgid "E557: Cannot open termcap file"
 msgstr "E557: �⊥�閖�见�� termcap 瑼娍��"
 
-#: term.c:2131
+#: term.c:2145
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfo 銝剜�埝�厩�蝡舀�蠘���䠷�"
 
-#: term.c:2133
+#: term.c:2147
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcap 銝剜�埝�厩�蝡舀�蠘���䠷�"
 
-#: term.c:2292
+#: term.c:2306
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcap 瘝埝�� \"%s\" entry"
 
-#: term.c:2766
+#: term.c:2780
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: 蝯�蝡舀�罸�閬� \"cm\" ���賢��"
 
 #. Highlight title
-#: term.c:4927
+#: term.c:4990
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5457,42 +5721,42 @@ msgstr ""
 "\n"
 "--- 蝯�蝡舀���厰枤 ---"
 
-#: ui.c:252
+#: ui.c:258
 msgid "new shell started\n"
 msgstr "韏瑕�閙鰵 shell\n"
 
-#: ui.c:1784
+#: ui.c:1841
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: 霈���𤥁撓�仿𥲤隤歹�屸𣪧��衤葉...\n"
 
 #. must display the prompt
-#: undo.c:394
+#: undo.c:405
 msgid "No undo possible; continue anyway"
 msgstr "�⊥�閖������𥡝�讠匱蝥�𠜱���"
 
-#: undo.c:549
+#: undo.c:561
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 銵諹�罸𥲤隤�"
 
-#: undo.c:718
+#: undo.c:757
 msgid "1 change"
 msgstr "銝����㺿霈�"
 
-#: undo.c:720
+#: undo.c:759
 #, c-format
 msgid "%ld changes"
 msgstr "%ld ���㺿霈�"
 
-#: undo.c:764
+#: undo.c:812
 msgid "E439: undo list corrupt"
 msgstr "E439: 敺拙�笔�𡑒”��滚��"
 
-#: undo.c:796
+#: undo.c:844
 msgid "E440: undo line missing"
-msgstr "E440: �𪄳銝滚�閬� undo ��銵�"
+msgstr "E440: �𪄳銝滚�閬� undo ��銵� "
 
 #. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:682
+#: version.c:707
 msgid ""
 "\n"
 "MS-Windows 16/32 bit GUI version"
@@ -5500,7 +5764,7 @@ msgstr ""
 "\n"
 "MS-Windows 16/32 Bit ��硋�讠�屸𢒰���𧋦"
 
-#: version.c:684
+#: version.c:709
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
@@ -5508,15 +5772,15 @@ msgstr ""
 "\n"
 "MS-Windows 32 Bit ��硋�讠�屸𢒰���𧋦"
 
-#: version.c:687
+#: version.c:712
 msgid " in Win32s mode"
 msgstr "Win32s 璅∪��"
 
-#: version.c:689
+#: version.c:714
 msgid " with OLE support"
 msgstr "�𣈲�螱 OLE"
 
-#: version.c:692
+#: version.c:717
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
@@ -5524,7 +5788,7 @@ msgstr ""
 "\n"
 "MS-Windows 32 Bit console ���𧋦"
 
-#: version.c:696
+#: version.c:721
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
@@ -5532,7 +5796,7 @@ msgstr ""
 "\n"
 "MS-Windows 32 Bit console ���𧋦"
 
-#: version.c:700
+#: version.c:725
 msgid ""
 "\n"
 "32 bit MS-DOS version"
@@ -5540,7 +5804,7 @@ msgstr ""
 "\n"
 "32 Bit MS-DOS ���𧋦"
 
-#: version.c:702
+#: version.c:727
 msgid ""
 "\n"
 "16 bit MS-DOS version"
@@ -5548,7 +5812,7 @@ msgstr ""
 "\n"
 "16 Bit MS-DOS ���𧋦"
 
-#: version.c:708
+#: version.c:733
 msgid ""
 "\n"
 "MacOS X (unix) version"
@@ -5556,7 +5820,7 @@ msgstr ""
 "\n"
 "MacOS X (unix) ���𧋦"
 
-#: version.c:710
+#: version.c:735
 msgid ""
 "\n"
 "MacOS X version"
@@ -5564,7 +5828,7 @@ msgstr ""
 "\n"
 "MacOS X ���𧋦"
 
-#: version.c:713
+#: version.c:738
 msgid ""
 "\n"
 "MacOS version"
@@ -5572,7 +5836,7 @@ msgstr ""
 "\n"
 "MacOS ���𧋦"
 
-#: version.c:718
+#: version.c:743
 msgid ""
 "\n"
 "RISC OS version"
@@ -5580,7 +5844,7 @@ msgstr ""
 "\n"
 "RISC OS ���𧋦"
 
-#: version.c:728
+#: version.c:753
 msgid ""
 "\n"
 "Included patches: "
@@ -5588,11 +5852,11 @@ msgstr ""
 "\n"
 "撘訫�乩耨甇�: "
 
-#: version.c:754 version.c:1097
+#: version.c:779 version.c:1147
 msgid "Modified by "
 msgstr "靽格㺿����"
 
-#: version.c:761
+#: version.c:786
 msgid ""
 "\n"
 "Compiled "
@@ -5600,11 +5864,11 @@ msgstr ""
 "\n"
 "蝺刻陌"
 
-#: version.c:764
+#: version.c:789
 msgid "by "
 msgstr "��:"
 
-#: version.c:776
+#: version.c:801
 msgid ""
 "\n"
 "Huge version "
@@ -5612,7 +5876,7 @@ msgstr ""
 "\n"
 "頞�撘瑞��𧋦 "
 
-#: version.c:779
+#: version.c:804
 msgid ""
 "\n"
 "Big version "
@@ -5620,7 +5884,7 @@ msgstr ""
 "\n"
 "憭批�讠��𧋦 "
 
-#: version.c:782
+#: version.c:807
 msgid ""
 "\n"
 "Normal version "
@@ -5628,7 +5892,7 @@ msgstr ""
 "\n"
 "銝������𧋦 "
 
-#: version.c:785
+#: version.c:810
 msgid ""
 "\n"
 "Small version "
@@ -5636,7 +5900,7 @@ msgstr ""
 "\n"
 "蝪⊥�梶��𧋦 "
 
-#: version.c:787
+#: version.c:812
 msgid ""
 "\n"
 "Tiny version "
@@ -5644,282 +5908,318 @@ msgstr ""
 "\n"
 "蝎曄陛���𧋦 "
 
-#: version.c:793
+#: version.c:818
 msgid "without GUI."
 msgstr "銝滢蝙�鍂��硋�讠�屸𢒰��"
 
-#: version.c:798
+#: version.c:823
 msgid "with GTK2-GNOME GUI."
 msgstr "雿輻鍂 GTK2-GNOME ��硋�讠�屸𢒰��"
 
-#: version.c:800
+#: version.c:825
 msgid "with GTK-GNOME GUI."
 msgstr "雿輻鍂 GTK-GNOME ��硋�讠�屸𢒰��"
 
-#: version.c:804
+#: version.c:829
 msgid "with GTK2 GUI."
 msgstr "雿輻鍂 GTK2 ��硋�讠�屸𢒰��"
 
-#: version.c:806
+#: version.c:831
 msgid "with GTK GUI."
 msgstr "雿輻鍂 GTK ��硋�讠�屸𢒰��"
 
-#: version.c:811
+#: version.c:836
 msgid "with X11-Motif GUI."
 msgstr "雿輻鍂 X11-Motif ��硋�讠�屸𢒰��"
 
-#: version.c:814
+#: version.c:840
+msgid "with X11-neXtaw GUI."
+msgstr "雿輻鍂 X11-neXtaw ��硋�讠�屸𢒰��"
+
+#: version.c:842
 msgid "with X11-Athena GUI."
 msgstr "雿輻鍂 X11-Athena ��硋�讠�屸𢒰��"
 
-#: version.c:817
+#: version.c:846
 msgid "with BeOS GUI."
 msgstr "雿輻鍂 BeOS ��硋�讠�屸𢒰��"
 
-#: version.c:820
+#: version.c:849
 msgid "with Photon GUI."
 msgstr "雿輻鍂Photon��硋�讠�屸𢒰��"
 
-#: version.c:823
+#: version.c:852
 msgid "with GUI."
 msgstr "雿輻鍂��硋�讠�屸𢒰��"
 
-#: version.c:826
+#: version.c:855
 msgid "with Carbon GUI."
 msgstr "雿輻鍂 Carbon ��硋�讠�屸𢒰��"
 
-#: version.c:829
+#: version.c:858
 msgid "with Cocoa GUI."
 msgstr "雿輻鍂 Cocoa ��硋�讠�屸𢒰��"
 
-#: version.c:832
+#: version.c:861
 msgid "with (classic) GUI."
 msgstr "雿輻鍂 (�喟絞) ��硋�讠�屸𢒰��"
 
-#: version.c:843
+#: version.c:872
 msgid "  Features included (+) or not (-):\n"
 msgstr " �𤌍��滚虾雿輻鍂(+)����滚虾雿輻鍂(-)��璅∠���𡑒”:\n"
 
-#: version.c:855
+#: version.c:884
 msgid "   system vimrc file: \""
 msgstr "        蝟餌絞 vimrc 閮剖�𡁏��: \""
 
-#: version.c:860
+#: version.c:889
 msgid "     user vimrc file: \""
 msgstr "  雿輻鍂���衤犖 vimrc 閮剖�𡁏��: \""
 
-#: version.c:865
+#: version.c:894
 msgid " 2nd user vimrc file: \""
 msgstr "    蝚砌�𣬚��衤犖 vimrc 瑼娍��: \""
 
-#: version.c:870
+#: version.c:899
 msgid " 3rd user vimrc file: \""
 msgstr "    蝚砌�厩��衤犖 vimrc 瑼娍��: \""
 
-#: version.c:875
+#: version.c:904
 msgid "      user exrc file: \""
 msgstr "   雿輻鍂���衤犖 exrc 閮剖�𡁏��: \""
 
-#: version.c:880
+#: version.c:909
 msgid "  2nd user exrc file: \""
 msgstr "   蝚砌�𣬚�雿輻鍂�� exrc 瑼娍��: \""
 
-#: version.c:886
+#: version.c:915
 msgid "  system gvimrc file: \""
 msgstr "         蝟餌絞 gvimrc 瑼娍��: \""
 
-#: version.c:890
+#: version.c:919
 msgid "    user gvimrc file: \""
 msgstr "     雿輻鍂���衤犖 gvimrc 瑼�: \""
 
-#: version.c:894
+#: version.c:923
 msgid "2nd user gvimrc file: \""
 msgstr "   蝚砌�𣬚��衤犖 gvimrc 瑼娍��: \""
 
-#: version.c:899
+#: version.c:928
 msgid "3rd user gvimrc file: \""
 msgstr "   蝚砌�厩��衤犖 gvimrc 瑼娍��: \""
 
-#: version.c:906
+#: version.c:935
 msgid "    system menu file: \""
 msgstr "           蝟餌絞�詨鱓閮剖�𡁏��: \""
 
-#: version.c:914
+#: version.c:943
 msgid "  fall-back for $VIM: \""
 msgstr "              $VIM ��鞱身��: \""
 
-#: version.c:920
+#: version.c:949
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "       $VIMRUNTIME ��鞱身��: \""
 
-#: version.c:924
+#: version.c:953
 msgid "Compilation: "
 msgstr "蝺刻陌�䲮撘�: "
 
-#: version.c:930
+#: version.c:959
 msgid "Compiler: "
 msgstr "蝺刻陌�膥: "
 
-#: version.c:935
+#: version.c:964
 msgid "Linking: "
 msgstr "����鞉䲮撘�: "
 
-#: version.c:940
+#: version.c:969
 msgid "  DEBUG BUILD"
 msgstr "  �膄�𥲤���𧋦"
 
-#: version.c:976
+#: version.c:1008
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: version.c:978
+#: version.c:1010
 msgid "version "
 msgstr "���𧋦   "
 
-#: version.c:979
+#: version.c:1011
 msgid "by Bram Moolenaar et al."
 msgstr "蝬剛風��: Bram Moolenaar et al."
 
-#: version.c:983
+#: version.c:1015
 msgid "Vim is open source and freely distributable"
 msgstr "Vim �箏虾�䌊�眏�袇雿����𧢲𦆮��笔�讠Ⅳ頠罸��"
 
-#: version.c:985
+#: version.c:1017
 msgid "Help poor children in Uganda!"
 msgstr "隢见鼠�𨭌�誩僕�𠉛��虾�𣂼酋蝡�!"
 
-#: version.c:986
+#: version.c:1018
 msgid "type  :help iccf<Enter>       for information "
 msgstr "�脖�甇亥牧��舘�贝撓��          :help iccf<Enter>"
 
-#: version.c:988
+#: version.c:1020
 msgid "type  :q<Enter>               to exit         "
 msgstr "閬��𣪧��贝�贝撓��                  :q<Enter>            "
 
-#: version.c:989
+#: version.c:1021
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "蝺帋�𡃏牧��舘�贝撓��                :help<Enter>         "
 
-#: version.c:990
+#: version.c:1022
 msgid "type  :help version6<Enter>   for version info"
 msgstr "�鰵���𧋦鞈��𡃏�贝撓��              :help version6<Enter>"
 
-#: version.c:993
+#: version.c:1025
 msgid "Running in Vi compatible mode"
 msgstr "Vi �㮾摰寞芋撘�"
 
-#: version.c:994
+#: version.c:1026
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "憒���𡏭�摰��冽芋�挱�喟絞 Vi 隢贝撓�� :set nocp<Enter>"
 
-#: version.c:995
+#: version.c:1027
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "憒���𣈯�閬�撠� Vi �㮾摰寞芋撘讐��脖�甇亥牧��舘�贝撓�� :help cp-default<Enter>"
 
-#: version.c:1010
+#: version.c:1042
 msgid "menu  Help->Orphans           for information    "
 msgstr "�脖�甇亥牧��舘�钅�詨�㚚�詨鱓�� 頛𥪜𨭌隤芣��->�墙��穃迨��"
 
-#: version.c:1012
+#: version.c:1044
 msgid "Running modeless, typed text is inserted"
 msgstr "�嘑銵� Modeless 璅∪�𧶏�諹撓�亦�����埈��䌊��閙�鍦��"
 
-#: version.c:1013
+#: version.c:1045
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
 msgstr "�詨�㚚�詨鱓���𣬚楊頛胯�溻���典�蠘身摰𠾼�溻�����𥟇�鍦�交芋撘譌��"
 
-#: version.c:1014
+#: version.c:1046
 msgid "                              for two modes      "
 msgstr "                              �拍車璅∪��           "
 
-#: version.c:1018
+#: version.c:1050
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr "�詨�㚚�詨鱓���𣬚楊頛胯�溻���典�蠘身摰𠾼�溻�����𥕦�喟絞Vi�㮾摰寞芋撘譌��"
 
-#: version.c:1019
+#: version.c:1051
 msgid "                              for Vim defaults   "
 msgstr "                              隞亙�� Vim ��鞱身��    "
 
-#: version.c:1065
+#: version.c:1098
+msgid "Sponsor Vim development!"
+msgstr "韐𠰴𨭌 Vim ����讠䔄����鞾𩑈嚗�"
+
+#: version.c:1099
+msgid "Become a registered Vim user!"
+msgstr "��鞟�� Vim ��閮餃�𠹺蝙�鍂��嚗�"
+
+#: version.c:1102
+msgid "type  :help sponsor<Enter>    for information "
+msgstr "閰喟敦隤芣�舘�贝撓��          :help sponsor<Enter>"
+
+#: version.c:1103
+msgid "type  :help register<Enter>   for information "
+msgstr "閰喟敦隤芣�舘�贝撓��          :help register<Enter> "
+
+#: version.c:1105
+msgid "menu  Help->Sponsor/Register  for information    "
+msgstr "閰喟敦隤芣�舘�钅�詨�㚚�詨鱓��    頛𥪜𨭌隤芣��->韐𠰴𨭌/閮餃��      "
+
+#: version.c:1115
 msgid "WARNING: Windows 95/98/ME detected"
 msgstr "瘜冽��: �菜葫�� Windows 95/98/ME"
 
-#: version.c:1068
+#: version.c:1118
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr "憒���𣈯�閬�撠� Windows 95 �𣈲�螱���凒憭朞���𡃏�贝撓�� :help windows95<Enter>"
 
-#: window.c:204
+#: window.c:203
 msgid "E441: There is no preview window"
 msgstr "E441: 瘝埝�厰�鞱汗閬𣇉��"
 
-#: window.c:577
+#: window.c:581
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: 銝滩�賢�峕����𠧧閬𣇉�㛖�箏椰銝𠰴��𢰧銝贝��"
 
-#: window.c:1336
+#: window.c:1340
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: ��匧�嗅����𠧧閬𣇉�埈��⊥�閙�贝��"
 
-#: window.c:1827
+#: window.c:1836
 msgid "E444: Cannot close last window"
 msgstr "E444: 銝滩�賡�𣈯�㗇�敺䔶��贝�𣇉��"
 
-#: window.c:2557
+#: window.c:2567
 msgid "Already only one window"
 msgstr "撌脩�枏蘨��銝��贝�𣇉�𦯀�"
 
-#: window.c:2604
+#: window.c:2614
 msgid "E445: Other window contains changes"
 msgstr "E445: �嗅�閬𣇉�埈�㗇凒��閗����"
 
-#: window.c:4449
+#: window.c:4480
 msgid "E446: No file name under cursor"
 msgstr "E446: 皜豢�躰�閙�埝�㗇�𥪜��"
 
-#: window.c:4568
+#: window.c:4599
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: �銁頝臬�睲葉�𪄳銝滚�瑼娍�� \"%s\""
 
-#: ../GvimExt/gvimext.cpp:586
+#: if_perl.xs:326 globals.h:1241
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: �⊥�閖�齿鰵頛匧�亦�见�誩澈 %s"
+
+#: if_perl.xs:554
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr "��甇�, 甇文𦶢隞斤�⊥�蓥蝙�鍂. ��笔��: �⊥�閗�匧�� Perl 蝔见�誩澈(Library)"
+
+#: if_perl.xs:607
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr "E299: �銁 sandbox 銝剔�� Safe 璅∠����⊥�訫嘑銵� Perl"
+
+#: GvimExt/gvimext.cpp:583
 msgid "Edit with &multiple Vims"
 msgstr "雿輻鍂憭𡁜�� Vim session 蝺刻摩(&M)"
 
-#: ../GvimExt/gvimext.cpp:592
+#: GvimExt/gvimext.cpp:589
 msgid "Edit with single &Vim"
 msgstr "�蘨雿輻鍂��䔶��� Vim session 蝺刻摩(&V)"
 
-#: ../GvimExt/gvimext.cpp:601
+#: GvimExt/gvimext.cpp:598
 msgid "&Diff with Vim"
 msgstr "雿輻鍂 Vim 靘�瘥磰�(&Diff)"
 
-#: ../GvimExt/gvimext.cpp:614
+#: GvimExt/gvimext.cpp:611
 msgid "Edit with &Vim"
 msgstr "雿輻鍂 Vim 蝺刻摩甇斗��(&V)"
 
 #. Now concatenate
-#: ../GvimExt/gvimext.cpp:636
+#: GvimExt/gvimext.cpp:633
 msgid "Edit with existing Vim - &"
 msgstr "雿輻鍂�嘑銵䔶葉�� Vim session 蝺刻摩 - &"
 
-#: ../GvimExt/gvimext.cpp:749
+#: GvimExt/gvimext.cpp:746
 msgid "Edits the selected file(s) with Vim"
 msgstr "雿輻鍂 Vim 蝺刻摩撌脤�詨�𣇉�瑼娍��"
 
-#: ../GvimExt/gvimext.cpp:888 ../GvimExt/gvimext.cpp:969
+#: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
 msgid "Error creating process: Check if gvim is in your path!"
 msgstr "�⊥�訫嘑銵𣬚�见��: 隢𧢲炎�䰻 gvim ��㗇�埝�匧銁雿删� PATH 霈𦠜彍鋆�!"
 
-#: ../GvimExt/gvimext.cpp:889 ../GvimExt/gvimext.cpp:903
-#: ../GvimExt/gvimext.cpp:970
+#: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
 msgid "gvimext.dll error"
 msgstr "gvimext.dll �𥲤隤�"
 
-#: ../GvimExt/gvimext.cpp:902
+#: GvimExt/gvimext.cpp:899
 msgid "Path length too long!"
 msgstr "頝臬�煾𩑈摨血云�𩑈!"
 
-#: globals.h:990
+#: globals.h:1031
 msgid "--No lines in buffer--"
 msgstr "--蝺抵�嘥��∟����--"
 
@@ -5927,392 +6227,424 @@ msgstr "--蝺抵�嘥��∟����--"
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: globals.h:1149
+#: globals.h:1194
 msgid "E470: Command aborted"
-msgstr "E470: �𦶢隞方◤撘瑕�銝剜𪃾�嘑銵�"
+msgstr "E470: �𦶢隞方◤撘瑕�銝剜𪃾�嘑銵� "
 
-#: globals.h:1150
+#: globals.h:1195
 msgid "E471: Argument required"
 msgstr "E471: ��閬����誘���彍"
 
-#: globals.h:1151
+#: globals.h:1196
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ 敺屸𢒰��㕑府��� / ? ��� &"
 
-#: globals.h:1153
+#: globals.h:1198
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: 銝滩�賢銁�𦶢隞文�𡑒�𣇉�𦯀葉雿輻鍂��<CR>�嘑銵䕘�龦TRL-C �𣪧���"
 
-#: globals.h:1155
+#: globals.h:1200
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc 鋆∠����誘�⊥�訫嘑銵�"
+msgstr "E12: exrc/vimrc 鋆∠����誘�⊥�訫嘑銵� "
 
-#: globals.h:1157
+#: globals.h:1202
 msgid "E171: Missing :endif"
 msgstr "E171: 蝻箏�� :endif"
 
-#: globals.h:1158
+#: globals.h:1203
 msgid "E600: Missing :endtry"
 msgstr "E600: 蝻箏�� :endtry"
 
-#: globals.h:1159
+#: globals.h:1204
 msgid "E170: Missing :endwhile"
 msgstr "E170: 蝻箏�� :endwhile"
 
-#: globals.h:1160
+#: globals.h:1205
 msgid "E588: :endwhile without :while"
 msgstr "E588: :endwhile 蝻箏�穃�齿�厩� :while"
 
-#: globals.h:1162
+#: globals.h:1207
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: 瑼娍��歇蝬枏�睃銁 (�虾�鍂 ! 撘瑕���碶誨)"
 
-#: globals.h:1163
+#: globals.h:1208
 msgid "E472: Command failed"
 msgstr "E472: �𦶢隞文嘑銵�仃���"
 
-#: globals.h:1165
+#: globals.h:1210
 #, c-format
 msgid "E234: Unknown fontset: %s"
 msgstr "E234: 銝齿迤蝣箇�摮堒���� (Fontset): %s"
 
-#: globals.h:1169
+#: globals.h:1214
 #, c-format
 msgid "E235: Unknown font: %s"
 msgstr "銝齿迤蝣箇�摮堒�见�滨迂: %s"
 
-#: globals.h:1172
+#: globals.h:1217
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
 msgstr "E236: \"%s\" 銝齿糓�𤐄摰𡁜祝摨血�堒��"
 
-#: globals.h:1174
+#: globals.h:1219
 msgid "E473: Internal error"
 msgstr "E473: �折�券𥲤隤�"
 
-#: globals.h:1175
+#: globals.h:1220
 msgid "Interrupted"
 msgstr "撌脖葉�𪃾"
 
-#: globals.h:1176
+#: globals.h:1221
 msgid "E14: Invalid address"
 msgstr "E14: 銝齿迤蝣箇�雿滚�"
 
-#: globals.h:1177
+#: globals.h:1222
 msgid "E474: Invalid argument"
 msgstr "E474: 銝齿迤蝣箇����彍"
 
-#: globals.h:1178
+#: globals.h:1223
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: 銝齿迤蝣箇����彍: %s"
 
-#: globals.h:1180
+#: globals.h:1225
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: 銝齿迤蝣箇��讠�堒��: %s"
 
-#: globals.h:1182
+#: globals.h:1227
 msgid "E16: Invalid range"
 msgstr "E16: 銝齿迤蝣箇�蝭����"
 
-#: globals.h:1183
+#: globals.h:1228
 msgid "E476: Invalid command"
 msgstr "E476: 銝齿迤蝣箇��𦶢隞�"
 
-#: globals.h:1185
+#: globals.h:1230
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" �糓�𤌍��"
 
-#: globals.h:1188
+#: globals.h:1233
 msgid "E18: Unexpected characters before '='"
 msgstr "E18: '=' ��漤𢒰�枂�𣶹鈭��𥲤隤斤�摮堒��"
 
-#: globals.h:1191
+#: globals.h:1236
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: �鐤�㙈�遆撘誩澈 \"%s\"() 憭望��"
 
-#: globals.h:1196
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: �⊥�閖�齿鰵頛匧�亦�见�誩澈 %s"
-
-#: globals.h:1197
+#: globals.h:1242
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: �⊥�閗�匧�亦�见�誩澈���遆撘� %s"
 
-#: globals.h:1199
+#: globals.h:1244
 msgid "E19: Mark has invalid line number"
 msgstr "E19: 璅躰�条�銵諹�罸𥲤隤�"
 
-#: globals.h:1200
+#: globals.h:1245
 msgid "E20: Mark not set"
 msgstr "E20: 瘝埝�㕑身摰𡁏�躰��"
 
-#: globals.h:1201
+#: globals.h:1246
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: ��删�� 'modifiable' �賊��糓��𣈯�厩�嚗峕�隞乩�滩�賭耨�㺿"
 
-#: globals.h:1202
+#: globals.h:1247
 msgid "E22: Scripts nested too deep"
 msgstr "E22: 撌Y��噼艘�鐤�㙈憭芸�𡁜惜"
 
-#: globals.h:1203
+#: globals.h:1248
 msgid "E23: No alternate file"
 msgstr "E23: 瘝埝�㗇𤜯隞��瑼娍��"
 
-#: globals.h:1204
+#: globals.h:1249
 msgid "E24: No such abbreviation"
 msgstr "E24: 瘝埝�厰�坔�� abbreviation 撠齿��"
 
-#: globals.h:1205
+#: globals.h:1250
 msgid "E477: No ! allowed"
 msgstr "E477: 銝滚虾雿輻鍂 '!'"
 
-#: globals.h:1207
+#: globals.h:1252
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: ��删�箇楊霅舀�瘝埝�匧�惩�亙�硋�讠�屸𢒰��蝔见�讐Ⅳ嚗峕�隞亦�⊥�蓥蝙�鍂��硋�讠�屸𢒰"
 
-#: globals.h:1210
+#: globals.h:1255
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: ��删�箇楊霅舀�瘝埝�匧�惩�� Hebrew ��蝔见�讐Ⅳ嚗峕�隞亦�⊥�蓥蝙�鍂 Hebrew\n"
 
-#: globals.h:1213
+#: globals.h:1258
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
 msgstr "E27: ��删�箇楊霅舀�瘝埝�匧�惩�� Farsi ��蝔见�讐Ⅳ嚗峕�隞亦�⊥�蓥蝙�鍂 Farsi\n"
 
-#: globals.h:1216
+#: globals.h:1261
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ��删�箇楊霅舀�瘝埝�匧�惩�� Arabic ��蝔见�讐Ⅳ嚗峕�隞亦�⊥�蓥蝙�鍂\n"
+
+#: globals.h:1264
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: 瘝埝�匧�滨�� '%s' �� highlight group"
 
-#: globals.h:1218
+#: globals.h:1266
 msgid "E29: No inserted text yet"
 msgstr "E29: ��瘝埝�㗇�鍦�交���烾��"
 
-#: globals.h:1219
+#: globals.h:1267
 msgid "E30: No previous command line"
 msgstr "E30: 瘝埝�匧�滢����𦶢隞�"
 
-#: globals.h:1220
+#: globals.h:1268
 msgid "E31: No such mapping"
 msgstr "E31: 瘝埝�厰�坔�� mapping 撠齿��"
 
-#: globals.h:1221
+#: globals.h:1269
 msgid "E479: No match"
 msgstr "E479: �𪄳銝滚�"
 
-#: globals.h:1222
+#: globals.h:1270
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: �𪄳銝滚�: %s"
 
-#: globals.h:1223
+#: globals.h:1271
 msgid "E32: No file name"
 msgstr "E32: 瘝埝�㗇�𥪜��"
 
-#: globals.h:1224
+#: globals.h:1272
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: 瘝埝�匧�滢��𧢲�𨅯��/��碶誨���𦶢隞�"
 
-#: globals.h:1225
+#: globals.h:1273
 msgid "E34: No previous command"
 msgstr "E34: 瘝埝�匧�滢��见𦶢隞�"
 
-#: globals.h:1226
+#: globals.h:1274
 msgid "E35: No previous regular expression"
 msgstr "E35: 瘝埝�匧�滢��𧢲�𨅯�𧢲��誘"
 
-#: globals.h:1227
+#: globals.h:1275
 msgid "E481: No range allowed"
 msgstr "E481: 銝滚虾雿輻鍂蝭���齿��誘"
 
-#: globals.h:1229
+#: globals.h:1277
 msgid "E36: Not enough room"
 msgstr "E36: 瘝埝�㕑雲憭删�蝛粹��"
 
-#: globals.h:1232
+#: globals.h:1280
 #, c-format
 msgid "E247: no registered server named \"%s\""
 msgstr "E247: 瘝埝�㕑酉�羓�� \"%s\" ��隡箸�滚膥"
 
-#: globals.h:1234
+#: globals.h:1282
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: 銝滩�賢遣蝡𧢲�娍�� %s"
 
-#: globals.h:1235
+#: globals.h:1283
 msgid "E483: Can't get temp file name"
 msgstr "E483: �⊥�訫�㛖䰻�麱摮䀹�𥪜��"
 
-#: globals.h:1236
+#: globals.h:1284
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: �⊥�閖�见���娍�� %s"
 
-#: globals.h:1237
+#: globals.h:1285
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: �⊥�閗���𡝗�娍�� %s"
 
-#: globals.h:1238
+#: globals.h:1286
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: 撌脫凒�㺿�擧�娍���撠𡁏𧊋摮䀹�� (�虾�鍂 ! 撘瑕��嘑銵�)"
 
-#: globals.h:1239
+#: globals.h:1287
 msgid "E38: Null argument"
 msgstr "E38: 蝛箇� (Null) ���彍"
 
-#: globals.h:1241
+#: globals.h:1289
 msgid "E39: Number expected"
 msgstr "E39: ��㕑府閬���㗇彍摮�"
 
-#: globals.h:1244
+#: globals.h:1292
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: �⊥�閖�见�罸𥲤隤斗�娍�� %s"
 
-#: globals.h:1247
+#: globals.h:1295
 msgid "E233: cannot open display"
 msgstr "E233: <銝滩�賡�见�� X Server DISPLAY>"
 
-#: globals.h:1249
+#: globals.h:1297
 msgid "E41: Out of memory!"
 msgstr "E41: 閮䀹�園�𥪯�滩雲!"
 
-#: globals.h:1251
+#: globals.h:1299
 msgid "Pattern not found"
 msgstr "�𪄳銝滚�"
 
-#: globals.h:1253
+#: globals.h:1301
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: �𪄳銝滚� %s"
 
-#: globals.h:1254
+#: globals.h:1302
 msgid "E487: Argument must be positive"
 msgstr "E487: ���彍��㕑府�糓甇�彍"
 
-#: globals.h:1256
+#: globals.h:1304
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: �⊥�訫�𧼮���滢��讠𤌍��"
 
-#: globals.h:1260
+#: globals.h:1308
 msgid "E42: No Errors"
 msgstr "E42: 瘝埝�厰𥲤隤�"
 
-#: globals.h:1262
+#: globals.h:1310
 msgid "E43: Damaged match string"
 msgstr "E43: 蝚血���𦯀葡��匧�誯��"
 
-#: globals.h:1263
+#: globals.h:1311
 msgid "E44: Corrupted regexp program"
 msgstr "E44: regexp ��匧�誯��"
 
-#: globals.h:1264
+#: globals.h:1312
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: ��㕑身摰� 'readonly' �賊�(�𣈲霈�) (�虾�鍂 ! 撘瑕��嘑銵�)"
 
-#: globals.h:1266
+#: globals.h:1314
 #, c-format
 msgid "E46: Cannot set read-only variable \"%s\""
 msgstr "E46: �⊥�閗身摰𡁜𣈲霈�霈𦠜彍 \"%s\""
 
-#: globals.h:1269
+#: globals.h:1317
 msgid "E47: Error while reading errorfile"
 msgstr "E47: 霈���㚚𥲤隤斗�娍��仃���"
 
-#: globals.h:1272
+#: globals.h:1320
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: 銝滩�賢銁 sandbox 鋆∪枂�𣶹"
 
-#: globals.h:1274
+#: globals.h:1322
 msgid "E523: Not allowed here"
 msgstr "E523: �躰ㄐ銝滚虾雿輻鍂"
 
-#: globals.h:1277
+#: globals.h:1325
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: 銝齿𣈲�螱閮剖�朞攟撟閙芋撘�"
 
-#: globals.h:1279
+#: globals.h:1327
 msgid "E49: Invalid scroll size"
 msgstr "E49: �𥲤隤斤��㬢��訫之撠�"
 
-#: globals.h:1280
+#: globals.h:1328
 msgid "E91: 'shell' option is empty"
 msgstr "E91: 'E71: �賊� 'shell' �𧊋閮剖��"
 
-#: globals.h:1282
+#: globals.h:1330
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: �⊥�閗���� sign data!"
 
-#: globals.h:1284
+#: globals.h:1332
 msgid "E72: Close error on swap file"
 msgstr "E72: �麱摮䀹�娪�𣈯�厰𥲤隤�"
 
-#: globals.h:1285
+#: globals.h:1333
 msgid "E73: tag stack empty"
 msgstr "E73: 璅嗵惜����𠰴歇蝛�"
 
-#: globals.h:1286
+#: globals.h:1334
 msgid "E74: Command too complex"
 msgstr "E74: �𦶢隞文云銴���"
 
-#: globals.h:1287
+#: globals.h:1335
 msgid "E75: Name too long"
 msgstr "E75: ��滚�堒云�𩑈"
 
-#: globals.h:1288
+#: globals.h:1336
 msgid "E76: Too many ["
 msgstr "E76: 憭芸�� ["
 
-#: globals.h:1289
+#: globals.h:1337
 msgid "E77: Too many file names"
 msgstr "E77: 憭芸�𡁏�𥪜��"
 
-#: globals.h:1290
+#: globals.h:1338
 msgid "E488: Trailing characters"
 msgstr "E488: 雿㰘撓�乩�憭𡁻�条�摮堒��"
 
-#: globals.h:1291
+#: globals.h:1339
 msgid "E78: Unknown mark"
 msgstr "E78: �⊥�閗齒霅条�璅躰��"
 
-#: globals.h:1292
+#: globals.h:1340
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: �⊥�訫�閖�贝𨯬�鍂摮堒��"
 
-#: globals.h:1294
+#: globals.h:1342
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' 銝滩�賣�� 'winminheight' �凒撠�"
 
-#: globals.h:1296
+#: globals.h:1344
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' 銝滩�賣�� 'winminwidth' �凒撠�"
 
-#: globals.h:1299
+#: globals.h:1347
 msgid "E80: Error while writing"
 msgstr "E80: 撖怠�仿𥲤隤�"
 
-#: globals.h:1300
+#: globals.h:1348
 msgid "Zero count"
 msgstr "�彍���妟 (?)"
 
-#: globals.h:1302
+#: globals.h:1350
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> 銝滩�賢銁 script �𧋦����碶蝙�鍂."
 
-#: globals.h:1305
+#: globals.h:1353
 msgid "E449: Invalid expression received"
 msgstr "E449: �𤣰��銝齿迤蝣箇��讠�堒��"
 
-#: globals.h:1308
+#: globals.h:1356
 msgid "E463: Region is guarded, cannot modify"
 msgstr "E463: ����蠘◤靽肽風嚗𣬚�⊥�蓥耨�㺿"
 
+#~ msgid "E565: error reading cscope connection %d"
+#~ msgstr "E565: 霈���� cscope ���� %d �𥲤隤�"
+
+#~ msgid "E260: cscope connection not found"
+#~ msgstr "E260: �𪄳銝滚� cscope ����"
+
+#~ msgid "cscope connection closed"
+#~ msgstr "cscope ���𡁜歇��𣈯��"
+
+#~ msgid "couldn't malloc\n"
+#~ msgstr "�⊥�蓥蝙�鍂 malloc\n"
+
+#~ msgid "%2d %-5ld  %-34s  <none>\n"
+#~ msgstr "%2d %-5ld  %-34s  <��>\n"
+
+#~ msgid "\"\n"
+#~ msgstr "\"\n"
+
+#~ msgid "--help\t\tShow Gnome arguments"
+#~ msgstr "--help\t\t憿舐內 Gnome �㮾��𨅯��彍"
+
+#~ msgid " BLOCK"
+#~ msgstr " ��憛�"
+
+#~ msgid " LINE"
+#~ msgstr " 銵屸�詨��"
+
+#~ msgid "Linear tag search"
+#~ msgstr "蝺𡁏�扳�𨅯�𧢲�嗵惜 (Tags)"
+
+#~ msgid "Binary tag search"
+#~ msgstr "鈭����𨅯��(Binary search) 璅嗵惜(Tags)"
+
 #~ msgid "function "
 #~ msgstr "�遆撘� "