updated for version 7.0055v7.0055

26 files changed, 4768 insertions, 3418 deletions

diff --git a/src/VisVim/Res/ToolbarL.bmp b/src/VisVim/Res/ToolbarL.bmp
new file mode 100644
index 000000000..e11c66fc6
--- /dev/null
+++ b/src/VisVim/Res/ToolbarL.bmp
diff --git a/src/VisVim/Res/ToolbarM.bmp b/src/VisVim/Res/ToolbarM.bmp
new file mode 100644
index 000000000..22e15f489
--- /dev/null
+++ b/src/VisVim/Res/ToolbarM.bmp
diff --git a/src/eval.c b/src/eval.c
index bde12e56e..c7aba5145 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -316,6 +316,8 @@ static struct vimvar
     {VV_NAME("val",		 VAR_UNKNOWN), VV_RO},
     {VV_NAME("key",		 VAR_UNKNOWN), VV_RO},
     {VV_NAME("profiling",	 VAR_NUMBER), VV_RO},
+    {VV_NAME("fcs_reason",	 VAR_STRING), VV_RO},
+    {VV_NAME("fcs_choice",	 VAR_STRING), 0},
 };
 
 /* shorthand */
@@ -549,6 +551,7 @@ static void f_synID __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_synIDattr __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_synIDtrans __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_system __ARGS((typval_T *argvars, typval_T *rettv));
+static void f_taglist __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_tempname __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_tolower __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_toupper __ARGS((typval_T *argvars, typval_T *rettv));
@@ -6196,6 +6199,7 @@ static struct fst
     {"synIDattr",	2, 3, f_synIDattr},
     {"synIDtrans",	1, 1, f_synIDtrans},
     {"system",		1, 2, f_system},
+    {"taglist",		1, 1, f_taglist},
     {"tempname",	0, 0, f_tempname},
     {"tolower",		1, 1, f_tolower},
     {"toupper",		1, 1, f_toupper},
@@ -13134,6 +13138,35 @@ done:
 }
 
 /*
+ * "gettags()" function
+ */
+    static void
+f_taglist(argvars, rettv)
+    typval_T  *argvars;
+    typval_T  *rettv;
+{
+    char_u  *tag_pattern;
+    list_T  *l;
+
+    tag_pattern = get_tv_string(&argvars[0]);
+
+    rettv->vval.v_number = FALSE;
+
+    l = list_alloc();
+    if (l != NULL)
+    {
+	if (get_tags(l, tag_pattern) != FAIL)
+	{
+	    rettv->vval.v_list = l;
+	    rettv->v_type = VAR_LIST;
+	    ++l->lv_refcount;
+	}
+	else
+	    list_free(l);
+    }
+}
+
+/*
  * "tempname()" function
  */
 /*ARGSUSED*/
@@ -14010,7 +14043,7 @@ set_vim_var_nr(idx, val)
 }
 
 /*
- * Get number v: variable value;
+ * Get number v: variable value.
  */
     long
 get_vim_var_nr(idx)
@@ -14019,6 +14052,18 @@ get_vim_var_nr(idx)
     return vimvars[idx].vv_nr;
 }
 
+#if defined(FEAT_AUTOCMD) || defined(PROTO)
+/*
+ * Get string v: variable value.  Uses a static buffer, can only be used once.
+ */
+    char_u *
+get_vim_var_str(idx)
+    int		idx;
+{
+    return get_tv_string(&vimvars[idx].vv_tv);
+}
+#endif
+
 /*
  * Set v:count, v:count1 and v:prevcount.
  */
diff --git a/src/fileio.c b/src/fileio.c
index c3aef90a1..1edf0ae79 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1331,7 +1331,8 @@ retry:
 
 		/*
 		 * If there is conversion error or not enough room try using
-		 * another conversion.
+		 * another conversion.  Except for when there is no
+		 * alternative (help files).
 		 */
 		while ((iconv(iconv_fd, (void *)&fromp, &from_size,
 							       &top, &to_size)
@@ -2753,7 +2754,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
 	    if (!(did_cmd = apply_autocmds_exarg(EVENT_BUFWRITECMD,
 					 sfname, sfname, FALSE, curbuf, eap)))
 	    {
-		if (bt_nofile(curbuf))
+		if (overwriting && bt_nofile(curbuf))
 		    nofile_err = TRUE;
 		else
 		    apply_autocmds_exarg(EVENT_BUFWRITEPRE,
@@ -2765,7 +2766,7 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
 	    if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD,
 					 sfname, sfname, FALSE, curbuf, eap)))
 	    {
-		if (bt_nofile(curbuf))
+		if (overwriting && bt_nofile(curbuf))
 		    nofile_err = TRUE;
 		else
 		    apply_autocmds_exarg(EVENT_FILEWRITEPRE,
@@ -5917,7 +5918,10 @@ buf_check_timestamp(buf, focus)
 #endif
 #ifdef FEAT_AUTOCMD
     static int	busy = FALSE;
+    int		n;
+    char_u	*s;
 #endif
+    char	*reason;
 
     /* If there is no file name, the buffer is not loaded, 'buftype' is
      * set, we are in the middle of a save or being called recursively: ignore
@@ -5975,15 +5979,26 @@ buf_check_timestamp(buf, focus)
 	    reload = TRUE;
 	else
 	{
-#ifdef FEAT_AUTOCMD
-	    int n;
+	    if (stat_res < 0)
+		reason = "deleted";
+	    else if (bufIsChanged(buf))
+		reason = "conflict";
+	    else if (orig_size != buf->b_orig_size || buf_contents_changed(buf))
+		reason = "changed";
+	    else if (orig_mode != buf->b_orig_mode)
+		reason = "mode";
+	    else
+		reason = "time";
 
+#ifdef FEAT_AUTOCMD
 	    /*
 	     * Only give the warning if there are no FileChangedShell
 	     * autocommands.
 	     * Avoid being called recursively by setting "busy".
 	     */
 	    busy = TRUE;
+	    set_vim_var_string(VV_FCS_REASON, (char_u *)reason, -1);
+	    set_vim_var_string(VV_FCS_CHOICE, (char_u *)"", -1);
 	    n = apply_autocmds(EVENT_FILECHANGEDSHELL,
 				      buf->b_fname, buf->b_fname, FALSE, buf);
 	    busy = FALSE;
@@ -5991,13 +6006,19 @@ buf_check_timestamp(buf, focus)
 	    {
 		if (!buf_valid(buf))
 		    EMSG(_("E246: FileChangedShell autocommand deleted buffer"));
-		return 2;
+		s = get_vim_var_str(VV_FCS_CHOICE);
+		if (STRCMP(s, "reload") == 0 && *reason != 'd')
+		    reload = TRUE;
+		else if (STRCMP(s, "ask") == 0)
+		    n = FALSE;
+		else
+		    return 2;
 	    }
-	    else
+	    if (!n)
 #endif
 	    {
-		if (stat_res < 0)
-		    mesg = _("E211: Warning: File \"%s\" no longer available");
+		if (*reason == 'd')
+		    mesg = _("E211: File \"%s\" no longer available");
 		else
 		{
 		    helpmesg = TRUE;
@@ -6010,13 +6031,22 @@ buf_check_timestamp(buf, focus)
 		     * checked out of CVS).  Always warn when the buffer was
 		     * changed.
 		     */
-		    if (bufIsChanged(buf))
+		    if (reason[2] == 'n')
+		    {
 			mesg = _("W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as well");
-		    else if (orig_size != buf->b_orig_size
-			    || buf_contents_changed(buf))
+			mesg2 = _("See \":help W12\" for more info.");
+		    }
+		    else if (reason[1] == 'h')
+		    {
 			mesg = _("W11: Warning: File \"%s\" has changed since editing started");
-		    else if (orig_mode != buf->b_orig_mode)
+			mesg2 = _("See \":help W11\" for more info.");
+		    }
+		    else if (*reason == 'm')
+		    {
 			mesg = _("W16: Warning: Mode of file \"%s\" has changed since editing started");
+			mesg2 = _("See \":help W16\" for more info.");
+		    }
+		    /* Else: only timestamp changed, ignored */
 		}
 	    }
 	}
@@ -6038,9 +6068,7 @@ buf_check_timestamp(buf, focus)
 	path = home_replace_save(buf, buf->b_fname);
 	if (path != NULL)
 	{
-	    if (helpmesg)
-		mesg2 = _("See \":help W11\" for more info.");
-	    else
+	    if (!helpmesg)
 		mesg2 = "";
 	    tbuf = alloc((unsigned)(STRLEN(path) + STRLEN(mesg)
 							+ STRLEN(mesg2) + 2));
diff --git a/src/getchar.c b/src/getchar.c
index 8328e19a1..e93ce0529 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1483,10 +1483,14 @@ vgetc()
 #endif
 	   )
 	{
+	    int	    save_allow_keys = allow_keys;
+
 	    ++no_mapping;
+	    allow_keys = 0;		/* make sure BS is not found */
 	    c2 = vgetorpeek(TRUE);	/* no mapping for these chars */
 	    c = vgetorpeek(TRUE);
 	    --no_mapping;
+	    allow_keys = save_allow_keys;
 	    if (c2 == KS_MODIFIER)
 	    {
 		mod_mask = c;
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 8abdf8613..debc11bc4 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -896,6 +896,38 @@ keyval_to_string(unsigned int keyval, unsigned int state, char_u *string)
 }
 #endif /* HAVE_GTK2 */
 
+    static int
+modifiers_gdk2vim(guint state)
+{
+    int modifiers = 0;
+
+    if (state & GDK_SHIFT_MASK)
+	modifiers |= MOD_MASK_SHIFT;
+    if (state & GDK_CONTROL_MASK)
+	modifiers |= MOD_MASK_CTRL;
+    if (state & GDK_MOD1_MASK)
+	modifiers |= MOD_MASK_ALT;
+    if (state & GDK_MOD4_MASK)
+	modifiers |= MOD_MASK_META;
+
+    return modifiers;
+}
+
+    static int
+modifiers_gdk2mouse(guint state)
+{
+    int modifiers = 0;
+
+    if (state & GDK_SHIFT_MASK)
+	modifiers |= MOUSE_SHIFT;
+    if (state & GDK_CONTROL_MASK)
+	modifiers |= MOUSE_CTRL;
+    if (state & GDK_MOD1_MASK)
+	modifiers |= MOUSE_ALT;
+
+    return modifiers;
+}
+
 /*
  * Main keyboard handler:
  */
@@ -1112,13 +1144,7 @@ key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
 #endif
 	    )
     {
-	modifiers = 0;
-	if (state & GDK_SHIFT_MASK)
-	    modifiers |= MOD_MASK_SHIFT;
-	if (state & GDK_CONTROL_MASK)
-	    modifiers |= MOD_MASK_CTRL;
-	if (state & GDK_MOD1_MASK)
-	    modifiers |= MOD_MASK_ALT;
+	modifiers = modifiers_gdk2vim(state);
 
 	/*
 	 * For some keys a shift modifier is translated into another key
@@ -1598,13 +1624,7 @@ process_motion_notify(int x, int y, GdkModifierType state)
     }
 
     /* translate modifier coding between the main engine and GTK */
-    vim_modifiers = 0x0;
-    if (state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(state);
 
     /* inform the editor engine about the occurence of this event */
     gui_send_mouse_event(button, x, y, FALSE, vim_modifiers);
@@ -1796,13 +1816,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 	xim_reset();
 #endif
 
-    vim_modifiers = 0x0;
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers);
     if (gtk_main_level() > 0)
@@ -1821,7 +1835,7 @@ button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
 scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 {
     int	    button;
-    int_u   vim_modifiers = 0;
+    int_u   vim_modifiers;
 
     if (gtk_socket_id != 0 && !GTK_WIDGET_HAS_FOCUS(widget))
 	gtk_widget_grab_focus(widget);
@@ -1844,12 +1858,7 @@ scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
 	xim_reset();
 # endif
 
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(button, (int)event->x, (int)event->y,
 							FALSE, vim_modifiers);
@@ -1881,13 +1890,7 @@ button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
     x = event->x;
     y = event->y;
 
-    vim_modifiers = 0x0;
-    if (event->state & GDK_SHIFT_MASK)
-	vim_modifiers |= MOUSE_SHIFT;
-    if (event->state & GDK_CONTROL_MASK)
-	vim_modifiers |= MOUSE_CTRL;
-    if (event->state & GDK_MOD1_MASK)
-	vim_modifiers |= MOUSE_ALT;
+    vim_modifiers = modifiers_gdk2mouse(event->state);
 
     gui_send_mouse_event(MOUSE_RELEASE, x, y, FALSE, vim_modifiers);
     if (gtk_main_level() > 0)
@@ -2001,16 +2004,11 @@ drag_handle_uri_list(GdkDragContext	*context,
 
     if (fnames != NULL && nfiles > 0)
     {
-	int_u   modifiers = 0;
+	int_u   modifiers;
 
 	gtk_drag_finish(context, TRUE, FALSE, time_); /* accept */
 
-	if (state & GDK_SHIFT_MASK)
-	    modifiers |= MOUSE_SHIFT;
-	if (state & GDK_CONTROL_MASK)
-	    modifiers |= MOUSE_CTRL;
-	if (state & GDK_MOD1_MASK)
-	    modifiers |= MOUSE_ALT;
+	modifiers = modifiers_gdk2mouse(state);
 
 	gui_handle_drop(x, y, modifiers, fnames, nfiles);
     }
@@ -2061,12 +2059,7 @@ drag_handle_text(GdkDragContext	    *context,
     vim_free(tmpbuf);
 # endif
 
-    if (state & GDK_SHIFT_MASK)
-	dropkey[2] |= MOD_MASK_SHIFT;
-    if (state & GDK_CONTROL_MASK)
-	dropkey[2] |= MOD_MASK_CTRL;
-    if (state & GDK_MOD1_MASK)
-	dropkey[2] |= MOD_MASK_ALT;
+    dropkey[2] = modifiers_gdk2vim(state);
 
     if (dropkey[2] != 0)
 	add_to_input_buf(dropkey, (int)sizeof(dropkey));
diff --git a/src/gui_w32.c b/src/gui_w32.c
index d6d37c4d1..230836247 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1958,7 +1958,7 @@ gui_mch_draw_string(
 	    ++clen;
 	}
 	ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
-			     foptions, pcliprect, unicodebuf, clen, unicodepdy);
+			   foptions, pcliprect, unicodebuf, clen, unicodepdy);
 	len = cells;	/* used for underlining */
     }
     else if ((enc_codepage > 0 && (int)GetACP() != enc_codepage) || enc_latin9)
@@ -1975,8 +1975,26 @@ gui_mch_draw_string(
 			(char *)text, len,
 			(LPWSTR)unicodebuf, unibuflen);
 	    if (len != 0)
+	    {
+		/* Use unicodepdy to make characters fit as we expect, even
+		 * when the font uses different widths (e.g., bold character
+		 * is wider). */
+		if (unicodepdy != NULL)
+		{
+		    int i;
+		    int cw;
+
+		    for (i = 0; i < len; ++i)
+		    {
+			cw = utf_char2cells(unicodebuf[i]);
+			if (cw > 2)
+			    cw = 1;
+			unicodepdy[i] = cw * gui.char_width;
+		    }
+		}
 		ExtTextOutW(s_hdc, TEXT_X(col), TEXT_Y(row),
-			      foptions, pcliprect, unicodebuf, len, NULL);
+			    foptions, pcliprect, unicodebuf, len, unicodepdy);
+	    }
 	}
     }
     else
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 6d990c5d1..809054f0f 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -998,6 +998,8 @@ gui_x11_key_hit_cb(w, dud, event, dum)
 	    modifiers |= MOD_MASK_CTRL;
 	if (ev_press->state & Mod1Mask)
 	    modifiers |= MOD_MASK_ALT;
+	if (ev_press->state & Mod4Mask)
+	    modifiers |= MOD_MASK_META;
 
 	/*
 	 * For some keys a shift modifier is translated into another key
diff --git a/src/keymap.h b/src/keymap.h
index cb79ad1e1..5babdf4af 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -458,23 +458,24 @@ enum key_extra
 #define MOD_MASK_SHIFT	    0x02
 #define MOD_MASK_CTRL	    0x04
 #define MOD_MASK_ALT	    0x08	/* aka META */
-#define MOD_MASK_2CLICK	    0x10	/* use MOD_MASK_MULTI_CLICK */
-#define MOD_MASK_3CLICK	    0x20	/* use MOD_MASK_MULTI_CLICK */
-#define MOD_MASK_4CLICK	    0x30	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_META	    0x10	/* META when it's different from ALT */
+#define MOD_MASK_2CLICK	    0x20	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_3CLICK	    0x40	/* use MOD_MASK_MULTI_CLICK */
+#define MOD_MASK_4CLICK	    0x60	/* use MOD_MASK_MULTI_CLICK */
 #ifdef MACOS
-# define MOD_MASK_CMD	     0x80
+# define MOD_MASK_CMD	    0x80
 #endif
 
 #define MOD_MASK_MULTI_CLICK	(MOD_MASK_2CLICK|MOD_MASK_3CLICK|MOD_MASK_4CLICK)
 
 /*
  * The length of the longest special key name, including modifiers.
- * Current longest is <M-C-S-4-MiddleRelease> (length includes '<' and '>').
+ * Current longest is <M-C-S-T-4-MiddleRelease> (length includes '<' and '>').
  */
-#define MAX_KEY_NAME_LEN    23
+#define MAX_KEY_NAME_LEN    25
 
 /* Maximum length of a special key event as tokens.  This includes modifiers.
- * The longest event is something like <M-C-S-4-LeftDrag> which would be the
+ * The longest event is something like <M-C-S-T-4-LeftDrag> which would be the
  * following string of tokens:
  *
  * <K_SPECIAL> <KS_MODIFIER> bitmask <K_SPECIAL> <KS_EXTRA> <KT_LEFTDRAG>.
diff --git a/src/misc2.c b/src/misc2.c
index d5a80929b..9b21168d8 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1644,6 +1644,7 @@ static struct modmasktable
 } mod_mask_table[] =
 {
     {MOD_MASK_ALT,		MOD_MASK_ALT,		(char_u)'M'},
+    {MOD_MASK_META,		MOD_MASK_META,		(char_u)'T'},
     {MOD_MASK_CTRL,		MOD_MASK_CTRL,		(char_u)'C'},
     {MOD_MASK_SHIFT,		MOD_MASK_SHIFT,		(char_u)'S'},
     {MOD_MASK_MULTI_CLICK,	MOD_MASK_2CLICK,	(char_u)'2'},
diff --git a/src/normal.c b/src/normal.c
index 2d2efc2f3..9bf2e66b7 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -2257,7 +2257,8 @@ do_mouse(oap, c, dir, count, fixindent)
      * multiple clicks and the middle mouse button.
      * Accept shift-leftmouse drags when 'mousemodel' is "popup.*".
      */
-    if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT))
+    if ((mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL | MOD_MASK_ALT
+							     | MOD_MASK_META))
 	    && (!is_click
 		|| (mod_mask & MOD_MASK_MULTI_CLICK)
 		|| which_button == MOUSE_MIDDLE)
diff --git a/src/option.c b/src/option.c
index 5cf1b4620..e7210b3f9 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3149,11 +3149,13 @@ set_init_2()
 	 * with a dark background, that can handle color.  Recognized are:
 	 * "linux"	    Linux console
 	 * "screen.linux"   Linux console with screen
+	 * "cygwin"	    Cygwin shell
 	 */
 	idx = findoption((char_u *)"bg");
 	if (!(options[idx].flags & P_WAS_SET)
 		&& (STRCMP(T_NAME, "linux") == 0
-		    || STRCMP(T_NAME, "screen.linux") == 0))
+		    || STRCMP(T_NAME, "screen.linux") == 0
+		    || STRCMP(T_NAME, "cygwin") == 0))
 	{
 	    set_string_option_direct(NULL, idx, (char_u *)"dark", OPT_FREE);
 	    /* don't mark it as set, when starting the GUI it may be changed
diff --git a/src/os_mac_conv.c b/src/os_mac_conv.c
index 68d46c0f2..eed0ebbe9 100644
--- a/src/os_mac_conv.c
+++ b/src/os_mac_conv.c
@@ -292,7 +292,13 @@ mac_conv_init()
 
     if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
 		utf8_canon_encoding) != noErr)
-	gUTF16ToUTF8Converter = NULL;
+    {
+	/* On pre-10.3, Unicode normalization is not available so
+	 * fall back to non-normalizing converter */
+	if (TECCreateConverter(&gUTF16ToUTF8Converter, utf16_encoding,
+		    utf8_encoding) != noErr)
+	    gUTF16ToUTF8Converter = NULL;
+    }
 }
 
 /*
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 4f3a49bef..5e96da8af 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -385,6 +385,7 @@ mch_FullName(
     else
 #endif
     {
+#ifdef FEAT_MBYTE
 	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage
 # ifdef __BORLANDC__
 		/* Wide functions of Borland C 5.5 do not work on Windows 98. */
@@ -415,7 +416,6 @@ mch_FullName(
 	    vim_free(wname);
 	    vim_free(cname);
 	}
-#ifdef FEAT_MBYTE
 	if (nResult == FAIL)	    /* fall back to non-wide function */
 #endif
 	{
@@ -2487,8 +2487,13 @@ serverSendEnc(HWND target)
     COPYDATASTRUCT data;
 
     data.dwData = COPYDATA_ENCODING;
+#ifdef FEAT_MBYTE
     data.cbData = STRLEN(p_enc) + 1;
     data.lpData = p_enc;
+#else
+    data.cbData = STRLEN("latin1") + 1;
+    data.lpData = "latin1";
+#endif
     (void)SendMessage(target, WM_COPYDATA, (WPARAM)message_window,
 							     (LPARAM)(&data));
 }
diff --git a/src/po/ja.po b/src/po/ja.po
index 17d94d516..8b8559efc 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -3,188 +3,188 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-4.
-# Last Change: 29-Apr-2004.
+# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-5.
+# Last Change: 05-Mar-2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 6.2\n"
-"POT-Creation-Date: 2004-04-29 13:16+0900\n"
-"PO-Revision-Date: 2004-04-29 13:00+0900\n"
+"Project-Id-Version: Vim 7.0\n"
+"POT-Creation-Date: 2005-03-04 13:11+0900\n"
+"PO-Revision-Date: 2004-03-05 00:50+0900\n"
 "Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buffer.c:102
+#: ../buffer.c:102
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: バッファを1つも作成できないので, 終了します..."
 
-#: buffer.c:105
+#: ../buffer.c:105
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: バッファを作成できないので, 他のを使用します..."
 
-#: buffer.c:805
+#: ../buffer.c:857
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 解放されたバッファはありません"
 
-#: buffer.c:807
+#: ../buffer.c:859
 msgid "E516: No buffers were deleted"
 msgstr "E516: 削除されたバッファはありません"
 
-#: buffer.c:809
+#: ../buffer.c:861
 msgid "E517: No buffers were wiped out"
 msgstr "E517: 破棄されたバッファはありません"
 
-#: buffer.c:817
+#: ../buffer.c:869
 msgid "1 buffer unloaded"
 msgstr "1 個のバッファが解放されました"
 
-#: buffer.c:819
+#: ../buffer.c:871
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d 個のバッファが解放されました"
 
-#: buffer.c:824
+#: ../buffer.c:876
 msgid "1 buffer deleted"
 msgstr "1 個のバッファが削除されました"
 
-#: buffer.c:826
+#: ../buffer.c:878
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d 個のバッファが削除されました"
 
-#: buffer.c:831
+#: ../buffer.c:883
 msgid "1 buffer wiped out"
 msgstr "1 個のバッファが破棄されました"
 
-#: buffer.c:833
+#: ../buffer.c:885
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d 個のバッファが破棄されました"
 
-#: buffer.c:894
+#: ../buffer.c:946
 msgid "E84: No modified buffer found"
 msgstr "E84: 変更されたバッファはありません"
 
 #. back where we started, didn't find anything.
-#: buffer.c:933
+#: ../buffer.c:985
 msgid "E85: There is no listed buffer"
 msgstr "E85: リスト表示されるバッファはありません"
 
-#: buffer.c:945
+#: ../buffer.c:997
 #, c-format
 msgid "E86: Buffer %ld does not exist"
 msgstr "E86: バッファ %ld はありません"
 
-#: buffer.c:948
+#: ../buffer.c:1000
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 最後のバッファを越えて移動はできません"
 
-#: buffer.c:950
+#: ../buffer.c:1002
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: 最初のバッファより前へは移動できません"
 
-#: buffer.c:988
+#: ../buffer.c:1044
 #, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)"
 
-#: buffer.c:1005
+#: ../buffer.c:1061
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: 最後のバッファは解放できません"
 
-#: buffer.c:1538
+#: ../buffer.c:1611
 msgid "W14: Warning: List of file names overflow"
-msgstr "W14: 警告: ファイル名のリストが長すぎます"
+msgstr "W14: 警告: ファイル名のリストが長過ぎます"
 
-#: buffer.c:1709
+#: ../buffer.c:1795
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: バッファ %ld がみつかりません"
 
-#: buffer.c:1940
+#: ../buffer.c:2058
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s に複数の該当がありました"
 
-#: buffer.c:1942
+#: ../buffer.c:2060
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s に該当するバッファはありませんでした"
 
-#: buffer.c:2337
+#: ../buffer.c:2473
 #, c-format
 msgid "line %ld"
 msgstr "行 %ld"
 
-#: buffer.c:2420
+#: ../buffer.c:2561
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: この名前のバッファは既にあります"
 
-#: buffer.c:2713
+#: ../buffer.c:2878
 msgid " [Modified]"
 msgstr " [変更あり]"
 
-#: buffer.c:2718
+#: ../buffer.c:2883
 msgid "[Not edited]"
 msgstr "[未編集]"
 
-#: buffer.c:2723
+#: ../buffer.c:2888
 msgid "[New file]"
 msgstr "[新ファイル]"
 
-#: buffer.c:2724
+#: ../buffer.c:2889
 msgid "[Read errors]"
 msgstr "[読込エラー]"
 
-#: buffer.c:2726 fileio.c:2049
+#: ../buffer.c:2891 ../fileio.c:2106 ../netbeans.c:3418
 msgid "[readonly]"
 msgstr "[読込専用]"
 
-#: buffer.c:2747
+#: ../buffer.c:2912
 msgid "1 line --%d%%--"
 msgstr "1 行 --%d%%--"
 
-#: buffer.c:2749
+#: ../buffer.c:2914
 msgid "%ld lines --%d%%--"
 msgstr "%ld 行 --%d%%--"
 
-#: buffer.c:2756
+#: ../buffer.c:2921
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "行 %ld (全体 %ld) --%d%%-- col "
 
-#: buffer.c:2864
-msgid "[No file]"
-msgstr "[無題]"
+#: ../buffer.c:3029 ../buffer.c:4750 ../memline.c:1657
+msgid "[No Name]"
+msgstr "[無名]"
 
 #. must be a help buffer
-#: buffer.c:2904
+#: ../buffer.c:3068
 msgid "help"
 msgstr "ヘルプ"
 
-#: buffer.c:3463 screen.c:5038
+#: ../buffer.c:3619 ../screen.c:5071
 msgid "[help]"
 msgstr "[ヘルプ]"
 
-#: buffer.c:3495 screen.c:5044
+#: ../buffer.c:3651 ../screen.c:5077
 msgid "[Preview]"
 msgstr "[プレビュー]"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "All"
 msgstr "全て"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "Bot"
 msgstr "末尾"
 
-#: buffer.c:3777
+#: ../buffer.c:3933
 msgid "Top"
 msgstr "先頭"
 
-#: buffer.c:4523
+#: ../buffer.c:4702
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -192,15 +192,11 @@ msgstr ""
 "\n"
 "# バッファリスト:\n"
 
-#: buffer.c:4556
+#: ../buffer.c:4737
 msgid "[Error List]"
 msgstr "[エラーリスト]"
 
-#: buffer.c:4569 memline.c:1520
-msgid "[No File]"
-msgstr "[無題]"
-
-#: buffer.c:4882
+#: ../buffer.c:5063
 msgid ""
 "\n"
 "--- Signs ---"
@@ -208,150 +204,154 @@ msgstr ""
 "\n"
 "--- サイン ---"
 
-#: buffer.c:4901
+#: ../buffer.c:5082
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s のサイン:"
 
-#: buffer.c:4907
+#: ../buffer.c:5088
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    行=%ld  識別子=%d  名前=%s"
 
-#: diff.c:139
+#: ../diff.c:163
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: %ld 以上のバッファはdiffできません"
 
-#: diff.c:709
+#: ../diff.c:737
 msgid "E97: Cannot create diffs"
 msgstr "E97: 差分を作成できません "
 
-#: diff.c:814
+#: ../diff.c:843
 msgid "Patch file"
 msgstr "パッチファイル"
 
-#: diff.c:1065
+#: ../diff.c:1146
 msgid "E98: Cannot read diff output"
 msgstr "E98: diffの出力を読込めません"
 
-#: diff.c:1815
+#: ../diff.c:1896
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: 現在のバッファは差分モードではありません"
 
-#: diff.c:1827
+#: ../diff.c:1908
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: 差分モードである他のバッファはありません"
 
-#: diff.c:1835
+#: ../diff.c:1916
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: 差分モードのバッファが2個以上あるので、どれを使うか特定できません"
 
-#: diff.c:1858
+#: ../diff.c:1939
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: バッファ \"%s\" がみつかりません"
 
-#: diff.c:1864
+#: ../diff.c:1945
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: バッファ \"%s\" は差分モードではありません"
 
-#: digraph.c:2199
+#: ../digraph.c:2200
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 合字にEscapeは使用できません"
 
-#: digraph.c:2384
+#: ../digraph.c:2384
 msgid "E544: Keymap file not found"
 msgstr "E544: キーマップファイルがみつかりません"
 
-#: digraph.c:2411
+#: ../digraph.c:2411
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source で取込むファイル以外では :loadkeymap を使えません"
 
-#: edit.c:40
+#: ../edit.c:41
 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^V^N^P)"
+#: ../edit.c:42
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
+msgstr " ^X モード (^E^Y^L^]^F^I^K^D^U^V^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
+#: ../edit.c:45
 msgid " Keyword Local completion (^N^P)"
 msgstr " 局所キーワード補完 (^N^P)"
 
-#: edit.c:45
+#: ../edit.c:46
 msgid " Whole line completion (^L^N^P)"
 msgstr " 行(全体)補完 (^L^N^P)"
 
-#: edit.c:46
+#: ../edit.c:47
 msgid " File name completion (^F^N^P)"
 msgstr "ファイル名補完 (^F^N^P)"
 
-#: edit.c:47
+#: ../edit.c:48
 msgid " Tag completion (^]^N^P)"
 msgstr " タグ補完 (^]^N^P)"
 
-#: edit.c:48
+#: ../edit.c:49
 msgid " Path pattern completion (^N^P)"
 msgstr " パスパターン補完 (^N^P)"
 
-#: edit.c:49
+#: ../edit.c:50
 msgid " Definition completion (^D^N^P)"
 msgstr " 定義補完 (^D^N^P)"
 
-#: edit.c:51
+#: ../edit.c:52
 msgid " Dictionary completion (^K^N^P)"
 msgstr " 辞書補完 (^K^N^P)"
 
-#: edit.c:52
+#: ../edit.c:53
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " シソーラス補完 (^T^N^P)"
 
-#: edit.c:53
+#: ../edit.c:54
 msgid " Command-line completion (^V^N^P)"
 msgstr " コマンドライン補完 (^V^N^P)"
 
-#: edit.c:56
+#: ../edit.c:55
+msgid " User defined completion (^U^N^P)"
+msgstr " ユーザ定義補完 (^U^N^P)"
+
+#: ../edit.c:58
 msgid "Hit end of paragraph"
 msgstr "段落の最後にヒット"
 
-#: edit.c:962
+#: ../edit.c:994
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' オプションが空です"
 
-#: edit.c:1166
+#: ../edit.c:1204
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' オプションが空です"
 
-#: edit.c:2162
+#: ../edit.c:2204
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "辞書をスキャン中: %s"
 
-#: edit.c:2368
+#: ../edit.c:2410
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (挿入) スクロール(^E/^Y)"
 
-#: edit.c:2370
+#: ../edit.c:2412
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (置換) スクロール (^E/^Y)"
 
-#: edit.c:2684
+#: ../edit.c:2813
 #, c-format
 msgid "Scanning: %s"
 msgstr "スキャン中: %s"
 
-#: edit.c:2719
+#: ../edit.c:2848
 msgid "Scanning tags."
 msgstr "タグをスキャン中."
 
-#: edit.c:3381
+#: ../edit.c:3549
 msgid " Adding"
 msgstr " 追加中"
 
@@ -359,121 +359,283 @@ msgstr " 追加中"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: edit.c:3430
+#: ../edit.c:3598
 msgid "-- Searching..."
 msgstr "-- 検索中..."
 
-#: edit.c:3486
+#: ../edit.c:3654
 msgid "Back at original"
 msgstr "始めに戻る"
 
-#: edit.c:3491
+#: ../edit.c:3659
 msgid "Word from other line"
 msgstr "他の行の単語"
 
-#: edit.c:3496
+#: ../edit.c:3664
 msgid "The only match"
 msgstr "唯一の該当"
 
-#: edit.c:3555
+#: ../edit.c:3723
 #, c-format
 msgid "match %d of %d"
 msgstr "%d 番目の該当 (全該当 %d 個中)"
 
-#: edit.c:3558
+#: ../edit.c:3726
 #, c-format
 msgid "match %d"
 msgstr "%d 番目の該当"
 
-#. Skip further arguments but do continue to
-#. * search for a trailing command.
-#: eval.c:1024
+#: ../eval.c:93
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: 予期せぬ文字が :let にありました"
+
+#: ../eval.c:94
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: リストのインデックスが範囲外です: %ld"
+
+#: ../eval.c:95
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: 未定義の変数です: %s"
+
+#: ../eval.c:96
+msgid "E111: Missing ']'"
+msgstr "E111: ']' がみつかりません"
+
+#: ../eval.c:97
 #, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: 未知の変数: \"%s\""
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s の引数はリスト型でなければなりません"
+
+#: ../eval.c:98
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionaary"
+msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
+
+#: ../eval.c:99
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: 辞書型に空のキーを使うことはできません"
+
+#: ../eval.c:100
+msgid "E714: List required"
+msgstr "E471: リスト型が必要です"
+
+#: ../eval.c:101
+msgid "E715: Dictionary required"
+msgstr "E715: 辞書型が必要です"
+
+#: ../eval.c:102
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 関数の引数が多過ぎます: %s"
+
+#: ../eval.c:103
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: 辞書型にキーが存在しません: %s"
+
+#: ../eval.c:104
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+
+#: ../eval.c:105
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: 辞書型内にエントリが既に存在します"
+
+#: ../eval.c:106
+msgid "E718: Funcref required"
+msgstr "E718: 関数参照型が要求されます"
+
+#: ../eval.c:107
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: [:] を辞書型と組み合わせては使えません"
+
+#: ../eval.c:108
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: 異なった型の変数です %s="
+
+#: ../eval.c:109
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: 未知の関数です: %s"
+
+#: ../eval.c:1428
+msgid "E687: Less targets than List items"
+msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"
+
+#: ../eval.c:1433
+msgid "E688: More targets than List items"
+msgstr "E688: ターゲットがリスト型内の要素よりも多いです"
+
+#: ../eval.c:1519
+msgid "Double ; in list of variables"
+msgstr "リスト型の値に2つ以上の ; が検出されました"
+
+#: ../eval.c:1685
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s の値を一覧表示できません"
+
+#: ../eval.c:2020
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: リスト型と辞書型以外はインデックス指定できません"
+
+#: ../eval.c:2026
+msgid "E708: [:] must come last"
+msgstr "E708: [:] は最後でなければいけません"
+
+#: ../eval.c:2072
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] にはリスト型の値が必要です"
+
+#: ../eval.c:2308
+msgid "E710: List value has more items than target"
+msgstr "E710: リスト型変数にターゲットよりも多い要素があります"
+
+#: ../eval.c:2312
+msgid "E711: List value has not enough items"
+msgstr "E711: リスト型変数に十分な数の要素がありません"
+
+#
+#: ../eval.c:2506
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for の後に \"in\" がありません"
 
-#: eval.c:1320
+#: ../eval.c:2721
 #, c-format
 msgid "E107: Missing braces: %s"
 msgstr "E107: カッコ '(' がありません: %s"
 
-#: eval.c:1435 eval.c:1449
+#: ../eval.c:2947
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: その変数はありません: \"%s\""
 
-#: eval.c:1705
+#: ../eval.c:3034
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (アンチ)ロックするには変数の入れ子が深過ぎます"
+
+#: ../eval.c:3336
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' の後に ':' がありません"
 
-#: eval.c:2327
+#: ../eval.c:3628
+msgid "E691: Can only compare List with List"
+msgstr "E691: リスト型はリスト型としか比較できません"
+
+#: ../eval.c:3630
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: リスト型には無効な操作です"
+
+#: ../eval.c:3657
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: 辞書型は辞書型としか比較できません"
+
+#: ../eval.c:3659
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: 辞書型には無効な操作です"
+
+#: ../eval.c:3679
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: 関数参照型は関数参照型としか比較できません"
+
+#: ../eval.c:3681
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: 関数参照型には無効な操作です"
+
+#: ../eval.c:4086
 msgid "E110: Missing ')'"
 msgstr "E110: ')' がみつかりません"
 
-#: eval.c:2389
-msgid "E111: Missing ']'"
-msgstr "E111: ']' がみつかりません"
+#: ../eval.c:4193
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: 関数参照型はインデックスできません"
 
-#: eval.c:2466
+#: ../eval.c:4432
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: オプション名がありません: %s"
 
-#: eval.c:2484
+#: ../eval.c:4450
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: 未知のオプションです: %s"
 
-#: eval.c:2555
+#: ../eval.c:4516
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: 引用符 (\") がありません: %s"
 
-#: eval.c:2698
+#: ../eval.c:4652
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: 引用符 (') がありません: %s"
 
-#: eval.c:3054
+#: ../eval.c:4731
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 関数 %s には無効な引数です"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: リスト型にカンマがありません: %s"
 
-#: eval.c:3083
+#: ../eval.c:4739
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未知の関数です: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: リスト型の最後に ']' がありません: %s"
 
-#: eval.c:3084
+#: ../eval.c:5768
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 関数の引数が多すぎます: %s"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: 辞書型にコロンがありません: %s"
+
+#: ../eval.c:5791
+msgid "E721: Duplicate key in Dictionary"
+msgstr "E721: 辞書型に重複キーがそんざいします"
 
-#: eval.c:3085
+#: ../eval.c:5811
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 関数の引数が足りません: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: 辞書型にカンマがありません: %s"
 
-#: eval.c:3086
+#: ../eval.c:5819
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: スクリプト以外で<SID>が使われました: %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: 辞書型の最後に '}' がありません: %s"
+
+#: ../eval.c:5855
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: 表示するには変数の入れ子が深過ぎます"
+
+#: ../eval.c:7098
+msgid "E699: Too many arguments"
+msgstr "E699: が多過ぎます"
 
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #.
-#: eval.c:3687 gui.c:4376 gui_gtk.c:2059
+#: ../eval.c:7253 ../gui.c:4390 ../gui_gtk.c:2137 ../os_mswin.c:602
 msgid "&Ok"
 msgstr "&Ok"
 
-#: eval.c:4226
+#: ../eval.c:7859
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: %s というキーは既に存在します"
+
+#: ../eval.c:8339
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld 行:"
 
-#: eval.c:5477
+#: ../eval.c:8428
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: 未知の関数です: %s"
+
+#: ../eval.c:9966
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -481,130 +643,195 @@ msgstr ""
 "決定(&O)\n"
 "キャンセル(&C)"
 
-#: eval.c:5517
+#: ../eval.c:10005
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() が inputsave() よりも多く呼ばれました"
 
-# Added at 10-Mar-2004.
-#: eval.c:5977
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
+#: ../eval.c:10155
+msgid "E745: Range not allowed"
+msgstr "E745: 範囲指定は許可されていません"
+
+#: ../eval.c:10358
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() には無効な型です"
+
+#: ../eval.c:11090
+msgid "E726: Stride is zero"
+msgstr "E726: ストライド(前進量)が 0 です"
+
+#: ../eval.c:11092
+msgid "E727: Start past end"
+msgstr "E727: 開始位置が終了位置を越えました"
 
-#: eval.c:6609
+#: ../eval.c:11163 ../eval.c:13672
+msgid "<empty>"
+msgstr "<空>"
+
+#: ../eval.c:11287
 msgid "E240: No connection to Vim server"
 msgstr "E240: Vim サーバへの接続がありません"
 
-#: eval.c:6706
+#: ../eval.c:11333
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s へ送ることができません"
+
+#: ../eval.c:11465
 msgid "E277: Unable to read a server reply"
 msgstr "E277: サーバの応答がありません"
 
-#: eval.c:6734
+# Added at 10-Mar-2004.
+#: ../eval.c:11720
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
+
+#: ../eval.c:12144
 msgid "E258: Unable to send to client"
 msgstr "E258: クライアントへ送ることができません"
 
-#: eval.c:6782
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s へ送ることができません"
+#: ../eval.c:12551
+msgid "E702: Sort compare function failed"
+msgstr "E702: ソートの比較関数が失敗しました"
 
-#: eval.c:6882
+#: ../eval.c:12670
 msgid "(Invalid)"
 msgstr "(無効)"
 
-#: eval.c:8060
+#: ../eval.c:13088
+msgid "E677: Error writing temp file"
+msgstr "E677: 一時ファイル書込中にエラーが発生しました"
+
+#: ../eval.c:14421
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: 関数参照型を数値として扱っています。"
+
+#: ../eval.c:14429
+msgid "E745: Using a List as a number"
+msgstr "E745: リスト型を数値として扱っています"
+
+#: ../eval.c:14432
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: 辞書型を数値として扱っています"
+
+#: ../eval.c:14490
+msgid "E729: using Funcref as a String"
+msgstr "E729: 関数参照型を文字列として扱っています"
+
+#: ../eval.c:14493
+msgid "E730: using List as a String"
+msgstr "E730: リスト型を文字列として扱っています"
+
+#: ../eval.c:14496
+msgid "E731: using Dictionary as a String"
+msgstr "E731: 変数型を文字列として扱っています"
+
+#: ../eval.c:14826
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: 未定義の変数です: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: 関数参照型変数名は大文字で始まらなければなりません: %s"
+
+#: ../eval.c:14831
+#, c-format
+msgid "705: Variable name conflicts with existing function: %s"
+msgstr "705: 変数名が既存の関数名と衝突します: %s"
 
-#: eval.c:8492
+#: ../eval.c:14840
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 不正な変数名です: %s"
 
-#: eval.c:8784
+#: ../eval.c:14857
 #, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: 変数の型が一致しません: %s"
+
+#: ../eval.c:14946
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: 値がロックされています: %s"
+
+#: ../eval.c:14947 ../eval.c:14953 ../os_mswin.c:2206
+msgid "Unknown"
+msgstr "不明"
 
-#: eval.c:8857
+#: ../eval.c:14952
 #, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 未定義の関数です: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s の値を変更できません"
+
+#: ../eval.c:15030
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
 
-#: eval.c:8870
+#: ../eval.c:15458
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: '(' がありません: %s"
 
-#: eval.c:8903
+#: ../eval.c:15491
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: 不正な引数です: %s"
 
-#: eval.c:8982
+#: ../eval.c:15579
 msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction がありません"
 
-#: eval.c:9089
+#: ../eval.c:15765
 #, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 関数 %s を再定義できません: 使用中です"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
 
-#: eval.c:9159
+#: ../eval.c:15878
 msgid "E129: Function name required"
 msgstr "E129: 関数名が要求されます"
 
-#: eval.c:9210
+#: ../eval.c:15963
 #, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: 関数名は大文字で始まらなければなりません: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s"
 
-#: eval.c:9402
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: 未定義の関数です: %s"
-
-#: eval.c:9407
+#: ../eval.c:16441
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: 関数 %s を削除できません: 使用中です"
 
-#: eval.c:9455
+#: ../eval.c:16561
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
 
 #. always scroll up, don't overwrite
-#: eval.c:9508
+#: ../eval.c:16691
 #, c-format
 msgid "calling %s"
 msgstr "%s を実行中です"
 
-#: eval.c:9570
+#: ../eval.c:16785
 #, c-format
 msgid "%s aborted"
 msgstr "%s が中断されました"
 
-#: eval.c:9572
+#: ../eval.c:16787
 #, c-format
 msgid "%s returning #%ld"
 msgstr "%s が #%ld を返しました"
 
-#: eval.c:9579
+#: ../eval.c:16797
 #, c-format
-msgid "%s returning \"%s\""
-msgstr "%s が \"%s\" を返しました"
+msgid "%s returning %s"
+msgstr "%s が %s を返しました"
 
 #. always scroll up, don't overwrite
-#: eval.c:9595 ex_cmds2.c:2365
+#: ../eval.c:16818 ../ex_cmds2.c:2933
 #, c-format
 msgid "continuing in %s"
 msgstr "%s の実行を継続中です"
 
-#: eval.c:9621
+#: ../eval.c:16866
 msgid "E133: :return not inside a function"
 msgstr "E133: 関数外に :return がありました"
 
-#: eval.c:9952
+#: ../eval.c:17266
 msgid ""
 "\n"
 "# global variables:\n"
@@ -612,95 +839,95 @@ msgstr ""
 "\n"
 "# グローバル変数:\n"
 
-#: ex_cmds.c:92
+#: ../ex_cmds.c:92
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16進数 %02x,  8進数 %03o"
 
-#: ex_cmds.c:118
+#: ../ex_cmds.c:118
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16進数 %04x, 8進数 %o"
 
-#: ex_cmds.c:119
+#: ../ex_cmds.c:119
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16進数 %08x, 8進数 %o"
 
-#: ex_cmds.c:430
+#: ../ex_cmds.c:430
 msgid "E134: Move lines into themselves"
 msgstr "E134: 行をそれ自身には移動できません"
 
-#: ex_cmds.c:499
+#: ../ex_cmds.c:499
 msgid "1 line moved"
 msgstr "1 行が移動されました"
 
-#: ex_cmds.c:501
+#: ../ex_cmds.c:501
 #, c-format
 msgid "%ld lines moved"
 msgstr "%ld 行が移動されました"
 
-#: ex_cmds.c:924
+#: ../ex_cmds.c:977
 #, c-format
 msgid "%ld lines filtered"
 msgstr "%ld 行がフィルタ処理されました"
 
-#: ex_cmds.c:952
+#: ../ex_cmds.c:1005
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *フィルタ* autocommandは現在のバッファを変更してはいけません"
 
-#: ex_cmds.c:1037
+#: ../ex_cmds.c:1090
 msgid "[No write since last change]\n"
 msgstr "[最後の変更が保存されていません]\n"
 
-#: ex_cmds.c:1283
+#: ../ex_cmds.c:1340
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s 行目: "
 
-#: ex_cmds.c:1288
+#: ../ex_cmds.c:1347
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: エラーが多過ぎるので, 以降はスキップします"
 
-#: ex_cmds.c:1323
+#: ../ex_cmds.c:1382
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfoファイル \"%s\"%s%s%s を読込み中 "
 
-#: ex_cmds.c:1324
+#: ../ex_cmds.c:1383
 msgid " info"
 msgstr " 情報"
 
-#: ex_cmds.c:1325
+#: ../ex_cmds.c:1384
 msgid " marks"
 msgstr " マーク"
 
-#: ex_cmds.c:1326
+#: ../ex_cmds.c:1385
 msgid " FAILED"
 msgstr " 失敗"
 
-#: ex_cmds.c:1418
+#: ../ex_cmds.c:1477
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfoファイルが書込みできません: %s"
 
-#: ex_cmds.c:1543
+#: ../ex_cmds.c:1602
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfoファイル %s を保存できません!"
 
-#: ex_cmds.c:1551
+#: ../ex_cmds.c:1610
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "viminfoファイル \"%s\" を書込み中"
 
 #. Write the info:
-#: ex_cmds.c:1649
+#: ../ex_cmds.c:1708
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# この viminfo ファイルは Vim %s によって生成されました.\n"
 
-#: ex_cmds.c:1651
+#: ../ex_cmds.c:1710
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -708,47 +935,47 @@ msgstr ""
 "# 変更する際には十分注意してください!\n"
 "\n"
 
-#: ex_cmds.c:1653
+#: ../ex_cmds.c:1712
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# このファイルが書かれた時の 'encoding' の値\n"
 
-#: ex_cmds.c:1752
+#: ../ex_cmds.c:1811
 msgid "Illegal starting char"
 msgstr "不正な先頭文字です"
 
-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
+#: ../ex_cmds.c:2176 ../ex_cmds2.c:1280
 msgid "Save As"
 msgstr "別名で保存"
 
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
-#: ex_cmds.c:2140
+#: ../ex_cmds.c:2219
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: 同じ名前のファイルが他のバッファで読込まれています"
 
-#: ex_cmds.c:2174
+#: ../ex_cmds.c:2253
 msgid "Write partial file?"
 msgstr "ファイルを部分的に保存しますか?"
 
-#: ex_cmds.c:2181
+#: ../ex_cmds.c:2260
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: バッファを部分的に保存するには ! を使ってください"
 
-#: ex_cmds.c:2296
+#: ../ex_cmds.c:2377
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
 msgstr "既存のファイル \"%.*s\" を上書きしますか?"
 
-#: ex_cmds.c:2367
+#: ../ex_cmds.c:2448
 #, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: バッファ %ld には名前がありません"
 
-#: ex_cmds.c:2405
+#: ../ex_cmds.c:2487
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: ファイルは保存されませんでした: 'write' オプションにより無効です"
 
-#: ex_cmds.c:2425
+#: ../ex_cmds.c:2507
 #, c-format
 msgid ""
 "'readonly' option is set for \"%.*s\".\n"
@@ -757,68 +984,77 @@ msgstr ""
 "\"%.*s\" には 'readonly' オプションが設定されています\n"
 "強制的に上書きしますか?"
 
-#: ex_cmds.c:2597
+#: ../ex_cmds.c:2680
 msgid "Edit File"
 msgstr "ファイルを編集"
 
-#: ex_cmds.c:3205
+#: ../ex_cmds.c:3293
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommandが予期せず新しいバッファ %s を削除しました"
 
-#: ex_cmds.c:3339
+#: ../ex_cmds.c:3503
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: 数ではない引数が :z に渡されました"
 
-#: ex_cmds.c:3424
+#: ../ex_cmds.c:3602
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvimではシェルコマンドを使えません"
 
-#: ex_cmds.c:3531
+#: ../ex_cmds.c:3714
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: 正規表現は文字で区切ることができません"
 
-#: ex_cmds.c:3877
+#: ../ex_cmds.c:4137
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s に置換しますか? (y/n/a/q/l/^E/^Y)"
 
-#: ex_cmds.c:4270
+#: ../ex_cmds.c:4543
 msgid "(Interrupted) "
 msgstr "(割込まれました)"
 
-#: ex_cmds.c:4274
+#: ../ex_cmds.c:4547
+msgid "1 match"
+msgstr "1 箇所該当しました"
+
+#: ../ex_cmds.c:4547
 msgid "1 substitution"
 msgstr "1 箇所置換しました"
 
-#: ex_cmds.c:4276
+#: ../ex_cmds.c:4550
+#, c-format
+msgid "%ld matches"
+msgstr "%ld 箇所該当しました"
+
+#: ../ex_cmds.c:4550
 #, c-format
 msgid "%ld substitutions"
 msgstr "%ld 箇所置換しました"
 
-#: ex_cmds.c:4279
+#: ../ex_cmds.c:4553
 msgid " on 1 line"
 msgstr " (計 1 行内)"
 
-#: ex_cmds.c:4281
+#: ../ex_cmds.c:4555
 #, c-format
 msgid " on %ld lines"
 msgstr " (計 %ld 行内)"
 
-#: ex_cmds.c:4332
+#: ../ex_cmds.c:4606
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global を再帰的には使えません"
 
-#: ex_cmds.c:4367
+#: ../ex_cmds.c:4641
 msgid "E148: Regular expression missing from global"
 msgstr "E148: globalコマンドに正規表現が指定されていません"
 
-#: ex_cmds.c:4416
+#: ../ex_cmds.c:4714
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "パターンが全ての行でみつかりました: %s"
 
-#: ex_cmds.c:4497
+#: ../ex_cmds.c:4799
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -828,408 +1064,428 @@ msgstr ""
 "# 最後に置換された文字列:\n"
 "$"
 
-#: ex_cmds.c:4598 ex_docmd.c:2011
+#: ../ex_cmds.c:4900
 msgid "E478: Don't panic!"
 msgstr "E478: 慌てないでください"
 
-#: ex_cmds.c:4650
+#: ../ex_cmds.c:4946
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: 残念ですが '%s' のヘルプが %s にはありません"
 
-#: ex_cmds.c:4653
+#: ../ex_cmds.c:4949
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: 残念ですが %s にはヘルプがありません"
 
-#: ex_cmds.c:4687
+#: ../ex_cmds.c:4983
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "残念ですがヘルプファイル \"%s\" がみつかりません"
 
-#: ex_cmds.c:5170
+#: ../ex_cmds.c:5533
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: ディレクトリではありません: %s"
 
-#: ex_cmds.c:5309
+#: ../ex_cmds.c:5673
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: 書込み用に %s を開けません"
 
-#: ex_cmds.c:5345
+#: ../ex_cmds.c:5708
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: 読込用に %s を開けません"
 
 # Added at 29-Apr-2004.
-#: ex_cmds.c:5367
+#: ../ex_cmds.c:5744
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1つの言語のヘルプファイルに複数のエンコードが混在しています: %s"
 
-#: ex_cmds.c:5445
+#: ../ex_cmds.c:5822
 #, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: タグ \"%s\" がファイル %s に重複しています"
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: タグ \"%s\" がファイル %s/%s に重複しています"
 
-#: ex_cmds.c:5557
+#: ../ex_cmds.c:5938
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: 未知のsignコマンドです: %s"
 
-#: ex_cmds.c:5577
+#: ../ex_cmds.c:5958
 msgid "E156: Missing sign name"
 msgstr "E156: sign名がありません"
 
-#: ex_cmds.c:5623
+#: ../ex_cmds.c:6004
 msgid "E612: Too many signs defined"
 msgstr "E612: signの定義が多数見つかりました"
 
-#: ex_cmds.c:5691
+#: ../ex_cmds.c:6072
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: 無効なsignのテキストです: %s"
 
-#: ex_cmds.c:5722 ex_cmds.c:5913
+#: ../ex_cmds.c:6103 ../ex_cmds.c:6294
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: 未知のsignです: %s"
 
-#: ex_cmds.c:5771
+#: ../ex_cmds.c:6152
 msgid "E159: Missing sign number"
 msgstr "E159: signの番号がありません"
 
-#: ex_cmds.c:5853
+#: ../ex_cmds.c:6234
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 無効なバッファ名です: %s"
 
-#: ex_cmds.c:5892
+#: ../ex_cmds.c:6273
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: 無効なsign識別子です: %ld"
 
 # Added at 27-Jan-2004.
-#: ex_cmds.c:5962
+#: ../ex_cmds.c:6343
 msgid " (NOT FOUND)"
 msgstr "  (みつかりません)"
 
-#: ex_cmds.c:5964
+#: ../ex_cmds.c:6345
 msgid " (not supported)"
 msgstr " (非サポート)"
 
-#: ex_cmds.c:6063
+#: ../ex_cmds.c:6444
 msgid "[Deleted]"
 msgstr "[削除済]"
 
-#: ex_cmds2.c:92
+#: ../ex_cmds2.c:140
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
 
-#: ex_cmds2.c:96 ex_docmd.c:966
+#: ../ex_cmds2.c:144 ../ex_docmd.c:1063
 #, c-format
 msgid "line %ld: %s"
 msgstr "行 %ld: %s"
 
-#: ex_cmds2.c:98
+#: ../ex_cmds2.c:146
 #, c-format
 msgid "cmd: %s"
 msgstr "コマンド: %s"
 
-#: ex_cmds2.c:290
+#: ../ex_cmds2.c:338
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "ブレークポイント \"%s%s\" 行 %ld"
 
-#: ex_cmds2.c:540
+#: ../ex_cmds2.c:640
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: ブレークポイントがみつかりません: %s"
 
-#: ex_cmds2.c:566
+#: ../ex_cmds2.c:665
 msgid "No breakpoints defined"
 msgstr "ブレークポイントが定義されていません"
 
-#: ex_cmds2.c:571
+#: ../ex_cmds2.c:670
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  行 %ld"
 
-#: ex_cmds2.c:786
+#: ../ex_cmds2.c:990
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: 初めに :profile start <fname> を実行してください"
+
+#: ../ex_cmds2.c:1305
 #, c-format
 msgid "Save changes to \"%.*s\"?"
 msgstr "変更を \"%.*s\" に保存しますか?"
 
-#: ex_cmds2.c:788 ex_docmd.c:9356
+#: ../ex_cmds2.c:1307 ../ex_docmd.c:9919
 msgid "Untitled"
 msgstr "無題"
 
-#: ex_cmds2.c:915
+#: ../ex_cmds2.c:1434
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: バッファ \"%s\" の変更は保存されていません"
 
-#: ex_cmds2.c:984
+#: ../ex_cmds2.c:1505
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "警告: 予期せず他バッファへ移動しました (autocommands を調べてください)"
 
-#: ex_cmds2.c:1387
+#: ../ex_cmds2.c:1924
 msgid "E163: There is only one file to edit"
 msgstr "E163: 編集するファイルは1つしかありません"
 
-#: ex_cmds2.c:1389
+#: ../ex_cmds2.c:1926
 msgid "E164: Cannot go before first file"
 msgstr "E164: 最初のファイルより前には行けません"
 
-#: ex_cmds2.c:1391
+#: ../ex_cmds2.c:1928
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: 最後のファイルを越えて後には行けません"
 
-#: ex_cmds2.c:1804
+#: ../ex_cmds2.c:2341
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: そのコンパイラには対応していません: %s"
 
-#: ex_cmds2.c:1897
+#: ../ex_cmds2.c:2438
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" を \"%s\" から検索中"
 
-#: ex_cmds2.c:1919
+#: ../ex_cmds2.c:2460
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" を検索中"
 
-#: ex_cmds2.c:1940
+#: ../ex_cmds2.c:2482
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
 msgstr "'runtimepath' の中にはみつかりません: \"%s\""
 
-#: ex_cmds2.c:1974
+#: ../ex_cmds2.c:2516
 msgid "Source Vim script"
 msgstr "Vimスクリプトの取込み"
 
-#: ex_cmds2.c:2164
+#: ../ex_cmds2.c:2692
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "ディレクトリは取込めません: \"%s\""
 
-#: ex_cmds2.c:2202
+#: ../ex_cmds2.c:2730
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" を取込めません"
 
-#: ex_cmds2.c:2204
+#: ../ex_cmds2.c:2732
 #, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "行 %ld: \"%s\" を取込めません"
 
-#: ex_cmds2.c:2218
+#: ../ex_cmds2.c:2746
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" を取込中"
 
-#: ex_cmds2.c:2220
+#: ../ex_cmds2.c:2748
 #, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "行 %ld: %s を取込中"
 
-#: ex_cmds2.c:2363
+#: ../ex_cmds2.c:2931
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s の取込を完了"
 
-#: ex_cmds2.c:2707
+#: ../ex_cmds2.c:3301
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: 警告: 行区切が不正です. ^M がないのでしょう"
 
-#: ex_cmds2.c:2756
+#: ../ex_cmds2.c:3435
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding が取込スクリプト以外で使用されました"
 
-#: ex_cmds2.c:2789
+#: ../ex_cmds2.c:3468
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish が取込スクリプト以外で使用されました"
 
-#: ex_cmds2.c:3238
+#: ../ex_cmds2.c:3917
 #, c-format
 msgid "Page %d"
 msgstr "%d ページ"
 
-#: ex_cmds2.c:3394
+#: ../ex_cmds2.c:4073
 msgid "No text to be printed"
 msgstr "印刷するテキストがありません"
 
-#: ex_cmds2.c:3472
+#: ../ex_cmds2.c:4151
 msgid "Printing page %d (%d%%)"
 msgstr "印刷中: ページ %d (%d%%)"
 
-#: ex_cmds2.c:3484
+#: ../ex_cmds2.c:4163
 #, c-format
 msgid " Copy %d of %d"
 msgstr " コピー %d (全 %d 中)"
 
-#: ex_cmds2.c:3542
+#: ../ex_cmds2.c:4221
 #, c-format
 msgid "Printed: %s"
 msgstr "印刷しました: %s"
 
-#: ex_cmds2.c:3549
+#: ../ex_cmds2.c:4228
 msgid "Printing aborted"
 msgstr "印刷が中止されました"
 
-#: ex_cmds2.c:3914
+#: ../ex_cmds2.c:4882
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript出力ファイルの書込みエラーです"
 
-#: ex_cmds2.c:4189
+#: ../ex_cmds2.c:5342
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: ファイル \"%s\" を開けません"
 
-#: ex_cmds2.c:4199 ex_cmds2.c:4824
+#: ../ex_cmds2.c:5352 ../ex_cmds2.c:6226
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScriptのリソースファイル \"%s\" を読込めません"
 
-#: ex_cmds2.c:4207
+#: ../ex_cmds2.c:5368
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: ファイル \"%s\" は PostScript リソースファイルではありません"
 
-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
+#: ../ex_cmds2.c:5386 ../ex_cmds2.c:5405 ../ex_cmds2.c:5450
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: ファイル \"%s\" は対応していない PostScript リソースファイルです"
 
-#: ex_cmds2.c:4309
+#: ../ex_cmds2.c:5469
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: リソースファイル \"%s\" はバージョンが異なります"
 
-#: ex_cmds2.c:4776
+#: ../ex_cmds2.c:5947
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: 互換性の無いマルチバイトエンコーディングと文字セットです"
+
+#: ../ex_cmds2.c:5964
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: マルチバイトエンコーディングでは printmbcharset を空にできません"
+
+#: ../ex_cmds2.c:5982
+msgid "E675: No default font specfifed for multi-byte printing."
+msgstr ""
+"E675: マルチバイト文字を印刷するためのデフォルトフォントが指定されていません"
+
+#: ../ex_cmds2.c:6175
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript出力用のファイルを開けません"
 
-#: ex_cmds2.c:4809
+#: ../ex_cmds2.c:6212
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: ファイル \"%s\" を開けません"
 
-#: ex_cmds2.c:4928
+#: ../ex_cmds2.c:6343
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScriptのリソースファイル \"prolog.ps\" がみつかりません"
 
-#: ex_cmds2.c:4959
+#: ../ex_cmds2.c:6356
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: PostScriptのリソースファイル \"cidfont.ps\" がみつかりません"
+
+#: ../ex_cmds2.c:6394 ../ex_cmds2.c:6416 ../ex_cmds2.c:6445
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScriptのリソースファイル \"%s.ps\" がみつかりません"
 
-#: ex_cmds2.c:4977
+#: ../ex_cmds2.c:6432
 #, c-format
-msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
-msgstr "E620: マルチバイト文字をエンコード \"%s\" へ変換できません"
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: 印刷エンコード \"%s\" へ変換できません"
 
-#: ex_cmds2.c:5102
+#: ../ex_cmds2.c:6686
 msgid "Sending to printer..."
 msgstr "プリンタに送信中..."
 
-#: ex_cmds2.c:5106
+#: ../ex_cmds2.c:6690
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScriptファイルの印刷に失敗しました"
 
-#: ex_cmds2.c:5108
+#: ../ex_cmds2.c:6692
 msgid "Print job sent."
 msgstr "印刷ジョブを送信しました."
 
-#: ex_cmds2.c:5618
+#: ../ex_cmds2.c:7299
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "現在の %s言語: \"%s\""
 
-#: ex_cmds2.c:5629
+#: ../ex_cmds2.c:7310
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: 言語を \"%s\" に設定できません"
 
-#: ex_docmd.c:525
+#: ../ex_docmd.c:604
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Exモードに入ります. ノーマルに戻るには\"visual\"と入力してください."
 
-#. must be at EOF
-#: ex_docmd.c:561
+#: ../ex_docmd.c:659
 msgid "E501: At end-of-file"
 msgstr "E501: ファイルの終了位置"
 
-#: ex_docmd.c:669
+#: ../ex_docmd.c:758
 msgid "E169: Command too recursive"
 msgstr "E169: コマンドが再帰的過ぎます"
 
-#: ex_docmd.c:1229
+#: ../ex_docmd.c:1340
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: 例外が捕捉されませんでした: %s"
 
-#: ex_docmd.c:1317
+#: ../ex_docmd.c:1428
 msgid "End of sourced file"
 msgstr "取込ファイルの最後です"
 
-#: ex_docmd.c:1318
+#: ../ex_docmd.c:1429
 msgid "End of function"
 msgstr "関数の最後です"
 
-#: ex_docmd.c:1907
+#: ../ex_docmd.c:2031
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: ユーザ定義コマンドのあいまいな使用です"
 
-#: ex_docmd.c:1921
+#: ../ex_docmd.c:2045
 msgid "E492: Not an editor command"
 msgstr "E492: エディタのコマンドではありません"
 
-#: ex_docmd.c:2030
+#: ../ex_docmd.c:2152
 msgid "E493: Backwards range given"
 msgstr "E493: 逆さまの範囲が指定されました"
 
-#: ex_docmd.c:2039
+#: ../ex_docmd.c:2161
 msgid "Backwards range given, OK to swap"
 msgstr "逆さまの範囲が指定されました, 入替えますか?"
 
-#: ex_docmd.c:2162
+#: ../ex_docmd.c:2286
 msgid "E494: Use w or w>>"
 msgstr "E494: w もしくは w>> を使用してください"
 
-#: ex_docmd.c:3788
+#: ../ex_docmd.c:3974
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: このバージョンではこのコマンドは利用できません, ごめんなさい"
 
-#: ex_docmd.c:3991
+#: ../ex_docmd.c:4229
 msgid "E172: Only one file name allowed"
 msgstr "E172: ファイル名は 1 つにしてください"
 
-#: ex_docmd.c:4571
+#: ../ex_docmd.c:4817
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "編集すべきファイルが 1 個ありますが, 終了しますか?"
 
-#: ex_docmd.c:4574
+#: ../ex_docmd.c:4820
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "編集すべきファイルがあと %d 個ありますが, 終了しますか?"
 
-#: ex_docmd.c:4581
+#: ../ex_docmd.c:4827
 msgid "E173: 1 more file to edit"
 msgstr "E173: 編集すべきファイルが 1 個あります"
 
-#: ex_docmd.c:4583
+#: ../ex_docmd.c:4829
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: 編集すべきファイルがあと %ld 個あります"
 
-#: ex_docmd.c:4678
+#: ../ex_docmd.c:4924
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください"
 
-#: ex_docmd.c:4789
+#: ../ex_docmd.c:5034
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
@@ -1237,324 +1493,344 @@ msgstr ""
 "\n"
 "    名前        引数 範囲  補完      定義"
 
-#: ex_docmd.c:4878
+#: ../ex_docmd.c:5123
 msgid "No user-defined commands found"
 msgstr "ユーザ定義コマンドが見つかりませんでした"
 
-#: ex_docmd.c:4910
+#: ../ex_docmd.c:5155
 msgid "E175: No attribute specified"
 msgstr "E175: 属性は定義されていません"
 
-#: ex_docmd.c:4962
+#: ../ex_docmd.c:5207
 msgid "E176: Invalid number of arguments"
 msgstr "E176: 引数の数が無効です"
 
-#: ex_docmd.c:4977
+#: ../ex_docmd.c:5222
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: カウントを2重指定することはできません"
 
-#: ex_docmd.c:4987
+#: ../ex_docmd.c:5232
 msgid "E178: Invalid default value for count"
 msgstr "E178: カウントの省略値が無効です"
 
-#: ex_docmd.c:5018
+#: ../ex_docmd.c:5263
 msgid "E179: argument required for complete"
 msgstr "E179: 補完のための引数が必要です"
 
-#: ex_docmd.c:5050
+#: ../ex_docmd.c:5295
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: 無効な補完指定です: %s"
 
-#: ex_docmd.c:5059
+#: ../ex_docmd.c:5304
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: 補完引数はカスタム補完でしか使用できません"
 
-#: ex_docmd.c:5065
+#: ../ex_docmd.c:5310
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: カスタム補完には引数として関数が必要です"
 
-#: ex_docmd.c:5076
+#: ../ex_docmd.c:5321
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: 無効な属性です: %s"
 
-#: ex_docmd.c:5119
+#: ../ex_docmd.c:5364
 msgid "E182: Invalid command name"
 msgstr "E182: 無効なコマンド名です"
 
-#: ex_docmd.c:5134
+#: ../ex_docmd.c:5379
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: ユーザ定義コマンドは英大文字で始まらなければなりません"
 
-#: ex_docmd.c:5205
+#: ../ex_docmd.c:5450
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: そのユーザ定義コマンドはありません: %s"
 
-#: ex_docmd.c:5666
+#: ../ex_docmd.c:5910
 #, c-format
 msgid "E185: Cannot find color scheme %s"
 msgstr "E185: カラースキーム %s がみつかりません"
 
-#: ex_docmd.c:5674
+#: ../ex_docmd.c:5918
 msgid "Greetings, Vim user!"
 msgstr "Vim 使いさん、やあ!"
 
-#: ex_docmd.c:6391
+#: ../ex_docmd.c:6660
 msgid "Edit File in new window"
 msgstr "新しいウィンドウでファイルを編集します"
 
-#: ex_docmd.c:6686
+#: ../ex_docmd.c:7053
 msgid "No swap file"
 msgstr "スワップファイルがありません"
 
-#: ex_docmd.c:6790
+#: ../ex_docmd.c:7159
 msgid "Append File"
 msgstr "追加ファイル"
 
-#: ex_docmd.c:6854
+#: ../ex_docmd.c:7239
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr ""
+"E747: バッファが修正されているので, ディレクトリを変更できません (! "
+"を追加で上書)"
+
+#: ../ex_docmd.c:7248
 msgid "E186: No previous directory"
 msgstr "E186: 前のディレクトリはありません"
 
-#: ex_docmd.c:6936
+#: ../ex_docmd.c:7330
 msgid "E187: Unknown"
 msgstr "E187: 未知"
 
-#: ex_docmd.c:7021
+#: ../ex_docmd.c:7416
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: "
 
-#: ex_docmd.c:7077
+#: ../ex_docmd.c:7476
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "ウィンドウ位置: X %d, Y %d"
 
-#: ex_docmd.c:7082
+#: ../ex_docmd.c:7481
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: このプラットホームにはウィンドウ位置の取得機能は実装されていません"
 
-#: ex_docmd.c:7092
+#: ../ex_docmd.c:7491
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos には2つの数値の引数が必要です"
 
-#: ex_docmd.c:7370
+#: ../ex_docmd.c:7797
 msgid "Save Redirection"
 msgstr "リダイレクトを保存します"
 
-#: ex_docmd.c:7560
+#: ../ex_docmd.c:8014
 msgid "Save View"
 msgstr "ビューを保存します"
 
-#: ex_docmd.c:7561
+#: ../ex_docmd.c:8015
 msgid "Save Session"
 msgstr "セッション情報を保存します"
 
-#: ex_docmd.c:7563
+#: ../ex_docmd.c:8017
 msgid "Save Setup"
 msgstr "設定を保存します"
 
-#: ex_docmd.c:7715
+#: ../ex_docmd.c:8156
+#, c-format
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: ディレクトリを作成できません: %s"
+
+#: ../ex_docmd.c:8185
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" が存在します (上書するには ! を追加してください)"
 
-#: ex_docmd.c:7720
+#: ../ex_docmd.c:8190
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: \"%s\" を書込み用として開けません"
 
 #. set mark
-#: ex_docmd.c:7744
+#: ../ex_docmd.c:8214
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: 引数は文字か前進/後退クォートでしなければいけません"
 
-#: ex_docmd.c:7786
+#: ../ex_docmd.c:8255
 msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal の再帰利用が深くなりすぎました"
+msgstr "E192: :normal の再帰利用が深くなり過ぎました"
 
-#: ex_docmd.c:8304
+#: ../ex_docmd.c:8804
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: '#'を置き換える副ファイルの名前がありません"
 
-#: ex_docmd.c:8335
+#: ../ex_docmd.c:8835
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: \"<afile>\"を置き換えるautocommandのファイル名がありません"
 
-#: ex_docmd.c:8343
+#: ../ex_docmd.c:8843
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: \"<abuf>\"を置き換えるautocommandバッファ番号がありません"
 
-#: ex_docmd.c:8354
+#: ../ex_docmd.c:8854
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: \"<amatch>\"を置き換えるautocommandの該当名がありません"
 
-#: ex_docmd.c:8364
+#: ../ex_docmd.c:8864
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: \"<sfile>\"を置き換える :source 対象ファイル名がありません"
 
-#: ex_docmd.c:8405
+#: ../ex_docmd.c:8905
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: '%' や '#' が無名ファイルなので \":p:h\" を伴わない使い方はできません"
 
-#: ex_docmd.c:8407
+#: ../ex_docmd.c:8907
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: 空文字列として評価されました"
 
-#: ex_docmd.c:9338
+#: ../ex_docmd.c:9901
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfoファイルを読込用として開けません"
 
-#: ex_docmd.c:9511
+#: ../ex_docmd.c:10074
 msgid "E196: No digraphs in this version"
 msgstr "E196: このバージョンに合字はありません"
 
-#: ex_eval.c:440
+#: ../ex_eval.c:439
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' で始まる例外は :throw できません"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:529
+#: ../ex_eval.c:528
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "例外が発生しました: %s"
 
-#: ex_eval.c:576
+#: ../ex_eval.c:575
 #, c-format
 msgid "Exception finished: %s"
 msgstr "例外が収束しました: %s"
 
-#: ex_eval.c:577
+#: ../ex_eval.c:576
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "例外が破棄されました: %s"
 
-#: ex_eval.c:620 ex_eval.c:664
+#: ../ex_eval.c:619 ../ex_eval.c:663
 #, c-format
 msgid "%s, line %ld"
 msgstr "%s, 行 %ld"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:638
+#: ../ex_eval.c:637
 #, c-format
 msgid "Exception caught: %s"
 msgstr "例外が捕捉されました: %s"
 
-#: ex_eval.c:713
+#: ../ex_eval.c:712
 #, c-format
 msgid "%s made pending"
 msgstr "%s により未決定状態が生じました"
 
-#: ex_eval.c:716
+#: ../ex_eval.c:715
 #, c-format
 msgid "%s resumed"
 msgstr "%s が再開しました"
 
-#: ex_eval.c:720
+#: ../ex_eval.c:719
 #, c-format
 msgid "%s discarded"
 msgstr "%s が破棄されました"
 
-#: ex_eval.c:746
+#: ../ex_eval.c:745
 msgid "Exception"
 msgstr "例外"
 
-#: ex_eval.c:752
+#: ../ex_eval.c:751
 msgid "Error and interrupt"
 msgstr "エラーと割込み"
 
-#: ex_eval.c:754 gui.c:4375
+#: ../ex_eval.c:753 ../gui.c:4389 ../gui_xmdlg.c:687 ../gui_xmdlg.c:809
+#: ../os_mswin.c:601
 msgid "Error"
 msgstr "エラー"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ex_eval.c:756
+#: ../ex_eval.c:755
 msgid "Interrupt"
 msgstr "割込み"
 
-#: ex_eval.c:830
+#: ../ex_eval.c:829
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if の入れ子が深過ぎます"
 
-#: ex_eval.c:867
+#: ../ex_eval.c:866
 msgid "E580: :endif without :if"
 msgstr "E580: :if のない :endif があります"
 
-#: ex_eval.c:911
+#: ../ex_eval.c:911
 msgid "E581: :else without :if"
 msgstr "E581: :if のない :else があります"
 
-#: ex_eval.c:914
+#: ../ex_eval.c:914
 msgid "E582: :elseif without :if"
 msgstr "E582: :if のない :elseif があります"
 
-#: ex_eval.c:921
+#: ../ex_eval.c:921
 msgid "E583: multiple :else"
 msgstr "E583: 複数の :else があります"
 
-#: ex_eval.c:924
+#: ../ex_eval.c:924
 msgid "E584: :elseif after :else"
 msgstr "E584: :else の後に :elseif があります"
 
-#: ex_eval.c:991
-msgid "E585: :while nesting too deep"
-msgstr "E585: :while の入れ子が深く過ぎます"
+#: ../ex_eval.c:991
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while や :for の入れ子が深過ぎます"
+
+#: ../ex_eval.c:1089
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :while や :for のない :continue があります"
+
+#: ../ex_eval.c:1128
+msgid "E587: :break without :while or :for"
+msgstr "E587: :while や :for のない :break があります"
 
-#: ex_eval.c:1047
-msgid "E586: :continue without :while"
-msgstr "E586: :while のない :continue があります"
+#: ../ex_eval.c:1178
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :endfor を :while と組み合わせています"
 
-#: ex_eval.c:1087
-msgid "E587: :break without :while"
-msgstr "E587: :while のない :break があります"
+#: ../ex_eval.c:1180
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :endwhile を :for と組み合わせています"
 
-#: ex_eval.c:1286
+#: ../ex_eval.c:1351
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try の入れ子が深過ぎます"
 
-#: ex_eval.c:1366
+#: ../ex_eval.c:1431
 msgid "E603: :catch without :try"
 msgstr "E603: :try のない :catch があります"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ex_eval.c:1388
+#: ../ex_eval.c:1450
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally の後に :catch があります"
 
-#: ex_eval.c:1521
+#: ../ex_eval.c:1584
 msgid "E606: :finally without :try"
 msgstr "E606: :try のない :finally があります"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ex_eval.c:1545
+#: ../ex_eval.c:1604
 msgid "E607: multiple :finally"
 msgstr "E607: 複数の :finalyy があります"
 
-#: ex_eval.c:1654
+#: ../ex_eval.c:1714
 msgid "E602: :endtry without :try"
 msgstr "E602: :try のない :endtry です"
 
-#: ex_eval.c:1986
+#: ../ex_eval.c:2218
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: 関数の外に :endfunction がありました"
 
-#: ex_getln.c:3295
+#: ../ex_getln.c:3503
 msgid "tagname"
 msgstr "タグ名"
 
-#: ex_getln.c:3298
+#: ../ex_getln.c:3506
 msgid " kind file\n"
 msgstr " ファイル種類\n"
 
-#: ex_getln.c:4751
+#: ../ex_getln.c:5005
 msgid "'history' option is zero"
 msgstr "オプション 'history' がゼロです"
 
-#: ex_getln.c:5017
+#: ../ex_getln.c:5276
 #, c-format
 msgid ""
 "\n"
@@ -1563,259 +1839,263 @@ msgstr ""
 "\n"
 "# %s 項目の履歴 (新しいものから古いものへ):\n"
 
-#: ex_getln.c:5018
+#: ../ex_getln.c:5277
 msgid "Command Line"
 msgstr "コマンドライン"
 
-#: ex_getln.c:5019
+#: ../ex_getln.c:5278
 msgid "Search String"
 msgstr "検索文字列"
 
-#: ex_getln.c:5020
+#: ../ex_getln.c:5279
 msgid "Expression"
 msgstr "式"
 
-#: ex_getln.c:5021
+#: ../ex_getln.c:5280
 msgid "Input Line"
 msgstr "入力行"
 
-#: ex_getln.c:5059
+#: ../ex_getln.c:5318
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar がコマンド長を超えました"
 
-#: ex_getln.c:5236
+#: ../ex_getln.c:5499
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: アクティブなウィンドウかバッファが削除されました"
 
-#: fileio.c:371
+#: ../fileio.c:374
 msgid "Illegal file name"
 msgstr "不正なファイル名"
 
-#: fileio.c:395 fileio.c:529 fileio.c:2850 fileio.c:2891
+#: ../fileio.c:399 ../fileio.c:539 ../fileio.c:2940 ../fileio.c:2981
 msgid "is a directory"
 msgstr " はディレクトリです"
 
-#: fileio.c:397
+#: ../fileio.c:401
 msgid "is not a file"
 msgstr " はファイルではありません"
 
-#: fileio.c:551 fileio.c:4057
+#: ../fileio.c:561 ../fileio.c:4172
 msgid "[New File]"
 msgstr "[新ファイル]"
 
-#: fileio.c:584
+#: ../fileio.c:594
 msgid "[Permission Denied]"
 msgstr "[認可がありません]"
 
-#: fileio.c:688
+#: ../fileio.c:705
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre autocommand がファイルを読込不可にしました"
 
-#: fileio.c:690
+#: ../fileio.c:707
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre autocommand は現在のバッファを変えられません"
 
-#: fileio.c:711
+#: ../fileio.c:728
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: 標準入力から読込中...\n"
 
-#: fileio.c:717
+#: ../fileio.c:734
 msgid "Reading from stdin..."
 msgstr "標準入力から読込み中..."
 
 #. Re-opening the original file failed!
-#: fileio.c:988
+#: ../fileio.c:1011
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: 変換がファイルを読込不可にしました"
 
-#: fileio.c:2027
+#: ../fileio.c:2084
 msgid "[fifo/socket]"
 msgstr "[FIFO/ソケット]"
 
-#: fileio.c:2034
+#: ../fileio.c:2091
 msgid "[fifo]"
 msgstr "[FIFO]"
 
-#: fileio.c:2041
+#: ../fileio.c:2098
 msgid "[socket]"
 msgstr "[ソケット]"
 
-#: fileio.c:2049
+#: ../fileio.c:2106 ../netbeans.c:3418
 msgid "[RO]"
 msgstr "[読専]"
 
-#: fileio.c:2059
+#: ../fileio.c:2116
 msgid "[CR missing]"
 msgstr "[CR無]"
 
-#: fileio.c:2064
+#: ../fileio.c:2121
 msgid "[NL found]"
 msgstr "[NL有]"
 
-#: fileio.c:2069
+#: ../fileio.c:2126
 msgid "[long lines split]"
 msgstr "[長行分割]"
 
-#: fileio.c:2075 fileio.c:4041
+#: ../fileio.c:2132 ../fileio.c:4156
 msgid "[NOT converted]"
 msgstr "[未変換]"
 
-#: fileio.c:2080 fileio.c:4046
+#: ../fileio.c:2137 ../fileio.c:4161
 msgid "[converted]"
 msgstr "[変換済]"
 
-#: fileio.c:2087 fileio.c:4071
+#: ../fileio.c:2144 ../fileio.c:4186
 msgid "[crypted]"
 msgstr "[暗号化]"
 
-#: fileio.c:2094
+#: ../fileio.c:2151
 msgid "[CONVERSION ERROR]"
 msgstr "[変換エラー]"
 
-#: fileio.c:2100
+#: ../fileio.c:2157
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
 msgstr "[%ld 行目の不正なバイト]"
 
-#: fileio.c:2107
+#: ../fileio.c:2164
 msgid "[READ ERRORS]"
 msgstr "[読込エラー]"
 
-#: fileio.c:2323
+#: ../fileio.c:2380
 msgid "Can't find temp file for conversion"
 msgstr "変換に必要な一時ファイルがみつかりません"
 
-#: fileio.c:2330
+#: ../fileio.c:2387
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' による変換が失敗しました"
 
-#: fileio.c:2333
+#: ../fileio.c:2390
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' の出力を読込めませんでした"
 
-#: fileio.c:2733
+#: ../fileio.c:2793
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwriteバッファの該当するautocommandは存在しません"
+
+#: ../fileio.c:2821
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: 保存するバッファをautocommandが削除か解放しました"
 
-#: fileio.c:2756
+#: ../fileio.c:2844
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: autocommandが予期せぬ方法で行数を変更しました"
 
 # Added at 19-Jan-2004.
-#: fileio.c:2794
+#: ../fileio.c:2884
 msgid "NetBeans dissallows writes of unmodified buffers"
 msgstr "NetBeansは未変更のバッファを上書することは許可していません"
 
-#: fileio.c:2802
+#: ../fileio.c:2892
 msgid "Partial writes disallowed for NetBeans buffers"
 msgstr "NetBeansバッファの一部を書き出すことはできません"
 
-#: fileio.c:2856 fileio.c:2874
+#: ../fileio.c:2946 ../fileio.c:2964
 msgid "is not a file or writable device"
 msgstr "はファイルでも書込み可能デバイスでもありません"
 
-#: fileio.c:2926
+#: ../fileio.c:3016 ../netbeans.c:3481
 msgid "is read-only (add ! to override)"
 msgstr "は読込専用です (強制書込には ! を追加)"
 
-#: fileio.c:3272
+#: ../fileio.c:3362
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: バックアップファイルを保存できません (! を追加で強制保存)"
 
-#: fileio.c:3284
+#: ../fileio.c:3374
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制)"
 
-#: fileio.c:3286
+#: ../fileio.c:3376
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制読込)"
 
-#: fileio.c:3302
+#: ../fileio.c:3392
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: バックアップファイルを作れません (! を追加で強制作成)"
 
-#: fileio.c:3405
+#: ../fileio.c:3495
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: バックアップファイルを作れません (! を追加で強制作成)"
 
-#: fileio.c:3467
+#: ../fileio.c:3557
 msgid "E460: The resource fork would be lost (add ! to override)"
 msgstr "E460: リソースフォークが失われるかもしれません (! を追加で強制)"
 
-#: fileio.c:3566
+#: ../fileio.c:3667
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: 保存用一時ファイルがみつかりません"
 
-#: fileio.c:3584
+#: ../fileio.c:3685
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: 変換できません (! を追加で変換せずに保存)"
 
-#: fileio.c:3619
+#: ../fileio.c:3720
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: リンクされたファイルに書込めません"
 
-#: fileio.c:3623
+#: ../fileio.c:3724
 msgid "E212: Can't open file for writing"
 msgstr "E212: 書込み用にファイルを開けません"
 
-#: fileio.c:3885
+#: ../fileio.c:4000
 msgid "E667: Fsync failed"
 msgstr "E667: fsync に失敗しました"
 
-#: fileio.c:3892
+#: ../fileio.c:4007
 msgid "E512: Close failed"
 msgstr "E512: 閉じることに失敗"
 
-#: fileio.c:3963
-msgid "E513: write error, conversion failed"
-msgstr "E513: 書込みエラー, 変換失敗"
+#: ../fileio.c:4078
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: 書込みエラー, 変換失敗 (上書するには 'fenc' を空にしてください)"
 
-#: fileio.c:3969
+#: ../fileio.c:4084
 msgid "E514: write error (file system full?)"
 msgstr "E514: 書込みエラー, (ファイルシステムが満杯?)"
 
-#: fileio.c:4036
+#: ../fileio.c:4151
 msgid " CONVERSION ERROR"
 msgstr " 変換エラー"
 
-#: fileio.c:4052
+#: ../fileio.c:4167
 msgid "[Device]"
 msgstr "[デバイス]"
 
-#: fileio.c:4057
+#: ../fileio.c:4172
 msgid "[New]"
 msgstr "[新]"
 
-#: fileio.c:4079
+#: ../fileio.c:4194
 msgid " [a]"
 msgstr " [a]"
 
-#: fileio.c:4079
+#: ../fileio.c:4194
 msgid " appended"
 msgstr " 追加"
 
-#: fileio.c:4081
+#: ../fileio.c:4196
 msgid " [w]"
 msgstr " [w]"
 
-#: fileio.c:4081
+#: ../fileio.c:4196
 msgid " written"
 msgstr " 書込み"
 
-#: fileio.c:4131
+#: ../fileio.c:4249
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: patchmode: 原本ファイルを保存できません"
 
-#: fileio.c:4153
+#: ../fileio.c:4271
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: 空の原本ファイルをtouchできません"
 
-#: fileio.c:4168
+#: ../fileio.c:4286
 msgid "E207: Can't delete backup file"
 msgstr "E207: バックアップファイルを消せません"
 
-#: fileio.c:4232
+#: ../fileio.c:4350
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -1823,126 +2103,126 @@ msgstr ""
 "\n"
 "警告: 原本ファイルが失われたか変更されました\n"
 
-#: fileio.c:4234
+#: ../fileio.c:4352
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "ファイルの保存に成功するまでエディタを終了しないでください!"
 
-#: fileio.c:4323
+#: ../fileio.c:4441
 msgid "[dos]"
 msgstr "[dos]"
 
-#: fileio.c:4323
+#: ../fileio.c:4441
 msgid "[dos format]"
 msgstr "[dosフォーマット]"
 
-#: fileio.c:4330
+#: ../fileio.c:4448
 msgid "[mac]"
 msgstr "[mac]"
 
-#: fileio.c:4330
+#: ../fileio.c:4448
 msgid "[mac format]"
 msgstr "[macフォーマット]"
 
-#: fileio.c:4337
+#: ../fileio.c:4455
 msgid "[unix]"
 msgstr "[unix]"
 
-#: fileio.c:4337
+#: ../fileio.c:4455
 msgid "[unix format]"
 msgstr "[unixフォーマット]"
 
-#: fileio.c:4364
+#: ../fileio.c:4482
 msgid "1 line, "
 msgstr "1 行, "
 
-#: fileio.c:4366
+#: ../fileio.c:4484
 #, c-format
 msgid "%ld lines, "
 msgstr "%ld 行, "
 
-#: fileio.c:4369
+#: ../fileio.c:4487
 msgid "1 character"
 msgstr "1 文字"
 
-#: fileio.c:4371
+#: ../fileio.c:4489
 #, c-format
 msgid "%ld characters"
 msgstr "%ld 文字"
 
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
 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:4400
+#: ../fileio.c:4518
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "警告: 読込んだ後にファイルに変更がありました!!!"
 
-#: fileio.c:4402
+#: ../fileio.c:4520
 msgid "Do you really want to write to it"
 msgstr "本当に上書きしますか"
 
-#: fileio.c:5566
+#: ../fileio.c:5746
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" を書込み中のエラーです"
 
-#: fileio.c:5573
+#: ../fileio.c:5753
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: \"%s\" を閉じる時にエラーです"
 
-#: fileio.c:5576
+#: ../fileio.c:5756
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: \"%s\" を読込中のエラーです"
 
-#: fileio.c:5810
+#: ../fileio.c:5993
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: autocommand の FileChangedShell がバッファを削除しました"
 
-#: fileio.c:5817
+#: ../fileio.c:6000
 #, c-format
 msgid "E211: Warning: File \"%s\" no longer available"
 msgstr "E211: 警告: ファイル \"%s\" は既に存在しません"
 
-#: fileio.c:5831
+#: ../fileio.c:6014
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: 警告: ファイル \"%s\" が変更されVimのバッファも変更されました"
 
-#: fileio.c:5834
+#: ../fileio.c:6017
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: 警告: ファイル \"%s\" は編集開始後に変更されました"
 
-#: fileio.c:5836
+#: ../fileio.c:6019
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: 警告: ファイル \"%s\" のモードが編集開始後に変更されました"
 
-#: fileio.c:5846
+#: ../fileio.c:6029
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: 警告: ファイル \"%s\" は編集開始後に作成されました"
 
-#: fileio.c:5859
+#: ../fileio.c:6042
 msgid "See \":help W11\" for more info."
 msgstr "詳細は \":help W11\" を参照してください"
 
-#: fileio.c:5873
+#: ../fileio.c:6056
 msgid "Warning"
 msgstr "警告"
 
-#: fileio.c:5874
+#: ../fileio.c:6057
 msgid ""
 "&OK\n"
 "&Load File"
@@ -1950,43 +2230,48 @@ msgstr ""
 "&OK\n"
 "ファイル読込(&L)"
 
-#: fileio.c:5980
+#: ../fileio.c:6159
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: \"%s\" をリロードする準備ができませんでした"
 
-#: fileio.c:5999
+#: ../fileio.c:6178
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" はリロードできませんでした"
 
-#: fileio.c:6580
+#: ../fileio.c:6773
 msgid "--Deleted--"
 msgstr "--削除済--"
 
+#: ../fileio.c:6920
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
+
 #. the group doesn't exist
-#: fileio.c:6740
+#: ../fileio.c:6964
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: そのグループはありません: \"%s\""
 
-#: fileio.c:6866
+#: ../fileio.c:7090
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * の後に不正な文字がありました: %s"
 
-#: fileio.c:6878
+#: ../fileio.c:7102
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: そのようなイベントはありません: %s"
 
-#: fileio.c:6880
+#: ../fileio.c:7104
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: そのようなグループもしくはイベントはありません: %s"
 
 #. Highlight title
-#: fileio.c:7038
+#: ../fileio.c:7302
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -1994,166 +2279,180 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: fileio.c:7309
+#: ../fileio.c:7538
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <バッファ=%d>: 無効なバッファ番号です"
+
+#: ../fileio.c:7635
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: 全てのイベントに対してのautocommandは実行できません"
 
-#: fileio.c:7332
+#: ../fileio.c:7658
 msgid "No matching autocommands"
 msgstr "該当するautocommandは存在しません"
 
-#: fileio.c:7653
+#: ../fileio.c:7982
 msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommandの入れ子が深すぎます"
+msgstr "E218: autocommandの入れ子が深過ぎます"
 
-#: fileio.c:7928
+#: ../fileio.c:8290
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands for \"%s\""
 
-#: fileio.c:7936
+#: ../fileio.c:8298
 #, c-format
 msgid "Executing %s"
 msgstr "%s を実行しています"
 
 #. always scroll up, don't overwrite
-#: fileio.c:8004
+#: ../fileio.c:8366
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: fileio.c:8571
+#: ../fileio.c:8961
 msgid "E219: Missing {."
 msgstr "E219: { がありません."
 
-#: fileio.c:8573
+#: ../fileio.c:8963
 msgid "E220: Missing }."
 msgstr "E220: } がありません."
 
-#: fold.c:68
+#: ../fold.c:68
 msgid "E490: No fold found"
 msgstr "E490: 折畳みがありません"
 
-#: fold.c:593
+#: ../fold.c:593
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: 現在の 'foldmethod' では折畳みを作成できません"
 
-#: fold.c:595
+#: ../fold.c:595
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません"
 
-#: getchar.c:248
+#: ../fold.c:1984
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--%3ld 行が折畳まれました"
+
+#: ../getchar.c:249
 msgid "E222: Add to read buffer"
 msgstr "E222: 読込バッファへ追加"
 
-#: getchar.c:2198
+#: ../getchar.c:2234
 msgid "E223: recursive mapping"
 msgstr "E223: 再帰的マッピング"
 
-#: getchar.c:3077
+#: ../getchar.c:3114
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s というグローバル短縮入力は既に存在します"
 
-#: getchar.c:3080
+#: ../getchar.c:3117
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s というグローバルマッピングは既に存在します"
 
-#: getchar.c:3212
+#: ../getchar.c:3249
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s という短縮入力は既に存在します"
 
-#: getchar.c:3215
+#: ../getchar.c:3252
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s というマッピングは既に存在します"
 
-#: getchar.c:3279
+#: ../getchar.c:3316
 msgid "No abbreviation found"
 msgstr "短縮入力はみつかりませんでした"
 
-#: getchar.c:3281
+#: ../getchar.c:3318
 msgid "No mapping found"
 msgstr "マッピングはみつかりませんでした"
 
-#: getchar.c:4173
+#: ../getchar.c:4210
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: 不正なモード"
 
-#: gui.c:220
+#: ../gui.c:220
 msgid "E229: Cannot start the GUI"
 msgstr "E229: GUIを開始できません"
 
-#: gui.c:349
+#: ../gui.c:355
 #, c-format
 msgid "E230: Cannot read from \"%s\""
 msgstr "E230: \"%s\"から読込むことができません"
 
-#: gui.c:472
+#: ../gui.c:478
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr "E665: 有効なフォントが見つからないので, GUIを開始できません"
 
-#: gui.c:477
+#: ../gui.c:483
 msgid "E231: 'guifontwide' invalid"
 msgstr "E231: 'guifontwide' が無効です"
 
-#: gui.c:547
+#: ../gui.c:553
 msgid "E599: Value of 'imactivatekey' is invalid"
 msgstr "E599: 'imactivatekey' に設定された値が無効です"
 
-#: gui.c:4061
+#: ../gui.c:4070
 #, c-format
 msgid "E254: Cannot allocate color %s"
 msgstr "E254: %s の色を割り当てられません"
 
-#: gui_at_fs.c:300
+#: ../gui.c:4598
+msgid "No match at cursor, finding next"
+msgstr "カーソルの位置にマッチはありません, 次を検索しています"
+
+#: ../gui_at_fs.c:300
 msgid "<cannot open> "
 msgstr "<開けません>"
 
-#: gui_at_fs.c:1136
+#: ../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:2781
+#: ../gui_at_fs.c:2781
 msgid "E614: vim_SelFile: can't return to current directory"
 msgstr "E614: vim_SelFile: 現在のディレクトリに戻れません"
 
-#: gui_at_fs.c:2801
+#: ../gui_at_fs.c:2801
 msgid "Pathname:"
 msgstr "パス名:"
 
-#: gui_at_fs.c:2807
+#: ../gui_at_fs.c:2807
 msgid "E615: vim_SelFile: can't get current directory"
 msgstr "E615: vim_SelFile: 現在のディレクトリを取得できません"
 
-#: gui_at_fs.c:2815 gui_motif.c:1623
+#: ../gui_at_fs.c:2815 ../gui_xmdlg.c:932
 msgid "OK"
 msgstr "OK"
 
-#: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
+#: ../gui_at_fs.c:2815 ../gui_gtk.c:2809 ../gui_xmdlg.c:941
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: gui_at_sb.c:486
+#: ../gui_at_sb.c:486
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "スクロールバー: 画像を取得できませんでした."
 
-#: gui_athena.c:2047 gui_motif.c:1871
+#: ../gui_athena.c:2175 ../gui_motif.c:2292
 msgid "Vim dialog"
 msgstr "Vim ダイアログ"
 
-#: gui_beval.c:101 gui_w32.c:3830
+#: ../gui_beval.c:101 ../gui_w32.c:4093
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: メッセージとコールバックのある BalloonEval を作成できません"
 
-#: gui_gtk.c:1607
+#: ../gui_gtk.c:1687
 msgid "Vim dialog..."
 msgstr "Vim ダイアログ..."
 
-#: gui_gtk.c:2060 message.c:2993
+#: ../gui_gtk.c:2138 ../message.c:3016
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2163,112 +2462,136 @@ msgstr ""
 "いいえ(&N)\n"
 "キャンセル(&C)"
 
-#: gui_gtk.c:2268
+#: ../gui_gtk.c:2346
 msgid "Input _Methods"
 msgstr "インプットメソッド"
 
-#: gui_gtk.c:2534 gui_motif.c:2768
+#: ../gui_gtk.c:2612 ../gui_motif.c:3243
 msgid "VIM - Search and Replace..."
 msgstr "VIM - 検索と置換..."
 
-#: gui_gtk.c:2542 gui_motif.c:2770
+#: ../gui_gtk.c:2620 ../gui_motif.c:3245
 msgid "VIM - Search..."
 msgstr "VIM - 検索..."
 
-#: gui_gtk.c:2574 gui_motif.c:2888
+#: ../gui_gtk.c:2652 ../gui_motif.c:3354
 msgid "Find what:"
 msgstr "検索文字列:"
 
-#: gui_gtk.c:2592 gui_motif.c:2920
+#: ../gui_gtk.c:2670 ../gui_motif.c:3387
 msgid "Replace with:"
 msgstr "置換文字列:"
 
 #. whole word only button
-#: gui_gtk.c:2624 gui_motif.c:3036
+#: ../gui_gtk.c:2702 ../gui_motif.c:3508
 msgid "Match whole word only"
 msgstr "正確に該当するものだけ"
 
 #. match case button
-#: gui_gtk.c:2635 gui_motif.c:3048
+#: ../gui_gtk.c:2713 ../gui_motif.c:3520
 msgid "Match case"
 msgstr "大文字/小文字を区別する"
 
-#: gui_gtk.c:2645 gui_motif.c:2990
+#: ../gui_gtk.c:2723 ../gui_motif.c:3459
 msgid "Direction"
 msgstr "方向"
 
 #. 'Up' and 'Down' buttons
-#: gui_gtk.c:2657 gui_motif.c:3002
+#: ../gui_gtk.c:2735 ../gui_motif.c:3472
 msgid "Up"
 msgstr "上"
 
-#: gui_gtk.c:2661 gui_motif.c:3010
+#: ../gui_gtk.c:2739 ../gui_motif.c:3481
 msgid "Down"
 msgstr "下"
 
-#: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
+#: ../gui_gtk.c:2761 ../gui_gtk.c:2763
 msgid "Find Next"
 msgstr "次を検索"
 
-#: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
+#: ../gui_gtk.c:2780 ../gui_gtk.c:2782
 msgid "Replace"
 msgstr "置換"
 
-#: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
+#: ../gui_gtk.c:2793 ../gui_gtk.c:2795
 msgid "Replace All"
 msgstr "全て置換"
 
-#: gui_gtk_x11.c:2327
+#: ../gui_gtk_x11.c:2327
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n"
 
-#: gui_gtk_x11.c:3519
+#: ../gui_gtk_x11.c:3527
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: メインウィンドウが不意に破壊されました\n"
 
-#: gui_gtk_x11.c:4138
+#: ../gui_gtk_x11.c:4147
 msgid "Font Selection"
 msgstr "フォント選択"
 
-#: gui_gtk_x11.c:6035 ui.c:2117
+#: ../gui_gtk_x11.c:6104 ../ui.c:2142
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "空の選択領域のかわりにCUT_BUFFER0が使用されました"
 
-#: gui_motif.c:1617 gui_motif.c:1620
-msgid "Filter"
-msgstr "フィルタ"
+#: ../gui_motif.c:2054
+msgid "&Filter"
+msgstr "フィルタ(&F)"
+
+#: ../gui_motif.c:2055 ../gui_motif.c:3322
+msgid "&Cancel"
+msgstr "キャンセル(&C)"
 
-#: gui_motif.c:1619
+#: ../gui_motif.c:2056
 msgid "Directories"
 msgstr "ディレクトリ"
 
-#: gui_motif.c:1621
-msgid "Help"
-msgstr "ヘルプ"
+#: ../gui_motif.c:2057
+msgid "Filter"
+msgstr "フィルタ"
+
+#: ../gui_motif.c:2058
+msgid "&Help"
+msgstr "ヘルプ(&H)"
 
-#: gui_motif.c:1622
+#: ../gui_motif.c:2059
 msgid "Files"
 msgstr "ファイル"
 
-#: gui_motif.c:1624
+#: ../gui_motif.c:2060
+msgid "&OK"
+msgstr "&OK"
+
+#: ../gui_motif.c:2061
 msgid "Selection"
 msgstr "選択"
 
-#: gui_motif.c:2835
-msgid "Undo"
-msgstr "アンドゥ"
+#: ../gui_motif.c:3274
+msgid "Find &Next"
+msgstr "次を検索(&N)"
+
+#: ../gui_motif.c:3289
+msgid "&Replace"
+msgstr "置換(&R)"
 
-#: gui_riscos.c:952
+#: ../gui_motif.c:3300
+msgid "Replace &All"
+msgstr "全て置換(&A)"
+
+#: ../gui_motif.c:3311
+msgid "&Undo"
+msgstr "アンドゥ(&U)"
+
+#: ../gui_riscos.c:952
 #, c-format
 msgid "E610: Can't load Zap font '%s'"
 msgstr "E610: Zapフォント '%s' を読込めません"
 
-#: gui_riscos.c:1048
+#: ../gui_riscos.c:1048
 #, c-format
 msgid "E611: Can't use font %s"
 msgstr "E611: フォント %s を使用できません"
 
-#: gui_riscos.c:3270
+#: ../gui_riscos.c:3272
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
@@ -2276,64 +2599,83 @@ msgstr ""
 "\n"
 "子プロセスへ停止メッセージを送信中です.\n"
 
-#: gui_w32.c:830
+#: ../gui_w32.c:840
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: タイトルが \"%s\" のウィンドウはみつかりません"
+
+#: ../gui_w32.c:848
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
 
-#: gui_w48.c:2090
+#: ../gui_w32.c:1098
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDIアプリの中ではウィンドウを開けません"
+
+#: ../gui_w48.c:2213
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "検索文字列 ('\\' を検索するには '\\\\')"
 
-#: gui_w48.c:2115
+#: ../gui_w48.c:2238
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
 msgstr "検索・置換 ('\\' を検索するには '\\\\')"
 
-#: gui_x11.c:1537
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+#: ../gui_w48.c:3044
+msgid "Not Used"
+msgstr "使われません"
+
+#: ../gui_w48.c:3045
+msgid "Directory\t*.nothing\n"
+msgstr "ディレクトリ\t*.nothing\n"
+
+#: ../gui_x11.c:1537
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: 色指定が正しくないのでエントリを割り当てられません"
 
-#: gui_x11.c:2118
+#: ../gui_x11.c:2141
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
 msgstr "E250: 以下の文字セットのフォントがありません %s:"
 
-#: gui_x11.c:2161
+#: ../gui_x11.c:2184
 #, c-format
 msgid "E252: Fontset name: %s"
 msgstr "E252: フォントセット名: %s"
 
-#: gui_x11.c:2162
+#: ../gui_x11.c:2185
 #, c-format
 msgid "Font '%s' is not fixed-width"
 msgstr "フォント '%s' は固定幅ではありません"
 
-#: gui_x11.c:2181
+#: ../gui_x11.c:2204
 #, c-format
 msgid "E253: Fontset name: %s\n"
 msgstr "E253: フォントセット名: %s\n"
 
-#: gui_x11.c:2182
+#: ../gui_x11.c:2205
 #, c-format
 msgid "Font0: %s\n"
 msgstr "フォント0: %s\n"
 
-#: gui_x11.c:2183
+#: ../gui_x11.c:2206
 #, c-format
 msgid "Font1: %s\n"
 msgstr "フォント1: %s\n"
 
-#: gui_x11.c:2184
+#: ../gui_x11.c:2207
 #, 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の2倍ではありません\n"
 
-#: gui_x11.c:2185
+#: ../gui_x11.c:2208
 #, c-format
 msgid "Font0 width: %ld\n"
 msgstr "フォント0の幅: %ld\n"
 
-#: gui_x11.c:2186
+#: ../gui_x11.c:2209
 #, c-format
 msgid ""
 "Font1 width: %ld\n"
@@ -2342,164 +2684,209 @@ msgstr ""
 "フォント1の幅: %ld\n"
 "\n"
 
-#: hangulin.c:610
+#: ../gui_xmdlg.c:688 ../gui_xmdlg.c:810
+msgid "Invalid font specification"
+msgstr "無効なフォント指定です"
+
+#: ../gui_xmdlg.c:689 ../gui_xmdlg.c:811
+msgid "&Dismiss"
+msgstr "却下する(&D)"
+
+#: ../gui_xmdlg.c:698
+msgid "no specific match"
+msgstr "マッチするものがありません"
+
+#: ../gui_xmdlg.c:910
+msgid "Vim - Font Selector"
+msgstr "Vim - フォント選択"
+
+#: ../gui_xmdlg.c:979
+msgid "Name:"
+msgstr "名前:"
+
+#. create toggle button
+#: ../gui_xmdlg.c:1019
+msgid "Show size in Points"
+msgstr "サイズをポイントで表示する"
+
+# msgid " BLOCK"
+# msgstr " ブロック"
+# msgid " LINE"
+# msgstr " 行"
+#: ../gui_xmdlg.c:1038
+msgid "Encoding:"
+msgstr "エンコード:"
+
+#: ../gui_xmdlg.c:1084
+msgid "Font:"
+msgstr "フォント:"
+
+#: ../gui_xmdlg.c:1117
+msgid "Style:"
+msgstr "スタイル:"
+
+#: ../gui_xmdlg.c:1149
+msgid "Size:"
+msgstr "サイズ:"
+
+#: ../hangulin.c:610
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: ハングルオートマトンエラー"
 
-#: if_cscope.c:77
+#: ../if_cscope.c:77
 msgid "Add a new database"
 msgstr "新データベースを追加"
 
-#: if_cscope.c:79
+#: ../if_cscope.c:79
 msgid "Query for a pattern"
 msgstr "パターンのクエリーを追加"
 
-#: if_cscope.c:81
+#: ../if_cscope.c:81
 msgid "Show this message"
 msgstr "このメッセージを表示する"
 
-#: if_cscope.c:83
+#: ../if_cscope.c:83
 msgid "Kill a connection"
 msgstr "接続を終了する"
 
-#: if_cscope.c:85
+#: ../if_cscope.c:85
 msgid "Reinit all connections"
 msgstr "全ての接続を再初期化する"
 
-#: if_cscope.c:87
+#: ../if_cscope.c:87
 msgid "Show connections"
 msgstr "接続を表示する"
 
-#: if_cscope.c:95
+#: ../if_cscope.c:95
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: 使用方法: cs[cope] %s"
 
-#: if_cscope.c:124
+#: ../if_cscope.c:124
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "このcscopeコマンドは分割ウィンドウではサポートされません.\n"
 
-#: if_cscope.c:175
+#: ../if_cscope.c:175
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: 使用法: cstag <ident>"
 
-#: if_cscope.c:231
+#: ../if_cscope.c:231
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: タグがみつかりません"
 
-#: if_cscope.c:409
+#: ../if_cscope.c:409
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) エラー: %d"
 
-#: if_cscope.c:419
+#: ../if_cscope.c:419
 msgid "E563: stat error"
 msgstr "E563: stat エラー"
 
-#: if_cscope.c:516
+#: ../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:534
+#: ../if_cscope.c:534
 #, c-format
 msgid "Added cscope database %s"
 msgstr "cscopeデータベース %s を追加"
 
-#: if_cscope.c:589
+#: ../if_cscope.c:589
 #, c-format
 msgid "E262: error reading cscope connection %ld"
 msgstr "E262: cscopeの接続 %ld を読込み中のエラーです"
 
-#: if_cscope.c:694
+#: ../if_cscope.c:694
 msgid "E561: unknown cscope search type"
 msgstr "E561: 未知のcscope検索型です"
 
-#: if_cscope.c:736
+#: ../if_cscope.c:736
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: cscopeパイプを作成できませんでした"
 
-#: if_cscope.c:753
+#: ../if_cscope.c:753
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscopeの起動準備(fork)に失敗しました"
 
-#: if_cscope.c:847 if_cscope.c:897
+#: ../if_cscope.c:847 ../if_cscope.c:897
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection の実行に失敗しました"
 
-#: if_cscope.c:898
+#: ../if_cscope.c:898
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: cscopeプロセスを起動できませんでした"
 
-#: if_cscope.c:911
+#: ../if_cscope.c:911
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: to_fp の fdopen に失敗しました"
 
-#: if_cscope.c:913
+#: ../if_cscope.c:913
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fr_fp の fdopen に失敗しました"
 
-#: if_cscope.c:951
+#: ../if_cscope.c:951
 msgid "E567: no cscope connections"
 msgstr "E567: cscope接続に失敗しました"
 
-#: if_cscope.c:1025
+#: ../if_cscope.c:1025
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: cscopeクエリー %s of %s に該当がありませんでした"
 
-#: if_cscope.c:1082
+#: ../if_cscope.c:1082
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: 無効な cscopequickfix フラグ %c の %c です"
 
-#: if_cscope.c:1152
+#: ../if_cscope.c:1152
 msgid "cscope commands:\n"
 msgstr "cscopeコマンド:\n"
 
-#: if_cscope.c:1155
+#: ../if_cscope.c:1155
 #, c-format
 msgid "%-5s: %-30s (Usage: %s)"
 msgstr "%-5s: %-30s (使用法: %s)"
 
-#: if_cscope.c:1253
+#: ../if_cscope.c:1253
 #, c-format
 msgid "E625: cannot open cscope database: %s"
 msgstr "E625: cscopeデータベース: %s を開くことができません"
 
-#: if_cscope.c:1271
+#: ../if_cscope.c:1271
 msgid "E626: cannot get cscope database information"
 msgstr "E626: cscopeデータベースの情報を取得できません"
 
-#: if_cscope.c:1296
+#: ../if_cscope.c:1296
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: 重複するcscopeデータベースは追加されませんでした"
 
-#: if_cscope.c:1307
+#: ../if_cscope.c:1307
 msgid "E569: maximum number of cscope connections reached"
 msgstr "E569: cscope接続の最大数に達しました"
 
-#: if_cscope.c:1424
+#: ../if_cscope.c:1424
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope接続 %s がみつかりませんでした"
 
-#: if_cscope.c:1458
+#: ../if_cscope.c:1458
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope接続 %s が閉じられました"
 
 #. should not reach here
-#: if_cscope.c:1598
+#: ../if_cscope.c:1598
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches で致命的なエラーです"
 
-#: if_cscope.c:1848
+#: ../if_cscope.c:1848
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope タグ: %s"
 
-#: if_cscope.c:1870
+#: ../if_cscope.c:1870
 msgid ""
 "\n"
 "   #   line"
@@ -2507,28 +2894,123 @@ msgstr ""
 "\n"
 "   #   行番号"
 
-#: if_cscope.c:1872
+#: ../if_cscope.c:1872
 msgid "filename / context / line\n"
 msgstr "ファイル名 / 文脈 / 行\n"
 
-#: if_cscope.c:1990
+#: ../if_cscope.c:1990
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: cscopeエラー: %s"
 
-#: if_cscope.c:2176
+#: ../if_cscope.c:2176
 msgid "All cscope databases reset"
 msgstr "全てのcscopeデータベースをリセットします"
 
-#: if_cscope.c:2244
+#: ../if_cscope.c:2244
 msgid "no cscope connections\n"
 msgstr "cscope接続がありません\n"
 
-#: if_cscope.c:2248
+#: ../if_cscope.c:2248
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    データベース名                      prepend パス\n"
 
-#: if_python.c:436
+#: ../if_mzsch.c:785
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr ""
+"???: このコマンドは無効です, ごめんなさい: MzScheme "
+"ライブラリをロードできませんでした."
+
+#: ../if_mzsch.c:1222 ../if_python.c:1084 ../if_tcl.c:1406
+msgid "invalid expression"
+msgstr "無効な式です"
+
+#: ../if_mzsch.c:1230 ../if_python.c:1098 ../if_tcl.c:1411
+msgid "expressions disabled at compile time"
+msgstr "式はコンパイル時に無効にされています"
+
+#: ../if_mzsch.c:1317
+msgid "hidden option"
+msgstr "隠しオプション"
+
+#: ../if_mzsch.c:1319 ../if_tcl.c:505
+msgid "unknown option"
+msgstr "未知のオプションです"
+
+#: ../if_mzsch.c:1468
+msgid "window index is out of range"
+msgstr "範囲外のウィンドウ番号です"
+
+#: ../if_mzsch.c:1623
+msgid "couldn't open buffer"
+msgstr "バッファを開けません"
+
+#: ../if_mzsch.c:1888 ../if_mzsch.c:1914 ../if_mzsch.c:1989 ../if_mzsch.c:2038
+#: ../if_mzsch.c:2147 ../if_mzsch.c:2190 ../if_python.c:2311
+#: ../if_python.c:2345 ../if_python.c:2400 ../if_python.c:2468
+#: ../if_python.c:2590 ../if_python.c:2642 ../if_tcl.c:688 ../if_tcl.c:733
+#: ../if_tcl.c:807 ../if_tcl.c:877 ../if_tcl.c:2003
+msgid "cannot save undo information"
+msgstr "アンドゥ情報が保存できません"
+
+#: ../if_mzsch.c:1893 ../if_mzsch.c:1997 ../if_mzsch.c:2051
+#: ../if_python.c:2313 ../if_python.c:2407 ../if_python.c:2479
+msgid "cannot delete line"
+msgstr "行を消せません"
+
+#: ../if_mzsch.c:1919 ../if_mzsch.c:2065 ../if_python.c:2350
+#: ../if_python.c:2495 ../if_tcl.c:694 ../if_tcl.c:2025
+msgid "cannot replace line"
+msgstr "行を置換できません"
+
+#: ../if_mzsch.c:2079 ../if_mzsch.c:2152 ../if_mzsch.c:2199
+#: ../if_python.c:2513 ../if_python.c:2592 ../if_python.c:2650
+msgid "cannot insert line"
+msgstr "行を挿入できません"
+
+#: ../if_mzsch.c:2295 ../if_python.c:2762
+msgid "string cannot contain newlines"
+msgstr "文字列には改行文字を含められません"
+
+#: ../if_mzsch.c:2378
+msgid "Vim error: ~a"
+msgstr "Vim エラー: ~a"
+
+#: ../if_mzsch.c:2387
+msgid "Vim error"
+msgstr "Vim エラー"
+
+#: ../if_mzsch.c:2443
+msgid "buffer is invalid"
+msgstr "バッファは無効です"
+
+#: ../if_mzsch.c:2452
+msgid "window is invalid"
+msgstr "ウィンドウは無効です"
+
+#: ../if_mzsch.c:2472
+msgid "linenr out of range"
+msgstr "範囲外の行番号です"
+
+#: ../globals.h:1293 ../if_perl.xs:326 if_perl.xs:326
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ライブラリ %s をロードできませんでした"
+
+#: ../if_perl.xs:556 if_perl.xs:556
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"このコマンドは無効です, ごめんなさい: Perlライブラリをロードできませんでした."
+
+#: ../if_perl.xs:609 if_perl.xs:609
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: サンドボックスでは Safe "
+"モジュールを使用しないPerlスクリプトは禁じられています"
+
+#: ../if_python.c:438
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2537,197 +3019,168 @@ msgstr ""
 "Pythonライブラリをロードできませんでした."
 
 # Added at 07-Feb-2004.
-#: if_python.c:500
+#: ../if_python.c:504
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python を再帰的に実行することはできません"
 
-#: if_python.c:701
+#: ../if_python.c:705
 msgid "can't delete OutputObject attributes"
 msgstr "OutputObject属性を消せません"
 
-#: if_python.c:708
+#: ../if_python.c:712
 msgid "softspace must be an integer"
 msgstr "softspace は integer でなければなりません"
 
-#: if_python.c:716
+#: ../if_python.c:720
 msgid "invalid attribute"
 msgstr "無効な属性です"
 
-#: if_python.c:755 if_python.c:769
+#: ../if_python.c:759 ../if_python.c:773
 msgid "writelines() requires list of strings"
 msgstr "writelines() には文字列のリストが必要です"
 
-#: if_python.c:895
+#: ../if_python.c:899
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: I/Oオブジェクトの初期化中にエラーです"
 
-#: if_python.c:1080 if_tcl.c:1402
-msgid "invalid expression"
-msgstr "無効な式です"
-
-#: if_python.c:1094 if_tcl.c:1407
-msgid "expressions disabled at compile time"
-msgstr "式はコンパイル時に無効にされています"
-
-#: if_python.c:1107
+#: ../if_python.c:1111
 msgid "attempt to refer to deleted buffer"
 msgstr "消されたバッファが参照されました"
 
-#: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
+#: ../if_python.c:1126 ../if_python.c:1167 ../if_python.c:1231
+#: ../if_tcl.c:1218
 msgid "line number out of range"
 msgstr "範囲外の行番号です"
 
-#: if_python.c:1362
+#: ../if_python.c:1366
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
 msgstr "<バッファオブジェクト (消去済み) %8lX>"
 
-#: if_python.c:1453 if_tcl.c:836
+#: ../if_python.c:1457 ../if_tcl.c:840
 msgid "invalid mark name"
 msgstr "無効なマーク名です"
 
-#: if_python.c:1733
+#: ../if_python.c:1737
 msgid "no such buffer"
 msgstr "そのようなバッファはありません"
 
-#: if_python.c:1821
+#: ../if_python.c:1825
 msgid "attempt to refer to deleted window"
 msgstr "消されたウィンドウが参照されました"
 
-#: if_python.c:1866
+#: ../if_python.c:1870
 msgid "readonly attribute"
 msgstr "読込専用属性"
 
-#: if_python.c:1879
+#: ../if_python.c:1883
 msgid "cursor position outside buffer"
 msgstr "カーソルがバッファの外にあります"
 
-#: if_python.c:1956
+#: ../if_python.c:1960
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
 msgstr "<ウィンドウオブジェクト (消去済) %.8lX>"
 
-#: if_python.c:1968
+#: ../if_python.c:1972
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
 msgstr "<ウィンドウオブジェクト (未知) %.8lX>"
 
-#: if_python.c:1970
+#: ../if_python.c:1974
 #, c-format
 msgid "<window %d>"
 msgstr "<ウィンドウ %d>"
 
-#: if_python.c:2046
+#: ../if_python.c:2050
 msgid "no such window"
 msgstr "そのようなウィンドウはありません"
 
-#: 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:2309 if_python.c:2403 if_python.c:2475
-msgid "cannot delete line"
-msgstr "行を消せません"
-
-#: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
-msgid "cannot replace line"
-msgstr "行を置換できません"
-
-#: if_python.c:2509 if_python.c:2588 if_python.c:2646
-msgid "cannot insert line"
-msgstr "行を挿入できません"
-
-#: if_python.c:2750
-msgid "string cannot contain newlines"
-msgstr "文字列には改行文字を含められません"
-
-#: if_ruby.c:422
+#: ../if_ruby.c:422
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: このコマンドは無効です,ごめんなさい: "
 "Rubyライブラリをロードできませんでした."
 
-#: if_ruby.c:485
+#: ../if_ruby.c:485
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: 未知のlongjmp状態: %d"
 
-#: if_sniff.c:67
+#: ../if_sniff.c:67
 msgid "Toggle implementation/definition"
 msgstr "実装と定義を切り替える"
 
-#: if_sniff.c:68
+#: ../if_sniff.c:68
 msgid "Show base class of"
 msgstr "次のクラスの基底を表示"
 
-#: if_sniff.c:69
+#: ../if_sniff.c:69
 msgid "Show overridden member function"
 msgstr "オーバーライドされたメンバ関数を表示"
 
-#: if_sniff.c:70
+#: ../if_sniff.c:70
 msgid "Retrieve from file"
 msgstr "ファイルから回復する"
 
-#: if_sniff.c:71
+#: ../if_sniff.c:71
 msgid "Retrieve from project"
 msgstr "プロジェクトから回復する"
 
-#: if_sniff.c:73
+#: ../if_sniff.c:73
 msgid "Retrieve from all projects"
 msgstr "全てのプロジェクトから回復する"
 
-#: if_sniff.c:74
+#: ../if_sniff.c:74
 msgid "Retrieve"
 msgstr "回復"
 
-#: if_sniff.c:75
+#: ../if_sniff.c:75
 msgid "Show source of"
 msgstr "次のソースを表示する"
 
-#: if_sniff.c:76
+#: ../if_sniff.c:76
 msgid "Find symbol"
 msgstr "みつけたシンボル"
 
-#: if_sniff.c:77
+#: ../if_sniff.c:77
 msgid "Browse class"
 msgstr "クラスを参照"
 
-#: if_sniff.c:78
+#: ../if_sniff.c:78
 msgid "Show class in hierarchy"
 msgstr "階層でクラスを表示"
 
-#: if_sniff.c:79
+#: ../if_sniff.c:79
 msgid "Show class in restricted hierarchy"
 msgstr "限定された階層でクラスを表示"
 
-#: if_sniff.c:80
+#: ../if_sniff.c:80
 msgid "Xref refers to"
 msgstr "Xref の参照先"
 
-#: if_sniff.c:81
+#: ../if_sniff.c:81
 msgid "Xref referred by"
 msgstr "Xref が参照される"
 
-#: if_sniff.c:82
+#: ../if_sniff.c:82
 msgid "Xref has a"
 msgstr "Xref が次のものをもっています"
 
-#: if_sniff.c:83
+#: ../if_sniff.c:83
 msgid "Xref used by"
 msgstr "Xref が使用される"
 
-#: if_sniff.c:84
+#: ../if_sniff.c:84
 msgid "Show docu of"
 msgstr "次の文章を表示"
 
-#: if_sniff.c:85
+#: ../if_sniff.c:85
 msgid "Generate docu for"
 msgstr "次の文章を生成"
 
-#: if_sniff.c:97
+#: ../if_sniff.c:97
 msgid ""
 "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
 "$PATH).\n"
@@ -2735,216 +3188,216 @@ msgstr ""
 "SNiFF+に接続できません. 環境をチェックしてください(sniffemacs が $PATH "
 "になければなりません).\n"
 
-#: if_sniff.c:425
+#: ../if_sniff.c:425
 msgid "E274: Sniff: Error during read. Disconnected"
 msgstr "E274: Sniff: 読込中にエラーが発生しました. 切断しました"
 
-#: if_sniff.c:553
+#: ../if_sniff.c:553
 msgid "SNiFF+ is currently "
 msgstr "現在SNiFF+ の状態は「"
 
-#: if_sniff.c:555
+#: ../if_sniff.c:555
 msgid "not "
 msgstr "未"
 
-#: if_sniff.c:556
+#: ../if_sniff.c:556
 msgid "connected"
 msgstr "接続」です"
 
-#: if_sniff.c:592
+#: ../if_sniff.c:592
 #, c-format
 msgid "E275: Unknown SNiFF+ request: %s"
 msgstr "E275: 未知の SNiFF+ リクエストです: %s"
 
-#: if_sniff.c:605
+#: ../if_sniff.c:605
 msgid "E276: Error connecting to SNiFF+"
 msgstr "E276: SNiFF+ への接続中のエラーです"
 
-#: if_sniff.c:1009
+#: ../if_sniff.c:1009
 msgid "E278: SNiFF+ not connected"
 msgstr "E278: SNiFF+ に接続されていません"
 
-#: if_sniff.c:1018
+#: ../if_sniff.c:1018
 msgid "E279: Not a SNiFF+ buffer"
 msgstr "E279: SNiFF+ バッファがありません"
 
-#: if_sniff.c:1083
+#: ../if_sniff.c:1083
 msgid "Sniff: Error during write. Disconnected"
 msgstr "Sniff: 書込み中にエラーが発生したので切断しました"
 
-#: if_tcl.c:418
+#: ../if_tcl.c:422
 msgid "invalid buffer number"
 msgstr "無効なバッファ番号です"
 
-#: if_tcl.c:464 if_tcl.c:931 if_tcl.c:1110
+#: ../if_tcl.c:468 ../if_tcl.c:935 ../if_tcl.c:1114
 msgid "not implemented yet"
 msgstr "まだ実装されていません"
 
-#: if_tcl.c:501
-msgid "unknown option"
-msgstr "未知のオプションです"
-
 #. ???
-#: if_tcl.c:774
+#: ../if_tcl.c:778
 msgid "cannot set line(s)"
 msgstr "行を設定できません"
 
-#: if_tcl.c:845
+#: ../if_tcl.c:849
 msgid "mark not set"
 msgstr "マークは設定されていません"
 
-#: if_tcl.c:851 if_tcl.c:1066
+#: ../if_tcl.c:855 ../if_tcl.c:1070
 #, c-format
 msgid "row %d column %d"
 msgstr "行 %d 列 %d"
 
-#: if_tcl.c:881
+#: ../if_tcl.c:885
 msgid "cannot insert/append line"
 msgstr "行の挿入/追加をできません"
 
-#: if_tcl.c:1268
+#: ../if_tcl.c:1272
 msgid "unknown flag: "
 msgstr "未知のフラグ:"
 
-#: if_tcl.c:1338
+#: ../if_tcl.c:1342
 msgid "unknown vimOption"
 msgstr "未知の vimOption です"
 
-#: if_tcl.c:1423
+#: ../if_tcl.c:1427
 msgid "keyboard interrupt"
 msgstr "キーボード割込み"
 
-#: if_tcl.c:1428
+#: ../if_tcl.c:1432
 msgid "vim error"
 msgstr "vim エラー"
 
-#: if_tcl.c:1471
+#: ../if_tcl.c:1475
 msgid "cannot create buffer/window command: object is being deleted"
 msgstr ""
 "バッファ/ウィンドウ作成コマンドを作成できません: "
 "オブジェクトが消去されていました"
 
-#: if_tcl.c:1545
+#: ../if_tcl.c:1549
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr ""
 "コールバックコマンドを登録できません: バッファ/ウィンドウが既に消去されました"
 
 #. This should never happen.  Famous last word?
-#: if_tcl.c:1562
+#: ../if_tcl.c:1566
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to "
 "vim-dev@vim.org"
 msgstr ""
 "E280: TCL 致命的エラー: reflist 汚染!? vim-dev@vim.org に報告してください"
 
-#: if_tcl.c:1563
+#: ../if_tcl.c:1567
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
 "コールバックコマンドを登録できません: "
 "バッファ/ウィンドウの参照がみつかりません"
 
-#: if_tcl.c:1724
+#: ../if_tcl.c:1728
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
 "E571: このコマンドは無効です,ごめんなさい: "
 "Tclライブラリをロードできませんでした."
 
-#: if_tcl.c:1886
+#: ../if_tcl.c:1890
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
 msgstr ""
 "E281: TCL エラー: 終了コードが整数値ではありません!? vim-dev@vim.org "
 "に報告してください"
 
-#: if_tcl.c:2007
+#: ../if_tcl.c:2011
 msgid "cannot get line"
 msgstr "行を取得できません"
 
-#: if_xcmdsrv.c:225
+#: ../if_xcmdsrv.c:233
 msgid "Unable to register a command server name"
 msgstr "命令サーバの名前を登録できません"
 
-#: if_xcmdsrv.c:473
+#: ../if_xcmdsrv.c:489
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: 目的のプログラムへのコマンド送信に失敗しました"
 
-#: if_xcmdsrv.c:747
+#: ../if_xcmdsrv.c:762
 #, c-format
 msgid "E573: Invalid server id used: %s"
 msgstr "E573: 無効なサーバIDが使われました: %s"
 
-#: if_xcmdsrv.c:1110
+#: ../if_xcmdsrv.c:1132
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
 
-#: main.c:60
+#: ../main.c:60
 msgid "Unknown option"
 msgstr "未知のオプションです"
 
-#: main.c:62
+#: ../main.c:62
 msgid "Too many edit arguments"
-msgstr "編集引数が多すぎます"
+msgstr "編集引数が多過ぎます"
 
-#: main.c:64
+#: ../main.c:64
 msgid "Argument missing after"
 msgstr "引数がありません"
 
-#: main.c:66
+#: ../main.c:66
 msgid "Garbage after option"
 msgstr "オプションの後にゴミがあります"
 
-#: main.c:68
+#: ../main.c:68
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\", \"-c command\", \"--cmd command\" の引数が多すぎます"
+msgstr "\"+command\", \"-c command\", \"--cmd command\" の引数が多過ぎます"
 
-#: main.c:70
+#: ../main.c:70
 msgid "Invalid argument for"
 msgstr "無効な引数です: "
 
-#: main.c:466
+#: ../main.c:481
 msgid "This Vim was not compiled with the diff feature."
 msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
 
-#: main.c:932
+#: ../main.c:958
 msgid "Attempt to open script file again: \""
 msgstr "スクリプトファイルを再び開いてみます: \""
 
 # msgid "\"\n"
 # msgstr "\"\n"
-#: main.c:941
+#: ../main.c:967
 msgid "Cannot open for reading: \""
 msgstr "読込用として開けません"
 
-#: main.c:985
+#: ../main.c:1021
 msgid "Cannot open for script output: \""
 msgstr "スクリプト出力用を開けません"
 
-#: main.c:1132
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d 個のファイルが編集を控えています\n"
+#: ../main.c:1297
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: エラー: NetBeansからgvimをスタートできません\n"
 
-#: main.c:1233
+#: ../main.c:1302
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: 警告: 端末への出力ではありません\n"
 
-#: main.c:1235
+#: ../main.c:1304
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: 警告: 端末からの入力ではありません\n"
 
+#: ../main.c:1314
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d 個のファイルが編集を控えています\n"
+
 #. just in case..
-#: main.c:1297
+#: ../main.c:1377
 msgid "pre-vimrc command line"
 msgstr "vimrc前のコマンドライン"
 
-#: main.c:1338
+#: ../main.c:1418
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: \"%s\"から読込むことができません"
 
-#: main.c:2411
+#: ../main.c:2521
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -2952,23 +3405,23 @@ msgstr ""
 "\n"
 "より詳細な情報は: \"vim -h\"\n"
 
-#: main.c:2444
+#: ../main.c:2554
 msgid "[file ..]       edit specified file(s)"
 msgstr "[ファイル..]    あるファイルを編集する"
 
-#: main.c:2445
+#: ../main.c:2555
 msgid "-               read text from stdin"
 msgstr "-               標準入力からテキストを読込む"
 
-#: main.c:2446
+#: ../main.c:2556
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t タグ         タグが定義されたところから編集する"
 
-#: main.c:2448
+#: ../main.c:2558
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  最初のエラーで編集する"
 
-#: main.c:2457
+#: ../main.c:2567
 msgid ""
 "\n"
 "\n"
@@ -2978,11 +3431,11 @@ msgstr ""
 "\n"
 "使用法:"
 
-#: main.c:2460
+#: ../main.c:2570
 msgid " vim [arguments] "
 msgstr " vim [引数]"
 
-#: main.c:2464
+#: ../main.c:2574
 msgid ""
 "\n"
 "   or:"
@@ -2990,7 +3443,11 @@ msgstr ""
 "\n"
 "   もしくは:"
 
-#: main.c:2467
+#: ../main.c:2577
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "大文字小文字は無視されます / フラグは大文字にしてください"
+
+#: ../main.c:2580
 msgid ""
 "\n"
 "\n"
@@ -3000,241 +3457,241 @@ msgstr ""
 "\n"
 "引数:\n"
 
-#: main.c:2468
+#: ../main.c:2581
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\tこのあとにはファイル名だけ"
 
-#: main.c:2470
+#: ../main.c:2583
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tワイルドカードを展開しない"
 
-#: main.c:2473
+#: ../main.c:2586
 msgid "-register\t\tRegister this gvim for OLE"
 msgstr "-register\t\tこのgvimをOLEとして登録する"
 
-#: main.c:2474
+#: ../main.c:2587
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tgvimのOLE登録を解除する"
 
-#: main.c:2477
+#: ../main.c:2590
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tGUIで起動する (\"gvim\" と同じ)"
 
-#: main.c:2478
+#: ../main.c:2591
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f or  --nofork\tフォアグラウンド: GUIを始めるときにforkしない"
 
-#: main.c:2480
+#: ../main.c:2593
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tViモード (\"vi\" と同じ)"
 
-#: main.c:2481
+#: ../main.c:2594
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tExモード (\"ex\" と同じ)"
 
-#: main.c:2482
+#: ../main.c:2595
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\tサイレント(バッチ)モード (\"ex\" 専用)"
 
-#: main.c:2484
+#: ../main.c:2597
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\t差分モード (\"vidiff\" と同じ)"
 
-#: main.c:2486
+#: ../main.c:2599
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\tイージーモード (\"evim\" と同じ, モード無)"
 
-#: main.c:2487
+#: ../main.c:2600
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t読込専用モード (\"view\" と同じ)"
 
-#: main.c:2488
+#: ../main.c:2601
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t制限モード (\"rvim\" と同じ)"
 
-#: main.c:2489
+#: ../main.c:2602
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t変更 (ファイル保存時) をできないようにする"
 
-#: main.c:2490
+#: ../main.c:2603
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\tテキストの編集を行なえないようにする"
 
-#: main.c:2491
+#: ../main.c:2604
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tバイナリモード"
 
-#: main.c:2493
+#: ../main.c:2606
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLispモード"
 
-#: main.c:2495
+#: ../main.c:2608
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tVi互換モード: 'compatible'"
 
-#: main.c:2496
+#: ../main.c:2609
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi非互換モード: 'nocompatible"
 
-#: main.c:2497
+#: ../main.c:2610
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose レベル"
 
-#: main.c:2498
+#: ../main.c:2611
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\tデバッグモード"
 
-#: main.c:2499
+#: ../main.c:2612
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\tスワップファイルを使用せずメモリだけ"
 
-#: main.c:2500
+#: ../main.c:2613
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\tスワップファイルを列挙し終了"
 
-#: main.c:2501
+#: ../main.c:2614
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (ファイル名)\tクラッシュしたセッションを復帰"
 
-#: main.c:2502
+#: ../main.c:2615
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t-rと同じ"
 
-#: main.c:2504
+#: ../main.c:2617
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\tウィンドウを開くのに newcli を使用しない"
 
-#: main.c:2505
+#: ../main.c:2618
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tI/Oに <device> を使用する"
 
-#: main.c:2508
+#: ../main.c:2621
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\tアラビア語モードで起動する"
 
-#: main.c:2511
+#: ../main.c:2624
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tヘブライ語モードで起動する"
 
-#: main.c:2514
+#: ../main.c:2627
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\tペルシア語モードで起動する"
 
-#: main.c:2516
+#: ../main.c:2629
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t端末を <terminal> に設定する"
 
-#: main.c:2517
+#: ../main.c:2630
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrcの代わりに <vimrc> を使う"
 
-#: main.c:2519
+#: ../main.c:2632
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
 msgstr "-U <gvimrc>\t\t.gvimrcの代わりに <gvimrc> を使う"
 
-#: main.c:2521
+#: ../main.c:2634
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tプラグインスクリプトをロードしない"
 
-#: main.c:2522
+#: ../main.c:2635
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN 個ウィンドウを開く(省略値: ファイルにつき1個)"
 
-#: main.c:2523
+#: ../main.c:2636
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t-oと同じだが垂直分割"
 
-#: main.c:2524
+#: ../main.c:2637
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\tファイルの最後からはじめる"
 
-#: main.c:2525
+#: ../main.c:2638
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t<lnum> 行からはじめる"
 
-#: main.c:2527
+#: ../main.c:2640
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\tvimrcをロードする前に <command> を実行する"
 
-#: main.c:2529
+#: ../main.c:2642
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t最初のファイルをロード後 <command> を実行する"
 
-#: main.c:2530
+#: ../main.c:2643
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t最初のファイルをロード後ファイル <session> を取込む"
 
-#: main.c:2531
+#: ../main.c:2644
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\tファイル <scriptin> からノーマルコマンドを読込む"
 
-#: main.c:2532
+#: ../main.c:2645
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t入力した全コマンドをファイル <scriptout> に追加する"
 
-#: main.c:2533
+#: ../main.c:2646
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t入力した全コマンドをファイル <scriptout> に保存する"
 
-#: main.c:2535
+#: ../main.c:2648
 msgid "-x\t\t\tEdit encrypted files"
 msgstr "-x\t\t\t暗号化されたファイルを編集する"
 
-#: main.c:2539
+#: ../main.c:2652
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\tvimを指定した X サーバに接続する"
 
-#: main.c:2541
+#: ../main.c:2654
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\tXサーバに接続しない"
 
-#: main.c:2544
+#: ../main.c:2657
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <files>\t可能ならばVimサーバで <files> を編集する"
 
-#: main.c:2545
+#: ../main.c:2658
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-silnet <files>  同上, サーバが無くても警告文を出力しない"
 
-#: main.c:2546
+#: ../main.c:2659
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr "--remote-wait <files>\t--remote後 ファイルの編集が終わるのを待つ"
 
-#: main.c:2547
+#: ../main.c:2660
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-wait-silent <files>  同上, サーバが無くても警告文を出力しない"
 
-#: main.c:2548
+#: ../main.c:2661
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\tVimサーバに <keys> を送信して終了する"
 
-#: main.c:2549
+#: ../main.c:2662
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
 msgstr "--remote-expr <expr>\tサーバで <expr> を実行して結果を表示する"
 
-#: main.c:2550
+#: ../main.c:2663
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\tVimサーバ名の一覧を表示して終了する"
 
-#: main.c:2551
+#: ../main.c:2664
 msgid "--servername <name>\tSend to/become the Vim server <name>"
 msgstr "--servename <name>\t\tVimサーバ <name> に送信/名前設定する"
 
-#: main.c:2554
+#: ../main.c:2667
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfoの代わりに <viminfo> を使う"
 
-#: main.c:2556
+#: ../main.c:2669
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h or  --help\tヘルプ(このメッセージ)を表示し終了する"
 
-#: main.c:2557
+#: ../main.c:2670
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tバージョン情報を表示し終了する"
 
-#: main.c:2561
+#: ../main.c:2674
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
@@ -3242,7 +3699,7 @@ msgstr ""
 "\n"
 "gvimによって解釈される引数(Motifバージョン):\n"
 
-#: main.c:2565
+#: ../main.c:2678
 msgid ""
 "\n"
 "Arguments recognised by gvim (neXtaw version):\n"
@@ -3250,7 +3707,7 @@ msgstr ""
 "\n"
 "gvimによって解釈される引数(neXtawバージョン):\n"
 
-#: main.c:2567
+#: ../main.c:2680
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
@@ -3258,72 +3715,72 @@ msgstr ""
 "\n"
 "gvimによって解釈される引数(Athenaバージョン):\n"
 
-#: main.c:2571
+#: ../main.c:2684
 msgid "-display <display>\tRun vim on <display>"
 msgstr "-display <display>\t<display> でvimを実行する"
 
-#: main.c:2572
+#: ../main.c:2685
 msgid "-iconic\t\tStart vim iconified"
 msgstr "-iconic\t\t最小化した状態でvimを起動する"
 
-#: main.c:2574
+#: ../main.c:2687
 msgid "-name <name>\t\tUse resource as if vim was <name>"
 msgstr "-name <name>\t\tvimの名が <name> であるとしてリソースを使う"
 
-#: main.c:2575
+#: ../main.c:2688
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (実装されていない)\n"
 
-#: main.c:2577
+#: ../main.c:2690
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
 msgstr "-background <color>\t背景色に <color> を使う(同義: -bg)"
 
-#: main.c:2578
+#: ../main.c:2691
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
 msgstr "-foreground <color>\t前景色に <color> を使う(同義: -fg)"
 
-#: main.c:2579 main.c:2599
+#: ../main.c:2692 ../main.c:2712 ../main.c:2728
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
 msgstr "-font <font>\t\tテキスト表示に <font> を使う(同義: -fn)"
 
-#: main.c:2580
+#: ../main.c:2693
 msgid "-boldfont <font>\tUse <font> for bold text"
 msgstr "-boldfont <font>\t太字に <font> を使う"
 
-#: main.c:2581
+#: ../main.c:2694
 msgid "-italicfont <font>\tUse <font> for italic text"
 msgstr "-italicfont <for>\t斜体字に <font> を使う"
 
-#: main.c:2582 main.c:2600
+#: ../main.c:2695 ../main.c:2713 ../main.c:2729
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
 msgstr "-geometry <geom>\t初期配置に <geom> を使う(同義: -geom)"
 
-#: main.c:2583
+#: ../main.c:2696
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
 msgstr "-borderwidth <width>\t境界の幅を <width> にする(同義: -bw)"
 
-#: main.c:2584
+#: ../main.c:2697
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr ""
 "-scrollbarwidth <width>  スクロールバーの幅を <width> にする(同義: -sw)"
 
-#: main.c:2586
+#: ../main.c:2699
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
 msgstr "-menuheight <height>\tメニューバーの高さを <height> にする(同義: -mh)"
 
-#: main.c:2588 main.c:2601
+#: ../main.c:2701 ../main.c:2714
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\t反転映像を使用する(同義: -rv)"
 
-#: main.c:2589
+#: ../main.c:2702
 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
 msgstr "+reverse\t\t反転映像を使用しない(同義: +rv)"
 
-#: main.c:2590
+#: ../main.c:2703
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <resource>\t特定のリソースを使用する"
 
-#: main.c:2593
+#: ../main.c:2706
 msgid ""
 "\n"
 "Arguments recognised by gvim (RISC OS version):\n"
@@ -3331,15 +3788,15 @@ msgstr ""
 "\n"
 "gvimによって解釈される引数(RISC OSバージョン):\n"
 
-#: main.c:2594
+#: ../main.c:2707
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\t初期のウィンドウのコラム単位の幅"
 
-#: main.c:2595
+#: ../main.c:2708
 msgid "--rows <number>\tInitial height of window in rows"
 msgstr "--rows <number>\t初期のウィンドウの行単位の高さ"
 
-#: main.c:2598
+#: ../main.c:2711
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3347,62 +3804,86 @@ msgstr ""
 "\n"
 "gvimによって解釈される引数(GTK+バージョン):\n"
 
-#: main.c:2602
+#: ../main.c:2715
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\t<display> でvimを実行する(同義: --display)"
 
-#: main.c:2604
+#: ../main.c:2717
 msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\tメインウィンドウを識別する一意な役割(role)を設定する"
 
-#: main.c:2606
+#: ../main.c:2719
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t異なるGTK widgetでVimを開く"
 
-#: main.c:2609
+#: ../main.c:2722
+msgid ""
+"\n"
+"Arguments recognised by kvim (KDE version):\n"
+msgstr ""
+"\n"
+"kvimによって解釈される引数(KDEバージョン):\n"
+
+#: ../main.c:2723
+msgid "-black\t\tUse reverse video"
+msgstr "-black\t\t反転画面を使用する"
+
+#: ../main.c:2725
+msgid "-tip\t\t\tDisplay the tip dialog on startup"
+msgstr "-tip\t\t\t起動時にチップダイアログを表示する"
+
+#: ../main.c:2726
+msgid "-notip\t\tDisable the tip dialog"
+msgstr "-notip\t\tチップダイアログを無効にする"
+
+#: ../main.c:2730
+msgid "--display <display>\tRun vim on <display>"
+msgstr "--display <display>\t<display> でvimを実行する"
+
+#: ../main.c:2733
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <親のタイトル>\tVimを親アプリケーションの中で起動する"
 
 # msgid "--help\t\tShow Gnome arguments"
 # msgstr "--help\t\tGNOMEの引数を見せる"
-#: main.c:2847
+#: ../main.c:2971
 msgid "No display"
 msgstr "ディスプレイが見つかりません"
 
 #. Failed to send, abort.
-#: main.c:2862
+#: ../main.c:2986
 msgid ": Send failed.\n"
 msgstr ": 送信に失敗しました.\n"
 
 #. Let vim start normally.
-#: main.c:2868
+#: ../main.c:2992
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": 送信に失敗しました. ローカルでの実行を試みています\n"
 
-#: main.c:2906 main.c:2927
+#: ../main.c:3030 ../main.c:3051
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d 個 (%d 個中) のファイルを編集しました"
 
-#: main.c:2949
+#: ../main.c:3073
 msgid "No display: Send expression failed.\n"
 msgstr "ディスプレイがありません: 式の送信に失敗しました.\n"
 
-#: main.c:2961
+#: ../main.c:3085
 msgid ": Send expression failed.\n"
 msgstr ": 式の送信に失敗しました.\n"
 
-#: mark.c:709
+#: ../mark.c:705
 msgid "No marks set"
 msgstr "マークが設定されていません"
 
-#: mark.c:711
+#: ../mark.c:707
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" に該当するマークがありません"
 
 #. Highlight title
-#: mark.c:722
+#: ../mark.c:718
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3411,7 +3892,7 @@ msgstr ""
 "mark   行   列 ファイル/テキスト"
 
 #. Highlight title
-#: mark.c:760
+#: ../mark.c:841
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3420,7 +3901,7 @@ msgstr ""
 " jump   行   列 ファイル/テキスト"
 
 #. Highlight title
-#: mark.c:805
+#: ../mark.c:886
 msgid ""
 "\n"
 "change line  col text"
@@ -3428,7 +3909,7 @@ msgstr ""
 "\n"
 "変更   行    列  テキスト"
 
-#: mark.c:1281
+#: ../mark.c:1362
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3437,7 +3918,7 @@ msgstr ""
 "# ファイルマーク:\n"
 
 #. Write the jumplist with -'
-#: mark.c:1316
+#: ../mark.c:1397
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3445,7 +3926,7 @@ msgstr ""
 "\n"
 "# ジャンプリスト (新しいものが先):\n"
 
-#: mark.c:1412
+#: ../mark.c:1493
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3453,123 +3934,123 @@ msgstr ""
 "\n"
 "# ファイル内マークの履歴 (新しいものから古いもの):\n"
 
-#: mark.c:1501
+#: ../mark.c:1582
 msgid "Missing '>'"
 msgstr "'>' がみつかりません"
 
-#: mbyte.c:467
+#: ../mbyte.c:470
 msgid "E543: Not a valid codepage"
 msgstr "E543: 無効なコードページです"
 
-#: mbyte.c:4431
+#: ../mbyte.c:4513
 msgid "E284: Cannot set IC values"
 msgstr "E284: ICの値を設定できません"
 
-#: mbyte.c:4583
+#: ../mbyte.c:4669
 msgid "E285: Failed to create input context"
 msgstr "E285: インプットコンテキストの作成に失敗しました"
 
-#: mbyte.c:4741
+#: ../mbyte.c:4827
 msgid "E286: Failed to open input method"
 msgstr "E286: インプットメソッドのオープンに失敗しました"
 
-#: mbyte.c:4752
+#: ../mbyte.c:4838
 msgid "E287: Warning: Could not set destroy callback to IM"
 msgstr "E287: 警告: IMの破壊コールバックを設定できませんでした"
 
-#: mbyte.c:4758
+#: ../mbyte.c:4844
 msgid "E288: input method doesn't support any style"
 msgstr "E288: インプットメソッドはどんなスタイルもサポートしません"
 
-#: mbyte.c:4815
+#: ../mbyte.c:4901
 msgid "E289: input method doesn't support my preedit type"
 msgstr "E289: インプットメソッドは my preedit type をサポートしません"
 
-#: mbyte.c:4889
+#: ../mbyte.c:4975
 msgid "E290: over-the-spot style requires fontset"
 msgstr "E290: over-the-spot スタイルにはfontsetが必要です"
 
-#: mbyte.c:4925
+#: ../mbyte.c:5011
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
 msgstr "E291: GTK+が1.2.3よりも古いのでステータスエリアが無効です"
 
-#: mbyte.c:5232
+#: ../mbyte.c:5318
 msgid "E292: Input Method Server is not running"
 msgstr "E292: インプットメソッドサーバ が動作していません"
 
-#: memfile.c:488
+#: ../memfile.c:488
 msgid "E293: block was not locked"
 msgstr "E293: ブロックがロックされていません"
 
-#: memfile.c:1005
+#: ../memfile.c:1010
 msgid "E294: Seek error in swap file read"
 msgstr "E294: スワップファイル読込時にシークエラーです"
 
-#: memfile.c:1010
+#: ../memfile.c:1015
 msgid "E295: Read error in swap file"
 msgstr "E295: スワップファイルの読込みエラーです"
 
-#: memfile.c:1062
+#: ../memfile.c:1067
 msgid "E296: Seek error in swap file write"
 msgstr "E296: スワップファイル書込み時にシークエラーです"
 
-#: memfile.c:1080
+#: ../memfile.c:1085
 msgid "E297: Write error in swap file"
 msgstr "E297: スワップファイルの書込みエラーです"
 
-#: memfile.c:1277
+#: ../memfile.c:1282
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: スワップファイルが既に存在します (symlinkによる攻撃?)"
 
-#: memline.c:275
+#: ../memline.c:310
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: ブロック 0 を取得できません?"
 
-#: memline.c:315
+#: ../memline.c:351
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: ブロック 1 を取得できません?"
 
-#: memline.c:333
+#: ../memline.c:369
 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:482
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: おっと, スワップファイルが失われました!!!"
 
-#: memline.c:448
+#: ../memline.c:487
 msgid "E302: Could not rename swap file"
 msgstr "E302: スワップファイルの名前を変えられません"
 
-#: memline.c:518
+#: ../memline.c:559
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: \"%s\" のスワップファイルを開けないのでリカバリは不可能です"
 
-#: memline.c:617
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: ブロック 0 を取得できませんでした??"
+#: ../memline.c:670
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): ブロック 0 を取得できませんでした??"
 
-#: memline.c:757
+#: ../memline.c:872
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: %s にはスワップファイルがみつかりません"
 
-#: memline.c:767
+#: ../memline.c:882
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "使用するスワップファイルの番号を入力してください(0 で終了): "
 
-#: memline.c:812
+#: ../memline.c:927
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: %s を開けません"
 
-#: memline.c:834
+#: ../memline.c:949
 msgid "Unable to read block 0 from "
 msgstr "ブロック 0 を読込めません "
 
-#: memline.c:837
+#: ../memline.c:952
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3577,28 +4058,28 @@ msgstr ""
 "\n"
 "恐らく変更がされていないかVimがスワップファイルを更新していません."
 
-#: memline.c:847 memline.c:864
+#: ../memline.c:962 ../memline.c:979
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vimのこのバージョンでは使用できません.\n"
 
-#: memline.c:849
+#: ../memline.c:964
 msgid "Use Vim version 3.0.\n"
 msgstr "Vimのバージョン3.0を使用してください.\n"
 
-#: memline.c:855
+#: ../memline.c:970
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s はVimのスワップファイルではないようです"
 
-#: memline.c:868
+#: ../memline.c:983
 msgid " cannot be used on this computer.\n"
 msgstr " このコンピュータでは使用できません.\n"
 
-#: memline.c:870
+#: ../memline.c:985
 msgid "The file was created on "
 msgstr "このファイルは次の場所で作られました "
 
-#: memline.c:874
+#: ../memline.c:989
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3606,81 +4087,81 @@ msgstr ""
 ",\n"
 "もしくはファイルが損傷しています."
 
-#: memline.c:903
+#: ../memline.c:1018
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "スワップファイル \"%s\" を使用中"
 
-#: memline.c:909
+#: ../memline.c:1024
 #, c-format
 msgid "Original file \"%s\""
 msgstr "原本ファイル \"%s\""
 
-#: memline.c:922
+#: ../memline.c:1037
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: 警告: 原本ファイルが変更されています"
 
-#: memline.c:975
+#: ../memline.c:1111
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: %s からブロック 1 を読込めません"
 
-#: memline.c:979
+#: ../memline.c:1115
 msgid "???MANY LINES MISSING"
 msgstr "???多くの行が失われています"
 
-#: memline.c:995
+#: ../memline.c:1131
 msgid "???LINE COUNT WRONG"
 msgstr "???行数が間違っています"
 
-#: memline.c:1002
+#: ../memline.c:1138
 msgid "???EMPTY BLOCK"
 msgstr "???ブロックが空です"
 
-#: memline.c:1028
+#: ../memline.c:1164
 msgid "???LINES MISSING"
 msgstr "???行が失われています"
 
-#: memline.c:1060
+#: ../memline.c:1196
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ブロック 1 のIDが間違っています(%s が.swpファイルでない?)"
 
-#: memline.c:1065
+#: ../memline.c:1201
 msgid "???BLOCK MISSING"
 msgstr "???ブロックがありません"
 
-#: memline.c:1081
+#: ../memline.c:1217
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? ここから???ENDまでの行が破壊されているようです"
 
-#: memline.c:1097
+#: ../memline.c:1233
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? ここから??ENDまでの行が挿入か削除されたようです"
 
-#: memline.c:1117
+#: ../memline.c:1253
 msgid "???END"
 msgstr "???END"
 
-#: memline.c:1143
+#: ../memline.c:1279
 msgid "E311: Recovery Interrupted"
 msgstr "E311: リカバリが割込まれました"
 
-#: memline.c:1148
+#: ../memline.c:1284
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: リカバリの最中にエラーが検出されました; ???で始まる行を参照してください"
 
-#: memline.c:1150
+#: ../memline.c:1286
 msgid "See \":help E312\" for more information."
 msgstr "詳細は \":help E312\" を参照してください"
 
-#: memline.c:1155
+#: ../memline.c:1291
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "リカバリが終了しました. 全てが正しいかチェックしてください."
 
-#: memline.c:1156
+#: ../memline.c:1292
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3688,11 +4169,11 @@ msgstr ""
 "\n"
 "(変更をチェックするために, このファイルを別の名前で保存した上で\n"
 
-#: memline.c:1157
+#: ../memline.c:1293
 msgid "and run diff with the original file to check for changes)\n"
 msgstr "原本ファイルとの diff を実行すると良いでしょう)\n"
 
-#: memline.c:1158
+#: ../memline.c:1294
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
@@ -3701,51 +4182,51 @@ msgstr ""
 "\n"
 
 #. use msg() to start the scrolling properly
-#: memline.c:1214
+#: ../memline.c:1350
 msgid "Swap files found:"
 msgstr "スワップファイルが複数見つかりました:"
 
-#: memline.c:1392
+#: ../memline.c:1528
 msgid "   In current directory:\n"
 msgstr "   現在のディレクトリ:\n"
 
-#: memline.c:1394
+#: ../memline.c:1530
 msgid "   Using specified name:\n"
 msgstr "   ある名前を使用中:\n"
 
-#: memline.c:1398
+#: ../memline.c:1534
 msgid "   In directory "
 msgstr "   ディレクトリ "
 
-#: memline.c:1416
+#: ../memline.c:1552
 msgid "      -- none --\n"
 msgstr "      -- なし --\n"
 
-#: memline.c:1488
+#: ../memline.c:1625
 msgid "          owned by: "
 msgstr "            所有者: "
 
-#: memline.c:1490
+#: ../memline.c:1627
 msgid "   dated: "
 msgstr "   日付: "
 
-#: memline.c:1494 memline.c:3684
+#: ../memline.c:1631 ../memline.c:3837
 msgid "             dated: "
 msgstr "             日付: "
 
-#: memline.c:1510
+#: ../memline.c:1647
 msgid "         [from Vim version 3.0]"
 msgstr "         [from Vim version 3.0]"
 
-#: memline.c:1514
+#: ../memline.c:1651
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [Vimのスワップファイルではないようです]"
 
-#: memline.c:1518
+#: ../memline.c:1655
 msgid "         file name: "
 msgstr "        ファイル名: "
 
-#: memline.c:1524
+#: ../memline.c:1661
 msgid ""
 "\n"
 "          modified: "
@@ -3753,15 +4234,15 @@ msgstr ""
 "\n"
 "          変更状態: "
 
-#: memline.c:1525
+#: ../memline.c:1662
 msgid "YES"
 msgstr "あり"
 
-#: memline.c:1525
+#: ../memline.c:1662
 msgid "no"
 msgstr "なし"
 
-#: memline.c:1529
+#: ../memline.c:1666
 msgid ""
 "\n"
 "         user name: "
@@ -3769,11 +4250,11 @@ msgstr ""
 "\n"
 "          ユーザ名: "
 
-#: memline.c:1536
+#: ../memline.c:1673
 msgid "   host name: "
 msgstr "   ホスト名: "
 
-#: memline.c:1538
+#: ../memline.c:1675
 msgid ""
 "\n"
 "         host name: "
@@ -3781,7 +4262,7 @@ msgstr ""
 "\n"
 "          ホスト名: "
 
-#: memline.c:1544
+#: ../memline.c:1681
 msgid ""
 "\n"
 "        process ID: "
@@ -3789,11 +4270,11 @@ msgstr ""
 "\n"
 "        プロセスID: "
 
-#: memline.c:1550
+#: ../memline.c:1687
 msgid " (still running)"
 msgstr " (まだ実行中)"
 
-#: memline.c:1562
+#: ../memline.c:1699
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
@@ -3801,7 +4282,7 @@ msgstr ""
 "\n"
 "         [このVimバージョンでは使用できません]"
 
-#: memline.c:1565
+#: ../memline.c:1702
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3809,92 +4290,92 @@ msgstr ""
 "\n"
 "         [このコンピュータでは使用できません]"
 
-#: memline.c:1570
+#: ../memline.c:1707
 msgid "         [cannot be read]"
 msgstr "         [読込めません]"
 
-#: memline.c:1574
+#: ../memline.c:1711
 msgid "         [cannot be opened]"
 msgstr "         [開けません]"
 
-#: memline.c:1764
+#: ../memline.c:1901
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: スワップファイルが無いので維持できません"
 
-#: memline.c:1817
+#: ../memline.c:1954
 msgid "File preserved"
 msgstr "ファイルが維持されます"
 
-#: memline.c:1819
+#: ../memline.c:1956
 msgid "E314: Preserve failed"
 msgstr "E314: 維持に失敗しました"
 
-#: memline.c:1890
+#: ../memline.c:2027
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: 無効なlnumです: %ld"
 
-#: memline.c:1916
+#: ../memline.c:2053
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
 msgstr "E316: ml_get: 行 %ld をみつけられません"
 
-#: memline.c:2306
+#: ../memline.c:2443
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ポインタブロックのIDが間違っています 3"
 
-#: memline.c:2386
+#: ../memline.c:2523
 msgid "stack_idx should be 0"
 msgstr "stack_idx は 0 であるべきです"
 
-#: memline.c:2448
+#: ../memline.c:2585
 msgid "E318: Updated too many blocks?"
-msgstr "E318: 更新されたブロックが多すぎるかも?"
+msgstr "E318: 更新されたブロックが多過ぎるかも?"
 
-#: memline.c:2630
+#: ../memline.c:2767
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: ポインタブロックのIDが間違っています 4"
 
-#: memline.c:2657
+#: ../memline.c:2794
 msgid "deleted block 1?"
 msgstr "ブロック 1 は消された?"
 
-#: memline.c:2857
+#: ../memline.c:2994
 #, c-format
 msgid "E320: Cannot find line %ld"
 msgstr "E320: 行 %ld がみつかりません"
 
-#: memline.c:3100
+#: ../memline.c:3237
 msgid "E317: pointer block id wrong"
 msgstr "E317: ポインタブロックのIDが間違っています"
 
-#: memline.c:3116
+#: ../memline.c:3253
 msgid "pe_line_count is zero"
 msgstr "pe_line_count がゼロです"
 
-#: memline.c:3145
+#: ../memline.c:3282
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
 msgstr "E322: 行番号が範囲外です: %ld 超えています"
 
-#: memline.c:3149
+#: ../memline.c:3286
 #, c-format
 msgid "E323: line count wrong in block %ld"
 msgstr "E323: ブロック %ld の行カウントが間違っています"
 
-#: memline.c:3198
+#: ../memline.c:3335
 msgid "Stack size increases"
 msgstr "スタックサイズが増えます"
 
-#: memline.c:3244
+#: ../memline.c:3381
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: ポインタブロックのIDが間違っています 2"
 
-#: memline.c:3674
+#: ../memline.c:3827
 msgid "E325: ATTENTION"
 msgstr "E325: 注意"
 
-#: memline.c:3675
+#: ../memline.c:3828
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -3902,17 +4383,17 @@ msgstr ""
 "\n"
 "次の名前でスワップファイルを見つけました \""
 
-#: memline.c:3679
+#: ../memline.c:3832
 msgid "While opening file \""
 msgstr "次のファイルを開いている最中 \""
 
-#: memline.c:3688
+#: ../memline.c:3841
 msgid "      NEWER than swap file!\n"
 msgstr "      スワップファイルよりも新しいです!\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
-#: memline.c:3692
+#: ../memline.c:3845
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.\n"
@@ -3924,11 +4405,11 @@ msgstr ""
 "    この場合には, 変更をした際に最終的に, 同じファイルの異なる\n"
 "    2つのインスタンスができてしまうことに注意してください.\n"
 
-#: memline.c:3693
+#: ../memline.c:3846
 msgid "    Quit, or continue with caution.\n"
 msgstr "    終了するか, 注意しながら続けます.\n"
 
-#: memline.c:3694
+#: ../memline.c:3847
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
@@ -3936,11 +4417,11 @@ msgstr ""
 "\n"
 "(2) このファイルの編集セッションがクラッシュした.\n"
 
-#: memline.c:3695
+#: ../memline.c:3848
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    この場合には \":recover\" か \"vim -r "
 
-#: memline.c:3697
+#: ../memline.c:3850
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -3948,11 +4429,11 @@ msgstr ""
 "\"\n"
 "    を使用して変更をリカバーします(\":help recover\" を参照).\n"
 
-#: memline.c:3698
+#: ../memline.c:3851
 msgid "    If you did this already, delete the swap file \""
 msgstr "    既にこれを行なったのならば, スワップファイル \""
 
-#: memline.c:3700
+#: ../memline.c:3853
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -3960,23 +4441,23 @@ msgstr ""
 "\"\n"
 "    を消せばこのメッセージを回避できます.\n"
 
-#: memline.c:3714 memline.c:3718
+#: ../memline.c:3867 ../memline.c:3871
 msgid "Swap file \""
 msgstr "スワップファイル \""
 
-#: memline.c:3715 memline.c:3721
+#: ../memline.c:3868 ../memline.c:3874
 msgid "\" already exists!"
 msgstr "\" が既にあります!"
 
-#: memline.c:3724
+#: ../memline.c:3877
 msgid "VIM - ATTENTION"
 msgstr "VIM - 注意"
 
-#: memline.c:3726
+#: ../memline.c:3879
 msgid "Swap file already exists!"
 msgstr "スワップファイルが既に存在します!"
 
-#: memline.c:3730
+#: ../memline.c:3883
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -3990,7 +4471,7 @@ msgstr ""
 "終了する(&Q)\n"
 "中止する(&A)"
 
-#: memline.c:3732
+#: ../memline.c:3885
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4006,37 +4487,37 @@ msgstr ""
 "中止する(&A)\n"
 "消去する(&D)"
 
-#: memline.c:3789
+#: ../memline.c:3942
 msgid "E326: Too many swap files found"
 msgstr "E326: スワップファイルが多数見つかりました"
 
-#: menu.c:64
+#: ../menu.c:64
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: メニューアイテムのパスの部分がサブメニューではありません"
 
-#: menu.c:65
+#: ../menu.c:65
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: メニューは他のモードにだけあります"
 
-#: menu.c:66
+#: ../menu.c:66
 msgid "E329: No menu of that name"
 msgstr "E329: その名前のメニューはありません"
 
-#: menu.c:525
+#: ../menu.c:522
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: メニューパスはサブメニューを生じるべきではありません"
 
-#: menu.c:564
+#: ../menu.c:561
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: メニューバーには直接メニューアイテムを追加できません"
 
-#: menu.c:570
+#: ../menu.c:567
 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:1097
+#: ../menu.c:1093
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4044,79 +4525,84 @@ msgstr ""
 "\n"
 "--- メニュー ---"
 
-#: menu.c:2019
+#: ../menu.c:2011
 msgid "Tear off this menu"
 msgstr "このメニューを切り取る"
 
-#: menu.c:2084
+#: ../menu.c:2076
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: メニューパスはメニューアイテムを生じなければいけません"
 
-#: menu.c:2104
+#: ../menu.c:2096
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: メニューがみつかりません: %s"
 
-#: menu.c:2173
+#: ../menu.c:2169
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s にはメニューが定義されていません"
 
-#: menu.c:2211
+#: ../menu.c:2208
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: メニューパスはサブメニューを生じなければいけません"
 
-#: menu.c:2232
+#: ../menu.c:2229
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: メニューがみつかりません - メニュー名を確認してください"
 
-#: message.c:414
+#: ../message.c:429
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s の処理中にエラーが検出されました:"
 
-#: message.c:440
+#: ../message.c:454
 #, c-format
 msgid "line %4ld:"
 msgstr "行 %4ld:"
 
-#: message.c:647
+#: ../message.c:657
 msgid "[string too long]"
-msgstr "[文字列が長すぎます]"
+msgstr "[文字列が長過ぎます]"
 
-#: message.c:797
+#: ../message.c:685
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: 無効なレジスタ名: '%s'"
+
+#: ../message.c:814
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
 msgstr "日本語メッセージ翻訳/監修: 村岡 太郎 <koron@tka.att.ne.jp>"
 
-#: message.c:1025
+#: ../message.c:1040
 msgid "Interrupt: "
 msgstr "割込み: "
 
-#: message.c:1028
+#: ../message.c:1043
 msgid "Hit ENTER to continue"
 msgstr "続けるにはENTERを押してください"
 
-#: message.c:1030
+#: ../message.c:1045
 msgid "Hit ENTER or type command to continue"
 msgstr "続けるにはENTERを押すかコマンドを入力してください"
 
-#: message.c:2351
+#: ../message.c:2370
 msgid "-- More --"
 msgstr "-- 継続 --"
 
-#: message.c:2354
+#: ../message.c:2373
 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
 msgstr " (RET/BS: 行送り, SPACE/b: ページ送り, d/u: 半ページ送り, q: 終了)"
 
-#: message.c:2355
+#: ../message.c:2374
 msgid " (RET: line, SPACE: page, d: half page, q: quit)"
 msgstr " (RET: 行送り, SPACE: ページ送り, d: 半ページ送り, q: 終了)"
 
-#: message.c:2976 message.c:2991
+#: ../message.c:2999 ../message.c:3014
 msgid "Question"
 msgstr "質問"
 
-#: message.c:2978
+#: ../message.c:3001
 msgid ""
 "&Yes\n"
 "&No"
@@ -4124,7 +4610,7 @@ msgstr ""
 "はい(&Y)\n"
 "いいえ(&N)"
 
-#: message.c:3011
+#: ../message.c:3034
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4138,59 +4624,67 @@ msgstr ""
 "全て放棄(&D)\n"
 "キャンセル(&C)"
 
-#: message.c:3052
+#: ../message.c:3075
+msgid "Select Directory dialog"
+msgstr "ディレクトリ選択ダイアログ"
+
+#: ../message.c:3077
 msgid "Save File dialog"
 msgstr "ファイル保存ダイアログ"
 
-#: message.c:3054
+#: ../message.c:3079
 msgid "Open File dialog"
 msgstr "ファイル読込ダイアログ"
 
 #. TODO: non-GUI file selector here
-#: message.c:3125
+#: ../message.c:3179
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: コンソールモードではファイルブラウザを使えません, ごめんなさい"
 
-#: misc1.c:2773
+#: ../misc1.c:2860
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: 警告: 読込専用ファイルを変更します"
 
-#: misc1.c:3021
+#: ../misc1.c:3113
 msgid "1 more line"
 msgstr "1 行 追加しました"
 
-#: misc1.c:3023
+#: ../misc1.c:3115
 msgid "1 line less"
 msgstr "1 行 削除しました"
 
-#: misc1.c:3028
+#: ../misc1.c:3120
 #, c-format
 msgid "%ld more lines"
 msgstr "%ld 行 追加しました"
 
-#: misc1.c:3030
+#: ../misc1.c:3122
 #, c-format
 msgid "%ld fewer lines"
 msgstr "%ld 行 削除しました"
 
-#: misc1.c:3033
+#: ../misc1.c:3125
 msgid " (Interrupted)"
 msgstr " (割込まれました)"
 
-#: misc1.c:7582
+#: ../misc1.c:3191
+msgid "Beep!"
+msgstr "ビーッ!"
+
+#: ../misc1.c:7814
 msgid "Vim: preserving files...\n"
 msgstr "Vim: ファイルを保存中...\n"
 
 #. close all memfiles, without deleting
-#: misc1.c:7592
+#: ../misc1.c:7824
 msgid "Vim: Finished.\n"
 msgstr "Vim: 終了しました.\n"
 
-#: misc2.c:695 misc2.c:711
+#: ../misc2.c:690 ../misc2.c:706
 msgid "ERROR: "
 msgstr "エラー: "
 
-#: misc2.c:715
+#: ../misc2.c:710
 #, c-format
 msgid ""
 "\n"
@@ -4199,7 +4693,7 @@ msgstr ""
 "\n"
 "[メモリ(バイト)] 総割当-解放量 %lu-%lu, 使用量 %lu, ピーク時 %lu\n"
 
-#: misc2.c:717
+#: ../misc2.c:712
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
@@ -4208,58 +4702,58 @@ msgstr ""
 "[呼出] 総 re/malloc() 回数 %lu, 総 free() 回数 %lu\n"
 "\n"
 
-#: misc2.c:772
+#: ../misc2.c:767
 msgid "E340: Line is becoming too long"
-msgstr "E340: 行が長くなりすぎました"
+msgstr "E340: 行が長くなり過ぎました"
 
-#: misc2.c:816
+#: ../misc2.c:811
 #, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
 msgstr "E341: 内部エラー: lalloc(%ld,)"
 
-#: misc2.c:924
+#: ../misc2.c:919
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
 msgstr "E342: メモリが足りません!  (%lu バイトを割当要求)"
 
-#: misc2.c:2593
+#: ../misc2.c:2580
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "実行のためにシェルを呼出し中: \"%s\""
 
-#: misc2.c:2815
+#: ../misc2.c:2845
 msgid "E545: Missing colon"
 msgstr "E545: コロンがありません"
 
-#: misc2.c:2817 misc2.c:2844
+#: ../misc2.c:2847 ../misc2.c:2874
 msgid "E546: Illegal mode"
 msgstr "E546: 不正なモードです"
 
-#: misc2.c:2883
+#: ../misc2.c:2913
 msgid "E547: Illegal mouseshape"
 msgstr "E547: 不正な 'mouseshape' です"
 
-#: misc2.c:2923
+#: ../misc2.c:2953
 msgid "E548: digit expected"
 msgstr "E548: 数値が必要です"
 
-#: misc2.c:2928
+#: ../misc2.c:2958
 msgid "E549: Illegal percentage"
 msgstr "E549: 不正なパーセンテージです"
 
-#: misc2.c:3238
+#: ../misc2.c:3270
 msgid "Enter encryption key: "
 msgstr "暗号化用のキーを入力してください: "
 
-#: misc2.c:3239
+#: ../misc2.c:3271
 msgid "Enter same key again: "
 msgstr "もう一度同じキーを入力してください: "
 
-#: misc2.c:3249
+#: ../misc2.c:3281
 msgid "Keys don't match!"
 msgstr "キーが一致しません"
 
-#: misc2.c:3798
+#: ../misc2.c:3825
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4268,163 +4762,171 @@ msgstr ""
 "E343: 無効なパスです: '**[数値]' はpathの最後か '%s' "
 "が続いてないといけません."
 
-#: misc2.c:5077
+#: ../misc2.c:5104
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpathには \"%s\" というファイルがありません"
 
-#: misc2.c:5080
+#: ../misc2.c:5107
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: pathには \"%s\" というファイルがありません"
 
-#: misc2.c:5086
+#: ../misc2.c:5113
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: cdpathにはこれ以上 \"%s\" というファイルがありません"
 
-#: misc2.c:5089
+#: ../misc2.c:5116
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: パスにはこれ以上 \"%s\" というファイルがありません"
 
-#: misc2.c:5323
+#: ../misc2.c:5356
 msgid "E550: Missing colon"
 msgstr "E550: コロンがありません"
 
-#: misc2.c:5335
+#: ../misc2.c:5368
 msgid "E551: Illegal component"
 msgstr "E551: 不正な構文要素です"
 
-#: misc2.c:5343
+#: ../misc2.c:5376
 msgid "E552: digit expected"
 msgstr "E552: 数値が必要です"
 
 #. Get here when the server can't be found.
-#: netbeans.c:396
+#: ../netbeans.c:409
 msgid "Cannot connect to Netbeans #2"
 msgstr "Netbeans #2 に接続できません"
 
-#: netbeans.c:404
+#: ../netbeans.c:417
 msgid "Cannot connect to Netbeans"
 msgstr "Netbeans に接続できません"
 
-#: netbeans.c:450
+#: ../netbeans.c:461
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeansの接続情報ファイルのアクセスモードに問題があります: \"%s\""
 
-#: netbeans.c:749
+#: ../netbeans.c:760
 msgid "read from Netbeans socket"
 msgstr "Netbeans のソケットを読込み"
 
-#: netbeans.c:1638
+#: ../netbeans.c:1680
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: バッファ %ld の NetBeans 接続が失われました"
 
-#: normal.c:2980
+#: ../netbeans.c:3479
+msgid "E505: "
+msgstr "E505: "
+
+#: ../normal.c:2997
 msgid "Warning: terminal cannot highlight"
 msgstr "警告: 使用している端末はハイライトできません"
 
-#: normal.c:3276
+#: ../normal.c:3293
 msgid "E348: No string under cursor"
 msgstr "E348: カーソルの位置には文字列がありません"
 
-#: normal.c:3278
+#: ../normal.c:3295
 msgid "E349: No identifier under cursor"
 msgstr "E349: カーソルの位置には識別子がありません"
 
-#: normal.c:4519
+#: ../normal.c:4537
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: 現在の 'foldmethod' では折畳みを消去できません"
 
-#: normal.c:6708
+#: ../normal.c:6808
 msgid "E664: changelist is empty"
 msgstr "E664: 変更リストが空です"
 
-#: normal.c:6710
+#: ../normal.c:6810
 msgid "E662: At start of changelist"
 msgstr "E662: 変更リストの先頭"
 
-#: normal.c:6712
+#: ../normal.c:6812
 msgid "E663: At end of changelist"
 msgstr "E663: 変更リストの末尾"
 
-#: normal.c:7973
+#: ../normal.c:8085
 msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Vimを終了するには :quit<Enter> と入力してください"
 
-#: ops.c:294
+#: ../ops.c:291
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 行が %s で 1 回処理されました"
 
-#: ops.c:296
+#: ../ops.c:293
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 行が %s で %d 回処理されました"
 
-#: ops.c:301
+#: ../ops.c:298
 #, c-format
 msgid "%ld lines %sed 1 time"
 msgstr "%ld 行が %s で 1 回処理されました"
 
-#: ops.c:304
+#: ../ops.c:301
 #, c-format
 msgid "%ld lines %sed %d times"
 msgstr "%ld 行が %s で %d 回処理されました"
 
-#: ops.c:662
+#: ../ops.c:659
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld 行がインデントされます... "
 
-#: ops.c:712
+#: ../ops.c:709
 msgid "1 line indented "
 msgstr "1 行をインデントしました"
 
-#: ops.c:714
+#: ../ops.c:711
 #, c-format
 msgid "%ld lines indented "
 msgstr "%ld 行をインデントしました"
 
+#: ../ops.c:1111
+msgid "E748: No previously used register"
+msgstr "E748: まだレジスタを使用していません"
+
 #. must display the prompt
-#: ops.c:1675
+#: ../ops.c:1633
 msgid "cannot yank; delete anyway"
 msgstr "ヤンクできません; とにかく消去"
 
-#: ops.c:2185
+#: ../ops.c:2223
 msgid "1 line changed"
 msgstr "1 行が変更されました"
 
-#: ops.c:2187
+#: ../ops.c:2225
 #, c-format
 msgid "%ld lines changed"
 msgstr "%ld 行が変更されました"
 
-#: ops.c:2571
+#: ../ops.c:2609
 #, c-format
 msgid "freeing %ld lines"
 msgstr "%ld 行を開放中"
 
-#: ops.c:2852
+#: ../ops.c:2891
 msgid "1 line yanked"
 msgstr "1 行がヤンクされました"
 
-#: ops.c:2854
+#: ../ops.c:2893
 #, c-format
 msgid "%ld lines yanked"
 msgstr "%ld 行がヤンクされました"
 
-#: ops.c:3139
+#: ../ops.c:3188
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: レジスタ %s には何もありません"
 
 #. Highlight title
-#: ops.c:3690
+#: ../ops.c:3751
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4432,11 +4934,11 @@ msgstr ""
 "\n"
 "--- レジスタ ---"
 
-#: ops.c:4997
+#: ../ops.c:5066
 msgid "Illegal register name"
 msgstr "不正なレジスタ名"
 
-#: ops.c:5085
+#: ../ops.c:5154
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4444,57 +4946,67 @@ msgstr ""
 "\n"
 "# レジスタ:\n"
 
-#: ops.c:5135
+#: ../ops.c:5210
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: 未知のレジスタ型 %d です"
 
-#: ops.c:5620
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: 無効なレジスタ名: '%s'"
-
-#: ops.c:5980
+#: ../ops.c:6084
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld 列; "
 
-#: ops.c:5987
+#: ../ops.c:6092
 #, c-format
 msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
 msgstr "選択 %s%ld / %ld 行; %ld / %ld 単語; %ld / %ld 文字"
 
-#: ops.c:6003
+#: ../ops.c:6098
+#, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "選択 %s%ld / %ld 行; %ld / %ld 単語; %ld / %ld 文字; %ld / %ld バイト"
+
+#: ../ops.c:6116
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
 msgstr "列 %s / %s; 行 %ld of %ld; 単語 %ld / %ld; 文字 %ld / %ld"
 
-#: ops.c:6014
+#: ../ops.c:6123
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"列 %s / %s; 行 %ld / %ld; 単語 %ld / %ld; 文字 %ld / %ld; バイト %ld of %ld"
+
+#: ../ops.c:6135
 #, c-format
 msgid "(+%ld for BOM)"
 msgstr "(+%ld for BOM)"
 
-#: option.c:1643
+#: ../option.c:1692
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N ページ"
 
-#: option.c:2092
+#: ../option.c:2171
 msgid "Thanks for flying Vim"
 msgstr "Vim を使ってくれてありがとう"
 
-#: option.c:3419 option.c:3535
+#: ../option.c:3594 ../option.c:3716
 msgid "E518: Unknown option"
 msgstr "E518: 未知のオプションです"
 
-#: option.c:3432
+#: ../option.c:3607
 msgid "E519: Option not supported"
 msgstr "E519: オプションはサポートされていません"
 
-#: option.c:3457
+#: ../option.c:3632
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline では許可されません"
 
-#: option.c:3522
+#: ../option.c:3703
 msgid ""
 "\n"
 "\tLast set from "
@@ -4502,139 +5014,139 @@ msgstr ""
 "\n"
 "\tLast set from "
 
-#: option.c:3661
+#: ../option.c:3842
 msgid "E521: Number required after ="
 msgstr "E521: = の後には数字が必要です"
 
-#: option.c:3989 option.c:4619
+#: ../option.c:4170 ../option.c:4831
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap 内にみつかりません"
 
-#: option.c:4064
+#: ../option.c:4258
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: 不正な文字です <%s>"
 
-#: option.c:4611
+#: ../option.c:4823
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' には空文字列を設定できません"
 
-#: option.c:4614
+#: ../option.c:4826
 msgid "E530: Cannot change term in GUI"
 msgstr "E530: GUIでは 'term' を変更できません"
 
-#: option.c:4616
+#: ../option.c:4828
 msgid "E531: Use \":gui\" to start the GUI"
 msgstr "E531: GUIをスタートするには \":gui\" を使用してください"
 
-#: option.c:4645
+#: ../option.c:4857
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' と 'patchmode' が同じです"
 
-#: option.c:4860
+#: ../option.c:5085
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: GTK+2 GUIでは変更できません"
 
-#: option.c:5016
+#: ../option.c:5249
 msgid "E524: Missing colon"
 msgstr "E524: コロンがありません"
 
-#: option.c:5018
+#: ../option.c:5251
 msgid "E525: Zero length string"
 msgstr "E525: 文字列の長さがゼロです"
 
-#: option.c:5086
+#: ../option.c:5326
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> の後に数字がありません"
 
-#: option.c:5100
+#: ../option.c:5340
 msgid "E527: Missing comma"
 msgstr "E527: カンマがありません"
 
-#: option.c:5107
+#: ../option.c:5347
 msgid "E528: Must specify a ' value"
 msgstr "E528: ' の値を指定しなければなりません"
 
-#: option.c:5148
+#: ../option.c:5388
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: 表示できない文字かワイド文字を含んでいます"
 
-#: option.c:5197
+#: ../option.c:5432
 msgid "E596: Invalid font(s)"
 msgstr "E596: 無効なフォントです"
 
-#: option.c:5205
+#: ../option.c:5440
 msgid "E597: can't select fontset"
 msgstr "E597: フォントセットを選択できません"
 
-#: option.c:5207
+#: ../option.c:5442
 msgid "E598: Invalid fontset"
 msgstr "E598: 無効なフォントセットです"
 
-#: option.c:5214
+#: ../option.c:5449
 msgid "E533: can't select wide font"
 msgstr "E533: ワイドフォントを選択できません"
 
-#: option.c:5216
+#: ../option.c:5451
 msgid "E534: Invalid wide font"
 msgstr "E534: 無効なワイドフォントです"
 
-#: option.c:5486
+#: ../option.c:5728
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: <%c> の後に不正な文字があります"
 
-#: option.c:5597
+#: ../option.c:5839
 msgid "E536: comma required"
 msgstr "E536: カンマが必要です"
 
-#: option.c:5607
+#: ../option.c:5849
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' は空であるか %s を含む必要があります"
 
-#: option.c:5679
+#: ../option.c:5924
 msgid "E538: No mouse support"
 msgstr "E538: マウスはサポートされません"
 
-#: option.c:5947
+#: ../option.c:6195
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: 式が終了していません"
 
-#: option.c:5951
+#: ../option.c:6199
 msgid "E541: too many items"
-msgstr "E541: 要素が多すぎます"
+msgstr "E541: 要素が多過ぎます"
 
-#: option.c:5953
+#: ../option.c:6201
 msgid "E542: unbalanced groups"
 msgstr "E542: グループが釣合いません"
 
-#: option.c:6193
+#: ../option.c:6441
 msgid "E590: A preview window already exists"
 msgstr "E590: プレビューウィンドウが既に存在します"
 
-#: option.c:6450
+#: ../option.c:6688
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: アラビア文字にはUTF-8が必要なので, ':set encoding=utf-8' してください"
 
-#: option.c:6776
+#: ../option.c:7052
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: 最低 %d の行数が必要です"
 
-#: option.c:6786
+#: ../option.c:7062
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: 最低 %d のカラム幅が必要です"
 
-#: option.c:7093
+#: ../option.c:7371
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: 未知のオプションです: %s"
 
-#: option.c:7213
+#: ../option.c:7504
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4642,7 +5154,7 @@ msgstr ""
 "\n"
 "--- 端末コード ---"
 
-#: option.c:7215
+#: ../option.c:7506
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4650,7 +5162,7 @@ msgstr ""
 "\n"
 "--- グローバルオプション値 ---"
 
-#: option.c:7217
+#: ../option.c:7508
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4658,7 +5170,7 @@ msgstr ""
 "\n"
 "--- ローカルオプション値 ---"
 
-#: option.c:7219
+#: ../option.c:7510
 msgid ""
 "\n"
 "--- Options ---"
@@ -4666,152 +5178,157 @@ msgstr ""
 "\n"
 "--- オプション ---"
 
-#: option.c:7925
+#: ../option.c:8240
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp エラー"
 
-#: option.c:8896
+#: ../option.c:9217
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': %s に対応する文字がありません"
 
-#: option.c:8930
+#: ../option.c:9243
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': セミコロンの後に余分な文字があります: %s"
 
-#: os_amiga.c:280
+#: ../os_amiga.c:280
 msgid "cannot open "
 msgstr "開けません "
 
-#: os_amiga.c:314
+#: ../os_amiga.c:314
 msgid "VIM: Can't open window!\n"
 msgstr "VIM: ウィンドウを開けません!\n"
 
-#: os_amiga.c:338
+#: ../os_amiga.c:338
 msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigadosのバージョン 2.04かそれ以降が必要です\n"
 
-#: os_amiga.c:344
+#: ../os_amiga.c:344
 #, c-format
 msgid "Need %s version %ld\n"
 msgstr "%s のバージョン %ld が必要です\n"
 
-#: os_amiga.c:416
+#: ../os_amiga.c:416
 msgid "Cannot open NIL:\n"
 msgstr "NILを開けません:\n"
 
-#: os_amiga.c:427
+#: ../os_amiga.c:427
 msgid "Cannot create "
 msgstr "作成できません "
 
-#: os_amiga.c:905
+#: ../os_amiga.c:905
 #, c-format
 msgid "Vim exiting with %d\n"
 msgstr "Vimは %d で終了します\n"
 
-#: os_amiga.c:937
+#: ../os_amiga.c:941
 msgid "cannot change console mode ?!\n"
 msgstr "コンソールモードを変更できません?!\n"
 
-#: os_amiga.c:1003
+#: ../os_amiga.c:1012
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: コンソールではない??\n"
 
 #. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1152
+#: ../os_amiga.c:1161
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: -f オプションでシェルを実行できません"
 
-#: os_amiga.c:1193 os_amiga.c:1283
+#: ../os_amiga.c:1202 ../os_amiga.c:1292
 msgid "Cannot execute "
 msgstr "実行できません "
 
-#: os_amiga.c:1196 os_amiga.c:1293
+#: ../os_amiga.c:1205 ../os_amiga.c:1302
 msgid "shell "
 msgstr "シェル "
 
-#: os_amiga.c:1216 os_amiga.c:1318
+#: ../os_amiga.c:1225 ../os_amiga.c:1327
 msgid " returned\n"
 msgstr " 戻りました\n"
 
-#: os_amiga.c:1459
+#: ../os_amiga.c:1468
 msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE が小さすぎます."
+msgstr "ANCHOR_BUF_SIZE が小さ過ぎます."
 
-#: os_amiga.c:1463
+#: ../os_amiga.c:1472
 msgid "I/O ERROR"
 msgstr "入出力エラー"
 
-#: os_mswin.c:539
+#: ../os_mswin.c:597
 msgid "...(truncated)"
 msgstr "...(省略)"
 
-#: os_mswin.c:641
+#: ../os_mswin.c:714
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' が80ではないため, 外部コマンドを実行できません"
 
-#: os_mswin.c:1973
+#: ../os_mswin.c:2091
 msgid "E237: Printer selection failed"
 msgstr "E237: プリンタの選択に失敗しました"
 
-#: os_mswin.c:2013
+#: ../os_mswin.c:2131
 #, c-format
 msgid "to %s on %s"
 msgstr "%s へ (%s 上の)"
 
-#: os_mswin.c:2028
+#: ../os_mswin.c:2146
 #, c-format
 msgid "E613: Unknown printer font: %s"
 msgstr "E613: 未知のプリンタオプションです: %s"
 
-#: os_mswin.c:2077 os_mswin.c:2087
+#: ../os_mswin.c:2195 ../os_mswin.c:2205
 #, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: 印刷エラー: %s"
 
-#: os_mswin.c:2088
-msgid "Unknown"
-msgstr "不明"
-
-#: os_mswin.c:2115
+#: ../os_mswin.c:2233
 #, c-format
 msgid "Printing '%s'"
 msgstr "印刷しています: '%s'"
 
-#: os_mswin.c:3204
+#: ../os_mswin.c:3372
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
 msgstr "E244: 文字セット名 \"%s\" は不正です (フォント名 \"%s\")"
 
-#: os_mswin.c:3212
+#: ../os_mswin.c:3382
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
 
-#: os_riscos.c:1259
+#: ../os_riscos.c:1259
 msgid "E366: Invalid 'osfiletype' option - using Text"
 msgstr "E366: 無効な 'osfiletype' オプション - \"Text\" を使います"
 
-#: os_unix.c:927
+#: ../os_unix.c:989
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: 2重のシグナルのため, 終了します\n"
 
-#: os_unix.c:933
+#: ../os_unix.c:995
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: 致命的シグナル %s を検知しました\n"
 
-#: os_unix.c:936
+#: ../os_unix.c:998
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: 致命的シグナルを検知しました\n"
 
-#: os_unix.c:1199
+#: ../os_unix.c:1318
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "Xサーバへの接続に %ld ミリ秒かかりました"
 
-#: os_unix.c:1226
+#. KDE sometimes produces X error that we want to ignore
+#: ../os_unix.c:1347
+msgid ""
+"\n"
+"Vim: Got X error but we continue...\n"
+msgstr ""
+"\n"
+"Vim: X のエラーを検出しましたが続行します...\n"
+
+#: ../os_unix.c:1351
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4819,15 +5336,15 @@ msgstr ""
 "\n"
 "Vim: X のエラーを検出しましたr\n"
 
-#: os_unix.c:1334
+#: ../os_unix.c:1464
 msgid "Testing the X display failed"
 msgstr "X display のチェックに失敗しました"
 
-#: os_unix.c:1473
+#: ../os_unix.c:1603
 msgid "Opening the X display timed out"
 msgstr "X display の open がタイムアウトしました"
 
-#: os_unix.c:3227 os_unix.c:3907
+#: ../os_unix.c:3384 ../os_unix.c:4220
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -4835,7 +5352,7 @@ msgstr ""
 "\n"
 "シェルを実行できません "
 
-#: os_unix.c:3275
+#: ../os_unix.c:3432
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
@@ -4843,7 +5360,7 @@ msgstr ""
 "\n"
 "sh シェルを実行できません\n"
 
-#: os_unix.c:3279 os_unix.c:3913
+#: ../os_unix.c:3436 ../os_unix.c:4226
 msgid ""
 "\n"
 "shell returned "
@@ -4851,7 +5368,7 @@ msgstr ""
 "\n"
 "シェルが値を返しました "
 
-#: os_unix.c:3414
+#: ../os_unix.c:3578
 msgid ""
 "\n"
 "Cannot create pipes\n"
@@ -4859,7 +5376,7 @@ msgstr ""
 "\n"
 "パイプを作成できません\n"
 
-#: os_unix.c:3429
+#: ../os_unix.c:3591 ../os_unix.c:3822
 msgid ""
 "\n"
 "Cannot fork\n"
@@ -4867,7 +5384,7 @@ msgstr ""
 "\n"
 "fork できません\n"
 
-#: os_unix.c:3920
+#: ../os_unix.c:4233
 msgid ""
 "\n"
 "Command terminated\n"
@@ -4875,78 +5392,79 @@ msgstr ""
 "\n"
 "コマンドを中断しました\n"
 
-#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975
+#: ../os_unix.c:4520 ../os_unix.c:4662 ../os_unix.c:6392
 msgid "XSMP lost ICE connection"
 msgstr "XSMP がICE接続を失いました"
 
-#: os_unix.c:5558
+#: ../os_unix.c:5792 ../os_unix.c:5893
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
+
+#: ../os_unix.c:5975
 msgid "Opening the X display failed"
 msgstr "X display の open に失敗しました"
 
-#: os_unix.c:5880
+#: ../os_unix.c:6297
 msgid "XSMP handling save-yourself request"
 msgstr "XSMP がsave-yourself要求を処理しています"
 
-#: os_unix.c:5999
+#: ../os_unix.c:6416
 msgid "XSMP opening connection"
 msgstr "XSMP が接続を開始しています"
 
-#: os_unix.c:6018
+#: ../os_unix.c:6435
 msgid "XSMP ICE connection watch failed"
 msgstr "XSMP ICE接続が失敗したようです"
 
-#: os_unix.c:6038
+#: ../os_unix.c:6455
 #, c-format
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnectionが失敗しました: %s"
 
-#: os_vms_mms.c:59
+#: ../os_vms_mms.c:59
 msgid "At line"
 msgstr "行"
 
-#: os_w32exe.c:65
-msgid "Could not allocate memory for command line."
-msgstr "コマンドラインにメモリを割り当てられません"
+#: ../os_w32exe.c:88
+msgid "Could not load vim32.dll!"
+msgstr "vim32.dll をロードできませんでした"
 
-#: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
+#: ../os_w32exe.c:88 ../os_w32exe.c:99
 msgid "VIM Error"
 msgstr "VIMエラー"
 
-#: os_w32exe.c:89
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll をロードできませんでした"
-
-#: os_w32exe.c:99
+#: ../os_w32exe.c:98
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "DLLから関数ポインタを取得できませんでした"
 
-#: os_win16.c:342 os_win32.c:3197
+#: ../os_win16.c:342 ../os_win32.c:3317
 #, c-format
 msgid "shell returned %d"
 msgstr "シェルがコード %d で終了しました"
 
-#: os_win32.c:2655
+#: ../os_win32.c:2776
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: イベント %s を検知\n"
 
-#: os_win32.c:2657
+#: ../os_win32.c:2778
 msgid "close"
 msgstr "閉じる"
 
-#: os_win32.c:2659
+#: ../os_win32.c:2780
 msgid "logoff"
 msgstr "ログオフ"
 
-#: os_win32.c:2660
+#: ../os_win32.c:2781
 msgid "shutdown"
 msgstr "シャットダウン"
 
-#: os_win32.c:3150
+#: ../os_win32.c:3270
 msgid "E371: Command not found"
 msgstr "E371: コマンドがありません"
 
-#: os_win32.c:3163
+#: ../os_win32.c:3283
 msgid ""
 "VIMRUN.EXE not found in your $PATH.\n"
 "External commands will not pause after completion.\n"
@@ -4956,269 +5474,264 @@ msgstr ""
 "外部コマンドの終了後に一時停止をしません.\n"
 "詳細は  :help win32-vimrun  を参照してください."
 
-#: os_win32.c:3166
+#: ../os_win32.c:3286
 msgid "Vim Warning"
 msgstr "Vimの警告"
 
-#: quickfix.c:258
+#: ../quickfix.c:284
 msgid "E372: Too many %%%c in format string"
-msgstr "E372: フォーマット文字列に %%%c が多すぎます"
+msgstr "E372: フォーマット文字列に %%%c が多過ぎます"
 
-#: quickfix.c:271
+#: ../quickfix.c:297
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: フォーマット文字列に予期せぬ %%%c がありました"
 
-#: quickfix.c:325
+#: ../quickfix.c:351
 msgid "E374: Missing ] in format string"
 msgstr "E374: フォーマット文字列に ] がありません"
 
-#: quickfix.c:339
+#: ../quickfix.c:365
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: フォーマット文字列では %%%c はサポートされません"
 
-#: quickfix.c:357
+#: ../quickfix.c:383
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: フォーマット文字列の前置に無効な %%%c があります"
 
-#: quickfix.c:365
+#: ../quickfix.c:391
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: フォーマット文字列に無効な %%%c があります"
 
-#: quickfix.c:391
+#: ../quickfix.c:417
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' にパターンが指定されていません"
 
-#: quickfix.c:501
+#: ../quickfix.c:537
 msgid "E379: Missing or empty directory name"
 msgstr "E379: ディレクトリ名が無いか空です"
 
-#: quickfix.c:990
+#: ../quickfix.c:1027
 msgid "E553: No more items"
 msgstr "E553: 要素がもうありません"
 
-#: quickfix.c:1229
+#: ../quickfix.c:1324
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
 
-#: quickfix.c:1231
+#: ../quickfix.c:1326
 msgid " (line deleted)"
 msgstr " (行が削除されました)"
 
-#: quickfix.c:1444
+#: ../quickfix.c:1539
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix スタックの末尾です"
 
-#: quickfix.c:1453
+#: ../quickfix.c:1548
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix スタックの先頭です"
 
-#: quickfix.c:1465
+#: ../quickfix.c:1560
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "エラー一覧 %d of %d; %d 個エラー"
 
-#: quickfix.c:1943
+#: ../quickfix.c:2042
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' オプションが設定されているので書込みません"
 
-#: regexp.c:838
+#
+#: ../quickfix.c:2326
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: 検索パターンか区切り記号が不正です"
+
+#: ../quickfix.c:2337
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: ファイル名が無いか無効なパターンです"
+
+#: ../quickfix.c:2416
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "ファイル \"%s\" を開けません"
+
+#: ../quickfix.c:2775
+msgid "E681: Buffer is not loaded"
+msgstr "E681: バッファは読み込まれませんでした"
+
+#: ../regexp.c:1006
 msgid "E339: Pattern too long"
-msgstr "E339: パターンが長すぎます"
+msgstr "E339: パターンが長過ぎます"
 
-#: regexp.c:1009
+#: ../regexp.c:1177
 msgid "E50: Too many \\z("
-msgstr "E50: \\z( が多すぎます"
+msgstr "E50: \\z( が多過ぎます"
 
-#: regexp.c:1020
+#: ../regexp.c:1188
 #, c-format
 msgid "E51: Too many %s("
-msgstr "E51: %s( が多すぎます"
+msgstr "E51: %s( が多過ぎます"
 
-#: regexp.c:1077
+#: ../regexp.c:1245
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( が釣り合っていません"
 
-#: regexp.c:1081
+#: ../regexp.c:1249
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( が釣り合っていません"
 
-#: regexp.c:1083
+#: ../regexp.c:1251
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( が釣り合っていません"
 
-#: regexp.c:1088
+#: ../regexp.c:1256
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) が釣り合っていません"
 
-#: regexp.c:1258
-#, c-format
-msgid "E56: %s* operand could be empty"
-msgstr "E56: %s* が空文字列になる可能性があります"
-
-#: regexp.c:1261
-#, c-format
-msgid "E57: %s+ operand could be empty"
-msgstr "E57: %s+ が空文字列になる可能性があります"
-
-#: regexp.c:1316
+#: ../regexp.c:1474
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ の後に不正な文字がありました"
 
-#: regexp.c:1344
-#, c-format
-msgid "E58: %s{ operand could be empty"
-msgstr "E58: %s{ が空文字列になる可能性があります"
-
-#: regexp.c:1354
+#: ../regexp.c:1508
 #, c-format
 msgid "E60: Too many complex %s{...}s"
-msgstr "E60: 複雑な %s{...} が多すぎます"
+msgstr "E60: 複雑な %s{...} が多過ぎます"
 
-#: regexp.c:1370
+#: ../regexp.c:1524
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61:%s* が入れ子になっています"
 
-#: regexp.c:1373
+#: ../regexp.c:1527
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62:%s%c が入れ子になっています"
 
 #
-#: regexp.c:1491
+#: ../regexp.c:1647
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ の無効な使用方法です"
 
-#: regexp.c:1536
+#: ../regexp.c:1692
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c の後になにもありません"
 
 #
-#: regexp.c:1592
+#: ../regexp.c:1748
 msgid "E65: Illegal back reference"
 msgstr "E65: 不正な後方参照です"
 
 #
-#: regexp.c:1605
+#: ../regexp.c:1761
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( はココでは許可されていません"
 
 #
-#: regexp.c:1624
+#: ../regexp.c:1780
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 その他はココでは許可されていません"
 
 #
-#: regexp.c:1635
+#: ../regexp.c:1791
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z の後に不正な文字がありました"
 
 #
-#: regexp.c:1684
+#: ../regexp.c:1840
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ の後に ] がありません"
 
-#: regexp.c:1700
+#: ../regexp.c:1856
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] が空です"
 
 #
-#: regexp.c:1760
+#: ../regexp.c:1901
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] の後に不正な文字がありました"
+
+#
+#: ../regexp.c:1952
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% の後に不正な文字がありました"
 
-#: regexp.c:2557
+#: ../regexp.c:2922
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} 内に文法エラーがあります"
 
-#: regexp.c:2863 regexp.c:3016
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: クラッシュにより中断; 正規表現が複雑過ぎるかも?"
-
-#: regexp.c:3004 regexp.c:3013
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: パターンによるスタック不足エラーです"
-
-#: regexp.c:3258
+#: ../regexp.c:3707
 msgid "External submatches:\n"
 msgstr "外部の部分該当:\n"
 
-#: screen.c:2143
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld 行が折畳まれました"
-
-#: screen.c:7959
+#: ../screen.c:7969
 msgid " VREPLACE"
 msgstr " 仮想置換"
 
-#: screen.c:7963
+#: ../screen.c:7973
 msgid " REPLACE"
 msgstr " 置換"
 
-#: screen.c:7968
+#: ../screen.c:7978
 msgid " REVERSE"
 msgstr " 反転"
 
-#: screen.c:7970
+#: ../screen.c:7980
 msgid " INSERT"
 msgstr " 挿入"
 
-#: screen.c:7973
+#: ../screen.c:7983
 msgid " (insert)"
 msgstr " (挿入)"
 
-#: screen.c:7975
+#: ../screen.c:7985
 msgid " (replace)"
 msgstr " (置換)"
 
-#: screen.c:7977
+#: ../screen.c:7987
 msgid " (vreplace)"
 msgstr " (仮想置換)"
 
-#: screen.c:7980
+#: ../screen.c:7990
 msgid " Hebrew"
 msgstr " ヘブライ"
 
-#: screen.c:7991
+#: ../screen.c:8001
 msgid " Arabic"
 msgstr " アラビア"
 
-#: screen.c:7994
+#: ../screen.c:8004
 msgid " (lang)"
 msgstr " (言語)"
 
-#: screen.c:7998
+#: ../screen.c:8008
 msgid " (paste)"
 msgstr " (貼り付け)"
 
-#: screen.c:8011
+#: ../screen.c:8021
 msgid " VISUAL"
 msgstr " ビジュアル"
 
-#: screen.c:8012
+#: ../screen.c:8022
 msgid " VISUAL LINE"
 msgstr " ビジュアル 行"
 
-#: screen.c:8013
+#: ../screen.c:8023
 msgid " VISUAL BLOCK"
 msgstr " ビジュアル 矩形"
 
-#: screen.c:8014
+#: ../screen.c:8024
 msgid " SELECT"
 msgstr " セレクト"
 
-#: screen.c:8015
+#: ../screen.c:8025
 msgid " SELECT LINE"
 msgstr " 行指向選択"
 
-#: screen.c:8016
+#: ../screen.c:8026
 msgid " SELECT BLOCK"
 msgstr " 矩形選択"
 
@@ -5226,118 +5739,118 @@ msgstr " 矩形選択"
 # msgstr " ブロック"
 # msgid " LINE"
 # msgstr " 行"
-#: screen.c:8031 screen.c:8094
+#: ../screen.c:8041 ../screen.c:8104
 msgid "recording"
 msgstr "記録中"
 
-#: search.c:37
+#: ../search.c:37
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "上まで検索したので下に戻ります"
 
-#: search.c:38
+#: ../search.c:38
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "下まで検索したので上に戻ります"
 
-#: search.c:526
+#: ../search.c:525
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: 無効な検索文字列です: %s"
 
-#: search.c:853
+#: ../search.c:868
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: 上まで検索したけれど該当箇所はありません: %s"
 
-#: search.c:856
+#: ../search.c:871
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: 下まで検索したけれど該当箇所はありません: %s"
 
-#: search.c:1249
+#: ../search.c:1265
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' のあとには '?' か '/' が期待されている"
 
-#: search.c:3758
+#: ../search.c:4147
 msgid " (includes previously listed match)"
 msgstr " (前に列挙した該当箇所を含む)"
 
 #. cursor at status line
-#: search.c:3778
+#: ../search.c:4167
 msgid "--- Included files "
 msgstr "--- インクルードされたファイル"
 
-#: search.c:3780
+#: ../search.c:4169
 msgid "not found "
 msgstr "みつかりません "
 
-#: search.c:3781
+#: ../search.c:4170
 msgid "in path ---\n"
 msgstr "パスに ----\n"
 
-#: search.c:3820
+#: ../search.c:4227
 msgid "  (Already listed)"
 msgstr "  (既に列挙)"
 
-#: search.c:3822
+#: ../search.c:4229
 msgid "  NOT FOUND"
 msgstr "  みつかりません"
 
-#: search.c:3874
+#: ../search.c:4281
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "インクルードされたファイルをスキャン中: %s"
 
-#: search.c:4092
+#: ../search.c:4499
 msgid "E387: Match is on current line"
 msgstr "E387: 現在行に該当があります"
 
-#: search.c:4235
+#: ../search.c:4642
 msgid "All included files were found"
 msgstr "全てのインクルードされたファイルがみつかりました"
 
-#: search.c:4237
+#: ../search.c:4644
 msgid "No included files"
 msgstr "インクルードファイルはありません"
 
-#: search.c:4253
+#: ../search.c:4660
 msgid "E388: Couldn't find definition"
 msgstr "E388: 定義をみつけられません"
 
-#: search.c:4255
+#: ../search.c:4662
 msgid "E389: Couldn't find pattern"
 msgstr "E389: パターンをみつけられません"
 
-#: syntax.c:3050
+#: ../syntax.c:3070
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: 不正な引数です: %s"
 
-#: syntax.c:3230
+#: ../syntax.c:3247
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: そのような構文クラスタはありません: %s"
 
-#: syntax.c:3394
+#: ../syntax.c:3411
 msgid "No Syntax items defined for this buffer"
 msgstr "このバッファに定義された構文要素はありません"
 
-#: syntax.c:3402
+#: ../syntax.c:3419
 msgid "syncing on C-style comments"
 msgstr "C言語風コメントから同期中"
 
-#: syntax.c:3410
+#: ../syntax.c:3427
 msgid "no syncing"
 msgstr "非同期"
 
-#: syntax.c:3413
+#: ../syntax.c:3430
 msgid "syncing starts "
 msgstr "同期開始 "
 
-#: syntax.c:3415 syntax.c:3490
+#: ../syntax.c:3432 ../syntax.c:3507
 msgid " lines before top line"
 msgstr " 行前(トップ行よりも)"
 
-#: syntax.c:3420
+#: ../syntax.c:3437
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5345,7 +5858,7 @@ msgstr ""
 "\n"
 "--- 構文同期要素 ---"
 
-#: syntax.c:3425
+#: ../syntax.c:3442
 msgid ""
 "\n"
 "syncing on items"
@@ -5353,7 +5866,7 @@ msgstr ""
 "\n"
 "要素上で同期中"
 
-#: syntax.c:3431
+#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5361,209 +5874,216 @@ msgstr ""
 "\n"
 "--- 構文要素 ---"
 
-#: syntax.c:3454
+#: ../syntax.c:3471
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: そのような構文クラスタはありません: %s"
 
-#: syntax.c:3480
+#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimal"
 
-#: syntax.c:3487
+#: ../syntax.c:3504
 msgid "maximal "
 msgstr "maximal"
 
-#: syntax.c:3499
+#: ../syntax.c:3516
 msgid "; match "
 msgstr "; 該当 "
 
-#: syntax.c:3501
+#: ../syntax.c:3518
 msgid " line breaks"
 msgstr " 個の改行"
 
-#: syntax.c:4135
+#: ../syntax.c:4146
+msgid "E395: contains argument not accepted here"
+msgstr "E395: この場所では引数containsは許可されていません"
+
+#: ../syntax.c:4157
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: この場所では引数containedinは許可されていません"
+
+#: ../syntax.c:4179
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: ここではグループは許可されません"
 
-#: syntax.c:4159
+#: ../syntax.c:4203
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: %s の範囲要素がみつかりません"
 
-#: syntax.c:4187
-msgid "E395: contains argument not accepted here"
-msgstr "E395: この場所では引数containsは許可されていません"
-
-#: syntax.c:4198
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: この場所では引数containedinは許可されていません"
-
-#: syntax.c:4276
+#: ../syntax.c:4281
 msgid "E397: Filename required"
 msgstr "E397: ファイル名が必要です"
 
-#: syntax.c:4614
+#: ../syntax.c:4404
+#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ']' がありません: %s"
+
+#: ../syntax.c:4644
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' がありません: %s"
 
-#: syntax.c:4772
+#: ../syntax.c:4803
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: 引数が足りません: 構文範囲 %s"
 
-#: syntax.c:5103
+#: ../syntax.c:5133
 msgid "E400: No cluster specified"
 msgstr "E400: クラスタが指定されていません"
 
-#: syntax.c:5140
+#: ../syntax.c:5170
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: パターン区切りがみつかりません: %s"
 
-#: syntax.c:5215
+#: ../syntax.c:5245
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: パターンのあとにゴミがあります: %s"
 
-#: syntax.c:5305
+#: ../syntax.c:5335
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: 構文同期: 連続行パターンが2度指定されました"
 
-#: syntax.c:5362
+#: ../syntax.c:5392
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: 不正な引数です: %s"
 
-#: syntax.c:5412
+#: ../syntax.c:5442
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: 等しい sign がありません: %s"
 
-#: syntax.c:5418
+#: ../syntax.c:5448
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: 空の引数: %s"
 
-#: syntax.c:5445
+#: ../syntax.c:5475
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s はココでは許可されていません"
 
-#: syntax.c:5452
+#: ../syntax.c:5482
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s は内容リストの先頭でなければならない"
 
-#: syntax.c:5522
+#: ../syntax.c:5552
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: 未知のグループ名: %s"
 
-#: syntax.c:5755
+#: ../syntax.c:5786
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: 無効な :syntax のサブコマンド: %s"
 
-#: syntax.c:6134
+#: ../syntax.c:6054
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim の再帰呼び出しを検出しました"
+
+#: ../syntax.c:6181
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: ハイライトグループがみつかりません: %s"
 
-#: syntax.c:6158
+#: ../syntax.c:6205
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: 引数が充分ではない: \":highlight link %s\""
 
-#: syntax.c:6165
+#: ../syntax.c:6212
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: 引数が多すぎます: \":highlight link %s\""
+msgstr "E413: 引数が多過ぎます: \":highlight link %s\""
 
-#: syntax.c:6185
+#: ../syntax.c:6232
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: グループが設定されているのでハイライトリンクは無視されます"
 
-#: syntax.c:6314
+#: ../syntax.c:6361
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: 予期せぬ同じ sign です: %s"
 
-#: syntax.c:6350
+#: ../syntax.c:6397
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: 同じ sign がありません: %s"
 
-#: syntax.c:6378
+#: ../syntax.c:6425
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: 引数がありません: %s"
 
-#: syntax.c:6415
+#: ../syntax.c:6462
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: 不正な値です: %s"
 
-#: syntax.c:6534
+#: ../syntax.c:6581
 msgid "E419: FG color unknown"
 msgstr "E419: 未知の前景色です"
 
-#: syntax.c:6545
+#: ../syntax.c:6592
 msgid "E420: BG color unknown"
 msgstr "E420: 未知の背景色です"
 
-#: syntax.c:6606
+#: ../syntax.c:6653
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: カラー名や番号を認識できません: %s"
 
-#: syntax.c:6812
+#: ../syntax.c:6859
 #, c-format
 msgid "E422: terminal code too long: %s"
-msgstr "E422: 終端コードが長すぎます: %s"
+msgstr "E422: 終端コードが長過ぎます: %s"
 
-#: syntax.c:6859
+#: ../syntax.c:6906
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: 不正な引数です: %s"
 
-#: syntax.c:7388
+#: ../syntax.c:7435
 msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: 多くの異なるハイライト属性が使われすぎています"
+msgstr "E424: 多くの異なるハイライト属性が使われ過ぎています"
 
-#: syntax.c:7909
+#: ../syntax.c:7955
 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:7916
+#: ../syntax.c:7963
 msgid "W18: Invalid character in group name"
 msgstr "W18: グループ名に不正な文字があります"
 
-#: tag.c:90
+#: ../tag.c:90
 msgid "E555: at bottom of tag stack"
 msgstr "E555: タグスタックの末尾です"
 
-#: tag.c:91
+#: ../tag.c:91
 msgid "E556: at top of tag stack"
 msgstr "E556: タグスタックの先頭です"
 
-#: tag.c:412
+#: ../tag.c:412
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: 最初の該当タグを超えて戻ることはできません"
 
-#: tag.c:550
+#: ../tag.c:550
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: タグがみつかりません: %s"
 
-#: tag.c:583
+#: ../tag.c:583
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: tag.c:586
+#: ../tag.c:586
 msgid "file\n"
 msgstr "ファイル\n"
 
@@ -5571,44 +6091,44 @@ msgstr "ファイル\n"
 #. * Ask to select a tag from the list.
 #. * When using ":silent" assume that <CR> was entered.
 #.
-#: tag.c:744
+#: ../tag.c:744
 msgid "Enter nr of choice (<CR> to abort): "
 msgstr "選択する番号を入力してください (<CR>で中止): "
 
-#: tag.c:784
+#: ../tag.c:784
 msgid "E427: There is only one matching tag"
 msgstr "E427: 該当タグが1つだけしかありません"
 
-#: tag.c:786
+#: ../tag.c:786
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: 最後に該当するタグを超えて進むことはできません"
 
-#: tag.c:810
+#: ../tag.c:810
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "ファイル \"%s\" がありません"
 
 #. Give an indication of the number of matching tags
-#: tag.c:823
+#: ../tag.c:823
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "タグ %d (全%d%s)"
 
-#: tag.c:826
+#: ../tag.c:826
 msgid " or more"
 msgstr " かそれ以上"
 
-#: tag.c:828
+#: ../tag.c:828
 msgid "  Using tag with different case!"
 msgstr "  タグを異なるcaseで使用します!"
 
-#: tag.c:872
+#: ../tag.c:872
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: ファイル \"%s\" がありません"
 
 #. Highlight title
-#: tag.c:941
+#: ../tag.c:941
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5616,75 +6136,75 @@ msgstr ""
 "\n"
 "  # TO タグ        FROM 行    in file/text"
 
-#: tag.c:1363
+#: ../tag.c:1363
 #, c-format
 msgid "Searching tags file %s"
 msgstr "タグファイル %s を検索中"
 
-#: tag.c:1550
+#: ../tag.c:1550
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: タグファイルのパスが %s に切り捨てられました\n"
 
-#: tag.c:2203
+#: ../tag.c:2202
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: タグファイル \"%s\" のフォーマットにエラーがあります"
 
-#: tag.c:2207
+#: ../tag.c:2206
 #, c-format
 msgid "Before byte %ld"
 msgstr "直前の %ld バイト"
 
-#: tag.c:2240
+#: ../tag.c:2239
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: タグファイルがソートされていません: %s"
 
 #. never opened any tags file
-#: tag.c:2280
+#: ../tag.c:2279
 msgid "E433: No tags file"
 msgstr "E433: タグファイルがありません"
 
-#: tag.c:3016
+#: ../tag.c:3020
 msgid "E434: Can't find tag pattern"
 msgstr "E434: タグパターンをみつけられません"
 
-#: tag.c:3027
+#: ../tag.c:3031
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: タグをみつけられないので単に推測します!"
 
-#: term.c:1759
+#: ../term.c:1776
 msgid "' not known. Available builtin terminals are:"
 msgstr "' は未知です. 現行の組み込み端末は次のとおりです:"
 
-#: term.c:1783
+#: ../term.c:1800
 msgid "defaulting to '"
 msgstr "省略値を次のように設定します '"
 
-#: term.c:2141
+#: ../term.c:2158
 msgid "E557: Cannot open termcap file"
 msgstr "E557: termcapファイルを開けません"
 
-#: term.c:2145
+#: ../term.c:2162
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfoに端末エントリをみつけられません"
 
-#: term.c:2147
+#: ../term.c:2164
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcapに端末エントリをみつけられません"
 
-#: term.c:2306
+#: ../term.c:2323
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcapに \"%s\" のエントリがありません"
 
-#: term.c:2780
+#: ../term.c:2797
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: 端末に \"cm\" 機能が必要です"
 
 #. Highlight title
-#: term.c:4990
+#: ../term.c:5039
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5692,42 +6212,42 @@ msgstr ""
 "\n"
 "--- 端末キー ---"
 
-#: ui.c:258
+#: ../ui.c:276
 msgid "new shell started\n"
 msgstr "新しいシェルを起動します\n"
 
-#: ui.c:1841
+#: ../ui.c:1860
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: 入力を読込み中のエラーにより終了します...\n"
 
 #. must display the prompt
-#: undo.c:405
+#: ../undo.c:422
 msgid "No undo possible; continue anyway"
 msgstr "可能なアンドゥはありません: とりあえず続けます"
 
-#: undo.c:561
+#: ../undo.c:578
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 行番号が間違っています"
 
-#: undo.c:757
+#: ../undo.c:778
 msgid "1 change"
 msgstr "1 箇所変更しました"
 
-#: undo.c:759
+#: ../undo.c:780
 #, c-format
 msgid "%ld changes"
 msgstr "%ld 箇所変更しました"
 
-#: undo.c:812
+#: ../undo.c:833
 msgid "E439: undo list corrupt"
 msgstr "E439: アンドゥリストが壊れています"
 
-#: undo.c:844
+#: ../undo.c:865
 msgid "E440: undo line missing"
 msgstr "E440: アンドゥ行がありません"
 
 #. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:1731
+#: ../version.c:722
 msgid ""
 "\n"
 "MS-Windows 16/32 bit GUI version"
@@ -5735,7 +6255,7 @@ msgstr ""
 "\n"
 "MS-Windows 16/32 ビット GUI 版"
 
-#: version.c:1733
+#: ../version.c:724
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
@@ -5743,15 +6263,15 @@ msgstr ""
 "\n"
 "MS-Windows 32 ビット GUI 版"
 
-#: version.c:1736
+#: ../version.c:727
 msgid " in Win32s mode"
 msgstr " in Win32s モード"
 
-#: version.c:1738
+#: ../version.c:729
 msgid " with OLE support"
 msgstr " with OLE サポート"
 
-#: version.c:1741
+#: ../version.c:732
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
@@ -5759,7 +6279,7 @@ msgstr ""
 "\n"
 "MS-Windows 32 ビット コンソール 版"
 
-#: version.c:1745
+#: ../version.c:736
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
@@ -5767,7 +6287,7 @@ msgstr ""
 "\n"
 "MS-Windows 16 ビット 版"
 
-#: version.c:1749
+#: ../version.c:740
 msgid ""
 "\n"
 "32 bit MS-DOS version"
@@ -5775,7 +6295,7 @@ msgstr ""
 "\n"
 "32 ビット MS-DOS 版"
 
-#: version.c:1751
+#: ../version.c:742
 msgid ""
 "\n"
 "16 bit MS-DOS version"
@@ -5783,7 +6303,7 @@ msgstr ""
 "\n"
 "16 ビット MS-DOS 版"
 
-#: version.c:1757
+#: ../version.c:748
 msgid ""
 "\n"
 "MacOS X (unix) version"
@@ -5791,7 +6311,7 @@ msgstr ""
 "\n"
 "MacOS X (unix) 版"
 
-#: version.c:1759
+#: ../version.c:750
 msgid ""
 "\n"
 "MacOS X version"
@@ -5799,7 +6319,7 @@ msgstr ""
 "\n"
 "MacOS X 版"
 
-#: version.c:1762
+#: ../version.c:753
 msgid ""
 "\n"
 "MacOS version"
@@ -5807,7 +6327,7 @@ msgstr ""
 "\n"
 "MacOS 版"
 
-#: version.c:1767
+#: ../version.c:758
 msgid ""
 "\n"
 "RISC OS version"
@@ -5815,7 +6335,7 @@ msgstr ""
 "\n"
 "RISC OS 版"
 
-#: version.c:1777
+#: ../version.c:768
 msgid ""
 "\n"
 "Included patches: "
@@ -5823,11 +6343,11 @@ msgstr ""
 "\n"
 "適用済パッチ: "
 
-#: version.c:1803 version.c:2171
+#: ../version.c:794 ../version.c:1162
 msgid "Modified by "
 msgstr "Modified by "
 
-#: version.c:1810
+#: ../version.c:801
 msgid ""
 "\n"
 "Compiled "
@@ -5835,11 +6355,11 @@ msgstr ""
 "\n"
 "Compiled "
 
-#: version.c:1813
+#: ../version.c:804
 msgid "by "
 msgstr "by "
 
-#: version.c:1825
+#: ../version.c:816
 msgid ""
 "\n"
 "Huge version "
@@ -5847,7 +6367,7 @@ msgstr ""
 "\n"
 "Huge 版 "
 
-#: version.c:1828
+#: ../version.c:819
 msgid ""
 "\n"
 "Big version "
@@ -5855,7 +6375,7 @@ msgstr ""
 "\n"
 "Big 版 "
 
-#: version.c:1831
+#: ../version.c:822
 msgid ""
 "\n"
 "Normal version "
@@ -5863,7 +6383,7 @@ msgstr ""
 "\n"
 "通常 版 "
 
-#: version.c:1834
+#: ../version.c:825
 msgid ""
 "\n"
 "Small version "
@@ -5871,7 +6391,7 @@ msgstr ""
 "\n"
 "Small 版 "
 
-#: version.c:1836
+#: ../version.c:827
 msgid ""
 "\n"
 "Tiny version "
@@ -5879,320 +6399,268 @@ msgstr ""
 "\n"
 "Tiny 版 "
 
-#: version.c:1842
+#: ../version.c:833
 msgid "without GUI."
 msgstr "without GUI."
 
-#: version.c:1847
+#: ../version.c:838
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
-#: version.c:1849
+#: ../version.c:840
 msgid "with GTK-GNOME GUI."
 msgstr "with GTK-GNOME GUI."
 
-#: version.c:1853
+#: ../version.c:844
 msgid "with GTK2 GUI."
 msgstr "with GTK2 GUI."
 
-#: version.c:1855
+#: ../version.c:846
 msgid "with GTK GUI."
 msgstr "with GTK GUI."
 
-#: version.c:1860
+#: ../version.c:851
 msgid "with X11-Motif GUI."
 msgstr "with X11-Motif GUI."
 
-#: version.c:1864
+#: ../version.c:855
 msgid "with X11-neXtaw GUI."
 msgstr "with X11-neXtaw GUI."
 
-#: version.c:1866
+#: ../version.c:857
 msgid "with X11-Athena GUI."
 msgstr "with X11-Athena GUI."
 
-#: version.c:1870
-msgid "with BeOS GUI."
-msgstr "with BeOS GUI."
-
-#: version.c:1873
+#: ../version.c:861
 msgid "with Photon GUI."
 msgstr "with Photon GUI."
 
-#: version.c:1876
+#: ../version.c:864
 msgid "with GUI."
 msgstr "with GUI."
 
-#: version.c:1879
+#: ../version.c:867
 msgid "with Carbon GUI."
 msgstr "with Carbon GUI."
 
-#: version.c:1882
+#: ../version.c:870
 msgid "with Cocoa GUI."
 msgstr "with Cocoa GUI."
 
-#: version.c:1885
+#: ../version.c:873
 msgid "with (classic) GUI."
 msgstr "with (クラシック) GUI."
 
-#: version.c:1896
+#: ../version.c:876
+msgid "with KDE GUI."
+msgstr "with KDE GUI."
+
+#: ../version.c:887
 msgid "  Features included (+) or not (-):\n"
 msgstr "  機能の一覧 有効(+)/無効(-)\n"
 
-#: version.c:1908
+#: ../version.c:899
 msgid "   system vimrc file: \""
 msgstr "      システム vimrc: \""
 
-#: version.c:1913
+#: ../version.c:904
 msgid "     user vimrc file: \""
 msgstr "        ユーザ vimrc: \""
 
-#: version.c:1918
+#: ../version.c:909
 msgid " 2nd user vimrc file: \""
 msgstr "     第2ユーザ vimrc: \""
 
-#: version.c:1923
+#: ../version.c:914
 msgid " 3rd user vimrc file: \""
 msgstr "     第3ユーザ vimrc: \""
 
-#: version.c:1928
+#: ../version.c:919
 msgid "      user exrc file: \""
 msgstr "         ユーザ exrc: \""
 
-#: version.c:1933
+#: ../version.c:924
 msgid "  2nd user exrc file: \""
 msgstr "      第2ユーザ exrc: \""
 
-#: version.c:1939
+#: ../version.c:930
 msgid "  system gvimrc file: \""
 msgstr "     システム gvimrc: \""
 
-#: version.c:1943
+#: ../version.c:934
 msgid "    user gvimrc file: \""
 msgstr "       ユーザ gvimrc: \""
 
-#: version.c:1947
+#: ../version.c:938
 msgid "2nd user gvimrc file: \""
 msgstr "    第2ユーザ gvimrc: \""
 
-#: version.c:1952
+#: ../version.c:943
 msgid "3rd user gvimrc file: \""
 msgstr "    第3ユーザ gvimrc: \""
 
-#: version.c:1959
+#: ../version.c:950
 msgid "    system menu file: \""
 msgstr "    システムメニュー: \""
 
-#: version.c:1967
+#: ../version.c:958
 msgid "  fall-back for $VIM: \""
 msgstr "       省略時の $VIM: \""
 
-#: version.c:1973
+#: ../version.c:964
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "省略時の $VIMRUNTIME: \""
 
-#: version.c:1977
+#: ../version.c:968
 msgid "Compilation: "
 msgstr "コンパイル: "
 
-#: version.c:1983
+#: ../version.c:974
 msgid "Compiler: "
 msgstr "コンパイラ: "
 
-#: version.c:1988
+#: ../version.c:979
 msgid "Linking: "
 msgstr "リンク: "
 
-#: version.c:1993
+#: ../version.c:984
 msgid "  DEBUG BUILD"
 msgstr "デバッグビルド"
 
-#: version.c:2032
+#: ../version.c:1023
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: version.c:2034
+#: ../version.c:1025
 msgid "version "
 msgstr "version "
 
-#: version.c:2035
+#: ../version.c:1026
 msgid "by Bram Moolenaar et al."
 msgstr "by Bram Moolenaar 他."
 
-#: version.c:2039
+#: ../version.c:1030
 msgid "Vim is open source and freely distributable"
 msgstr "Vim はオープンソースであり自由に配布可能です"
 
-#: version.c:2041
+#: ../version.c:1032
 msgid "Help poor children in Uganda!"
 msgstr "ウガンダの恵まれない子供たちに援助を!"
 
-#: version.c:2042
+#: ../version.c:1033
 msgid "type  :help iccf<Enter>       for information "
 msgstr "詳細な情報は           :help iccf<Enter>      "
 
-#: version.c:2044
+#: ../version.c:1035
 msgid "type  :q<Enter>               to exit         "
 msgstr "終了するには           :q<Enter>              "
 
-#: version.c:2045
+#: ../version.c:1036
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "オンラインヘルプは     :help<Enter> か <F1>   "
 
-#: version.c:2046
-msgid "type  :help version6<Enter>   for version info"
-msgstr "バージョン情報は       :help version6<Enter>  "
+#: ../version.c:1037
+msgid "type  :help version7<Enter>   for version info"
+msgstr "バージョン情報は       :help version7<Enter>  "
 
-#: version.c:2049
+#: ../version.c:1040
 msgid "Running in Vi compatible mode"
 msgstr "Vi互換モードで動作中"
 
-#: version.c:2050
+#: ../version.c:1041
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "Vim推奨値にするには    :set nocp<Enter>       "
 
-#: version.c:2051
+#: ../version.c:1042
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "詳細な情報は           :help cp-default<Enter>"
 
-#: version.c:2066
+#: ../version.c:1057
 msgid "menu  Help->Orphans           for information    "
 msgstr "詳細はメニューの ヘルプ→孤児 を参照して下さい   "
 
-#: version.c:2068
+#: ../version.c:1059
 msgid "Running modeless, typed text is inserted"
 msgstr "モード無で実行中, タイプした文字が挿入されます"
 
-#: version.c:2069
+#: ../version.c:1060
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
 msgstr "メニューの 編集→全体設定→挿入(初心者)モード切替"
 
-#: version.c:2070
+#: ../version.c:1061
 msgid "                              for two modes      "
 msgstr "                              でモード有に       "
 
-#: version.c:2074
+#: ../version.c:1065
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr "メニューの 編集→全体設定→Vi互換モード切替      "
 
-#: version.c:2075
+#: ../version.c:1066
 msgid "                              for Vim defaults   "
 msgstr "                              でVimとして動作    "
 
-#: version.c:2122
+#: ../version.c:1113
 msgid "Sponsor Vim development!"
 msgstr "Vimの開発を応援してください!"
 
-#: version.c:2123
+#: ../version.c:1114
 msgid "Become a registered Vim user!"
 msgstr "Vimの登録ユーザになってください!"
 
-#: version.c:2126
+#: ../version.c:1117
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "詳細な情報は           :help sponsor<Enter>   "
 
-#: version.c:2127
+#: ../version.c:1118
 msgid "type  :help register<Enter>   for information "
 msgstr "詳細な情報は           :help register<Enter>  "
 
-#: version.c:2129
+#: ../version.c:1120
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "詳細はメニューの ヘルプ→スポンサー/登録 を参照して下さい   "
 
-#: version.c:2139
+#: ../version.c:1130
 msgid "WARNING: Windows 95/98/ME detected"
 msgstr "   警告: Windows 95/98/Me を検出  "
 
-#: version.c:2142
+#: ../version.c:1133
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr " 詳細な情報は          :help windows95<Enter> "
 
-#: window.c:203
+#: ../window.c:208
 msgid "E441: There is no preview window"
 msgstr "E441: プレビューウィンドウがありません"
 
-#: window.c:581
+#: ../window.c:603
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: 左上と右下を同時に分割することはできません"
 
-#: window.c:1340
+#: ../window.c:1362
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: 他のウィンドウが分割されている時には順回できません"
 
-#: window.c:1836
+#: ../window.c:1858
 msgid "E444: Cannot close last window"
 msgstr "E444: 最後のウィンドウを閉じることはできません"
 
-#: window.c:2567
+#: ../window.c:2593
 msgid "Already only one window"
 msgstr "既にウィンドウは1つしかありません"
 
-#: window.c:2614
+#: ../window.c:2640
 msgid "E445: Other window contains changes"
 msgstr "E445: 他のウィンドウには変更があります"
 
-#: window.c:4480
+#: ../window.c:4564
 msgid "E446: No file name under cursor"
 msgstr "E446: カーソルの下にファイル名がありません"
 
-#: window.c:4599
+#: ../window.c:4683
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: pathには \"%s\" というファイルがありません"
 
-#: globals.h:1232 if_perl.xs:326
-#, 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ライブラリをロードできませんでした."
-
-#: if_perl.xs:607
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: サンドボックスでは Safe "
-"モジュールを使用しないPerlスクリプトは禁じられています"
-
-#: GvimExt/gvimext.cpp:583
-msgid "Edit with &multiple Vims"
-msgstr "各ファイルを別々の Vim で編集(&M)"
-
-#: GvimExt/gvimext.cpp:589
-msgid "Edit with single &Vim"
-msgstr "全ファイルを1つの Vim で編集(&V)"
-
-#: GvimExt/gvimext.cpp:598
-msgid "&Diff with Vim"
-msgstr "Vim で差分編集(&D)"
-
-#: GvimExt/gvimext.cpp:611
-msgid "Edit with &Vim"
-msgstr "Vim で編集(&V)"
-
-#: GvimExt/gvimext.cpp:633
-msgid "Edit with existing Vim - &"
-msgstr "既存の Vim で編集 - &"
-
-#: GvimExt/gvimext.cpp:746
-msgid "Edits the selected file(s) with Vim"
-msgstr "選択されたファイルを Vim で編集"
-
-#: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
-msgid "Error creating process: Check if gvim is in your path!"
-msgstr "起動エラー: gvim にパスが通っているか確かめてください!"
-
-#: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
-msgid "gvimext.dll error"
-msgstr "gvimext.dll エラー"
-
-#: GvimExt/gvimext.cpp:899
-msgid "Path length too long!"
-msgstr "パスが長すぎます!"
-
-#: globals.h:1022
+#: ../globals.h:1056
 msgid "--No lines in buffer--"
 msgstr "--バッファに行がありません--"
 
@@ -6200,388 +6668,418 @@ msgstr "--バッファに行がありません--"
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: globals.h:1185
+#: ../globals.h:1247
 msgid "E470: Command aborted"
 msgstr "E470: コマンドが中断されました"
 
-#: globals.h:1186
+#: ../globals.h:1248
 msgid "E471: Argument required"
 msgstr "E471: 引数が必要です"
 
-#: globals.h:1187
+#: ../globals.h:1249
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ の後は / か ? か & でなければなりません"
 
-#: globals.h:1189
+#: ../globals.h:1251
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: コマンドラインでは無効です; <CR>で実行, CTRL-Cでやめる"
 
-#: globals.h:1191
+#: ../globals.h:1253
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
 "E12: 現在のディレクトリやタグ検索ではexrc/vimrcのコマンドは許可されません"
 
-#: globals.h:1193
+#: ../globals.h:1255
 msgid "E171: Missing :endif"
 msgstr "E171: :endif がありません"
 
-#: globals.h:1194
+#: ../globals.h:1256
 msgid "E600: Missing :endtry"
 msgstr "E600: :endtry がありません"
 
-#: globals.h:1195
+#: ../globals.h:1257
 msgid "E170: Missing :endwhile"
 msgstr "E170: :endwhile がありません"
 
-#: globals.h:1196
+#: ../globals.h:1258
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor がありません"
+
+#: ../globals.h:1259
 msgid "E588: :endwhile without :while"
 msgstr "E588: :while のない :endwhile があります"
 
-#: globals.h:1198
+#: ../globals.h:1260
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor のない :for があります"
+
+#: ../globals.h:1262
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: ファイルが存在します (! を追加で上書)"
 
-#: globals.h:1199
+#: ../globals.h:1263
 msgid "E472: Command failed"
 msgstr "E472: コマンドが失敗しました"
 
-#: globals.h:1201
+#: ../globals.h:1265
 #, c-format
 msgid "E234: Unknown fontset: %s"
 msgstr "E234: 未知のフォントセット: %s"
 
-#: globals.h:1205
+#: ../globals.h:1269
 #, c-format
 msgid "E235: Unknown font: %s"
 msgstr "E235: 未知のフォント: %s"
 
-#: globals.h:1208
+#: ../globals.h:1272
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
 msgstr "E236: フォント \"%s\" は固定幅ではありません"
 
-#: globals.h:1210
+#: ../globals.h:1274
 msgid "E473: Internal error"
 msgstr "E473: 内部エラーです"
 
-#: globals.h:1211
+#: ../globals.h:1275
 msgid "Interrupted"
 msgstr "割込まれました"
 
-#: globals.h:1212
+#: ../globals.h:1276
 msgid "E14: Invalid address"
 msgstr "E14: 無効なアドレスです"
 
-#: globals.h:1213
+#: ../globals.h:1277
 msgid "E474: Invalid argument"
 msgstr "E474: 無効な引数です"
 
-#: globals.h:1214
+#: ../globals.h:1278
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: 無効な引数です: %s"
 
-#: globals.h:1216
+#: ../globals.h:1280
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: 無効な式です: %s"
 
-#: globals.h:1218
+#: ../globals.h:1282
 msgid "E16: Invalid range"
 msgstr "E16: 無効な範囲です"
 
-#: globals.h:1219
+#: ../globals.h:1283
 msgid "E476: Invalid command"
 msgstr "E476: 無効なコマンドです"
 
-#: globals.h:1221
+#: ../globals.h:1285
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" はディレクトリです"
 
-#: globals.h:1224
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: 予期せぬ文字が '=' の前にありました"
-
-#: globals.h:1227
+#: ../globals.h:1288
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: \"%s\"() のライブラリ呼出に失敗しました"
 
-#: globals.h:1233
+#: ../globals.h:1294
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: ライブラリの関数 %s をロードできませんでした"
 
-#: globals.h:1235
+#: ../globals.h:1296
 msgid "E19: Mark has invalid line number"
 msgstr "E19: マークに無効な行番号が指定されていました"
 
-#: globals.h:1236
+#: ../globals.h:1297
 msgid "E20: Mark not set"
 msgstr "E20: マークは設定されていません"
 
-#: globals.h:1237
+#: ../globals.h:1298
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: 'modifiable' がオフなので, 変更できません"
 
-#: globals.h:1238
+#: ../globals.h:1299
 msgid "E22: Scripts nested too deep"
-msgstr "E22: スクリプトの入れ子が深すぎます"
+msgstr "E22: スクリプトの入れ子が深過ぎます"
 
-#: globals.h:1239
+#: ../globals.h:1300
 msgid "E23: No alternate file"
 msgstr "E23: 副ファイルはありません"
 
-#: globals.h:1240
+#: ../globals.h:1301
 msgid "E24: No such abbreviation"
 msgstr "E24: そのような短縮入力はありません"
 
-#: globals.h:1241
+#: ../globals.h:1302
 msgid "E477: No ! allowed"
 msgstr "E477: ! は許可されていません"
 
-#: globals.h:1243
+#: ../globals.h:1304
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: GUIは使用不可能です: コンパイル時に無効にされています"
 
-#: globals.h:1246
+#: ../globals.h:1307
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: ヘブライ語は使用不可能です: コンパイル時に無効にされています\n"
 
-#: globals.h:1249
+#: ../globals.h:1310
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
 msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
 
-#: globals.h:1252
+#: ../globals.h:1313
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
 
-#: globals.h:1255
+#: ../globals.h:1316
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: そのような名のハイライトグループはありません: %s"
 
-#: globals.h:1257
+#: ../globals.h:1318
 msgid "E29: No inserted text yet"
 msgstr "E29: まだテキストが挿入されていません"
 
-#: globals.h:1258
+#: ../globals.h:1319
 msgid "E30: No previous command line"
 msgstr "E30: 以前にコマンド行がありません"
 
-#: globals.h:1259
+#: ../globals.h:1320
 msgid "E31: No such mapping"
 msgstr "E31: そのようなマッピングはありません"
 
-#: globals.h:1260
+#: ../globals.h:1321
 msgid "E479: No match"
 msgstr "E479: 該当はありません"
 
-#: globals.h:1261
+#: ../globals.h:1322
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: 該当はありません: %s"
 
-#: globals.h:1262
+#: ../globals.h:1323
 msgid "E32: No file name"
 msgstr "E32: ファイル名がありません"
 
-#: globals.h:1263
+#: ../globals.h:1324
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: 正規表現置換がまだ実行されていません"
 
-#: globals.h:1264
+#: ../globals.h:1325
 msgid "E34: No previous command"
 msgstr "E34: コマンドがまだ実行されていません"
 
-#: globals.h:1265
+#: ../globals.h:1326
 msgid "E35: No previous regular expression"
 msgstr "E35: 正規表現がまだ実行されていません"
 
-#: globals.h:1266
+#: ../globals.h:1327
 msgid "E481: No range allowed"
 msgstr "E481: 範囲指定は許可されていません"
 
-#: globals.h:1268
+#: ../globals.h:1329
 msgid "E36: Not enough room"
 msgstr "E36: 充分な容量がありません"
 
-#: globals.h:1271
+#: ../globals.h:1332
 #, c-format
 msgid "E247: no registered server named \"%s\""
 msgstr "E247: %s という名前の登録されたサーバはありません"
 
-#: globals.h:1273
+#: ../globals.h:1334
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: ファイル %s を作成できません"
 
-#: globals.h:1274
+#: ../globals.h:1335
 msgid "E483: Can't get temp file name"
 msgstr "E483: 一時ファイルの名前を取得できません"
 
-#: globals.h:1275
+#: ../globals.h:1336
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: ファイル \"%s\" を開けません"
 
-#: globals.h:1276
+#: ../globals.h:1337
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: ファイル %s を読込めません"
 
-#: globals.h:1277
+#: ../globals.h:1338
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
 
-#: globals.h:1278
+#: ../globals.h:1339
 msgid "E38: Null argument"
 msgstr "E38: 引数が空です"
 
-#: globals.h:1280
+#: ../globals.h:1341
 msgid "E39: Number expected"
 msgstr "E39: 数値が要求されています"
 
-#: globals.h:1283
+#: ../globals.h:1344
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: エラーファイル %s を開けません"
 
-#: globals.h:1286
+#: ../globals.h:1347
 msgid "E233: cannot open display"
 msgstr "E233: ディスプレイを開けません"
 
-#: globals.h:1288
+#: ../globals.h:1349
 msgid "E41: Out of memory!"
 msgstr "E41: メモリが尽き果てました!"
 
-#: globals.h:1290
+#: ../globals.h:1351
 msgid "Pattern not found"
 msgstr "パターンはみつかりませんでした"
 
-#: globals.h:1292
+#: ../globals.h:1353
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: パターンはみつかりませんでした: %s"
 
-#: globals.h:1293
+#: ../globals.h:1354
 msgid "E487: Argument must be positive"
 msgstr "E487: 引数は正の値でなければなりません"
 
-#: globals.h:1295
+#: ../globals.h:1356
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: 前のディレクトリに戻れません"
 
-#: globals.h:1299
+#: ../globals.h:1360
 msgid "E42: No Errors"
 msgstr "E42: エラーはありません"
 
-#: globals.h:1301
+#: ../globals.h:1362
 msgid "E43: Damaged match string"
 msgstr "E43: 該当文字列が破損しています"
 
-#: globals.h:1302
+#: ../globals.h:1363
 msgid "E44: Corrupted regexp program"
 msgstr "E44: 不正な正規表現プログラムです"
 
-#: globals.h:1303
+#: ../globals.h:1364
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: 'readonly' オプションが設定されています (! を追加で上書き)"
 
-#: globals.h:1305
+#: ../globals.h:1366
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
+
+#: ../globals.h:1367
 #, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: 読取専用変数 \"%s\" に設定することはできません"
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: サンドボックスでは変数 \"%s\" に値を設定できません"
 
-#: globals.h:1308
+#: ../globals.h:1370
 msgid "E47: Error while reading errorfile"
 msgstr "E47: エラーファイルの読込中にエラーが発生しました"
 
-#: globals.h:1311
+#: ../globals.h:1373
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: サンドボックスでは許されません"
 
-#: globals.h:1313
+#: ../globals.h:1375
 msgid "E523: Not allowed here"
 msgstr "E523: ここでは許可されません"
 
-#: globals.h:1316
+#: ../globals.h:1378
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: スクリーンモードの設定には対応していません"
 
-#: globals.h:1318
+#: ../globals.h:1380
 msgid "E49: Invalid scroll size"
 msgstr "E49: 無効なスクロール量です"
 
-#: globals.h:1319
+#: ../globals.h:1381
 msgid "E91: 'shell' option is empty"
 msgstr "E91: 'shell' オプションが空です"
 
-#: globals.h:1321
+#: ../globals.h:1383
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: sign のデータを読込めませんでした"
 
-#: globals.h:1323
+#: ../globals.h:1385
 msgid "E72: Close error on swap file"
 msgstr "E72: スワップファイルのクローズ時エラーです"
 
-#: globals.h:1324
+#: ../globals.h:1386
 msgid "E73: tag stack empty"
 msgstr "E73: タグスタックが空です"
 
-#: globals.h:1325
+#: ../globals.h:1387
 msgid "E74: Command too complex"
-msgstr "E74: コマンドが複雑すぎます"
+msgstr "E74: コマンドが複雑過ぎます"
 
-#: globals.h:1326
+#: ../globals.h:1388
 msgid "E75: Name too long"
-msgstr "E75: 名前が長すぎます"
+msgstr "E75: 名前が長過ぎます"
 
-#: globals.h:1327
+#: ../globals.h:1389
 msgid "E76: Too many ["
-msgstr "E76: [ が多すぎます"
+msgstr "E76: [ が多過ぎます"
 
-#: globals.h:1328
+#: ../globals.h:1390
 msgid "E77: Too many file names"
-msgstr "E77: ファイル名が多すぎます"
+msgstr "E77: ファイル名が多過ぎます"
 
-#: globals.h:1329
+#: ../globals.h:1391
 msgid "E488: Trailing characters"
 msgstr "E488: 余分な文字が後ろにあります"
 
-#: globals.h:1330
+#: ../globals.h:1392
 msgid "E78: Unknown mark"
 msgstr "E78: 未知のマーク"
 
-#: globals.h:1331
+#: ../globals.h:1393
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: ワイルドカードを展開できません"
 
-#: globals.h:1333
+#: ../globals.h:1395
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' は 'winminheight' より小さくできません"
 
-#: globals.h:1335
+#: ../globals.h:1397
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' は 'winminwidth' より小さくできません"
 
-#: globals.h:1338
+#: ../globals.h:1400
 msgid "E80: Error while writing"
 msgstr "E80: 書込み中のエラー"
 
-#: globals.h:1339
+#: ../globals.h:1401
 msgid "Zero count"
 msgstr "ゼロカウント"
 
-#: globals.h:1341
+#: ../globals.h:1403
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: スクリプト以外で<SID>が使われました"
 
-#: globals.h:1344
+#: ../globals.h:1406
 msgid "E449: Invalid expression received"
 msgstr "E449: 無効な式を受け取りました"
 
-#: globals.h:1347
+#: ../globals.h:1409
 msgid "E463: Region is guarded, cannot modify"
 msgstr "E463: 領域が保護されているので, 変更できません"
+
+#: ../globals.h:1410
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
+
+#: ../globals.h:1413
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 内部エラーです: %s"
+
+#: ../globals.h:1416
+msgid "E361: Crash intercepted; regexp too complex?"
+msgstr "E361: クラッシュにより中断; 正規表現が複雑過ぎるかも?"
+
+#: ../globals.h:1418
+msgid "E363: pattern caused out-of-stack error"
+msgstr "E363: パターンによるスタック不足エラーです"
+
+#: ../globals.h:1419
+msgid "E749: empty buffer"
+msgstr "E749: バッファが空です"
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index ae5c110c3..a7c6e3406 100644
--- a/src/po/ja.sjis.po
+++ b/src/po/ja.sjis.po
@@ -3,188 +3,188 @@
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-4.
-# Last Change: 29-Apr-2004.
+# MURAOKA Taro <koron@tka.att.ne.jp>, 2001-5.
+# Last Change: 05-Mar-2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Vim 6.2\n"
-"POT-Creation-Date: 2004-04-29 13:16+0900\n"
-"PO-Revision-Date: 2004-04-29 13:00+0900\n"
+"Project-Id-Version: Vim 7.0\n"
+"POT-Creation-Date: 2005-03-04 13:11+0900\n"
+"PO-Revision-Date: 2004-03-05 00:50+0900\n"
 "Last-Translator: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "Language-Team: MURAOKA Taro <koron@tka.att.ne.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp932\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: buffer.c:102
+#: ../buffer.c:102
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: �o�b�t�@��1��������������������, �I��������..."
 
-#: buffer.c:105
+#: ../buffer.c:105
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: �o�b�t�@������������������, �������g�p������..."
 
-#: buffer.c:805
+#: ../buffer.c:857
 msgid "E515: No buffers were unloaded"
 msgstr "E515: �����������o�b�t�@������������"
 
-#: buffer.c:807
+#: ../buffer.c:859
 msgid "E516: No buffers were deleted"
 msgstr "E516: �����������o�b�t�@������������"
 
-#: buffer.c:809
+#: ../buffer.c:861
 msgid "E517: No buffers were wiped out"
 msgstr "E517: �j���������o�b�t�@������������"
 
-#: buffer.c:817
+#: ../buffer.c:869
 msgid "1 buffer unloaded"
 msgstr "1 �����o�b�t�@����������������"
 
-#: buffer.c:819
+#: ../buffer.c:871
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d �����o�b�t�@����������������"
 
-#: buffer.c:824
+#: ../buffer.c:876
 msgid "1 buffer deleted"
 msgstr "1 �����o�b�t�@����������������"
 
-#: buffer.c:826
+#: ../buffer.c:878
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d �����o�b�t�@����������������"
 
-#: buffer.c:831
+#: ../buffer.c:883
 msgid "1 buffer wiped out"
 msgstr "1 �����o�b�t�@���j������������"
 
-#: buffer.c:833
+#: ../buffer.c:885
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d �����o�b�t�@���j������������"
 
-#: buffer.c:894
+#: ../buffer.c:946
 msgid "E84: No modified buffer found"
 msgstr "E84: ���X�������o�b�t�@������������"
 
 #. back where we started, didn't find anything.
-#: buffer.c:933
+#: ../buffer.c:985
 msgid "E85: There is no listed buffer"
 msgstr "E85: ���X�g�\\ｦ�������o�b�t�@������������"
 
-#: buffer.c:945
+#: ../buffer.c:997
 #, c-format
 msgid "E86: Buffer %ld does not exist"
 msgstr "E86: �o�b�t�@ %ld ������������"
 
-#: buffer.c:948
+#: ../buffer.c:1000
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: �������o�b�t�@���z��������������������"
 
-#: buffer.c:950
+#: ../buffer.c:1002
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: �������o�b�t�@�����O������������������"
 
-#: buffer.c:988
+#: ../buffer.c:1044
 #, c-format
 msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr "E89: �o�b�t�@ %ld �����X�������������������� (! �����X���j��)"
 
-#: buffer.c:1005
+#: ../buffer.c:1061
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: �������o�b�t�@����������������"
 
-#: buffer.c:1538
+#: ../buffer.c:1611
 msgid "W14: Warning: List of file names overflow"
-msgstr "W14: �x��: �t�@�C���������X�g������������"
+msgstr "W14: �x��: �t�@�C���������X�g������������"
 
-#: buffer.c:1709
+#: ../buffer.c:1795
 #, c-format
 msgid "E92: Buffer %ld not found"
 msgstr "E92: �o�b�t�@ %ld ����������������"
 
-#: buffer.c:1940
+#: ../buffer.c:2058
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s ���������Y��������������"
 
-#: buffer.c:1942
+#: ../buffer.c:2060
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s ���Y�������o�b�t�@������������������"
 
-#: buffer.c:2337
+#: ../buffer.c:2473
 #, c-format
 msgid "line %ld"
 msgstr "�s %ld"
 
-#: buffer.c:2420
+#: ../buffer.c:2561
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: �������O���o�b�t�@��������������"
 
-#: buffer.c:2713
+#: ../buffer.c:2878
 msgid " [Modified]"
 msgstr " [���X����]"
 
-#: buffer.c:2718
+#: ../buffer.c:2883
 msgid "[Not edited]"
 msgstr "[�����W]"
 
-#: buffer.c:2723
+#: ../buffer.c:2888
 msgid "[New file]"
 msgstr "[�V�t�@�C��]"
 
-#: buffer.c:2724
+#: ../buffer.c:2889
 msgid "[Read errors]"
 msgstr "[�����G���[]"
 
-#: buffer.c:2726 fileio.c:2049
+#: ../buffer.c:2891 ../fileio.c:2106 ../netbeans.c:3418
 msgid "[readonly]"
 msgstr "[�������p]"
 
-#: buffer.c:2747
+#: ../buffer.c:2912
 msgid "1 line --%d%%--"
 msgstr "1 �s --%d%%--"
 
-#: buffer.c:2749
+#: ../buffer.c:2914
 msgid "%ld lines --%d%%--"
 msgstr "%ld �s --%d%%--"
 
-#: buffer.c:2756
+#: ../buffer.c:2921
 msgid "line %ld of %ld --%d%%-- col "
 msgstr "�s %ld (�S�� %ld) --%d%%-- col "
 
-#: buffer.c:2864
-msgid "[No file]"
-msgstr "[����]"
+#: ../buffer.c:3029 ../buffer.c:4750 ../memline.c:1657
+msgid "[No Name]"
+msgstr "[����]"
 
 #. must be a help buffer
-#: buffer.c:2904
+#: ../buffer.c:3068
 msgid "help"
 msgstr "�w���v"
 
-#: buffer.c:3463 screen.c:5038
+#: ../buffer.c:3619 ../screen.c:5071
 msgid "[help]"
 msgstr "[�w���v]"
 
-#: buffer.c:3495 screen.c:5044
+#: ../buffer.c:3651 ../screen.c:5077
 msgid "[Preview]"
 msgstr "[�v���r���[]"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "All"
 msgstr "�S��"
 
-#: buffer.c:3775
+#: ../buffer.c:3931
 msgid "Bot"
 msgstr "����"
 
-#: buffer.c:3777
+#: ../buffer.c:3933
 msgid "Top"
 msgstr "����"
 
-#: buffer.c:4523
+#: ../buffer.c:4702
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -192,15 +192,11 @@ msgstr ""
 "\n"
 "# �o�b�t�@���X�g:\n"
 
-#: buffer.c:4556
+#: ../buffer.c:4737
 msgid "[Error List]"
 msgstr "[�G���[���X�g]"
 
-#: buffer.c:4569 memline.c:1520
-msgid "[No File]"
-msgstr "[����]"
-
-#: buffer.c:4882
+#: ../buffer.c:5063
 msgid ""
 "\n"
 "--- Signs ---"
@@ -208,150 +204,154 @@ msgstr ""
 "\n"
 "--- �T�C�� ---"
 
-#: buffer.c:4901
+#: ../buffer.c:5082
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s ���T�C��:"
 
-#: buffer.c:4907
+#: ../buffer.c:5088
 #, c-format
 msgid "    line=%ld  id=%d  name=%s"
 msgstr "    �s=%ld  ｯ���q=%d  ���O=%s"
 
-#: diff.c:139
+#: ../diff.c:163
 #, c-format
 msgid "E96: Can not diff more than %ld buffers"
 msgstr "E96: %ld �������o�b�t�@��diff����������"
 
-#: diff.c:709
+#: ../diff.c:737
 msgid "E97: Cannot create diffs"
 msgstr "E97: �������������������� "
 
-#: diff.c:814
+#: ../diff.c:843
 msgid "Patch file"
 msgstr "�p�b�`�t�@�C��"
 
-#: diff.c:1065
+#: ../diff.c:1146
 msgid "E98: Cannot read diff output"
 msgstr "E98: diff���o����������������"
 
-#: diff.c:1815
+#: ../diff.c:1896
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: �������o�b�t�@���������[�h��������������"
 
-#: diff.c:1827
+#: ../diff.c:1908
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: �������[�h�����������o�b�t�@������������"
 
-#: diff.c:1835
+#: ../diff.c:1916
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: �������[�h���o�b�t�@��2���������������A�������g������������������"
 
-#: diff.c:1858
+#: ../diff.c:1939
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: �o�b�t�@ \"%s\" ����������������"
 
-#: diff.c:1864
+#: ../diff.c:1945
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: �o�b�t�@ \"%s\" ���������[�h��������������"
 
-#: digraph.c:2199
+#: ../digraph.c:2200
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: ������Escape���g�p����������"
 
-#: digraph.c:2384
+#: ../digraph.c:2384
 msgid "E544: Keymap file not found"
 msgstr "E544: �L�[�}�b�v�t�@�C������������������"
 
-#: digraph.c:2411
+#: ../digraph.c:2411
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source ���������t�@�C�����O���� :loadkeymap ���g��������"
 
-#: edit.c:40
+#: ../edit.c:41
 msgid " Keyword completion (^N^P)"
 msgstr " �L�[���[�h���� (^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 ���[�h (^E^Y^L^]^F^I^K^D^V^N^P)"
+#: ../edit.c:42
+msgid " ^X mode (^E^Y^L^]^F^I^K^D^U^V^N^P)"
+msgstr " ^X ���[�h (^E^Y^L^]^F^I^K^D^U^V^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
+#: ../edit.c:45
 msgid " Keyword Local completion (^N^P)"
 msgstr " �����L�[���[�h���� (^N^P)"
 
-#: edit.c:45
+#: ../edit.c:46
 msgid " Whole line completion (^L^N^P)"
 msgstr " �s(�S��)���� (^L^N^P)"
 
-#: edit.c:46
+#: ../edit.c:47
 msgid " File name completion (^F^N^P)"
 msgstr "�t�@�C�������� (^F^N^P)"
 
-#: edit.c:47
+#: ../edit.c:48
 msgid " Tag completion (^]^N^P)"
 msgstr " �^�O���� (^]^N^P)"
 
-#: edit.c:48
+#: ../edit.c:49
 msgid " Path pattern completion (^N^P)"
 msgstr " �p�X�p�^�[������ (^N^P)"
 
-#: edit.c:49
+#: ../edit.c:50
 msgid " Definition completion (^D^N^P)"
 msgstr " ���`���� (^D^N^P)"
 
-#: edit.c:51
+#: ../edit.c:52
 msgid " Dictionary completion (^K^N^P)"
 msgstr " ｫ������ (^K^N^P)"
 
-#: edit.c:52
+#: ../edit.c:53
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " �V�\\�[���X���� (^T^N^P)"
 
-#: edit.c:53
+#: ../edit.c:54
 msgid " Command-line completion (^V^N^P)"
 msgstr " �R�}���h���C������ (^V^N^P)"
 
-#: edit.c:56
+#: ../edit.c:55
+msgid " User defined completion (^U^N^P)"
+msgstr " ���[�U���`���� (^U^N^P)"
+
+#: ../edit.c:58
 msgid "Hit end of paragraph"
 msgstr "�i�����������q�b�g"
 
-#: edit.c:962
+#: ../edit.c:994
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' �I�v�V������������"
 
-#: edit.c:1166
+#: ../edit.c:1204
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' �I�v�V������������"
 
-#: edit.c:2162
+#: ../edit.c:2204
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "ｫ�����X�L������: %s"
 
-#: edit.c:2368
+#: ../edit.c:2410
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (�}��) �X�N���[��(^E/^Y)"
 
-#: edit.c:2370
+#: ../edit.c:2412
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (�u��) �X�N���[�� (^E/^Y)"
 
-#: edit.c:2684
+#: ../edit.c:2813
 #, c-format
 msgid "Scanning: %s"
 msgstr "�X�L������: %s"
 
-#: edit.c:2719
+#: ../edit.c:2848
 msgid "Scanning tags."
 msgstr "�^�O���X�L������."
 
-#: edit.c:3381
+#: ../edit.c:3549
 msgid " Adding"
 msgstr " ������"
 
@@ -359,121 +359,283 @@ msgstr " ������"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: edit.c:3430
+#: ../edit.c:3598
 msgid "-- Searching..."
 msgstr "-- ������..."
 
-#: edit.c:3486
+#: ../edit.c:3654
 msgid "Back at original"
 msgstr "�n��������"
 
-#: edit.c:3491
+#: ../edit.c:3659
 msgid "Word from other line"
 msgstr "�����s���P��"
 
-#: edit.c:3496
+#: ../edit.c:3664
 msgid "The only match"
 msgstr "�B�����Y��"
 
-#: edit.c:3555
+#: ../edit.c:3723
 #, c-format
 msgid "match %d of %d"
 msgstr "%d �������Y�� (�S�Y�� %d ����)"
 
-#: edit.c:3558
+#: ../edit.c:3726
 #, c-format
 msgid "match %d"
 msgstr "%d �������Y��"
 
-#. Skip further arguments but do continue to
-#. * search for a trailing command.
-#: eval.c:1024
+#: ../eval.c:93
+msgid "E18: Unexpected characters in :let"
+msgstr "E18: �\\������������ :let ������������"
+
+#: ../eval.c:94
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: ���X�g���C���f�b�N�X�������O����: %ld"
+
+#: ../eval.c:95
+#, c-format
+msgid "E121: Undefined variable: %s"
+msgstr "E121: �����`����������: %s"
+
+#: ../eval.c:96
+msgid "E111: Missing ']'"
+msgstr "E111: ']' ����������������"
+
+#: ../eval.c:97
 #, c-format
-msgid "E106: Unknown variable: \"%s\""
-msgstr "E106: ���m������: \"%s\""
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �����������X�g�^��������������������"
+
+#: ../eval.c:98
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionaary"
+msgstr "E712: %s �����������X�g�^������ｫ���^��������������������"
+
+#: ../eval.c:99
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: ｫ���^�������L�[���g������������������"
+
+#: ../eval.c:100
+msgid "E714: List required"
+msgstr "E471: ���X�g�^���K�v����"
+
+#: ../eval.c:101
+msgid "E715: Dictionary required"
+msgstr "E715: ｫ���^���K�v����"
+
+#: ../eval.c:102
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: ����������������������: %s"
+
+#: ../eval.c:103
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: ｫ���^���L�[��������������: %s"
+
+#: ../eval.c:104
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: ���� %s �����`������, �����`�������� ! ������������������"
+
+#: ../eval.c:105
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: ｫ���^�����G���g������������������"
+
+#: ../eval.c:106
+msgid "E718: Funcref required"
+msgstr "E718: �����Q���^���v����������"
+
+#: ../eval.c:107
+msgid "E719: Cannot use [:] with a Dictionary"
+msgstr "E719: [:] ��ｫ���^���g�������������g��������"
+
+#: ../eval.c:108
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: ���������^���������� %s="
+
+#: ../eval.c:109
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ���m����������: %s"
+
+#: ../eval.c:1428
+msgid "E687: Less targets than List items"
+msgstr "E687: �^�[�Q�b�g�����X�g�^�����v�f����������������"
+
+#: ../eval.c:1433
+msgid "E688: More targets than List items"
+msgstr "E688: �^�[�Q�b�g�����X�g�^�����v�f��������������"
+
+#: ../eval.c:1519
+msgid "Double ; in list of variables"
+msgstr "���X�g�^���l��2�������� ; �����o����������"
+
+#: ../eval.c:1685
+#, c-format
+msgid "E738: Can't list variables for %s"
+msgstr "E738: %s ���l�������\\ｦ����������"
+
+#: ../eval.c:2020
+msgid "E689: Can only index a List or Dictionary"
+msgstr "E689: ���X�g�^��ｫ���^���O���C���f�b�N�X�w������������"
+
+#: ../eval.c:2026
+msgid "E708: [:] must come last"
+msgstr "E708: [:] ��������������������������"
+
+#: ../eval.c:2072
+msgid "E709: [:] requires a List value"
+msgstr "E709: [:] �������X�g�^���l���K�v����"
+
+#: ../eval.c:2308
+msgid "E710: List value has more items than target"
+msgstr "E710: ���X�g�^�������^�[�Q�b�g�����������v�f����������"
+
+#: ../eval.c:2312
+msgid "E711: List value has not enough items"
+msgstr "E711: ���X�g�^�������\\���������v�f������������"
+
+#
+#: ../eval.c:2506
+msgid "E690: Missing \"in\" after :for"
+msgstr "E690: :for ������ \"in\" ������������"
 
-#: eval.c:1320
+#: ../eval.c:2721
 #, c-format
 msgid "E107: Missing braces: %s"
 msgstr "E107: �J�b�R '(' ������������: %s"
 
-#: eval.c:1435 eval.c:1449
+#: ../eval.c:2947
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: ��������������������: \"%s\""
 
-#: eval.c:1705
+#: ../eval.c:3034
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: (�A���`)���b�N�������������������q���[��������"
+
+#: ../eval.c:3336
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' ������ ':' ������������"
 
-#: eval.c:2327
+#: ../eval.c:3628
+msgid "E691: Can only compare List with List"
+msgstr "E691: ���X�g�^�����X�g�^���������r����������"
+
+#: ../eval.c:3630
+msgid "E692: Invalid operation for Lists"
+msgstr "E692: ���X�g�^������������������"
+
+#: ../eval.c:3657
+msgid "E735: Can only compare Dictionary with Dictionary"
+msgstr "E735: ｫ���^��ｫ���^���������r����������"
+
+#: ../eval.c:3659
+msgid "E736: Invalid operation for Dictionary"
+msgstr "E736: ｫ���^������������������"
+
+#: ../eval.c:3679
+msgid "E693: Can only compare Funcref with Funcref"
+msgstr "E693: �����Q���^�������Q���^���������r����������"
+
+#: ../eval.c:3681
+msgid "E694: Invalid operation for Funcrefs"
+msgstr "E694: �����Q���^������������������"
+
+#: ../eval.c:4086
 msgid "E110: Missing ')'"
 msgstr "E110: ')' ����������������"
 
-#: eval.c:2389
-msgid "E111: Missing ']'"
-msgstr "E111: ']' ����������������"
+#: ../eval.c:4193
+msgid "E695: Cannot index a Funcref"
+msgstr "E695: �����Q���^���C���f�b�N�X����������"
 
-#: eval.c:2466
+#: ../eval.c:4432
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: �I�v�V������������������: %s"
 
-#: eval.c:2484
+#: ../eval.c:4450
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: ���m���I�v�V��������: %s"
 
-#: eval.c:2555
+#: ../eval.c:4516
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: ���p�� (\") ������������: %s"
 
-#: eval.c:2698
+#: ../eval.c:4652
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: ���p�� (') ������������: %s"
 
-#: eval.c:3054
+#: ../eval.c:4731
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ���� %s ������������������"
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: ���X�g�^���J���}������������: %s"
 
-#: eval.c:3083
+#: ../eval.c:4739
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ���m����������: %s"
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ���X�g�^�������� ']' ������������: %s"
 
-#: eval.c:3084
+#: ../eval.c:5768
 #, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ����������������������: %s"
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: ｫ���^���R����������������: %s"
+
+#: ../eval.c:5791
+msgid "E721: Duplicate key in Dictionary"
+msgstr "E721: ｫ���^���d���L�[����������������"
 
-#: eval.c:3085
+#: ../eval.c:5811
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ����������������������: %s"
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: ｫ���^���J���}������������: %s"
 
-#: eval.c:3086
+#: ../eval.c:5819
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: �X�N���v�g���O��<SID>���g����������: %s"
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: ｫ���^�������� '}' ������������: %s"
+
+#: ../eval.c:5855
+msgid "E724: variable nested too deep for displaying"
+msgstr "E724: �\\ｦ�������������������q���[��������"
+
+#: ../eval.c:7098
+msgid "E699: Too many arguments"
+msgstr "E699: ������������"
 
 #.
 #. * Yes this is ugly, I don't particularly like it either.  But doing it
 #. * this way has the compelling advantage that translations need not to
 #. * be touched at all.  See below what 'ok' and 'ync' are used for.
 #.
-#: eval.c:3687 gui.c:4376 gui_gtk.c:2059
+#: ../eval.c:7253 ../gui.c:4390 ../gui_gtk.c:2137 ../os_mswin.c:602
 msgid "&Ok"
 msgstr "&Ok"
 
-#: eval.c:4226
+#: ../eval.c:7859
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: %s �������L�[����������������"
+
+#: ../eval.c:8339
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld �s:"
 
-#: eval.c:5477
+#: ../eval.c:8428
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: ���m����������: %s"
+
+#: ../eval.c:9966
 msgid ""
 "&OK\n"
 "&Cancel"
@@ -481,130 +643,195 @@ msgstr ""
 "����(&O)\n"
 "�L�����Z��(&C)"
 
-#: eval.c:5517
+#: ../eval.c:10005
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() �� inputsave() ����������������������"
 
-# Added at 10-Mar-2004.
-#: eval.c:5977
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: �V���{���b�N�����N������������ (�z�������������\\������������)"
+#: ../eval.c:10155
+msgid "E745: Range not allowed"
+msgstr "E745: �����w����������������������"
+
+#: ../eval.c:10358
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() �����������^����"
+
+#: ../eval.c:11090
+msgid "E726: Stride is zero"
+msgstr "E726: �X�g���C�h(�O�i��)�� 0 ����"
+
+#: ../eval.c:11092
+msgid "E727: Start past end"
+msgstr "E727: �J�n���u���I�����u���z��������"
 
-#: eval.c:6609
+#: ../eval.c:11163 ../eval.c:13672
+msgid "<empty>"
+msgstr "<��>"
+
+#: ../eval.c:11287
 msgid "E240: No connection to Vim server"
 msgstr "E240: Vim �T�[�o��������������������"
 
-#: eval.c:6706
+#: ../eval.c:11333
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s ����������������������"
+
+#: ../eval.c:11465
 msgid "E277: Unable to read a server reply"
 msgstr "E277: �T�[�o������������������"
 
-#: eval.c:6734
+# Added at 10-Mar-2004.
+#: ../eval.c:11720
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: �V���{���b�N�����N������������ (�z�������������\\������������)"
+
+#: ../eval.c:12144
 msgid "E258: Unable to send to client"
 msgstr "E258: �N���C�A���g����������������������"
 
-#: eval.c:6782
-#, c-format
-msgid "E241: Unable to send to %s"
-msgstr "E241: %s ����������������������"
+#: ../eval.c:12551
+msgid "E702: Sort compare function failed"
+msgstr "E702: �\\�[�g�����r������ｸ�s��������"
 
-#: eval.c:6882
+#: ../eval.c:12670
 msgid "(Invalid)"
 msgstr "(����)"
 
-#: eval.c:8060
+#: ../eval.c:13088
+msgid "E677: Error writing temp file"
+msgstr "E677: �����t�@�C�����������G���[��������������"
+
+#: ../eval.c:14421
+msgid "E703: Using a Funcref as a number"
+msgstr "E703: �����Q���^�����l�������������������B"
+
+#: ../eval.c:14429
+msgid "E745: Using a List as a number"
+msgstr "E745: ���X�g�^�����l������������������"
+
+#: ../eval.c:14432
+msgid "E728: Using a Dictionary as a number"
+msgstr "E728: ｫ���^�����l������������������"
+
+#: ../eval.c:14490
+msgid "E729: using Funcref as a String"
+msgstr "E729: �����Q���^��������������������������"
+
+#: ../eval.c:14493
+msgid "E730: using List as a String"
+msgstr "E730: ���X�g�^��������������������������"
+
+#: ../eval.c:14496
+msgid "E731: using Dictionary as a String"
+msgstr "E731: �����^��������������������������"
+
+#: ../eval.c:14826
 #, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: �����`����������: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: �����Q���^�����������������n����������������������: %s"
+
+#: ../eval.c:14831
+#, c-format
+msgid "705: Variable name conflicts with existing function: %s"
+msgstr "705: ��������������������������������: %s"
 
-#: eval.c:8492
+#: ../eval.c:14840
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: �s��������������: %s"
 
-#: eval.c:8784
+#: ../eval.c:14857
 #, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ���� %s �����`������, �����`�������� ! ������������������"
+msgid "E706: Variable type mismatch for: %s"
+msgstr "E706: �������^�����v��������: %s"
+
+#: ../eval.c:14946
+#, c-format
+msgid "E741: Value is locked: %s"
+msgstr "E741: �l�����b�N������������: %s"
+
+#: ../eval.c:14947 ../eval.c:14953 ../os_mswin.c:2206
+msgid "Unknown"
+msgstr "�s��"
 
-#: eval.c:8857
+#: ../eval.c:14952
 #, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: �����`����������: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: %s ���l�����X����������"
+
+#: ../eval.c:15030
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: �R�s�[���������������������q���[��������"
 
-#: eval.c:8870
+#: ../eval.c:15458
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: '(' ������������: %s"
 
-#: eval.c:8903
+#: ../eval.c:15491
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: �s������������: %s"
 
-#: eval.c:8982
+#: ../eval.c:15579
 msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction ������������"
 
-#: eval.c:9089
+#: ../eval.c:15765
 #, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ���� %s �������`����������: �g�p������"
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: ���������X�N���v�g���t�@�C���������v��������: %s"
 
-#: eval.c:9159
+#: ../eval.c:15878
 msgid "E129: Function name required"
 msgstr "E129: ���������v����������"
 
-#: eval.c:9210
+#: ../eval.c:15963
 #, c-format
-msgid "E128: Function name must start with a capital: %s"
-msgstr "E128: �����������������n����������������������: %s"
+msgid "E128: Function name must start with a capital or contain a colon: %s"
+msgstr "E128: �����������������n�������R����������������������������: %s"
 
-#: eval.c:9402
-#, c-format
-msgid "E130: Undefined function: %s"
-msgstr "E130: �����`����������: %s"
-
-#: eval.c:9407
+#: ../eval.c:16441
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: ���� %s ����������������: �g�p������"
 
-#: eval.c:9455
+#: ../eval.c:16561
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: �������o�������q���� 'maxfuncdepth' ������������"
 
 #. always scroll up, don't overwrite
-#: eval.c:9508
+#: ../eval.c:16691
 #, c-format
 msgid "calling %s"
 msgstr "%s ��ﾀ�s������"
 
-#: eval.c:9570
+#: ../eval.c:16785
 #, c-format
 msgid "%s aborted"
 msgstr "%s �����f����������"
 
-#: eval.c:9572
+#: ../eval.c:16787
 #, c-format
 msgid "%s returning #%ld"
 msgstr "%s �� #%ld ������������"
 
-#: eval.c:9579
+#: ../eval.c:16797
 #, c-format
-msgid "%s returning \"%s\""
-msgstr "%s �� \"%s\" ������������"
+msgid "%s returning %s"
+msgstr "%s �� %s ������������"
 
 #. always scroll up, don't overwrite
-#: eval.c:9595 ex_cmds2.c:2365
+#: ../eval.c:16818 ../ex_cmds2.c:2933
 #, c-format
 msgid "continuing in %s"
 msgstr "%s ��ﾀ�s���p��������"
 
-#: eval.c:9621
+#: ../eval.c:16866
 msgid "E133: :return not inside a function"
 msgstr "E133: �����O�� :return ������������"
 
-#: eval.c:9952
+#: ../eval.c:17266
 msgid ""
 "\n"
 "# global variables:\n"
@@ -612,95 +839,95 @@ msgstr ""
 "\n"
 "# �O���[�o������:\n"
 
-#: ex_cmds.c:92
+#: ../ex_cmds.c:92
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16�i�� %02x,  8�i�� %03o"
 
-#: ex_cmds.c:118
+#: ../ex_cmds.c:118
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16�i�� %04x, 8�i�� %o"
 
-#: ex_cmds.c:119
+#: ../ex_cmds.c:119
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16�i�� %08x, 8�i�� %o"
 
-#: ex_cmds.c:430
+#: ../ex_cmds.c:430
 msgid "E134: Move lines into themselves"
 msgstr "E134: �s������ｩ�g������������������"
 
-#: ex_cmds.c:499
+#: ../ex_cmds.c:499
 msgid "1 line moved"
 msgstr "1 �s����������������"
 
-#: ex_cmds.c:501
+#: ../ex_cmds.c:501
 #, c-format
 msgid "%ld lines moved"
 msgstr "%ld �s����������������"
 
-#: ex_cmds.c:924
+#: ../ex_cmds.c:977
 #, c-format
 msgid "%ld lines filtered"
 msgstr "%ld �s���t�B���^��������������"
 
-#: ex_cmds.c:952
+#: ../ex_cmds.c:1005
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *�t�B���^* autocommand���������o�b�t�@�����X����������������"
 
-#: ex_cmds.c:1037
+#: ../ex_cmds.c:1090
 msgid "[No write since last change]\n"
 msgstr "[���������X��������������������]\n"
 
-#: ex_cmds.c:1283
+#: ../ex_cmds.c:1340
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s �s��: "
 
-#: ex_cmds.c:1288
+#: ../ex_cmds.c:1347
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: �G���[��������������, ���~���X�L�b�v������"
 
-#: ex_cmds.c:1323
+#: ../ex_cmds.c:1382
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfo�t�@�C�� \"%s\"%s%s%s ���������� "
 
-#: ex_cmds.c:1324
+#: ../ex_cmds.c:1383
 msgid " info"
 msgstr " ����"
 
-#: ex_cmds.c:1325
+#: ../ex_cmds.c:1384
 msgid " marks"
 msgstr " �}�[�N"
 
-#: ex_cmds.c:1326
+#: ../ex_cmds.c:1385
 msgid " FAILED"
 msgstr " ｸ�s"
 
-#: ex_cmds.c:1418
+#: ../ex_cmds.c:1477
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfo�t�@�C��������������������: %s"
 
-#: ex_cmds.c:1543
+#: ../ex_cmds.c:1602
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfo�t�@�C�� %s ����������������!"
 
-#: ex_cmds.c:1551
+#: ../ex_cmds.c:1610
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "viminfo�t�@�C�� \"%s\" ����������"
 
 #. Write the info:
-#: ex_cmds.c:1649
+#: ../ex_cmds.c:1708
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# ���� viminfo �t�@�C���� Vim %s ����������������������.\n"
 
-#: ex_cmds.c:1651
+#: ../ex_cmds.c:1710
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -708,47 +935,47 @@ msgstr ""
 "# ���X�����������\\������������������!\n"
 "\n"
 
-#: ex_cmds.c:1653
+#: ../ex_cmds.c:1712
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# �����t�@�C���������������� 'encoding' ���l\n"
 
-#: ex_cmds.c:1752
+#: ../ex_cmds.c:1811
 msgid "Illegal starting char"
 msgstr "�s����������������"
 
-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
+#: ../ex_cmds.c:2176 ../ex_cmds2.c:1280
 msgid "Save As"
 msgstr "����������"
 
 #. Overwriting a file that is loaded in another buffer is not a
 #. * good idea.
-#: ex_cmds.c:2140
+#: ../ex_cmds.c:2219
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: �������O���t�@�C���������o�b�t�@������������������"
 
-#: ex_cmds.c:2174
+#: ../ex_cmds.c:2253
 msgid "Write partial file?"
 msgstr "�t�@�C���������I��������������?"
 
-#: ex_cmds.c:2181
+#: ../ex_cmds.c:2260
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: �o�b�t�@�������I�������������� ! ���g������������"
 
-#: ex_cmds.c:2296
+#: ../ex_cmds.c:2377
 #, c-format
 msgid "Overwrite existing file \"%.*s\"?"
 msgstr "�������t�@�C�� \"%.*s\" ����������������?"
 
-#: ex_cmds.c:2367
+#: ../ex_cmds.c:2448
 #, c-format
 msgid "E141: No file name for buffer %ld"
 msgstr "E141: �o�b�t�@ %ld �������O������������"
 
-#: ex_cmds.c:2405
+#: ../ex_cmds.c:2487
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: �t�@�C������������������������: 'write' �I�v�V������������������"
 
-#: ex_cmds.c:2425
+#: ../ex_cmds.c:2507
 #, c-format
 msgid ""
 "'readonly' option is set for \"%.*s\".\n"
@@ -757,68 +984,77 @@ msgstr ""
 "\"%.*s\" ���� 'readonly' �I�v�V����������������������\n"
 "�����I����������������?"
 
-#: ex_cmds.c:2597
+#: ../ex_cmds.c:2680
 msgid "Edit File"
 msgstr "�t�@�C�������W"
 
-#: ex_cmds.c:3205
+#: ../ex_cmds.c:3293
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommand���\\�������V�����o�b�t�@ %s ��������������"
 
-#: ex_cmds.c:3339
+#: ../ex_cmds.c:3503
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: ���������������� :z ���n����������"
 
-#: ex_cmds.c:3424
+#: ../ex_cmds.c:3602
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim�����V�F���R�}���h���g��������"
 
-#: ex_cmds.c:3531
+#: ../ex_cmds.c:3714
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: ���K�\\��������������������������������"
 
-#: ex_cmds.c:3877
+#: ../ex_cmds.c:4137
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s ���u����������? (y/n/a/q/l/^E/^Y)"
 
-#: ex_cmds.c:4270
+#: ../ex_cmds.c:4543
 msgid "(Interrupted) "
 msgstr "(��������������)"
 
-#: ex_cmds.c:4274
+#: ../ex_cmds.c:4547
+msgid "1 match"
+msgstr "1 �����Y����������"
+
+#: ../ex_cmds.c:4547
 msgid "1 substitution"
 msgstr "1 �����u����������"
 
-#: ex_cmds.c:4276
+#: ../ex_cmds.c:4550
+#, c-format
+msgid "%ld matches"
+msgstr "%ld �����Y����������"
+
+#: ../ex_cmds.c:4550
 #, c-format
 msgid "%ld substitutions"
 msgstr "%ld �����u����������"
 
-#: ex_cmds.c:4279
+#: ../ex_cmds.c:4553
 msgid " on 1 line"
 msgstr " (�v 1 �s��)"
 
-#: ex_cmds.c:4281
+#: ../ex_cmds.c:4555
 #, c-format
 msgid " on %ld lines"
 msgstr " (�v %ld �s��)"
 
-#: ex_cmds.c:4332
+#: ../ex_cmds.c:4606
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global �����A�I�����g��������"
 
-#: ex_cmds.c:4367
+#: ../ex_cmds.c:4641
 msgid "E148: Regular expression missing from global"
 msgstr "E148: global�R�}���h�����K�\\�����w����������������"
 
-#: ex_cmds.c:4416
+#: ../ex_cmds.c:4714
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "�p�^�[�����S�����s����������������: %s"
 
-#: ex_cmds.c:4497
+#: ../ex_cmds.c:4799
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -828,408 +1064,428 @@ msgstr ""
 "# �������u��������������:\n"
 "$"
 
-#: ex_cmds.c:4598 ex_docmd.c:2011
+#: ../ex_cmds.c:4900
 msgid "E478: Don't panic!"
 msgstr "E478: �Q����������������"
 
-#: ex_cmds.c:4650
+#: ../ex_cmds.c:4946
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: �c�O������ '%s' ���w���v�� %s ��������������"
 
-#: ex_cmds.c:4653
+#: ../ex_cmds.c:4949
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: �c�O������ %s �����w���v������������"
 
-#: ex_cmds.c:4687
+#: ../ex_cmds.c:4983
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "�c�O�������w���v�t�@�C�� \"%s\" ����������������"
 
-#: ex_cmds.c:5170
+#: ../ex_cmds.c:5533
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: �f�B���N�g����������������: %s"
 
-#: ex_cmds.c:5309
+#: ../ex_cmds.c:5673
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: �������p�� %s ���J��������"
 
-#: ex_cmds.c:5345
+#: ../ex_cmds.c:5708
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: �����p�� %s ���J��������"
 
 # Added at 29-Apr-2004.
-#: ex_cmds.c:5367
+#: ../ex_cmds.c:5744
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1�����������w���v�t�@�C�����������G���R�[�h����������������: %s"
 
-#: ex_cmds.c:5445
+#: ../ex_cmds.c:5822
 #, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s"
-msgstr "E154: �^�O \"%s\" ���t�@�C�� %s ���d������������"
+msgid "E154: Duplicate tag \"%s\" in file %s/%s"
+msgstr "E154: �^�O \"%s\" ���t�@�C�� %s/%s ���d������������"
 
-#: ex_cmds.c:5557
+#: ../ex_cmds.c:5938
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ���m��sign�R�}���h����: %s"
 
-#: ex_cmds.c:5577
+#: ../ex_cmds.c:5958
 msgid "E156: Missing sign name"
 msgstr "E156: sign��������������"
 
-#: ex_cmds.c:5623
+#: ../ex_cmds.c:6004
 msgid "E612: Too many signs defined"
 msgstr "E612: sign�����`��������������������"
 
-#: ex_cmds.c:5691
+#: ../ex_cmds.c:6072
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: ������sign���e�L�X�g����: %s"
 
-#: ex_cmds.c:5722 ex_cmds.c:5913
+#: ../ex_cmds.c:6103 ../ex_cmds.c:6294
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: ���m��sign����: %s"
 
-#: ex_cmds.c:5771
+#: ../ex_cmds.c:6152
 msgid "E159: Missing sign number"
 msgstr "E159: sign������������������"
 
-#: ex_cmds.c:5853
+#: ../ex_cmds.c:6234
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: �������o�b�t�@������: %s"
 
-#: ex_cmds.c:5892
+#: ../ex_cmds.c:6273
 #, c-format
 msgid "E157: Invalid sign ID: %ld"
 msgstr "E157: ������signｯ���q����: %ld"
 
 # Added at 27-Jan-2004.
-#: ex_cmds.c:5962
+#: ../ex_cmds.c:6343
 msgid " (NOT FOUND)"
 msgstr "  (��������������)"
 
-#: ex_cmds.c:5964
+#: ../ex_cmds.c:6345
 msgid " (not supported)"
 msgstr " (���T�|�[�g)"
 
-#: ex_cmds.c:6063
+#: ../ex_cmds.c:6444
 msgid "[Deleted]"
 msgstr "[������]"
 
-#: ex_cmds2.c:92
+#: ../ex_cmds2.c:140
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "�f�o�b�O���[�h����������. ���������� \"cont\" ������������������."
 
-#: ex_cmds2.c:96 ex_docmd.c:966
+#: ../ex_cmds2.c:144 ../ex_docmd.c:1063
 #, c-format
 msgid "line %ld: %s"
 msgstr "�s %ld: %s"
 
-#: ex_cmds2.c:98
+#: ../ex_cmds2.c:146
 #, c-format
 msgid "cmd: %s"
 msgstr "�R�}���h: %s"
 
-#: ex_cmds2.c:290
+#: ../ex_cmds2.c:338
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
 msgstr "�u���[�N�|�C���g \"%s%s\" �s %ld"
 
-#: ex_cmds2.c:540
+#: ../ex_cmds2.c:640
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: �u���[�N�|�C���g����������������: %s"
 
-#: ex_cmds2.c:566
+#: ../ex_cmds2.c:665
 msgid "No breakpoints defined"
 msgstr "�u���[�N�|�C���g�����`��������������"
 
-#: ex_cmds2.c:571
+#: ../ex_cmds2.c:670
 #, c-format
 msgid "%3d  %s %s  line %ld"
 msgstr "%3d  %s %s  �s %ld"
 
-#: ex_cmds2.c:786
+#: ../ex_cmds2.c:990
+msgid "E750: First use :profile start <fname>"
+msgstr "E750: ������ :profile start <fname> ��ﾀ�s������������"
+
+#: ../ex_cmds2.c:1305
 #, c-format
 msgid "Save changes to \"%.*s\"?"
 msgstr "���X�� \"%.*s\" ��������������?"
 
-#: ex_cmds2.c:788 ex_docmd.c:9356
+#: ../ex_cmds2.c:1307 ../ex_docmd.c:9919
 msgid "Untitled"
 msgstr "����"
 
-#: ex_cmds2.c:915
+#: ../ex_cmds2.c:1434
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: �o�b�t�@ \"%s\" �����X��������������������"
 
-#: ex_cmds2.c:984
+#: ../ex_cmds2.c:1505
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "�x��: �\\���������o�b�t�@�������������� (autocommands ����������������)"
 
-#: ex_cmds2.c:1387
+#: ../ex_cmds2.c:1924
 msgid "E163: There is only one file to edit"
 msgstr "E163: ���W�����t�@�C����1����������������"
 
-#: ex_cmds2.c:1389
+#: ../ex_cmds2.c:1926
 msgid "E164: Cannot go before first file"
 msgstr "E164: �������t�@�C�������O�����s��������"
 
-#: ex_cmds2.c:1391
+#: ../ex_cmds2.c:1928
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: �������t�@�C�����z�����������s��������"
 
-#: ex_cmds2.c:1804
+#: ../ex_cmds2.c:2341
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: �����R���p�C����������������������: %s"
 
-#: ex_cmds2.c:1897
+#: ../ex_cmds2.c:2438
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" �� \"%s\" ����������"
 
-#: ex_cmds2.c:1919
+#: ../ex_cmds2.c:2460
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" ��������"
 
-#: ex_cmds2.c:1940
+#: ../ex_cmds2.c:2482
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
 msgstr "'runtimepath' ����������������������: \"%s\""
 
-#: ex_cmds2.c:1974
+#: ../ex_cmds2.c:2516
 msgid "Source Vim script"
 msgstr "Vim�X�N���v�g��������"
 
-#: ex_cmds2.c:2164
+#: ../ex_cmds2.c:2692
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "�f�B���N�g����������������: \"%s\""
 
-#: ex_cmds2.c:2202
+#: ../ex_cmds2.c:2730
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" ��������������"
 
-#: ex_cmds2.c:2204
+#: ../ex_cmds2.c:2732
 #, c-format
 msgid "line %ld: could not source \"%s\""
 msgstr "�s %ld: \"%s\" ��������������"
 
-#: ex_cmds2.c:2218
+#: ../ex_cmds2.c:2746
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" ��������"
 
-#: ex_cmds2.c:2220
+#: ../ex_cmds2.c:2748
 #, c-format
 msgid "line %ld: sourcing \"%s\""
 msgstr "�s %ld: %s ��������"
 
-#: ex_cmds2.c:2363
+#: ../ex_cmds2.c:2931
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s ������������"
 
-#: ex_cmds2.c:2707
+#: ../ex_cmds2.c:3301
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: �x��: �s�������s������. ^M ����������������"
 
-#: ex_cmds2.c:2756
+#: ../ex_cmds2.c:3435
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding �������X�N���v�g���O���g�p����������"
 
-#: ex_cmds2.c:2789
+#: ../ex_cmds2.c:3468
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish �������X�N���v�g���O���g�p����������"
 
-#: ex_cmds2.c:3238
+#: ../ex_cmds2.c:3917
 #, c-format
 msgid "Page %d"
 msgstr "%d �y�[�W"
 
-#: ex_cmds2.c:3394
+#: ../ex_cmds2.c:4073
 msgid "No text to be printed"
 msgstr "���������e�L�X�g������������"
 
-#: ex_cmds2.c:3472
+#: ../ex_cmds2.c:4151
 msgid "Printing page %d (%d%%)"
 msgstr "������: �y�[�W %d (%d%%)"
 
-#: ex_cmds2.c:3484
+#: ../ex_cmds2.c:4163
 #, c-format
 msgid " Copy %d of %d"
 msgstr " �R�s�[ %d (�S %d ��)"
 
-#: ex_cmds2.c:3542
+#: ../ex_cmds2.c:4221
 #, c-format
 msgid "Printed: %s"
 msgstr "������������: %s"
 
-#: ex_cmds2.c:3549
+#: ../ex_cmds2.c:4228
 msgid "Printing aborted"
 msgstr "���������~����������"
 
-#: ex_cmds2.c:3914
+#: ../ex_cmds2.c:4882
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript�o���t�@�C�����������G���[����"
 
-#: ex_cmds2.c:4189
+#: ../ex_cmds2.c:5342
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: �t�@�C�� \"%s\" ���J��������"
 
-#: ex_cmds2.c:4199 ex_cmds2.c:4824
+#: ../ex_cmds2.c:5352 ../ex_cmds2.c:6226
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScript�����\\�[�X�t�@�C�� \"%s\" ��������������"
 
-#: ex_cmds2.c:4207
+#: ../ex_cmds2.c:5368
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: �t�@�C�� \"%s\" �� PostScript ���\\�[�X�t�@�C����������������"
 
-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
+#: ../ex_cmds2.c:5386 ../ex_cmds2.c:5405 ../ex_cmds2.c:5450
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: �t�@�C�� \"%s\" ���������������� PostScript ���\\�[�X�t�@�C������"
 
-#: ex_cmds2.c:4309
+#: ../ex_cmds2.c:5469
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: ���\\�[�X�t�@�C�� \"%s\" ���o�[�W����������������"
 
-#: ex_cmds2.c:4776
+#: ../ex_cmds2.c:5947
+msgid "E673: Incompatible multi-byte encoding and character set."
+msgstr "E673: �������������}���`�o�C�g�G���R�[�f�B���O�������Z�b�g����"
+
+#: ../ex_cmds2.c:5964
+msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
+msgstr "E674: �}���`�o�C�g�G���R�[�f�B���O���� printmbcharset ����������������"
+
+#: ../ex_cmds2.c:5982
+msgid "E675: No default font specfifed for multi-byte printing."
+msgstr ""
+"E675: �}���`�o�C�g���������������������f�t�H���g�t�H���g���w����������������"
+
+#: ../ex_cmds2.c:6175
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript�o���p���t�@�C�����J��������"
 
-#: ex_cmds2.c:4809
+#: ../ex_cmds2.c:6212
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: �t�@�C�� \"%s\" ���J��������"
 
-#: ex_cmds2.c:4928
+#: ../ex_cmds2.c:6343
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScript�����\\�[�X�t�@�C�� \"prolog.ps\" ����������������"
 
-#: ex_cmds2.c:4959
+#: ../ex_cmds2.c:6356
+msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
+msgstr "E456: PostScript�����\\�[�X�t�@�C�� \"cidfont.ps\" ����������������"
+
+#: ../ex_cmds2.c:6394 ../ex_cmds2.c:6416 ../ex_cmds2.c:6445
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScript�����\\�[�X�t�@�C�� \"%s.ps\" ����������������"
 
-#: ex_cmds2.c:4977
+#: ../ex_cmds2.c:6432
 #, c-format
-msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
-msgstr "E620: �}���`�o�C�g�������G���R�[�h \"%s\" ����������������"
+msgid "E620: Unable to convert to print encoding \"%s\""
+msgstr "E620: �����G���R�[�h \"%s\" ����������������"
 
-#: ex_cmds2.c:5102
+#: ../ex_cmds2.c:6686
 msgid "Sending to printer..."
 msgstr "�v�����^�����M��..."
 
-#: ex_cmds2.c:5106
+#: ../ex_cmds2.c:6690
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScript�t�@�C����������ｸ�s��������"
 
-#: ex_cmds2.c:5108
+#: ../ex_cmds2.c:6692
 msgid "Print job sent."
 msgstr "�����W���u�����M��������."
 
-#: ex_cmds2.c:5618
+#: ../ex_cmds2.c:7299
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "������ %s����: \"%s\""
 
-#: ex_cmds2.c:5629
+#: ../ex_cmds2.c:7310
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: ������ \"%s\" ����������������"
 
-#: ex_docmd.c:525
+#: ../ex_docmd.c:604
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Ex���[�h����������. �m�[�}������������\"visual\"������������������."
 
-#. must be at EOF
-#: ex_docmd.c:561
+#: ../ex_docmd.c:659
 msgid "E501: At end-of-file"
 msgstr "E501: �t�@�C�����I�����u"
 
-#: ex_docmd.c:669
+#: ../ex_docmd.c:758
 msgid "E169: Command too recursive"
 msgstr "E169: �R�}���h�����A�I��������"
 
-#: ex_docmd.c:1229
+#: ../ex_docmd.c:1340
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: ���O����������������������: %s"
 
-#: ex_docmd.c:1317
+#: ../ex_docmd.c:1428
 msgid "End of sourced file"
 msgstr "�����t�@�C������������"
 
-#: ex_docmd.c:1318
+#: ../ex_docmd.c:1429
 msgid "End of function"
 msgstr "��������������"
 
-#: ex_docmd.c:1907
+#: ../ex_docmd.c:2031
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: ���[�U���`�R�}���h�������������g�p����"
 
-#: ex_docmd.c:1921
+#: ../ex_docmd.c:2045
 msgid "E492: Not an editor command"
 msgstr "E492: �G�f�B�^���R�}���h��������������"
 
-#: ex_docmd.c:2030
+#: ../ex_docmd.c:2152
 msgid "E493: Backwards range given"
 msgstr "E493: �t�������������w������������"
 
-#: ex_docmd.c:2039
+#: ../ex_docmd.c:2161
 msgid "Backwards range given, OK to swap"
 msgstr "�t�������������w������������, ������������?"
 
-#: ex_docmd.c:2162
+#: ../ex_docmd.c:2286
 msgid "E494: Use w or w>>"
 msgstr "E494: w �������� w>> ���g�p������������"
 
-#: ex_docmd.c:3788
+#: ../ex_docmd.c:3974
 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: �����o�[�W�������������R�}���h�����p����������, ������������"
 
-#: ex_docmd.c:3991
+#: ../ex_docmd.c:4229
 msgid "E172: Only one file name allowed"
 msgstr "E172: �t�@�C������ 1 ����������������"
 
-#: ex_docmd.c:4571
+#: ../ex_docmd.c:4817
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "���W�������t�@�C���� 1 ������������, �I����������?"
 
-#: ex_docmd.c:4574
+#: ../ex_docmd.c:4820
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "���W�������t�@�C�������� %d ������������, �I����������?"
 
-#: ex_docmd.c:4581
+#: ../ex_docmd.c:4827
 msgid "E173: 1 more file to edit"
 msgstr "E173: ���W�������t�@�C���� 1 ����������"
 
-#: ex_docmd.c:4583
+#: ../ex_docmd.c:4829
 #, c-format
 msgid "E173: %ld more files to edit"
 msgstr "E173: ���W�������t�@�C�������� %ld ����������"
 
-#: ex_docmd.c:4678
+#: ../ex_docmd.c:4924
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: �R�}���h��������������: �����`�������� ! ������������������"
 
-#: ex_docmd.c:4789
+#: ../ex_docmd.c:5034
 msgid ""
 "\n"
 "    Name        Args Range Complete  Definition"
@@ -1237,324 +1493,344 @@ msgstr ""
 "\n"
 "    ���O        ���� ����  ����      ���`"
 
-#: ex_docmd.c:4878
+#: ../ex_docmd.c:5123
 msgid "No user-defined commands found"
 msgstr "���[�U���`�R�}���h����������������������"
 
-#: ex_docmd.c:4910
+#: ../ex_docmd.c:5155
 msgid "E175: No attribute specified"
 msgstr "E175: ���������`��������������"
 
-#: ex_docmd.c:4962
+#: ../ex_docmd.c:5207
 msgid "E176: Invalid number of arguments"
 msgstr "E176: ������������������"
 
-#: ex_docmd.c:4977
+#: ../ex_docmd.c:5222
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: �J�E���g��2�d�w����������������������"
 
-#: ex_docmd.c:4987
+#: ../ex_docmd.c:5232
 msgid "E178: Invalid default value for count"
 msgstr "E178: �J�E���g�������l����������"
 
-#: ex_docmd.c:5018
+#: ../ex_docmd.c:5263
 msgid "E179: argument required for complete"
 msgstr "E179: �������������������K�v����"
 
-#: ex_docmd.c:5050
+#: ../ex_docmd.c:5295
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: �����������w������: %s"
 
-#: ex_docmd.c:5059
+#: ../ex_docmd.c:5304
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: �����������J�X�^�������������g�p����������"
 
-#: ex_docmd.c:5065
+#: ../ex_docmd.c:5310
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: �J�X�^���������������������������K�v����"
 
-#: ex_docmd.c:5076
+#: ../ex_docmd.c:5321
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: ��������������: %s"
 
-#: ex_docmd.c:5119
+#: ../ex_docmd.c:5364
 msgid "E182: Invalid command name"
 msgstr "E182: �������R�}���h������"
 
-#: ex_docmd.c:5134
+#: ../ex_docmd.c:5379
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: ���[�U���`�R�}���h���p���������n����������������������"
 
-#: ex_docmd.c:5205
+#: ../ex_docmd.c:5450
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: �������[�U���`�R�}���h������������: %s"
 
-#: ex_docmd.c:5666
+#: ../ex_docmd.c:5910
 #, c-format
 msgid "E185: Cannot find color scheme %s"
 msgstr "E185: �J���[�X�L�[�� %s ����������������"
 
-#: ex_docmd.c:5674
+#: ../ex_docmd.c:5918
 msgid "Greetings, Vim user!"
 msgstr "Vim �g�������A����!"
 
-#: ex_docmd.c:6391
+#: ../ex_docmd.c:6660
 msgid "Edit File in new window"
 msgstr "�V�����E�B���h�E���t�@�C�������W������"
 
-#: ex_docmd.c:6686
+#: ../ex_docmd.c:7053
 msgid "No swap file"
 msgstr "�X���b�v�t�@�C��������������"
 
-#: ex_docmd.c:6790
+#: ../ex_docmd.c:7159
 msgid "Append File"
 msgstr "�����t�@�C��"
 
-#: ex_docmd.c:6854
+#: ../ex_docmd.c:7239
+msgid "E747: Cannot change directory, buffer is modifed (add ! to override)"
+msgstr ""
+"E747: �o�b�t�@���C����������������, �f�B���N�g�������X���������� (! "
+"������������)"
+
+#: ../ex_docmd.c:7248
 msgid "E186: No previous directory"
 msgstr "E186: �O���f�B���N�g��������������"
 
-#: ex_docmd.c:6936
+#: ../ex_docmd.c:7330
 msgid "E187: Unknown"
 msgstr "E187: ���m"
 
-#: ex_docmd.c:7021
+#: ../ex_docmd.c:7416
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: "
 
-#: ex_docmd.c:7077
+#: ../ex_docmd.c:7476
 #, c-format
 msgid "Window position: X %d, Y %d"
 msgstr "�E�B���h�E���u: X %d, Y %d"
 
-#: ex_docmd.c:7082
+#: ../ex_docmd.c:7481
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: �����v���b�g�z�[�������E�B���h�E���u�������@�\\��ﾀ����������������"
 
-#: ex_docmd.c:7092
+#: ../ex_docmd.c:7491
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos ����2�������l���������K�v����"
 
-#: ex_docmd.c:7370
+#: ../ex_docmd.c:7797
 msgid "Save Redirection"
 msgstr "���_�C���N�g������������"
 
-#: ex_docmd.c:7560
+#: ../ex_docmd.c:8014
 msgid "Save View"
 msgstr "�r���[������������"
 
-#: ex_docmd.c:7561
+#: ../ex_docmd.c:8015
 msgid "Save Session"
 msgstr "�Z�b�V��������������������"
 
-#: ex_docmd.c:7563
+#: ../ex_docmd.c:8017
 msgid "Save Setup"
 msgstr "����������������"
 
-#: ex_docmd.c:7715
+#: ../ex_docmd.c:8156
+#, c-format
+msgid "E739: Cannot create directory: %s"
+msgstr "E739: �f�B���N�g������������������: %s"
+
+#: ../ex_docmd.c:8185
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" ������������ (������������ ! ������������������)"
 
-#: ex_docmd.c:7720
+#: ../ex_docmd.c:8190
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: \"%s\" ���������p�������J��������"
 
 #. set mark
-#: ex_docmd.c:7744
+#: ../ex_docmd.c:8214
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: �������������O�i/�����N�H�[�g����������������������"
 
-#: ex_docmd.c:7786
+#: ../ex_docmd.c:8255
 msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal �����A���p���[����������������"
+msgstr "E192: :normal �����A���p���[����������������"
 
-#: ex_docmd.c:8304
+#: ../ex_docmd.c:8804
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: '#'���u�����������t�@�C�������O������������"
 
-#: ex_docmd.c:8335
+#: ../ex_docmd.c:8835
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: \"<afile>\"���u��������autocommand���t�@�C����������������"
 
-#: ex_docmd.c:8343
+#: ../ex_docmd.c:8843
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: \"<abuf>\"���u��������autocommand�o�b�t�@����������������"
 
-#: ex_docmd.c:8354
+#: ../ex_docmd.c:8854
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: \"<amatch>\"���u��������autocommand���Y����������������"
 
-#: ex_docmd.c:8364
+#: ../ex_docmd.c:8864
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: \"<sfile>\"���u�������� :source �����t�@�C����������������"
 
-#: ex_docmd.c:8405
+#: ../ex_docmd.c:8905
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: '%' �� '#' �������t�@�C�������� \":p:h\" �����������g����������������"
 
-#: ex_docmd.c:8407
+#: ../ex_docmd.c:8907
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: ���������������]������������"
 
-#: ex_docmd.c:9338
+#: ../ex_docmd.c:9901
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfo�t�@�C���������p�������J��������"
 
-#: ex_docmd.c:9511
+#: ../ex_docmd.c:10074
 msgid "E196: No digraphs in this version"
 msgstr "E196: �����o�[�W����������������������"
 
-#: ex_eval.c:440
+#: ../ex_eval.c:439
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' ���n�������O�� :throw ����������"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:529
+#: ../ex_eval.c:528
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "���O��������������: %s"
 
-#: ex_eval.c:576
+#: ../ex_eval.c:575
 #, c-format
 msgid "Exception finished: %s"
 msgstr "���O��������������: %s"
 
-#: ex_eval.c:577
+#: ../ex_eval.c:576
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "���O���j������������: %s"
 
-#: ex_eval.c:620 ex_eval.c:664
+#: ../ex_eval.c:619 ../ex_eval.c:663
 #, c-format
 msgid "%s, line %ld"
 msgstr "%s, �s %ld"
 
 #. always scroll up, don't overwrite
-#: ex_eval.c:638
+#: ../ex_eval.c:637
 #, c-format
 msgid "Exception caught: %s"
 msgstr "���O����������������: %s"
 
-#: ex_eval.c:713
+#: ../ex_eval.c:712
 #, c-format
 msgid "%s made pending"
 msgstr "%s ����������������������������"
 
-#: ex_eval.c:716
+#: ../ex_eval.c:715
 #, c-format
 msgid "%s resumed"
 msgstr "%s �����J��������"
 
-#: ex_eval.c:720
+#: ../ex_eval.c:719
 #, c-format
 msgid "%s discarded"
 msgstr "%s ���j������������"
 
-#: ex_eval.c:746
+#: ../ex_eval.c:745
 msgid "Exception"
 msgstr "���O"
 
-#: ex_eval.c:752
+#: ../ex_eval.c:751
 msgid "Error and interrupt"
 msgstr "�G���[��������"
 
-#: ex_eval.c:754 gui.c:4375
+#: ../ex_eval.c:753 ../gui.c:4389 ../gui_xmdlg.c:687 ../gui_xmdlg.c:809
+#: ../os_mswin.c:601
 msgid "Error"
 msgstr "�G���["
 
 #. if (pending & CSTP_INTERRUPT)
-#: ex_eval.c:756
+#: ../ex_eval.c:755
 msgid "Interrupt"
 msgstr "������"
 
-#: ex_eval.c:830
+#: ../ex_eval.c:829
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if �������q���[��������"
 
-#: ex_eval.c:867
+#: ../ex_eval.c:866
 msgid "E580: :endif without :if"
 msgstr "E580: :if ������ :endif ����������"
 
-#: ex_eval.c:911
+#: ../ex_eval.c:911
 msgid "E581: :else without :if"
 msgstr "E581: :if ������ :else ����������"
 
-#: ex_eval.c:914
+#: ../ex_eval.c:914
 msgid "E582: :elseif without :if"
 msgstr "E582: :if ������ :elseif ����������"
 
-#: ex_eval.c:921
+#: ../ex_eval.c:921
 msgid "E583: multiple :else"
 msgstr "E583: ������ :else ����������"
 
-#: ex_eval.c:924
+#: ../ex_eval.c:924
 msgid "E584: :elseif after :else"
 msgstr "E584: :else ������ :elseif ����������"
 
-#: ex_eval.c:991
-msgid "E585: :while nesting too deep"
-msgstr "E585: :while �������q���[����������"
+#: ../ex_eval.c:991
+msgid "E585: :while/:for nesting too deep"
+msgstr "E585: :while �� :for �������q���[��������"
+
+#: ../ex_eval.c:1089
+msgid "E586: :continue without :while or :for"
+msgstr "E586: :while �� :for ������ :continue ����������"
+
+#: ../ex_eval.c:1128
+msgid "E587: :break without :while or :for"
+msgstr "E587: :while �� :for ������ :break ����������"
 
-#: ex_eval.c:1047
-msgid "E586: :continue without :while"
-msgstr "E586: :while ������ :continue ����������"
+#: ../ex_eval.c:1178
+msgid "E732: Using :endfor with :while"
+msgstr "E732: :endfor �� :while ���g����������������"
 
-#: ex_eval.c:1087
-msgid "E587: :break without :while"
-msgstr "E587: :while ������ :break ����������"
+#: ../ex_eval.c:1180
+msgid "E733: Using :endwhile with :for"
+msgstr "E733: :endwhile �� :for ���g����������������"
 
-#: ex_eval.c:1286
+#: ../ex_eval.c:1351
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try �������q���[��������"
 
-#: ex_eval.c:1366
+#: ../ex_eval.c:1431
 msgid "E603: :catch without :try"
 msgstr "E603: :try ������ :catch ����������"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ex_eval.c:1388
+#: ../ex_eval.c:1450
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally ������ :catch ����������"
 
-#: ex_eval.c:1521
+#: ../ex_eval.c:1584
 msgid "E606: :finally without :try"
 msgstr "E606: :try ������ :finally ����������"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ex_eval.c:1545
+#: ../ex_eval.c:1604
 msgid "E607: multiple :finally"
 msgstr "E607: ������ :finalyy ����������"
 
-#: ex_eval.c:1654
+#: ../ex_eval.c:1714
 msgid "E602: :endtry without :try"
 msgstr "E602: :try ������ :endtry ����"
 
-#: ex_eval.c:1986
+#: ../ex_eval.c:2218
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: �������O�� :endfunction ������������"
 
-#: ex_getln.c:3295
+#: ../ex_getln.c:3503
 msgid "tagname"
 msgstr "�^�O��"
 
-#: ex_getln.c:3298
+#: ../ex_getln.c:3506
 msgid " kind file\n"
 msgstr " �t�@�C������\n"
 
-#: ex_getln.c:4751
+#: ../ex_getln.c:5005
 msgid "'history' option is zero"
 msgstr "�I�v�V���� 'history' ���[������"
 
-#: ex_getln.c:5017
+#: ../ex_getln.c:5276
 #, c-format
 msgid ""
 "\n"
@@ -1563,259 +1839,263 @@ msgstr ""
 "\n"
 "# %s ���������� (�V����������������������):\n"
 
-#: ex_getln.c:5018
+#: ../ex_getln.c:5277
 msgid "Command Line"
 msgstr "�R�}���h���C��"
 
-#: ex_getln.c:5019
+#: ../ex_getln.c:5278
 msgid "Search String"
 msgstr "����������"
 
-#: ex_getln.c:5020
+#: ../ex_getln.c:5279
 msgid "Expression"
 msgstr "ｮ"
 
-#: ex_getln.c:5021
+#: ../ex_getln.c:5280
 msgid "Input Line"
 msgstr "�����s"
 
-#: ex_getln.c:5059
+#: ../ex_getln.c:5318
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar ���R�}���h��������������"
 
-#: ex_getln.c:5236
+#: ../ex_getln.c:5499
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: �A�N�e�B�u���E�B���h�E���o�b�t�@����������������"
 
-#: fileio.c:371
+#: ../fileio.c:374
 msgid "Illegal file name"
 msgstr "�s�����t�@�C����"
 
-#: fileio.c:395 fileio.c:529 fileio.c:2850 fileio.c:2891
+#: ../fileio.c:399 ../fileio.c:539 ../fileio.c:2940 ../fileio.c:2981
 msgid "is a directory"
 msgstr " ���f�B���N�g������"
 
-#: fileio.c:397
+#: ../fileio.c:401
 msgid "is not a file"
 msgstr " ���t�@�C����������������"
 
-#: fileio.c:551 fileio.c:4057
+#: ../fileio.c:561 ../fileio.c:4172
 msgid "[New File]"
 msgstr "[�V�t�@�C��]"
 
-#: fileio.c:584
+#: ../fileio.c:594
 msgid "[Permission Denied]"
 msgstr "[�F��������������]"
 
-#: fileio.c:688
+#: ../fileio.c:705
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre autocommand ���t�@�C���������s������������"
 
-#: fileio.c:690
+#: ../fileio.c:707
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre autocommand ���������o�b�t�@����������������"
 
-#: fileio.c:711
+#: ../fileio.c:728
 msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: �W����������������...\n"
 
-#: fileio.c:717
+#: ../fileio.c:734
 msgid "Reading from stdin..."
 msgstr "�W������������������..."
 
 #. Re-opening the original file failed!
-#: fileio.c:988
+#: ../fileio.c:1011
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: �������t�@�C���������s������������"
 
-#: fileio.c:2027
+#: ../fileio.c:2084
 msgid "[fifo/socket]"
 msgstr "[FIFO/�\\�P�b�g]"
 
-#: fileio.c:2034
+#: ../fileio.c:2091
 msgid "[fifo]"
 msgstr "[FIFO]"
 
-#: fileio.c:2041
+#: ../fileio.c:2098
 msgid "[socket]"
 msgstr "[�\\�P�b�g]"
 
-#: fileio.c:2049
+#: ../fileio.c:2106 ../netbeans.c:3418
 msgid "[RO]"
 msgstr "[����]"
 
-#: fileio.c:2059
+#: ../fileio.c:2116
 msgid "[CR missing]"
 msgstr "[CR��]"
 
-#: fileio.c:2064
+#: ../fileio.c:2121
 msgid "[NL found]"
 msgstr "[NL�L]"
 
-#: fileio.c:2069
+#: ../fileio.c:2126
 msgid "[long lines split]"
 msgstr "[���s����]"
 
-#: fileio.c:2075 fileio.c:4041
+#: ../fileio.c:2132 ../fileio.c:4156
 msgid "[NOT converted]"
 msgstr "[������]"
 
-#: fileio.c:2080 fileio.c:4046
+#: ../fileio.c:2137 ../fileio.c:4161
 msgid "[converted]"
 msgstr "[������]"
 
-#: fileio.c:2087 fileio.c:4071
+#: ../fileio.c:2144 ../fileio.c:4186
 msgid "[crypted]"
 msgstr "[������]"
 
-#: fileio.c:2094
+#: ../fileio.c:2151
 msgid "[CONVERSION ERROR]"
 msgstr "[�����G���[]"
 
-#: fileio.c:2100
+#: ../fileio.c:2157
 #, c-format
 msgid "[ILLEGAL BYTE in line %ld]"
 msgstr "[%ld �s�����s�����o�C�g]"
 
-#: fileio.c:2107
+#: ../fileio.c:2164
 msgid "[READ ERRORS]"
 msgstr "[�����G���[]"
 
-#: fileio.c:2323
+#: ../fileio.c:2380
 msgid "Can't find temp file for conversion"
 msgstr "�������K�v�������t�@�C������������������"
 
-#: fileio.c:2330
+#: ../fileio.c:2387
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' ������������ｸ�s��������"
 
-#: fileio.c:2333
+#: ../fileio.c:2390
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' ���o����������������������"
 
-#: fileio.c:2733
+#: ../fileio.c:2793
+msgid "E676: No matching autocommands for acwrite buffer"
+msgstr "E676: acwrite�o�b�t�@���Y������autocommand��������������"
+
+#: ../fileio.c:2821
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: ���������o�b�t�@��autocommand��������������������"
 
-#: fileio.c:2756
+#: ../fileio.c:2844
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: autocommand���\\���������@���s�������X��������"
 
 # Added at 19-Jan-2004.
-#: fileio.c:2794
+#: ../fileio.c:2884
 msgid "NetBeans dissallows writes of unmodified buffers"
 msgstr "NetBeans�������X���o�b�t�@��������������������������������"
 
-#: fileio.c:2802
+#: ../fileio.c:2892
 msgid "Partial writes disallowed for NetBeans buffers"
 msgstr "NetBeans�o�b�t�@�������������o������������������"
 
-#: fileio.c:2856 fileio.c:2874
+#: ../fileio.c:2946 ../fileio.c:2964
 msgid "is not a file or writable device"
 msgstr "���t�@�C���������������\\�f�o�C�X��������������"
 
-#: fileio.c:2926
+#: ../fileio.c:3016 ../netbeans.c:3481
 msgid "is read-only (add ! to override)"
 msgstr "���������p���� (������������ ! ������)"
 
-#: fileio.c:3272
+#: ../fileio.c:3362
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: �o�b�N�A�b�v�t�@�C������������������ (! ����������������)"
 
-#: fileio.c:3284
+#: ../fileio.c:3374
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: �o�b�N�A�b�v�t�@�C���������������G���[�������������� (! ������������)"
 
-#: fileio.c:3286
+#: ../fileio.c:3376
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: �o�b�N�A�b�v�p�t�@�C���������������� (! ����������������)"
 
-#: fileio.c:3302
+#: ../fileio.c:3392
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: �o�b�N�A�b�v�t�@�C�������������� (! ����������������)"
 
-#: fileio.c:3405
+#: ../fileio.c:3495
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: �o�b�N�A�b�v�t�@�C�������������� (! ����������������)"
 
-#: fileio.c:3467
+#: ../fileio.c:3557
 msgid "E460: The resource fork would be lost (add ! to override)"
 msgstr "E460: ���\\�[�X�t�H�[�N��ｸ�������������������� (! ������������)"
 
-#: fileio.c:3566
+#: ../fileio.c:3667
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: �����p�����t�@�C������������������"
 
-#: fileio.c:3584
+#: ../fileio.c:3685
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: �������������� (! ����������������������)"
 
-#: fileio.c:3619
+#: ../fileio.c:3720
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: �����N�������t�@�C����������������"
 
-#: fileio.c:3623
+#: ../fileio.c:3724
 msgid "E212: Can't open file for writing"
 msgstr "E212: �������p���t�@�C�����J��������"
 
-#: fileio.c:3885
+#: ../fileio.c:4000
 msgid "E667: Fsync failed"
 msgstr "E667: fsync ��ｸ�s��������"
 
-#: fileio.c:3892
+#: ../fileio.c:4007
 msgid "E512: Close failed"
 msgstr "E512: ������������ｸ�s"
 
-#: fileio.c:3963
-msgid "E513: write error, conversion failed"
-msgstr "E513: �������G���[, ����ｸ�s"
+#: ../fileio.c:4078
+msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
+msgstr "E513: �������G���[, ����ｸ�s (������������ 'fenc' ������������������)"
 
-#: fileio.c:3969
+#: ../fileio.c:4084
 msgid "E514: write error (file system full?)"
 msgstr "E514: �������G���[, (�t�@�C���V�X�e�������t?)"
 
-#: fileio.c:4036
+#: ../fileio.c:4151
 msgid " CONVERSION ERROR"
 msgstr " �����G���["
 
-#: fileio.c:4052
+#: ../fileio.c:4167
 msgid "[Device]"
 msgstr "[�f�o�C�X]"
 
-#: fileio.c:4057
+#: ../fileio.c:4172
 msgid "[New]"
 msgstr "[�V]"
 
-#: fileio.c:4079
+#: ../fileio.c:4194
 msgid " [a]"
 msgstr " [a]"
 
-#: fileio.c:4079
+#: ../fileio.c:4194
 msgid " appended"
 msgstr " ����"
 
-#: fileio.c:4081
+#: ../fileio.c:4196
 msgid " [w]"
 msgstr " [w]"
 
-#: fileio.c:4081
+#: ../fileio.c:4196
 msgid " written"
 msgstr " ������"
 
-#: fileio.c:4131
+#: ../fileio.c:4249
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: patchmode: ���{�t�@�C������������������"
 
-#: fileio.c:4153
+#: ../fileio.c:4271
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: �������{�t�@�C����touch����������"
 
-#: fileio.c:4168
+#: ../fileio.c:4286
 msgid "E207: Can't delete backup file"
 msgstr "E207: �o�b�N�A�b�v�t�@�C��������������"
 
-#: fileio.c:4232
+#: ../fileio.c:4350
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -1823,126 +2103,126 @@ msgstr ""
 "\n"
 "�x��: ���{�t�@�C����ｸ�����������X����������\n"
 
-#: fileio.c:4234
+#: ../fileio.c:4352
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "�t�@�C�����������������������G�f�B�^���I������������������!"
 
-#: fileio.c:4323
+#: ../fileio.c:4441
 msgid "[dos]"
 msgstr "[dos]"
 
-#: fileio.c:4323
+#: ../fileio.c:4441
 msgid "[dos format]"
 msgstr "[dos�t�H�[�}�b�g]"
 
-#: fileio.c:4330
+#: ../fileio.c:4448
 msgid "[mac]"
 msgstr "[mac]"
 
-#: fileio.c:4330
+#: ../fileio.c:4448
 msgid "[mac format]"
 msgstr "[mac�t�H�[�}�b�g]"
 
-#: fileio.c:4337
+#: ../fileio.c:4455
 msgid "[unix]"
 msgstr "[unix]"
 
-#: fileio.c:4337
+#: ../fileio.c:4455
 msgid "[unix format]"
 msgstr "[unix�t�H�[�}�b�g]"
 
-#: fileio.c:4364
+#: ../fileio.c:4482
 msgid "1 line, "
 msgstr "1 �s, "
 
-#: fileio.c:4366
+#: ../fileio.c:4484
 #, c-format
 msgid "%ld lines, "
 msgstr "%ld �s, "
 
-#: fileio.c:4369
+#: ../fileio.c:4487
 msgid "1 character"
 msgstr "1 ����"
 
-#: fileio.c:4371
+#: ../fileio.c:4489
 #, c-format
 msgid "%ld characters"
 msgstr "%ld ����"
 
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: fileio.c:4381
+#: ../fileio.c:4499 ../netbeans.c:3423
 msgid "[Incomplete last line]"
 msgstr "[���I�s���s���S]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: fileio.c:4400
+#: ../fileio.c:4518
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "�x��: �������������t�@�C�������X������������!!!"
 
-#: fileio.c:4402
+#: ../fileio.c:4520
 msgid "Do you really want to write to it"
 msgstr "�{������������������"
 
-#: fileio.c:5566
+#: ../fileio.c:5746
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" �������������G���[����"
 
-#: fileio.c:5573
+#: ../fileio.c:5753
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: \"%s\" �������������G���[����"
 
-#: fileio.c:5576
+#: ../fileio.c:5756
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: \"%s\" �����������G���[����"
 
-#: fileio.c:5810
+#: ../fileio.c:5993
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: autocommand �� FileChangedShell ���o�b�t�@��������������"
 
-#: fileio.c:5817
+#: ../fileio.c:6000
 #, c-format
 msgid "E211: Warning: File \"%s\" no longer available"
 msgstr "E211: �x��: �t�@�C�� \"%s\" ������������������"
 
-#: fileio.c:5831
+#: ../fileio.c:6014
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: �x��: �t�@�C�� \"%s\" �����X����Vim���o�b�t�@�����X����������"
 
-#: fileio.c:5834
+#: ../fileio.c:6017
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: �x��: �t�@�C�� \"%s\" �����W�J�n�������X����������"
 
-#: fileio.c:5836
+#: ../fileio.c:6019
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: �x��: �t�@�C�� \"%s\" �����[�h�����W�J�n�������X����������"
 
-#: fileio.c:5846
+#: ../fileio.c:6029
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: �x��: �t�@�C�� \"%s\" �����W�J�n������������������"
 
-#: fileio.c:5859
+#: ../fileio.c:6042
 msgid "See \":help W11\" for more info."
 msgstr "������ \":help W11\" ���Q��������������"
 
-#: fileio.c:5873
+#: ../fileio.c:6056
 msgid "Warning"
 msgstr "�x��"
 
-#: fileio.c:5874
+#: ../fileio.c:6057
 msgid ""
 "&OK\n"
 "&Load File"
@@ -1950,43 +2230,48 @@ msgstr ""
 "&OK\n"
 "�t�@�C������(&L)"
 
-#: fileio.c:5980
+#: ../fileio.c:6159
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: \"%s\" �������[�h��������������������������"
 
-#: fileio.c:5999
+#: ../fileio.c:6178
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" �������[�h����������������"
 
-#: fileio.c:6580
+#: ../fileio.c:6773
 msgid "--Deleted--"
 msgstr "--������--"
 
+#: ../fileio.c:6920
+#, c-format
+msgid "auto-removing autocommand: %s <buffer=%d>"
+msgstr "autocommand: %s <�o�b�t�@=%d> ��ｩ���I��������������"
+
 #. the group doesn't exist
-#: fileio.c:6740
+#: ../fileio.c:6964
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: �����O���[�v������������: \"%s\""
 
-#: fileio.c:6866
+#: ../fileio.c:7090
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * �������s��������������������: %s"
 
-#: fileio.c:6878
+#: ../fileio.c:7102
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: �����������C�x���g������������: %s"
 
-#: fileio.c:6880
+#: ../fileio.c:7104
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: �����������O���[�v���������C�x���g������������: %s"
 
 #. Highlight title
-#: fileio.c:7038
+#: ../fileio.c:7302
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -1994,166 +2279,180 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: fileio.c:7309
+#: ../fileio.c:7538
+#, c-format
+msgid "E680: <buffer=%d>: invalid buffer number "
+msgstr "E680: <�o�b�t�@=%d>: �������o�b�t�@��������"
+
+#: ../fileio.c:7635
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: �S�����C�x���g����������autocommand��ﾀ�s����������"
 
-#: fileio.c:7332
+#: ../fileio.c:7658
 msgid "No matching autocommands"
 msgstr "�Y������autocommand��������������"
 
-#: fileio.c:7653
+#: ../fileio.c:7982
 msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand�������q���[��������"
+msgstr "E218: autocommand�������q���[��������"
 
-#: fileio.c:7928
+#: ../fileio.c:8290
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands for \"%s\""
 
-#: fileio.c:7936
+#: ../fileio.c:8298
 #, c-format
 msgid "Executing %s"
 msgstr "%s ��ﾀ�s����������"
 
 #. always scroll up, don't overwrite
-#: fileio.c:8004
+#: ../fileio.c:8366
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: fileio.c:8571
+#: ../fileio.c:8961
 msgid "E219: Missing {."
 msgstr "E219: { ������������."
 
-#: fileio.c:8573
+#: ../fileio.c:8963
 msgid "E220: Missing }."
 msgstr "E220: } ������������."
 
-#: fold.c:68
+#: ../fold.c:68
 msgid "E490: No fold found"
 msgstr "E490: ������������������"
 
-#: fold.c:593
+#: ../fold.c:593
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: ������ 'foldmethod' ��������������������������"
 
-#: fold.c:595
+#: ../fold.c:595
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: ������ 'foldmethod' ��������������������������"
 
-#: getchar.c:248
+#: ../fold.c:1984
+#, c-format
+msgid "+--%3ld lines folded "
+msgstr "+--%3ld �s����������������"
+
+#: ../getchar.c:249
 msgid "E222: Add to read buffer"
 msgstr "E222: �����o�b�t�@������"
 
-#: getchar.c:2198
+#: ../getchar.c:2234
 msgid "E223: recursive mapping"
 msgstr "E223: ���A�I�}�b�s���O"
 
-#: getchar.c:3077
+#: ../getchar.c:3114
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s �������O���[�o���Z�k��������������������"
 
-#: getchar.c:3080
+#: ../getchar.c:3117
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s �������O���[�o���}�b�s���O����������������"
 
-#: getchar.c:3212
+#: ../getchar.c:3249
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s �������Z�k��������������������"
 
-#: getchar.c:3215
+#: ../getchar.c:3252
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s �������}�b�s���O����������������"
 
-#: getchar.c:3279
+#: ../getchar.c:3316
 msgid "No abbreviation found"
 msgstr "�Z�k��������������������������"
 
-#: getchar.c:3281
+#: ../getchar.c:3318
 msgid "No mapping found"
 msgstr "�}�b�s���O����������������������"
 
-#: getchar.c:4173
+#: ../getchar.c:4210
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: �s�������[�h"
 
-#: gui.c:220
+#: ../gui.c:220
 msgid "E229: Cannot start the GUI"
 msgstr "E229: GUI���J�n����������"
 
-#: gui.c:349
+#: ../gui.c:355
 #, c-format
 msgid "E230: Cannot read from \"%s\""
 msgstr "E230: \"%s\"��������������������������"
 
-#: gui.c:472
+#: ../gui.c:478
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr "E665: �L�����t�H���g������������������, GUI���J�n����������"
 
-#: gui.c:477
+#: ../gui.c:483
 msgid "E231: 'guifontwide' invalid"
 msgstr "E231: 'guifontwide' ����������"
 
-#: gui.c:547
+#: ../gui.c:553
 msgid "E599: Value of 'imactivatekey' is invalid"
 msgstr "E599: 'imactivatekey' �������������l����������"
 
-#: gui.c:4061
+#: ../gui.c:4070
 #, c-format
 msgid "E254: Cannot allocate color %s"
 msgstr "E254: %s ���F��������������������"
 
-#: gui_at_fs.c:300
+#: ../gui.c:4598
+msgid "No match at cursor, finding next"
+msgstr "�J�[�\\�������u���}�b�`������������, ������������������"
+
+#: ../gui_at_fs.c:300
 msgid "<cannot open> "
 msgstr "<�J��������>"
 
-#: gui_at_fs.c:1136
+#: ../gui_at_fs.c:1136
 #, c-format
 msgid "E616: vim_SelFile: can't get font %s"
 msgstr "E616: vim_SelFile: �t�H���g %s ����������������"
 
-#: gui_at_fs.c:2781
+#: ../gui_at_fs.c:2781
 msgid "E614: vim_SelFile: can't return to current directory"
 msgstr "E614: vim_SelFile: �������f�B���N�g��������������"
 
-#: gui_at_fs.c:2801
+#: ../gui_at_fs.c:2801
 msgid "Pathname:"
 msgstr "�p�X��:"
 
-#: gui_at_fs.c:2807
+#: ../gui_at_fs.c:2807
 msgid "E615: vim_SelFile: can't get current directory"
 msgstr "E615: vim_SelFile: �������f�B���N�g������������������"
 
-#: gui_at_fs.c:2815 gui_motif.c:1623
+#: ../gui_at_fs.c:2815 ../gui_xmdlg.c:932
 msgid "OK"
 msgstr "OK"
 
-#: gui_at_fs.c:2815 gui_gtk.c:2731 gui_motif.c:1618 gui_motif.c:2849
+#: ../gui_at_fs.c:2815 ../gui_gtk.c:2809 ../gui_xmdlg.c:941
 msgid "Cancel"
 msgstr "�L�����Z��"
 
-#: gui_at_sb.c:486
+#: ../gui_at_sb.c:486
 msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr "�X�N���[���o�[: ��������������������������."
 
-#: gui_athena.c:2047 gui_motif.c:1871
+#: ../gui_athena.c:2175 ../gui_motif.c:2292
 msgid "Vim dialog"
 msgstr "Vim �_�C�A���O"
 
-#: gui_beval.c:101 gui_w32.c:3830
+#: ../gui_beval.c:101 ../gui_w32.c:4093
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: ���b�Z�[�W���R�[���o�b�N������ BalloonEval ����������������"
 
-#: gui_gtk.c:1607
+#: ../gui_gtk.c:1687
 msgid "Vim dialog..."
 msgstr "Vim �_�C�A���O..."
 
-#: gui_gtk.c:2060 message.c:2993
+#: ../gui_gtk.c:2138 ../message.c:3016
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -2163,112 +2462,136 @@ msgstr ""
 "������(&N)\n"
 "�L�����Z��(&C)"
 
-#: gui_gtk.c:2268
+#: ../gui_gtk.c:2346
 msgid "Input _Methods"
 msgstr "�C���v�b�g���\\�b�h"
 
-#: gui_gtk.c:2534 gui_motif.c:2768
+#: ../gui_gtk.c:2612 ../gui_motif.c:3243
 msgid "VIM - Search and Replace..."
 msgstr "VIM - �������u��..."
 
-#: gui_gtk.c:2542 gui_motif.c:2770
+#: ../gui_gtk.c:2620 ../gui_motif.c:3245
 msgid "VIM - Search..."
 msgstr "VIM - ����..."
 
-#: gui_gtk.c:2574 gui_motif.c:2888
+#: ../gui_gtk.c:2652 ../gui_motif.c:3354
 msgid "Find what:"
 msgstr "����������:"
 
-#: gui_gtk.c:2592 gui_motif.c:2920
+#: ../gui_gtk.c:2670 ../gui_motif.c:3387
 msgid "Replace with:"
 msgstr "�u��������:"
 
 #. whole word only button
-#: gui_gtk.c:2624 gui_motif.c:3036
+#: ../gui_gtk.c:2702 ../gui_motif.c:3508
 msgid "Match whole word only"
 msgstr "���m���Y��������������"
 
 #. match case button
-#: gui_gtk.c:2635 gui_motif.c:3048
+#: ../gui_gtk.c:2713 ../gui_motif.c:3520
 msgid "Match case"
 msgstr "������/����������������"
 
-#: gui_gtk.c:2645 gui_motif.c:2990
+#: ../gui_gtk.c:2723 ../gui_motif.c:3459
 msgid "Direction"
 msgstr "����"
 
 #. 'Up' and 'Down' buttons
-#: gui_gtk.c:2657 gui_motif.c:3002
+#: ../gui_gtk.c:2735 ../gui_motif.c:3472
 msgid "Up"
 msgstr "��"
 
-#: gui_gtk.c:2661 gui_motif.c:3010
+#: ../gui_gtk.c:2739 ../gui_motif.c:3481
 msgid "Down"
 msgstr "��"
 
-#: gui_gtk.c:2683 gui_gtk.c:2685 gui_motif.c:2792
+#: ../gui_gtk.c:2761 ../gui_gtk.c:2763
 msgid "Find Next"
 msgstr "��������"
 
-#: gui_gtk.c:2702 gui_gtk.c:2704 gui_motif.c:2809
+#: ../gui_gtk.c:2780 ../gui_gtk.c:2782
 msgid "Replace"
 msgstr "�u��"
 
-#: gui_gtk.c:2715 gui_gtk.c:2717 gui_motif.c:2822
+#: ../gui_gtk.c:2793 ../gui_gtk.c:2795
 msgid "Replace All"
 msgstr "�S���u��"
 
-#: gui_gtk_x11.c:2327
+#: ../gui_gtk_x11.c:2327
 msgid "Vim: Received \"die\" request from session manager\n"
 msgstr "Vim: �Z�b�V�����}�l�[�W������ \"die\" �v������������������\n"
 
-#: gui_gtk_x11.c:3519
+#: ../gui_gtk_x11.c:3527
 msgid "Vim: Main window unexpectedly destroyed\n"
 msgstr "Vim: ���C���E�B���h�E���s�����j������������\n"
 
-#: gui_gtk_x11.c:4138
+#: ../gui_gtk_x11.c:4147
 msgid "Font Selection"
 msgstr "�t�H���g�I��"
 
-#: gui_gtk_x11.c:6035 ui.c:2117
+#: ../gui_gtk_x11.c:6104 ../ui.c:2142
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "�����I����������������CUT_BUFFER0���g�p����������"
 
-#: gui_motif.c:1617 gui_motif.c:1620
-msgid "Filter"
-msgstr "�t�B���^"
+#: ../gui_motif.c:2054
+msgid "&Filter"
+msgstr "�t�B���^(&F)"
+
+#: ../gui_motif.c:2055 ../gui_motif.c:3322
+msgid "&Cancel"
+msgstr "�L�����Z��(&C)"
 
-#: gui_motif.c:1619
+#: ../gui_motif.c:2056
 msgid "Directories"
 msgstr "�f�B���N�g��"
 
-#: gui_motif.c:1621
-msgid "Help"
-msgstr "�w���v"
+#: ../gui_motif.c:2057
+msgid "Filter"
+msgstr "�t�B���^"
+
+#: ../gui_motif.c:2058
+msgid "&Help"
+msgstr "�w���v(&H)"
 
-#: gui_motif.c:1622
+#: ../gui_motif.c:2059
 msgid "Files"
 msgstr "�t�@�C��"
 
-#: gui_motif.c:1624
+#: ../gui_motif.c:2060
+msgid "&OK"
+msgstr "&OK"
+
+#: ../gui_motif.c:2061
 msgid "Selection"
 msgstr "�I��"
 
-#: gui_motif.c:2835
-msgid "Undo"
-msgstr "�A���h�D"
+#: ../gui_motif.c:3274
+msgid "Find &Next"
+msgstr "��������(&N)"
+
+#: ../gui_motif.c:3289
+msgid "&Replace"
+msgstr "�u��(&R)"
 
-#: gui_riscos.c:952
+#: ../gui_motif.c:3300
+msgid "Replace &All"
+msgstr "�S���u��(&A)"
+
+#: ../gui_motif.c:3311
+msgid "&Undo"
+msgstr "�A���h�D(&U)"
+
+#: ../gui_riscos.c:952
 #, c-format
 msgid "E610: Can't load Zap font '%s'"
 msgstr "E610: Zap�t�H���g '%s' ��������������"
 
-#: gui_riscos.c:1048
+#: ../gui_riscos.c:1048
 #, c-format
 msgid "E611: Can't use font %s"
 msgstr "E611: �t�H���g %s ���g�p����������"
 
-#: gui_riscos.c:3270
+#: ../gui_riscos.c:3272
 msgid ""
 "\n"
 "Sending message to terminate child process.\n"
@@ -2276,64 +2599,83 @@ msgstr ""
 "\n"
 "�q�v���Z�X�����~���b�Z�[�W�����M������.\n"
 
-#: gui_w32.c:830
+#: ../gui_w32.c:840
+#, c-format
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �^�C�g���� \"%s\" ���E�B���h�E����������������"
+
+#: ../gui_w32.c:848
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
 msgstr "E243: �������T�|�[�g����������: \"-%s\"; OLE�����g�p������������."
 
-#: gui_w48.c:2090
+#: ../gui_w32.c:1098
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI�A�v�����������E�B���h�E���J��������"
+
+#: ../gui_w48.c:2213
 msgid "Find string (use '\\\\' to find  a '\\')"
 msgstr "���������� ('\\' �������������� '\\\\')"
 
-#: gui_w48.c:2115
+#: ../gui_w48.c:2238
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
 msgstr "�����E�u�� ('\\' �������������� '\\\\')"
 
-#: gui_x11.c:1537
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+#: ../gui_w48.c:3044
+msgid "Not Used"
+msgstr "�g����������"
+
+#: ../gui_w48.c:3045
+msgid "Directory\t*.nothing\n"
+msgstr "�f�B���N�g��\t*.nothing\n"
+
+#: ../gui_x11.c:1537
 msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
 msgstr "Vim E458: �F�w�������������������G���g����������������������"
 
-#: gui_x11.c:2118
+#: ../gui_x11.c:2141
 #, c-format
 msgid "E250: Fonts for the following charsets are missing in fontset %s:"
 msgstr "E250: �����������Z�b�g���t�H���g������������ %s:"
 
-#: gui_x11.c:2161
+#: ../gui_x11.c:2184
 #, c-format
 msgid "E252: Fontset name: %s"
 msgstr "E252: �t�H���g�Z�b�g��: %s"
 
-#: gui_x11.c:2162
+#: ../gui_x11.c:2185
 #, c-format
 msgid "Font '%s' is not fixed-width"
 msgstr "�t�H���g '%s' ����������������������"
 
-#: gui_x11.c:2181
+#: ../gui_x11.c:2204
 #, c-format
 msgid "E253: Fontset name: %s\n"
 msgstr "E253: �t�H���g�Z�b�g��: %s\n"
 
-#: gui_x11.c:2182
+#: ../gui_x11.c:2205
 #, c-format
 msgid "Font0: %s\n"
 msgstr "�t�H���g0: %s\n"
 
-#: gui_x11.c:2183
+#: ../gui_x11.c:2206
 #, c-format
 msgid "Font1: %s\n"
 msgstr "�t�H���g1: %s\n"
 
-#: gui_x11.c:2184
+#: ../gui_x11.c:2207
 #, c-format
-msgid "Font%d width is not twice that of font0\n"
-msgstr "�t�H���g%d �������t�H���g0���{��������������\n"
+msgid "Font%ld width is not twice that of font0\n"
+msgstr "�t�H���g%ld �������t�H���g0��2�{��������������\n"
 
-#: gui_x11.c:2185
+#: ../gui_x11.c:2208
 #, c-format
 msgid "Font0 width: %ld\n"
 msgstr "�t�H���g0����: %ld\n"
 
-#: gui_x11.c:2186
+#: ../gui_x11.c:2209
 #, c-format
 msgid ""
 "Font1 width: %ld\n"
@@ -2342,164 +2684,209 @@ msgstr ""
 "�t�H���g1����: %ld\n"
 "\n"
 
-#: hangulin.c:610
+#: ../gui_xmdlg.c:688 ../gui_xmdlg.c:810
+msgid "Invalid font specification"
+msgstr "�������t�H���g�w������"
+
+#: ../gui_xmdlg.c:689 ../gui_xmdlg.c:811
+msgid "&Dismiss"
+msgstr "�p������(&D)"
+
+#: ../gui_xmdlg.c:698
+msgid "no specific match"
+msgstr "�}�b�`��������������������"
+
+#: ../gui_xmdlg.c:910
+msgid "Vim - Font Selector"
+msgstr "Vim - �t�H���g�I��"
+
+#: ../gui_xmdlg.c:979
+msgid "Name:"
+msgstr "���O:"
+
+#. create toggle button
+#: ../gui_xmdlg.c:1019
+msgid "Show size in Points"
+msgstr "�T�C�Y���|�C���g���\\ｦ����"
+
+# msgid " BLOCK"
+# msgstr " �u���b�N"
+# msgid " LINE"
+# msgstr " �s"
+#: ../gui_xmdlg.c:1038
+msgid "Encoding:"
+msgstr "�G���R�[�h:"
+
+#: ../gui_xmdlg.c:1084
+msgid "Font:"
+msgstr "�t�H���g:"
+
+#: ../gui_xmdlg.c:1117
+msgid "Style:"
+msgstr "�X�^�C��:"
+
+#: ../gui_xmdlg.c:1149
+msgid "Size:"
+msgstr "�T�C�Y:"
+
+#: ../hangulin.c:610
 msgid "E256: Hangul automata ERROR"
 msgstr "E256: �n���O���I�[�g�}�g���G���["
 
-#: if_cscope.c:77
+#: ../if_cscope.c:77
 msgid "Add a new database"
 msgstr "�V�f�[�^�x�[�X������"
 
-#: if_cscope.c:79
+#: ../if_cscope.c:79
 msgid "Query for a pattern"
 msgstr "�p�^�[�����N�G���[������"
 
-#: if_cscope.c:81
+#: ../if_cscope.c:81
 msgid "Show this message"
 msgstr "�������b�Z�[�W���\\ｦ����"
 
-#: if_cscope.c:83
+#: ../if_cscope.c:83
 msgid "Kill a connection"
 msgstr "�������I������"
 
-#: if_cscope.c:85
+#: ../if_cscope.c:85
 msgid "Reinit all connections"
 msgstr "�S����������������������"
 
-#: if_cscope.c:87
+#: ../if_cscope.c:87
 msgid "Show connections"
 msgstr "�������\\ｦ����"
 
-#: if_cscope.c:95
+#: ../if_cscope.c:95
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: �g�p���@: cs[cope] %s"
 
-#: if_cscope.c:124
+#: ../if_cscope.c:124
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "����cscope�R�}���h�������E�B���h�E�����T�|�[�g����������.\n"
 
-#: if_cscope.c:175
+#: ../if_cscope.c:175
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: �g�p�@: cstag <ident>"
 
-#: if_cscope.c:231
+#: ../if_cscope.c:231
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: �^�O����������������"
 
-#: if_cscope.c:409
+#: ../if_cscope.c:409
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) �G���[: %d"
 
-#: if_cscope.c:419
+#: ../if_cscope.c:419
 msgid "E563: stat error"
 msgstr "E563: stat �G���["
 
-#: if_cscope.c:516
+#: ../if_cscope.c:516
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s ���f�B���N�g���y���L����cscope���f�[�^�x�[�X��������������"
 
-#: if_cscope.c:534
+#: ../if_cscope.c:534
 #, c-format
 msgid "Added cscope database %s"
 msgstr "cscope�f�[�^�x�[�X %s ������"
 
-#: if_cscope.c:589
+#: ../if_cscope.c:589
 #, c-format
 msgid "E262: error reading cscope connection %ld"
 msgstr "E262: cscope������ %ld �������������G���[����"
 
-#: if_cscope.c:694
+#: ../if_cscope.c:694
 msgid "E561: unknown cscope search type"
 msgstr "E561: ���m��cscope�����^����"
 
-#: if_cscope.c:736
+#: ../if_cscope.c:736
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: cscope�p�C�v����������������������"
 
-#: if_cscope.c:753
+#: ../if_cscope.c:753
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope���N������(fork)��ｸ�s��������"
 
-#: if_cscope.c:847 if_cscope.c:897
+#: ../if_cscope.c:847 ../if_cscope.c:897
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection ��ﾀ�s��ｸ�s��������"
 
-#: if_cscope.c:898
+#: ../if_cscope.c:898
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: cscope�v���Z�X���N������������������"
 
-#: if_cscope.c:911
+#: ../if_cscope.c:911
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: to_fp �� fdopen ��ｸ�s��������"
 
-#: if_cscope.c:913
+#: ../if_cscope.c:913
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fr_fp �� fdopen ��ｸ�s��������"
 
-#: if_cscope.c:951
+#: ../if_cscope.c:951
 msgid "E567: no cscope connections"
 msgstr "E567: cscope������ｸ�s��������"
 
-#: if_cscope.c:1025
+#: ../if_cscope.c:1025
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: cscope�N�G���[ %s of %s ���Y��������������������"
 
-#: if_cscope.c:1082
+#: ../if_cscope.c:1082
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: ������ cscopequickfix �t���O %c �� %c ����"
 
-#: if_cscope.c:1152
+#: ../if_cscope.c:1152
 msgid "cscope commands:\n"
 msgstr "cscope�R�}���h:\n"
 
-#: if_cscope.c:1155
+#: ../if_cscope.c:1155
 #, c-format
 msgid "%-5s: %-30s (Usage: %s)"
 msgstr "%-5s: %-30s (�g�p�@: %s)"
 
-#: if_cscope.c:1253
+#: ../if_cscope.c:1253
 #, c-format
 msgid "E625: cannot open cscope database: %s"
 msgstr "E625: cscope�f�[�^�x�[�X: %s ���J������������������"
 
-#: if_cscope.c:1271
+#: ../if_cscope.c:1271
 msgid "E626: cannot get cscope database information"
 msgstr "E626: cscope�f�[�^�x�[�X����������������������"
 
-#: if_cscope.c:1296
+#: ../if_cscope.c:1296
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: �d������cscope�f�[�^�x�[�X����������������������"
 
-#: if_cscope.c:1307
+#: ../if_cscope.c:1307
 msgid "E569: maximum number of cscope connections reached"
 msgstr "E569: cscope���������������B��������"
 
-#: if_cscope.c:1424
+#: ../if_cscope.c:1424
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope���� %s ����������������������"
 
-#: if_cscope.c:1458
+#: ../if_cscope.c:1458
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope���� %s ����������������"
 
 #. should not reach here
-#: if_cscope.c:1598
+#: ../if_cscope.c:1598
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches ���v���I���G���[����"
 
-#: if_cscope.c:1848
+#: ../if_cscope.c:1848
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope �^�O: %s"
 
-#: if_cscope.c:1870
+#: ../if_cscope.c:1870
 msgid ""
 "\n"
 "   #   line"
@@ -2507,28 +2894,123 @@ msgstr ""
 "\n"
 "   #   �s����"
 
-#: if_cscope.c:1872
+#: ../if_cscope.c:1872
 msgid "filename / context / line\n"
 msgstr "�t�@�C���� / ���� / �s\n"
 
-#: if_cscope.c:1990
+#: ../if_cscope.c:1990
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: cscope�G���[: %s"
 
-#: if_cscope.c:2176
+#: ../if_cscope.c:2176
 msgid "All cscope databases reset"
 msgstr "�S����cscope�f�[�^�x�[�X�����Z�b�g������"
 
-#: if_cscope.c:2244
+#: ../if_cscope.c:2244
 msgid "no cscope connections\n"
 msgstr "cscope����������������\n"
 
-#: if_cscope.c:2248
+#: ../if_cscope.c:2248
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    �f�[�^�x�[�X��                      prepend �p�X\n"
 
-#: if_python.c:436
+#: ../if_mzsch.c:785
+msgid ""
+"???: Sorry, this command is disabled, the MzScheme library could not be "
+"loaded."
+msgstr ""
+"???: �����R�}���h����������, ������������: MzScheme "
+"���C�u���������[�h����������������."
+
+#: ../if_mzsch.c:1222 ../if_python.c:1084 ../if_tcl.c:1406
+msgid "invalid expression"
+msgstr "������ｮ����"
+
+#: ../if_mzsch.c:1230 ../if_python.c:1098 ../if_tcl.c:1411
+msgid "expressions disabled at compile time"
+msgstr "ｮ���R���p�C������������������������"
+
+#: ../if_mzsch.c:1317
+msgid "hidden option"
+msgstr "�B���I�v�V����"
+
+#: ../if_mzsch.c:1319 ../if_tcl.c:505
+msgid "unknown option"
+msgstr "���m���I�v�V��������"
+
+#: ../if_mzsch.c:1468
+msgid "window index is out of range"
+msgstr "�����O���E�B���h�E��������"
+
+#: ../if_mzsch.c:1623
+msgid "couldn't open buffer"
+msgstr "�o�b�t�@���J��������"
+
+#: ../if_mzsch.c:1888 ../if_mzsch.c:1914 ../if_mzsch.c:1989 ../if_mzsch.c:2038
+#: ../if_mzsch.c:2147 ../if_mzsch.c:2190 ../if_python.c:2311
+#: ../if_python.c:2345 ../if_python.c:2400 ../if_python.c:2468
+#: ../if_python.c:2590 ../if_python.c:2642 ../if_tcl.c:688 ../if_tcl.c:733
+#: ../if_tcl.c:807 ../if_tcl.c:877 ../if_tcl.c:2003
+msgid "cannot save undo information"
+msgstr "�A���h�D��������������������"
+
+#: ../if_mzsch.c:1893 ../if_mzsch.c:1997 ../if_mzsch.c:2051
+#: ../if_python.c:2313 ../if_python.c:2407 ../if_python.c:2479
+msgid "cannot delete line"
+msgstr "�s������������"
+
+#: ../if_mzsch.c:1919 ../if_mzsch.c:2065 ../if_python.c:2350
+#: ../if_python.c:2495 ../if_tcl.c:694 ../if_tcl.c:2025
+msgid "cannot replace line"
+msgstr "�s���u������������"
+
+#: ../if_mzsch.c:2079 ../if_mzsch.c:2152 ../if_mzsch.c:2199
+#: ../if_python.c:2513 ../if_python.c:2592 ../if_python.c:2650
+msgid "cannot insert line"
+msgstr "�s���}������������"
+
+#: ../if_mzsch.c:2295 ../if_python.c:2762
+msgid "string cannot contain newlines"
+msgstr "�������������s��������������������"
+
+#: ../if_mzsch.c:2378
+msgid "Vim error: ~a"
+msgstr "Vim �G���[: ~a"
+
+#: ../if_mzsch.c:2387
+msgid "Vim error"
+msgstr "Vim �G���["
+
+#: ../if_mzsch.c:2443
+msgid "buffer is invalid"
+msgstr "�o�b�t�@����������"
+
+#: ../if_mzsch.c:2452
+msgid "window is invalid"
+msgstr "�E�B���h�E����������"
+
+#: ../if_mzsch.c:2472
+msgid "linenr out of range"
+msgstr "�����O���s��������"
+
+#: ../globals.h:1293 ../if_perl.xs:326 if_perl.xs:326
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ���C�u���� %s �����[�h����������������"
+
+#: ../if_perl.xs:556 if_perl.xs:556
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"�����R�}���h����������, ������������: Perl���C�u���������[�h����������������."
+
+#: ../if_perl.xs:609 if_perl.xs:609
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: �T���h�{�b�N�X���� Safe "
+"���W���[�����g�p������Perl�X�N���v�g������������������"
+
+#: ../if_python.c:438
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2537,197 +3019,168 @@ msgstr ""
 "Python���C�u���������[�h����������������."
 
 # Added at 07-Feb-2004.
-#: if_python.c:500
+#: ../if_python.c:504
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Python �����A�I��ﾀ�s��������������������"
 
-#: if_python.c:701
+#: ../if_python.c:705
 msgid "can't delete OutputObject attributes"
 msgstr "OutputObject����������������"
 
-#: if_python.c:708
+#: ../if_python.c:712
 msgid "softspace must be an integer"
 msgstr "softspace �� integer ��������������������"
 
-#: if_python.c:716
+#: ../if_python.c:720
 msgid "invalid attribute"
 msgstr "��������������"
 
-#: if_python.c:755 if_python.c:769
+#: ../if_python.c:759 ../if_python.c:773
 msgid "writelines() requires list of strings"
 msgstr "writelines() ���������������X�g���K�v����"
 
-#: if_python.c:895
+#: ../if_python.c:899
 msgid "E264: Python: Error initialising I/O objects"
 msgstr "E264: Python: I/O�I�u�W�F�N�g�������������G���[����"
 
-#: if_python.c:1080 if_tcl.c:1402
-msgid "invalid expression"
-msgstr "������ｮ����"
-
-#: if_python.c:1094 if_tcl.c:1407
-msgid "expressions disabled at compile time"
-msgstr "ｮ���R���p�C������������������������"
-
-#: if_python.c:1107
+#: ../if_python.c:1111
 msgid "attempt to refer to deleted buffer"
 msgstr "���������o�b�t�@���Q������������"
 
-#: if_python.c:1122 if_python.c:1163 if_python.c:1227 if_tcl.c:1214
+#: ../if_python.c:1126 ../if_python.c:1167 ../if_python.c:1231
+#: ../if_tcl.c:1218
 msgid "line number out of range"
 msgstr "�����O���s��������"
 
-#: if_python.c:1362
+#: ../if_python.c:1366
 #, c-format
 msgid "<buffer object (deleted) at %8lX>"
 msgstr "<�o�b�t�@�I�u�W�F�N�g (��������) %8lX>"
 
-#: if_python.c:1453 if_tcl.c:836
+#: ../if_python.c:1457 ../if_tcl.c:840
 msgid "invalid mark name"
 msgstr "�������}�[�N������"
 
-#: if_python.c:1733
+#: ../if_python.c:1737
 msgid "no such buffer"
 msgstr "�����������o�b�t�@������������"
 
-#: if_python.c:1821
+#: ../if_python.c:1825
 msgid "attempt to refer to deleted window"
 msgstr "���������E�B���h�E���Q������������"
 
-#: if_python.c:1866
+#: ../if_python.c:1870
 msgid "readonly attribute"
 msgstr "�������p����"
 
-#: if_python.c:1879
+#: ../if_python.c:1883
 msgid "cursor position outside buffer"
 msgstr "�J�[�\\�����o�b�t�@���O����������"
 
-#: if_python.c:1956
+#: ../if_python.c:1960
 #, c-format
 msgid "<window object (deleted) at %.8lX>"
 msgstr "<�E�B���h�E�I�u�W�F�N�g (������) %.8lX>"
 
-#: if_python.c:1968
+#: ../if_python.c:1972
 #, c-format
 msgid "<window object (unknown) at %.8lX>"
 msgstr "<�E�B���h�E�I�u�W�F�N�g (���m) %.8lX>"
 
-#: if_python.c:1970
+#: ../if_python.c:1974
 #, c-format
 msgid "<window %d>"
 msgstr "<�E�B���h�E %d>"
 
-#: if_python.c:2046
+#: ../if_python.c:2050
 msgid "no such window"
 msgstr "�����������E�B���h�E������������"
 
-#: 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 "�A���h�D��������������������"
-
-#: if_python.c:2309 if_python.c:2403 if_python.c:2475
-msgid "cannot delete line"
-msgstr "�s������������"
-
-#: if_python.c:2346 if_python.c:2491 if_tcl.c:690 if_tcl.c:2021
-msgid "cannot replace line"
-msgstr "�s���u������������"
-
-#: if_python.c:2509 if_python.c:2588 if_python.c:2646
-msgid "cannot insert line"
-msgstr "�s���}������������"
-
-#: if_python.c:2750
-msgid "string cannot contain newlines"
-msgstr "�������������s��������������������"
-
-#: if_ruby.c:422
+#: ../if_ruby.c:422
 msgid ""
 "E266: Sorry, this command is disabled, the Ruby library could not be loaded."
 msgstr ""
 "E266: �����R�}���h����������,������������: "
 "Ruby���C�u���������[�h����������������."
 
-#: if_ruby.c:485
+#: ../if_ruby.c:485
 #, c-format
 msgid "E273: unknown longjmp status %d"
 msgstr "E273: ���m��longjmp����: %d"
 
-#: if_sniff.c:67
+#: ../if_sniff.c:67
 msgid "Toggle implementation/definition"
 msgstr "ﾀ�������`������������"
 
-#: if_sniff.c:68
+#: ../if_sniff.c:68
 msgid "Show base class of"
 msgstr "�����N���X���������\\ｦ"
 
-#: if_sniff.c:69
+#: ../if_sniff.c:69
 msgid "Show overridden member function"
 msgstr "�I�[�o�[���C�h�����������o�������\\ｦ"
 
-#: if_sniff.c:70
+#: ../if_sniff.c:70
 msgid "Retrieve from file"
 msgstr "�t�@�C��������������"
 
-#: if_sniff.c:71
+#: ../if_sniff.c:71
 msgid "Retrieve from project"
 msgstr "�v���W�F�N�g������������"
 
-#: if_sniff.c:73
+#: ../if_sniff.c:73
 msgid "Retrieve from all projects"
 msgstr "�S�����v���W�F�N�g������������"
 
-#: if_sniff.c:74
+#: ../if_sniff.c:74
 msgid "Retrieve"
 msgstr "����"
 
-#: if_sniff.c:75
+#: ../if_sniff.c:75
 msgid "Show source of"
 msgstr "�����\\�[�X���\\ｦ����"
 
-#: if_sniff.c:76
+#: ../if_sniff.c:76
 msgid "Find symbol"
 msgstr "���������V���{��"
 
-#: if_sniff.c:77
+#: ../if_sniff.c:77
 msgid "Browse class"
 msgstr "�N���X���Q��"
 
-#: if_sniff.c:78
+#: ../if_sniff.c:78
 msgid "Show class in hierarchy"
 msgstr "�K�w���N���X���\\ｦ"
 
-#: if_sniff.c:79
+#: ../if_sniff.c:79
 msgid "Show class in restricted hierarchy"
 msgstr "�����������K�w���N���X���\\ｦ"
 
-#: if_sniff.c:80
+#: ../if_sniff.c:80
 msgid "Xref refers to"
 msgstr "Xref ���Q����"
 
-#: if_sniff.c:81
+#: ../if_sniff.c:81
 msgid "Xref referred by"
 msgstr "Xref ���Q��������"
 
-#: if_sniff.c:82
+#: ../if_sniff.c:82
 msgid "Xref has a"
 msgstr "Xref ������������������������"
 
-#: if_sniff.c:83
+#: ../if_sniff.c:83
 msgid "Xref used by"
 msgstr "Xref ���g�p������"
 
-#: if_sniff.c:84
+#: ../if_sniff.c:84
 msgid "Show docu of"
 msgstr "�����������\\ｦ"
 
-#: if_sniff.c:85
+#: ../if_sniff.c:85
 msgid "Generate docu for"
 msgstr "��������������"
 
-#: if_sniff.c:97
+#: ../if_sniff.c:97
 msgid ""
 "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
 "$PATH).\n"
@@ -2735,216 +3188,216 @@ msgstr ""
 "SNiFF+����������������. �������`�F�b�N������������(sniffemacs �� $PATH "
 "��������������������).\n"
 
-#: if_sniff.c:425
+#: ../if_sniff.c:425
 msgid "E274: Sniff: Error during read. Disconnected"
 msgstr "E274: Sniff: ���������G���[��������������. ���f��������"
 
-#: if_sniff.c:553
+#: ../if_sniff.c:553
 msgid "SNiFF+ is currently "
 msgstr "����SNiFF+ ���������u"
 
-#: if_sniff.c:555
+#: ../if_sniff.c:555
 msgid "not "
 msgstr "��"
 
-#: if_sniff.c:556
+#: ../if_sniff.c:556
 msgid "connected"
 msgstr "�����v����"
 
-#: if_sniff.c:592
+#: ../if_sniff.c:592
 #, c-format
 msgid "E275: Unknown SNiFF+ request: %s"
 msgstr "E275: ���m�� SNiFF+ ���N�G�X�g����: %s"
 
-#: if_sniff.c:605
+#: ../if_sniff.c:605
 msgid "E276: Error connecting to SNiFF+"
 msgstr "E276: SNiFF+ �������������G���[����"
 
-#: if_sniff.c:1009
+#: ../if_sniff.c:1009
 msgid "E278: SNiFF+ not connected"
 msgstr "E278: SNiFF+ ��������������������"
 
-#: if_sniff.c:1018
+#: ../if_sniff.c:1018
 msgid "E279: Not a SNiFF+ buffer"
 msgstr "E279: SNiFF+ �o�b�t�@������������"
 
-#: if_sniff.c:1083
+#: ../if_sniff.c:1083
 msgid "Sniff: Error during write. Disconnected"
 msgstr "Sniff: �����������G���[�����������������f��������"
 
-#: if_tcl.c:418
+#: ../if_tcl.c:422
 msgid "invalid buffer number"
 msgstr "�������o�b�t�@��������"
 
-#: if_tcl.c:464 if_tcl.c:931 if_tcl.c:1110
+#: ../if_tcl.c:468 ../if_tcl.c:935 ../if_tcl.c:1114
 msgid "not implemented yet"
 msgstr "����ﾀ����������������"
 
-#: if_tcl.c:501
-msgid "unknown option"
-msgstr "���m���I�v�V��������"
-
 #. ???
-#: if_tcl.c:774
+#: ../if_tcl.c:778
 msgid "cannot set line(s)"
 msgstr "�s����������������"
 
-#: if_tcl.c:845
+#: ../if_tcl.c:849
 msgid "mark not set"
 msgstr "�}�[�N��������������������"
 
-#: if_tcl.c:851 if_tcl.c:1066
+#: ../if_tcl.c:855 ../if_tcl.c:1070
 #, c-format
 msgid "row %d column %d"
 msgstr "�s %d �� %d"
 
-#: if_tcl.c:881
+#: ../if_tcl.c:885
 msgid "cannot insert/append line"
 msgstr "�s���}��/����������������"
 
-#: if_tcl.c:1268
+#: ../if_tcl.c:1272
 msgid "unknown flag: "
 msgstr "���m���t���O:"
 
-#: if_tcl.c:1338
+#: ../if_tcl.c:1342
 msgid "unknown vimOption"
 msgstr "���m�� vimOption ����"
 
-#: if_tcl.c:1423
+#: ../if_tcl.c:1427
 msgid "keyboard interrupt"
 msgstr "�L�[�{�[�h������"
 
-#: if_tcl.c:1428
+#: ../if_tcl.c:1432
 msgid "vim error"
 msgstr "vim �G���["
 
-#: if_tcl.c:1471
+#: ../if_tcl.c:1475
 msgid "cannot create buffer/window command: object is being deleted"
 msgstr ""
 "�o�b�t�@/�E�B���h�E�����R�}���h����������������: "
 "�I�u�W�F�N�g��������������������"
 
-#: if_tcl.c:1545
+#: ../if_tcl.c:1549
 msgid ""
 "cannot register callback command: buffer/window is already being deleted"
 msgstr ""
 "�R�[���o�b�N�R�}���h���o�^����������: �o�b�t�@/�E�B���h�E��������������������"
 
 #. This should never happen.  Famous last word?
-#: if_tcl.c:1562
+#: ../if_tcl.c:1566
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to "
 "vim-dev@vim.org"
 msgstr ""
 "E280: TCL �v���I�G���[: reflist ����!? vim-dev@vim.org ������������������"
 
-#: if_tcl.c:1563
+#: ../if_tcl.c:1567
 msgid "cannot register callback command: buffer/window reference not found"
 msgstr ""
 "�R�[���o�b�N�R�}���h���o�^����������: "
 "�o�b�t�@/�E�B���h�E���Q������������������"
 
-#: if_tcl.c:1724
+#: ../if_tcl.c:1728
 msgid ""
 "E571: Sorry, this command is disabled: the Tcl library could not be loaded."
 msgstr ""
 "E571: �����R�}���h����������,������������: "
 "Tcl���C�u���������[�h����������������."
 
-#: if_tcl.c:1886
+#: ../if_tcl.c:1890
 msgid ""
 "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
 msgstr ""
 "E281: TCL �G���[: �I���R�[�h�������l��������������!? vim-dev@vim.org "
 "������������������"
 
-#: if_tcl.c:2007
+#: ../if_tcl.c:2011
 msgid "cannot get line"
 msgstr "�s����������������"
 
-#: if_xcmdsrv.c:225
+#: ../if_xcmdsrv.c:233
 msgid "Unable to register a command server name"
 msgstr "�����T�[�o�����O���o�^����������"
 
-#: if_xcmdsrv.c:473
+#: ../if_xcmdsrv.c:489
 msgid "E248: Failed to send command to the destination program"
 msgstr "E248: ���I���v���O���������R�}���h���M��ｸ�s��������"
 
-#: if_xcmdsrv.c:747
+#: ../if_xcmdsrv.c:762
 #, c-format
 msgid "E573: Invalid server id used: %s"
 msgstr "E573: �������T�[�oID���g����������: %s"
 
-#: if_xcmdsrv.c:1110
+#: ../if_xcmdsrv.c:1132
 msgid "E251: VIM instance registry property is badly formed.  Deleted!"
 msgstr "E251: VIM ﾀ�����o�^�v���p�e�B���s������. ������������!"
 
-#: main.c:60
+#: ../main.c:60
 msgid "Unknown option"
 msgstr "���m���I�v�V��������"
 
-#: main.c:62
+#: ../main.c:62
 msgid "Too many edit arguments"
-msgstr "���W����������������"
+msgstr "���W����������������"
 
-#: main.c:64
+#: ../main.c:64
 msgid "Argument missing after"
 msgstr "����������������"
 
-#: main.c:66
+#: ../main.c:66
 msgid "Garbage after option"
 msgstr "�I�v�V�����������S�~����������"
 
-#: main.c:68
+#: ../main.c:68
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\", \"-c command\", \"--cmd command\" ������������������"
+msgstr "\"+command\", \"-c command\", \"--cmd command\" ������������������"
 
-#: main.c:70
+#: ../main.c:70
 msgid "Invalid argument for"
 msgstr "��������������: "
 
-#: main.c:466
+#: ../main.c:481
 msgid "This Vim was not compiled with the diff feature."
 msgstr "����Vim����diff�@�\\������������(�R���p�C��������)."
 
-#: main.c:932
+#: ../main.c:958
 msgid "Attempt to open script file again: \""
 msgstr "�X�N���v�g�t�@�C���������J����������: \""
 
 # msgid "\"\n"
 # msgstr "\"\n"
-#: main.c:941
+#: ../main.c:967
 msgid "Cannot open for reading: \""
 msgstr "�����p�������J��������"
 
-#: main.c:985
+#: ../main.c:1021
 msgid "Cannot open for script output: \""
 msgstr "�X�N���v�g�o���p���J��������"
 
-#: main.c:1132
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d �����t�@�C�������W���T����������\n"
+#: ../main.c:1297
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: �G���[: NetBeans����gvim���X�^�[�g����������\n"
 
-#: main.c:1233
+#: ../main.c:1302
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: �x��: �[�������o����������������\n"
 
-#: main.c:1235
+#: ../main.c:1304
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: �x��: �[��������������������������\n"
 
+#: ../main.c:1314
+#, c-format
+msgid "%d files to edit\n"
+msgstr "%d �����t�@�C�������W���T����������\n"
+
 #. just in case..
-#: main.c:1297
+#: ../main.c:1377
 msgid "pre-vimrc command line"
 msgstr "vimrc�O���R�}���h���C��"
 
-#: main.c:1338
+#: ../main.c:1418
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: \"%s\"��������������������������"
 
-#: main.c:2411
+#: ../main.c:2521
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -2952,23 +3405,23 @@ msgstr ""
 "\n"
 "����������������: \"vim -h\"\n"
 
-#: main.c:2444
+#: ../main.c:2554
 msgid "[file ..]       edit specified file(s)"
 msgstr "[�t�@�C��..]    �����t�@�C�������W����"
 
-#: main.c:2445
+#: ../main.c:2555
 msgid "-               read text from stdin"
 msgstr "-               �W�����������e�L�X�g��������"
 
-#: main.c:2446
+#: ../main.c:2556
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t �^�O         �^�O�����`�������������������W����"
 
-#: main.c:2448
+#: ../main.c:2558
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  �������G���[�����W����"
 
-#: main.c:2457
+#: ../main.c:2567
 msgid ""
 "\n"
 "\n"
@@ -2978,11 +3431,11 @@ msgstr ""
 "\n"
 "�g�p�@:"
 
-#: main.c:2460
+#: ../main.c:2570
 msgid " vim [arguments] "
 msgstr " vim [����]"
 
-#: main.c:2464
+#: ../main.c:2574
 msgid ""
 "\n"
 "   or:"
@@ -2990,7 +3443,11 @@ msgstr ""
 "\n"
 "   ��������:"
 
-#: main.c:2467
+#: ../main.c:2577
+msgid "where case is ignored prepend / to make flag upper case"
+msgstr "�������������������������� / �t���O����������������������"
+
+#: ../main.c:2580
 msgid ""
 "\n"
 "\n"
@@ -3000,241 +3457,241 @@ msgstr ""
 "\n"
 "����:\n"
 
-#: main.c:2468
+#: ../main.c:2581
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\t�������������t�@�C��������"
 
-#: main.c:2470
+#: ../main.c:2583
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\t���C���h�J�[�h���W�J������"
 
-#: main.c:2473
+#: ../main.c:2586
 msgid "-register\t\tRegister this gvim for OLE"
 msgstr "-register\t\t����gvim��OLE�������o�^����"
 
-#: main.c:2474
+#: ../main.c:2587
 msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tgvim��OLE�o�^����������"
 
-#: main.c:2477
+#: ../main.c:2590
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
 msgstr "-g\t\t\tGUI���N������ (\"gvim\" ������)"
 
-#: main.c:2478
+#: ../main.c:2591
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f or  --nofork\t�t�H�A�O���E���h: GUI���n����������fork������"
 
-#: main.c:2480
+#: ../main.c:2593
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi���[�h (\"vi\" ������)"
 
-#: main.c:2481
+#: ../main.c:2594
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx���[�h (\"ex\" ������)"
 
-#: main.c:2482
+#: ../main.c:2595
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\t�T�C�����g(�o�b�`)���[�h (\"ex\" ���p)"
 
-#: main.c:2484
+#: ../main.c:2597
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\t�������[�h (\"vidiff\" ������)"
 
-#: main.c:2486
+#: ../main.c:2599
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\t�C�[�W�[���[�h (\"evim\" ������, ���[�h��)"
 
-#: main.c:2487
+#: ../main.c:2600
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t�������p���[�h (\"view\" ������)"
 
-#: main.c:2488
+#: ../main.c:2601
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t�������[�h (\"rvim\" ������)"
 
-#: main.c:2489
+#: ../main.c:2602
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t���X (�t�@�C��������) ��������������������"
 
-#: main.c:2490
+#: ../main.c:2603
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t�e�L�X�g�����W���s������������������"
 
-#: main.c:2491
+#: ../main.c:2604
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\t�o�C�i�����[�h"
 
-#: main.c:2493
+#: ../main.c:2606
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp���[�h"
 
-#: main.c:2495
+#: ../main.c:2608
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tVi�������[�h: 'compatible'"
 
-#: main.c:2496
+#: ../main.c:2609
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi���������[�h: 'nocompatible"
 
-#: main.c:2497
+#: ../main.c:2610
 msgid "-V[N]\t\tVerbose level"
 msgstr "-V[N]\t\tVerbose ���x��"
 
-#: main.c:2498
+#: ../main.c:2611
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t�f�o�b�O���[�h"
 
-#: main.c:2499
+#: ../main.c:2612
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t�X���b�v�t�@�C�����g�p��������������"
 
-#: main.c:2500
+#: ../main.c:2613
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\t�X���b�v�t�@�C�����������I��"
 
-#: main.c:2501
+#: ../main.c:2614
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (�t�@�C����)\t�N���b�V�������Z�b�V���������A"
 
-#: main.c:2502
+#: ../main.c:2615
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t-r������"
 
-#: main.c:2504
+#: ../main.c:2617
 msgid "-f\t\t\tDon't use newcli to open window"
 msgstr "-f\t\t\t�E�B���h�E���J������ newcli ���g�p������"
 
-#: main.c:2505
+#: ../main.c:2618
 msgid "-dev <device>\t\tUse <device> for I/O"
 msgstr "-dev <device>\t\tI/O�� <device> ���g�p����"
 
-#: main.c:2508
+#: ../main.c:2621
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\t�A���r�A�����[�h���N������"
 
-#: main.c:2511
+#: ../main.c:2624
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t�w�u���C�����[�h���N������"
 
-#: main.c:2514
+#: ../main.c:2627
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t�y���V�A�����[�h���N������"
 
-#: main.c:2516
+#: ../main.c:2629
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t�[���� <terminal> ����������"
 
-#: main.c:2517
+#: ../main.c:2630
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc���������� <vimrc> ���g��"
 
-#: main.c:2519
+#: ../main.c:2632
 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
 msgstr "-U <gvimrc>\t\t.gvimrc���������� <gvimrc> ���g��"
 
-#: main.c:2521
+#: ../main.c:2634
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\t�v���O�C���X�N���v�g�����[�h������"
 
-#: main.c:2522
+#: ../main.c:2635
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN ���E�B���h�E���J��(�����l: �t�@�C��������1��)"
 
-#: main.c:2523
+#: ../main.c:2636
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t-o������������������"
 
-#: main.c:2524
+#: ../main.c:2637
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\t�t�@�C��������������������"
 
-#: main.c:2525
+#: ../main.c:2638
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t<lnum> �s������������"
 
-#: main.c:2527
+#: ../main.c:2640
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\tvimrc�����[�h�����O�� <command> ��ﾀ�s����"
 
-#: main.c:2529
+#: ../main.c:2642
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t�������t�@�C�������[�h�� <command> ��ﾀ�s����"
 
-#: main.c:2530
+#: ../main.c:2643
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t�������t�@�C�������[�h���t�@�C�� <session> ��������"
 
-#: main.c:2531
+#: ../main.c:2644
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\t�t�@�C�� <scriptin> �����m�[�}���R�}���h��������"
 
-#: main.c:2532
+#: ../main.c:2645
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t���������S�R�}���h���t�@�C�� <scriptout> ����������"
 
-#: main.c:2533
+#: ../main.c:2646
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t���������S�R�}���h���t�@�C�� <scriptout> ����������"
 
-#: main.c:2535
+#: ../main.c:2648
 msgid "-x\t\t\tEdit encrypted files"
 msgstr "-x\t\t\t�������������t�@�C�������W����"
 
-#: main.c:2539
+#: ../main.c:2652
 msgid "-display <display>\tConnect vim to this particular X-server"
 msgstr "-display <display>\tvim���w������ X �T�[�o����������"
 
-#: main.c:2541
+#: ../main.c:2654
 msgid "-X\t\t\tDo not connect to X server"
 msgstr "-X\t\t\tX�T�[�o������������"
 
-#: main.c:2544
+#: ../main.c:2657
 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
 msgstr "--remote <files>\t���\\������Vim�T�[�o�� <files> �����W����"
 
-#: main.c:2545
+#: ../main.c:2658
 msgid "--remote-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-silnet <files>  ����, �T�[�o�����������x�������o��������"
 
-#: main.c:2546
+#: ../main.c:2659
 msgid ""
 "--remote-wait <files>  As --remote but wait for files to have been edited"
 msgstr "--remote-wait <files>\t--remote�� �t�@�C�������W���I������������"
 
-#: main.c:2547
+#: ../main.c:2660
 msgid ""
 "--remote-wait-silent <files>  Same, don't complain if there is no server"
 msgstr "--remote-wait-silent <files>  ����, �T�[�o�����������x�������o��������"
 
-#: main.c:2548
+#: ../main.c:2661
 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
 msgstr "--remote-send <keys>\tVim�T�[�o�� <keys> �����M�����I������"
 
-#: main.c:2549
+#: ../main.c:2662
 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
 msgstr "--remote-expr <expr>\t�T�[�o�� <expr> ��ﾀ�s�����������\\ｦ����"
 
-#: main.c:2550
+#: ../main.c:2663
 msgid "--serverlist\t\tList available Vim server names and exit"
 msgstr "--serverlist\t\tVim�T�[�o�����������\\ｦ�����I������"
 
-#: main.c:2551
+#: ../main.c:2664
 msgid "--servername <name>\tSend to/become the Vim server <name>"
 msgstr "--servename <name>\t\tVim�T�[�o <name> �����M/���O��������"
 
-#: main.c:2554
+#: ../main.c:2667
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfo���������� <viminfo> ���g��"
 
-#: main.c:2556
+#: ../main.c:2669
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h or  --help\t�w���v(�������b�Z�[�W)���\\ｦ���I������"
 
-#: main.c:2557
+#: ../main.c:2670
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\t�o�[�W�����������\\ｦ���I������"
 
-#: main.c:2561
+#: ../main.c:2674
 msgid ""
 "\n"
 "Arguments recognised by gvim (Motif version):\n"
@@ -3242,7 +3699,7 @@ msgstr ""
 "\n"
 "gvim����������ﾟ����������(Motif�o�[�W����):\n"
 
-#: main.c:2565
+#: ../main.c:2678
 msgid ""
 "\n"
 "Arguments recognised by gvim (neXtaw version):\n"
@@ -3250,7 +3707,7 @@ msgstr ""
 "\n"
 "gvim����������ﾟ����������(neXtaw�o�[�W����):\n"
 
-#: main.c:2567
+#: ../main.c:2680
 msgid ""
 "\n"
 "Arguments recognised by gvim (Athena version):\n"
@@ -3258,72 +3715,72 @@ msgstr ""
 "\n"
 "gvim����������ﾟ����������(Athena�o�[�W����):\n"
 
-#: main.c:2571
+#: ../main.c:2684
 msgid "-display <display>\tRun vim on <display>"
 msgstr "-display <display>\t<display> ��vim��ﾀ�s����"
 
-#: main.c:2572
+#: ../main.c:2685
 msgid "-iconic\t\tStart vim iconified"
 msgstr "-iconic\t\t����������������vim���N������"
 
-#: main.c:2574
+#: ../main.c:2687
 msgid "-name <name>\t\tUse resource as if vim was <name>"
 msgstr "-name <name>\t\tvim������ <name> ���������������\\�[�X���g��"
 
-#: main.c:2575
+#: ../main.c:2688
 msgid "\t\t\t  (Unimplemented)\n"
 msgstr "\t\t\t  (ﾀ��������������)\n"
 
-#: main.c:2577
+#: ../main.c:2690
 msgid "-background <color>\tUse <color> for the background (also: -bg)"
 msgstr "-background <color>\t�w�i�F�� <color> ���g��(���`: -bg)"
 
-#: main.c:2578
+#: ../main.c:2691
 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
 msgstr "-foreground <color>\t�O�i�F�� <color> ���g��(���`: -fg)"
 
-#: main.c:2579 main.c:2599
+#: ../main.c:2692 ../main.c:2712 ../main.c:2728
 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
 msgstr "-font <font>\t\t�e�L�X�g�\\ｦ�� <font> ���g��(���`: -fn)"
 
-#: main.c:2580
+#: ../main.c:2693
 msgid "-boldfont <font>\tUse <font> for bold text"
 msgstr "-boldfont <font>\t������ <font> ���g��"
 
-#: main.c:2581
+#: ../main.c:2694
 msgid "-italicfont <font>\tUse <font> for italic text"
 msgstr "-italicfont <for>\tﾎ������ <font> ���g��"
 
-#: main.c:2582 main.c:2600
+#: ../main.c:2695 ../main.c:2713 ../main.c:2729
 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
 msgstr "-geometry <geom>\t�����z�u�� <geom> ���g��(���`: -geom)"
 
-#: main.c:2583
+#: ../main.c:2696
 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
 msgstr "-borderwidth <width>\t���E������ <width> ������(���`: -bw)"
 
-#: main.c:2584
+#: ../main.c:2697
 msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
 msgstr ""
 "-scrollbarwidth <width>  �X�N���[���o�[������ <width> ������(���`: -sw)"
 
-#: main.c:2586
+#: ../main.c:2699
 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
 msgstr "-menuheight <height>\t���j���[�o�[�������� <height> ������(���`: -mh)"
 
-#: main.c:2588 main.c:2601
+#: ../main.c:2701 ../main.c:2714
 msgid "-reverse\t\tUse reverse video (also: -rv)"
 msgstr "-reverse\t\t���]�f�����g�p����(���`: -rv)"
 
-#: main.c:2589
+#: ../main.c:2702
 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
 msgstr "+reverse\t\t���]�f�����g�p������(���`: +rv)"
 
-#: main.c:2590
+#: ../main.c:2703
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <resource>\t���������\\�[�X���g�p����"
 
-#: main.c:2593
+#: ../main.c:2706
 msgid ""
 "\n"
 "Arguments recognised by gvim (RISC OS version):\n"
@@ -3331,15 +3788,15 @@ msgstr ""
 "\n"
 "gvim����������ﾟ����������(RISC OS�o�[�W����):\n"
 
-#: main.c:2594
+#: ../main.c:2707
 msgid "--columns <number>\tInitial width of window in columns"
 msgstr "--columns <number>\t�������E�B���h�E���R�����P������"
 
-#: main.c:2595
+#: ../main.c:2708
 msgid "--rows <number>\tInitial height of window in rows"
 msgstr "--rows <number>\t�������E�B���h�E���s�P��������"
 
-#: main.c:2598
+#: ../main.c:2711
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3347,62 +3804,86 @@ msgstr ""
 "\n"
 "gvim����������ﾟ����������(GTK+�o�[�W����):\n"
 
-#: main.c:2602
+#: ../main.c:2715
 msgid "-display <display>\tRun vim on <display> (also: --display)"
 msgstr "-display <display>\t<display> ��vim��ﾀ�s����(���`: --display)"
 
-#: main.c:2604
+#: ../main.c:2717
 msgid "--role <role>\tSet a unique role to identify the main window"
 msgstr "--role <role>\t���C���E�B���h�E��ｯ����������������(role)����������"
 
-#: main.c:2606
+#: ../main.c:2719
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t������GTK widget��Vim���J��"
 
-#: main.c:2609
+#: ../main.c:2722
+msgid ""
+"\n"
+"Arguments recognised by kvim (KDE version):\n"
+msgstr ""
+"\n"
+"kvim����������ﾟ����������(KDE�o�[�W����):\n"
+
+#: ../main.c:2723
+msgid "-black\t\tUse reverse video"
+msgstr "-black\t\t���]�������g�p����"
+
+#: ../main.c:2725
+msgid "-tip\t\t\tDisplay the tip dialog on startup"
+msgstr "-tip\t\t\t�N�������`�b�v�_�C�A���O���\\ｦ����"
+
+#: ../main.c:2726
+msgid "-notip\t\tDisable the tip dialog"
+msgstr "-notip\t\t�`�b�v�_�C�A���O������������"
+
+#: ../main.c:2730
+msgid "--display <display>\tRun vim on <display>"
+msgstr "--display <display>\t<display> ��vim��ﾀ�s����"
+
+#: ../main.c:2733
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <�e���^�C�g��>\tVim���e�A�v���P�[�V�����������N������"
 
 # msgid "--help\t\tShow Gnome arguments"
 # msgstr "--help\t\tGNOME��������������"
-#: main.c:2847
+#: ../main.c:2971
 msgid "No display"
 msgstr "�f�B�X�v���C����������������"
 
 #. Failed to send, abort.
-#: main.c:2862
+#: ../main.c:2986
 msgid ": Send failed.\n"
 msgstr ": ���M��ｸ�s��������.\n"
 
 #. Let vim start normally.
-#: main.c:2868
+#: ../main.c:2992
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": ���M��ｸ�s��������. ���[�J������ﾀ�s��������������\n"
 
-#: main.c:2906 main.c:2927
+#: ../main.c:3030 ../main.c:3051
 #, c-format
 msgid "%d of %d edited"
 msgstr "%d �� (%d ����) ���t�@�C�������W��������"
 
-#: main.c:2949
+#: ../main.c:3073
 msgid "No display: Send expression failed.\n"
 msgstr "�f�B�X�v���C������������: ｮ�����M��ｸ�s��������.\n"
 
-#: main.c:2961
+#: ../main.c:3085
 msgid ": Send expression failed.\n"
 msgstr ": ｮ�����M��ｸ�s��������.\n"
 
-#: mark.c:709
+#: ../mark.c:705
 msgid "No marks set"
 msgstr "�}�[�N��������������������"
 
-#: mark.c:711
+#: ../mark.c:707
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" ���Y�������}�[�N������������"
 
 #. Highlight title
-#: mark.c:722
+#: ../mark.c:718
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3411,7 +3892,7 @@ msgstr ""
 "mark   �s   �� �t�@�C��/�e�L�X�g"
 
 #. Highlight title
-#: mark.c:760
+#: ../mark.c:841
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3420,7 +3901,7 @@ msgstr ""
 " jump   �s   �� �t�@�C��/�e�L�X�g"
 
 #. Highlight title
-#: mark.c:805
+#: ../mark.c:886
 msgid ""
 "\n"
 "change line  col text"
@@ -3428,7 +3909,7 @@ msgstr ""
 "\n"
 "���X   �s    ��  �e�L�X�g"
 
-#: mark.c:1281
+#: ../mark.c:1362
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3437,7 +3918,7 @@ msgstr ""
 "# �t�@�C���}�[�N:\n"
 
 #. Write the jumplist with -'
-#: mark.c:1316
+#: ../mark.c:1397
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3445,7 +3926,7 @@ msgstr ""
 "\n"
 "# �W�����v���X�g (�V������������):\n"
 
-#: mark.c:1412
+#: ../mark.c:1493
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3453,123 +3934,123 @@ msgstr ""
 "\n"
 "# �t�@�C�����}�[�N������ (�V��������������������):\n"
 
-#: mark.c:1501
+#: ../mark.c:1582
 msgid "Missing '>'"
 msgstr "'>' ����������������"
 
-#: mbyte.c:467
+#: ../mbyte.c:470
 msgid "E543: Not a valid codepage"
 msgstr "E543: �������R�[�h�y�[�W����"
 
-#: mbyte.c:4431
+#: ../mbyte.c:4513
 msgid "E284: Cannot set IC values"
 msgstr "E284: IC���l����������������"
 
-#: mbyte.c:4583
+#: ../mbyte.c:4669
 msgid "E285: Failed to create input context"
 msgstr "E285: �C���v�b�g�R���e�L�X�g��������ｸ�s��������"
 
-#: mbyte.c:4741
+#: ../mbyte.c:4827
 msgid "E286: Failed to open input method"
 msgstr "E286: �C���v�b�g���\\�b�h���I�[�v����ｸ�s��������"
 
-#: mbyte.c:4752
+#: ../mbyte.c:4838
 msgid "E287: Warning: Could not set destroy callback to IM"
 msgstr "E287: �x��: IM���j���R�[���o�b�N����������������������"
 
-#: mbyte.c:4758
+#: ../mbyte.c:4844
 msgid "E288: input method doesn't support any style"
 msgstr "E288: �C���v�b�g���\\�b�h���������X�^�C�����T�|�[�g��������"
 
-#: mbyte.c:4815
+#: ../mbyte.c:4901
 msgid "E289: input method doesn't support my preedit type"
 msgstr "E289: �C���v�b�g���\\�b�h�� my preedit type ���T�|�[�g��������"
 
-#: mbyte.c:4889
+#: ../mbyte.c:4975
 msgid "E290: over-the-spot style requires fontset"
 msgstr "E290: over-the-spot �X�^�C������fontset���K�v����"
 
-#: mbyte.c:4925
+#: ../mbyte.c:5011
 msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
 msgstr "E291: GTK+��1.2.3���������������X�e�[�^�X�G���A����������"
 
-#: mbyte.c:5232
+#: ../mbyte.c:5318
 msgid "E292: Input Method Server is not running"
 msgstr "E292: �C���v�b�g���\\�b�h�T�[�o ������������������"
 
-#: memfile.c:488
+#: ../memfile.c:488
 msgid "E293: block was not locked"
 msgstr "E293: �u���b�N�����b�N��������������"
 
-#: memfile.c:1005
+#: ../memfile.c:1010
 msgid "E294: Seek error in swap file read"
 msgstr "E294: �X���b�v�t�@�C�����������V�[�N�G���[����"
 
-#: memfile.c:1010
+#: ../memfile.c:1015
 msgid "E295: Read error in swap file"
 msgstr "E295: �X���b�v�t�@�C�����������G���[����"
 
-#: memfile.c:1062
+#: ../memfile.c:1067
 msgid "E296: Seek error in swap file write"
 msgstr "E296: �X���b�v�t�@�C�������������V�[�N�G���[����"
 
-#: memfile.c:1080
+#: ../memfile.c:1085
 msgid "E297: Write error in swap file"
 msgstr "E297: �X���b�v�t�@�C�����������G���[����"
 
-#: memfile.c:1277
+#: ../memfile.c:1282
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: �X���b�v�t�@�C������������������ (symlink�������U��?)"
 
-#: memline.c:275
+#: ../memline.c:310
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: �u���b�N 0 ����������������?"
 
-#: memline.c:315
+#: ../memline.c:351
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: �u���b�N 1 ����������������?"
 
-#: memline.c:333
+#: ../memline.c:369
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: �u���b�N 2 ����������������?"
 
 #. could not (re)open the swap file, what can we do????
-#: memline.c:443
+#: ../memline.c:482
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ������, �X���b�v�t�@�C����ｸ����������!!!"
 
-#: memline.c:448
+#: ../memline.c:487
 msgid "E302: Could not rename swap file"
 msgstr "E302: �X���b�v�t�@�C�������O����������������"
 
-#: memline.c:518
+#: ../memline.c:559
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: \"%s\" ���X���b�v�t�@�C�����J�������������J�o�����s���\\����"
 
-#: memline.c:617
-msgid "E304: ml_timestamp: Didn't get block 0??"
-msgstr "E304: ml_timestamp: �u���b�N 0 ����������������������??"
+#: ../memline.c:670
+msgid "E304: ml_upd_block0(): Didn't get block 0??"
+msgstr "E304: ml_upd_block0(): �u���b�N 0 ����������������������??"
 
-#: memline.c:757
+#: ../memline.c:872
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: %s �����X���b�v�t�@�C������������������"
 
-#: memline.c:767
+#: ../memline.c:882
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "�g�p�����X���b�v�t�@�C��������������������������(0 ���I��): "
 
-#: memline.c:812
+#: ../memline.c:927
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: %s ���J��������"
 
-#: memline.c:834
+#: ../memline.c:949
 msgid "Unable to read block 0 from "
 msgstr "�u���b�N 0 �������������� "
 
-#: memline.c:837
+#: ../memline.c:952
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3577,28 +4058,28 @@ msgstr ""
 "\n"
 "���������X����������������Vim���X���b�v�t�@�C�����X�V������������."
 
-#: memline.c:847 memline.c:864
+#: ../memline.c:962 ../memline.c:979
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vim�������o�[�W���������g�p����������.\n"
 
-#: memline.c:849
+#: ../memline.c:964
 msgid "Use Vim version 3.0.\n"
 msgstr "Vim���o�[�W����3.0���g�p������������.\n"
 
-#: memline.c:855
+#: ../memline.c:970
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ��Vim���X���b�v�t�@�C������������������"
 
-#: memline.c:868
+#: ../memline.c:983
 msgid " cannot be used on this computer.\n"
 msgstr " �����R���s���[�^�����g�p����������.\n"
 
-#: memline.c:870
+#: ../memline.c:985
 msgid "The file was created on "
 msgstr "�����t�@�C�������������������������� "
 
-#: memline.c:874
+#: ../memline.c:989
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3606,81 +4087,81 @@ msgstr ""
 ",\n"
 "���������t�@�C������������������."
 
-#: memline.c:903
+#: ../memline.c:1018
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "�X���b�v�t�@�C�� \"%s\" ���g�p��"
 
-#: memline.c:909
+#: ../memline.c:1024
 #, c-format
 msgid "Original file \"%s\""
 msgstr "���{�t�@�C�� \"%s\""
 
-#: memline.c:922
+#: ../memline.c:1037
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: �x��: ���{�t�@�C�������X������������"
 
-#: memline.c:975
+#: ../memline.c:1111
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: %s �����u���b�N 1 ��������������"
 
-#: memline.c:979
+#: ../memline.c:1115
 msgid "???MANY LINES MISSING"
 msgstr "???�������s��ｸ������������"
 
-#: memline.c:995
+#: ../memline.c:1131
 msgid "???LINE COUNT WRONG"
 msgstr "???�s������������������"
 
-#: memline.c:1002
+#: ../memline.c:1138
 msgid "???EMPTY BLOCK"
 msgstr "???�u���b�N��������"
 
-#: memline.c:1028
+#: ../memline.c:1164
 msgid "???LINES MISSING"
 msgstr "???�s��ｸ������������"
 
-#: memline.c:1060
+#: ../memline.c:1196
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: �u���b�N 1 ��ID����������������(%s ��.swp�t�@�C��������?)"
 
-#: memline.c:1065
+#: ../memline.c:1201
 msgid "???BLOCK MISSING"
 msgstr "???�u���b�N������������"
 
-#: memline.c:1081
+#: ../memline.c:1217
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? ��������???END�������s���j��������������������"
 
-#: memline.c:1097
+#: ../memline.c:1233
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? ��������??END�������s���}����������������������"
 
-#: memline.c:1117
+#: ../memline.c:1253
 msgid "???END"
 msgstr "???END"
 
-#: memline.c:1143
+#: ../memline.c:1279
 msgid "E311: Recovery Interrupted"
 msgstr "E311: ���J�o������������������"
 
-#: memline.c:1148
+#: ../memline.c:1284
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: ���J�o�����������G���[�����o����������; ???���n�����s���Q��������������"
 
-#: memline.c:1150
+#: ../memline.c:1286
 msgid "See \":help E312\" for more information."
 msgstr "������ \":help E312\" ���Q��������������"
 
-#: memline.c:1155
+#: ../memline.c:1291
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "���J�o�����I����������. �S�������������`�F�b�N������������."
 
-#: memline.c:1156
+#: ../memline.c:1292
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3688,11 +4169,11 @@ msgstr ""
 "\n"
 "(���X���`�F�b�N����������, �����t�@�C�����������O��������������\n"
 
-#: memline.c:1157
+#: ../memline.c:1293
 msgid "and run diff with the original file to check for changes)\n"
 msgstr "���{�t�@�C������ diff ��ﾀ�s������������������)\n"
 
-#: memline.c:1158
+#: ../memline.c:1294
 msgid ""
 "Delete the .swp file afterwards.\n"
 "\n"
@@ -3701,51 +4182,51 @@ msgstr ""
 "\n"
 
 #. use msg() to start the scrolling properly
-#: memline.c:1214
+#: ../memline.c:1350
 msgid "Swap files found:"
 msgstr "�X���b�v�t�@�C����������������������:"
 
-#: memline.c:1392
+#: ../memline.c:1528
 msgid "   In current directory:\n"
 msgstr "   �������f�B���N�g��:\n"
 
-#: memline.c:1394
+#: ../memline.c:1530
 msgid "   Using specified name:\n"
 msgstr "   �������O���g�p��:\n"
 
-#: memline.c:1398
+#: ../memline.c:1534
 msgid "   In directory "
 msgstr "   �f�B���N�g�� "
 
-#: memline.c:1416
+#: ../memline.c:1552
 msgid "      -- none --\n"
 msgstr "      -- ���� --\n"
 
-#: memline.c:1488
+#: ../memline.c:1625
 msgid "          owned by: "
 msgstr "            ���Lﾒ: "
 
-#: memline.c:1490
+#: ../memline.c:1627
 msgid "   dated: "
 msgstr "   ���t: "
 
-#: memline.c:1494 memline.c:3684
+#: ../memline.c:1631 ../memline.c:3837
 msgid "             dated: "
 msgstr "             ���t: "
 
-#: memline.c:1510
+#: ../memline.c:1647
 msgid "         [from Vim version 3.0]"
 msgstr "         [from Vim version 3.0]"
 
-#: memline.c:1514
+#: ../memline.c:1651
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [Vim���X���b�v�t�@�C������������������]"
 
-#: memline.c:1518
+#: ../memline.c:1655
 msgid "         file name: "
 msgstr "        �t�@�C����: "
 
-#: memline.c:1524
+#: ../memline.c:1661
 msgid ""
 "\n"
 "          modified: "
@@ -3753,15 +4234,15 @@ msgstr ""
 "\n"
 "          ���X����: "
 
-#: memline.c:1525
+#: ../memline.c:1662
 msgid "YES"
 msgstr "����"
 
-#: memline.c:1525
+#: ../memline.c:1662
 msgid "no"
 msgstr "����"
 
-#: memline.c:1529
+#: ../memline.c:1666
 msgid ""
 "\n"
 "         user name: "
@@ -3769,11 +4250,11 @@ msgstr ""
 "\n"
 "          ���[�U��: "
 
-#: memline.c:1536
+#: ../memline.c:1673
 msgid "   host name: "
 msgstr "   �z�X�g��: "
 
-#: memline.c:1538
+#: ../memline.c:1675
 msgid ""
 "\n"
 "         host name: "
@@ -3781,7 +4262,7 @@ msgstr ""
 "\n"
 "          �z�X�g��: "
 
-#: memline.c:1544
+#: ../memline.c:1681
 msgid ""
 "\n"
 "        process ID: "
@@ -3789,11 +4270,11 @@ msgstr ""
 "\n"
 "        �v���Z�XID: "
 
-#: memline.c:1550
+#: ../memline.c:1687
 msgid " (still running)"
 msgstr " (����ﾀ�s��)"
 
-#: memline.c:1562
+#: ../memline.c:1699
 msgid ""
 "\n"
 "         [not usable with this version of Vim]"
@@ -3801,7 +4282,7 @@ msgstr ""
 "\n"
 "         [����Vim�o�[�W���������g�p����������]"
 
-#: memline.c:1565
+#: ../memline.c:1702
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3809,92 +4290,92 @@ msgstr ""
 "\n"
 "         [�����R���s���[�^�����g�p����������]"
 
-#: memline.c:1570
+#: ../memline.c:1707
 msgid "         [cannot be read]"
 msgstr "         [������������]"
 
-#: memline.c:1574
+#: ../memline.c:1711
 msgid "         [cannot be opened]"
 msgstr "         [�J��������]"
 
-#: memline.c:1764
+#: ../memline.c:1901
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: �X���b�v�t�@�C��������������������������"
 
-#: memline.c:1817
+#: ../memline.c:1954
 msgid "File preserved"
 msgstr "�t�@�C����������������"
 
-#: memline.c:1819
+#: ../memline.c:1956
 msgid "E314: Preserve failed"
 msgstr "E314: ������ｸ�s��������"
 
-#: memline.c:1890
+#: ../memline.c:2027
 #, c-format
 msgid "E315: ml_get: invalid lnum: %ld"
 msgstr "E315: ml_get: ������lnum����: %ld"
 
-#: memline.c:1916
+#: ../memline.c:2053
 #, c-format
 msgid "E316: ml_get: cannot find line %ld"
 msgstr "E316: ml_get: �s %ld ������������������"
 
-#: memline.c:2306
+#: ../memline.c:2443
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: �|�C���^�u���b�N��ID���������������� 3"
 
-#: memline.c:2386
+#: ../memline.c:2523
 msgid "stack_idx should be 0"
 msgstr "stack_idx �� 0 ��������������"
 
-#: memline.c:2448
+#: ../memline.c:2585
 msgid "E318: Updated too many blocks?"
-msgstr "E318: �X�V�������u���b�N��������������?"
+msgstr "E318: �X�V�������u���b�N��������������?"
 
-#: memline.c:2630
+#: ../memline.c:2767
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: �|�C���^�u���b�N��ID���������������� 4"
 
-#: memline.c:2657
+#: ../memline.c:2794
 msgid "deleted block 1?"
 msgstr "�u���b�N 1 ����������?"
 
-#: memline.c:2857
+#: ../memline.c:2994
 #, c-format
 msgid "E320: Cannot find line %ld"
 msgstr "E320: �s %ld ����������������"
 
-#: memline.c:3100
+#: ../memline.c:3237
 msgid "E317: pointer block id wrong"
 msgstr "E317: �|�C���^�u���b�N��ID����������������"
 
-#: memline.c:3116
+#: ../memline.c:3253
 msgid "pe_line_count is zero"
 msgstr "pe_line_count ���[������"
 
-#: memline.c:3145
+#: ../memline.c:3282
 #, c-format
 msgid "E322: line number out of range: %ld past the end"
 msgstr "E322: �s�����������O����: %ld ������������"
 
-#: memline.c:3149
+#: ../memline.c:3286
 #, c-format
 msgid "E323: line count wrong in block %ld"
 msgstr "E323: �u���b�N %ld ���s�J�E���g����������������"
 
-#: memline.c:3198
+#: ../memline.c:3335
 msgid "Stack size increases"
 msgstr "�X�^�b�N�T�C�Y����������"
 
-#: memline.c:3244
+#: ../memline.c:3381
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: �|�C���^�u���b�N��ID���������������� 2"
 
-#: memline.c:3674
+#: ../memline.c:3827
 msgid "E325: ATTENTION"
 msgstr "E325: ����"
 
-#: memline.c:3675
+#: ../memline.c:3828
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -3902,17 +4383,17 @@ msgstr ""
 "\n"
 "�������O���X���b�v�t�@�C���������������� \""
 
-#: memline.c:3679
+#: ../memline.c:3832
 msgid "While opening file \""
 msgstr "�����t�@�C�����J������������ \""
 
-#: memline.c:3688
+#: ../memline.c:3841
 msgid "      NEWER than swap file!\n"
 msgstr "      �X���b�v�t�@�C���������V��������!\n"
 
 #. Some of these messages are long to allow translation to
 #. * other languages.
-#: memline.c:3692
+#: ../memline.c:3845
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.\n"
@@ -3924,11 +4405,11 @@ msgstr ""
 "    ������������, ���X�������������I�I��, �����t�@�C����������\n"
 "    2�����C���X�^���X������������������������������������.\n"
 
-#: memline.c:3693
+#: ../memline.c:3846
 msgid "    Quit, or continue with caution.\n"
 msgstr "    �I��������, ��������������������.\n"
 
-#: memline.c:3694
+#: ../memline.c:3847
 msgid ""
 "\n"
 "(2) An edit session for this file crashed.\n"
@@ -3936,11 +4417,11 @@ msgstr ""
 "\n"
 "(2) �����t�@�C�������W�Z�b�V�������N���b�V������.\n"
 
-#: memline.c:3695
+#: ../memline.c:3848
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    ������������ \":recover\" �� \"vim -r "
 
-#: memline.c:3697
+#: ../memline.c:3850
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -3948,11 +4429,11 @@ msgstr ""
 "\"\n"
 "    ���g�p�������X�����J�o�[������(\":help recover\" ���Q��).\n"
 
-#: memline.c:3698
+#: ../memline.c:3851
 msgid "    If you did this already, delete the swap file \""
 msgstr "    �����������s��������������, �X���b�v�t�@�C�� \""
 
-#: memline.c:3700
+#: ../memline.c:3853
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -3960,23 +4441,23 @@ msgstr ""
 "\"\n"
 "    ���������������b�Z�[�W��������������.\n"
 
-#: memline.c:3714 memline.c:3718
+#: ../memline.c:3867 ../memline.c:3871
 msgid "Swap file \""
 msgstr "�X���b�v�t�@�C�� \""
 
-#: memline.c:3715 memline.c:3721
+#: ../memline.c:3868 ../memline.c:3874
 msgid "\" already exists!"
 msgstr "\" ��������������!"
 
-#: memline.c:3724
+#: ../memline.c:3877
 msgid "VIM - ATTENTION"
 msgstr "VIM - ����"
 
-#: memline.c:3726
+#: ../memline.c:3879
 msgid "Swap file already exists!"
 msgstr "�X���b�v�t�@�C������������������!"
 
-#: memline.c:3730
+#: ../memline.c:3883
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -3990,7 +4471,7 @@ msgstr ""
 "�I������(&Q)\n"
 "���~����(&A)"
 
-#: memline.c:3732
+#: ../memline.c:3885
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4006,37 +4487,37 @@ msgstr ""
 "���~����(&A)\n"
 "��������(&D)"
 
-#: memline.c:3789
+#: ../memline.c:3942
 msgid "E326: Too many swap files found"
 msgstr "E326: �X���b�v�t�@�C����������������������"
 
-#: menu.c:64
+#: ../menu.c:64
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: ���j���[�A�C�e�����p�X���������T�u���j���[��������������"
 
-#: menu.c:65
+#: ../menu.c:65
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: ���j���[���������[�h��������������"
 
-#: menu.c:66
+#: ../menu.c:66
 msgid "E329: No menu of that name"
 msgstr "E329: �������O�����j���[������������"
 
-#: menu.c:525
+#: ../menu.c:522
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: ���j���[�p�X���T�u���j���[��������������������������"
 
-#: menu.c:564
+#: ../menu.c:561
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: ���j���[�o�[�����������j���[�A�C�e������������������"
 
-#: menu.c:570
+#: ../menu.c:567
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: �����������j���[�p�X��������������������"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: menu.c:1097
+#: ../menu.c:1093
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4044,79 +4525,84 @@ msgstr ""
 "\n"
 "--- ���j���[ ---"
 
-#: menu.c:2019
+#: ../menu.c:2011
 msgid "Tear off this menu"
 msgstr "�������j���[����������"
 
-#: menu.c:2084
+#: ../menu.c:2076
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: ���j���[�p�X�����j���[�A�C�e��������������������������"
 
-#: menu.c:2104
+#: ../menu.c:2096
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: ���j���[����������������: %s"
 
-#: menu.c:2173
+#: ../menu.c:2169
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s �������j���[�����`��������������"
 
-#: menu.c:2211
+#: ../menu.c:2208
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: ���j���[�p�X���T�u���j���[������������������������"
 
-#: menu.c:2232
+#: ../menu.c:2229
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: ���j���[���������������� - ���j���[�����m�F������������"
 
-#: message.c:414
+#: ../message.c:429
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s �����������G���[�����o����������:"
 
-#: message.c:440
+#: ../message.c:454
 #, c-format
 msgid "line %4ld:"
 msgstr "�s %4ld:"
 
-#: message.c:647
+#: ../message.c:657
 msgid "[string too long]"
-msgstr "[������������������]"
+msgstr "[������������������]"
 
-#: message.c:797
+#: ../message.c:685
+#, c-format
+msgid "E354: Invalid register name: '%s'"
+msgstr "E354: ���������W�X�^��: '%s'"
+
+#: ../message.c:814
 msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
 msgstr "���{�����b�Z�[�W�|��/���C: ���� ���Y <koron@tka.att.ne.jp>"
 
-#: message.c:1025
+#: ../message.c:1040
 msgid "Interrupt: "
 msgstr "������: "
 
-#: message.c:1028
+#: ../message.c:1043
 msgid "Hit ENTER to continue"
 msgstr "����������ENTER����������������"
 
-#: message.c:1030
+#: ../message.c:1045
 msgid "Hit ENTER or type command to continue"
 msgstr "����������ENTER���������R�}���h������������������"
 
-#: message.c:2351
+#: ../message.c:2370
 msgid "-- More --"
 msgstr "-- �p�� --"
 
-#: message.c:2354
+#: ../message.c:2373
 msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
 msgstr " (RET/BS: �s����, SPACE/b: �y�[�W����, d/u: ���y�[�W����, q: �I��)"
 
-#: message.c:2355
+#: ../message.c:2374
 msgid " (RET: line, SPACE: page, d: half page, q: quit)"
 msgstr " (RET: �s����, SPACE: �y�[�W����, d: ���y�[�W����, q: �I��)"
 
-#: message.c:2976 message.c:2991
+#: ../message.c:2999 ../message.c:3014
 msgid "Question"
 msgstr "ｿ��"
 
-#: message.c:2978
+#: ../message.c:3001
 msgid ""
 "&Yes\n"
 "&No"
@@ -4124,7 +4610,7 @@ msgstr ""
 "����(&Y)\n"
 "������(&N)"
 
-#: message.c:3011
+#: ../message.c:3034
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4138,59 +4624,67 @@ msgstr ""
 "�S������(&D)\n"
 "�L�����Z��(&C)"
 
-#: message.c:3052
+#: ../message.c:3075
+msgid "Select Directory dialog"
+msgstr "�f�B���N�g���I���_�C�A���O"
+
+#: ../message.c:3077
 msgid "Save File dialog"
 msgstr "�t�@�C�������_�C�A���O"
 
-#: message.c:3054
+#: ../message.c:3079
 msgid "Open File dialog"
 msgstr "�t�@�C�������_�C�A���O"
 
 #. TODO: non-GUI file selector here
-#: message.c:3125
+#: ../message.c:3179
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: �R���\\�[�����[�h�����t�@�C���u���E�U���g��������, ������������"
 
-#: misc1.c:2773
+#: ../misc1.c:2860
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: �x��: �������p�t�@�C�������X������"
 
-#: misc1.c:3021
+#: ../misc1.c:3113
 msgid "1 more line"
 msgstr "1 �s ������������"
 
-#: misc1.c:3023
+#: ../misc1.c:3115
 msgid "1 line less"
 msgstr "1 �s ������������"
 
-#: misc1.c:3028
+#: ../misc1.c:3120
 #, c-format
 msgid "%ld more lines"
 msgstr "%ld �s ������������"
 
-#: misc1.c:3030
+#: ../misc1.c:3122
 #, c-format
 msgid "%ld fewer lines"
 msgstr "%ld �s ������������"
 
-#: misc1.c:3033
+#: ../misc1.c:3125
 msgid " (Interrupted)"
 msgstr " (��������������)"
 
-#: misc1.c:7582
+#: ../misc1.c:3191
+msgid "Beep!"
+msgstr "�r�[�b!"
+
+#: ../misc1.c:7814
 msgid "Vim: preserving files...\n"
 msgstr "Vim: �t�@�C����������...\n"
 
 #. close all memfiles, without deleting
-#: misc1.c:7592
+#: ../misc1.c:7824
 msgid "Vim: Finished.\n"
 msgstr "Vim: �I����������.\n"
 
-#: misc2.c:695 misc2.c:711
+#: ../misc2.c:690 ../misc2.c:706
 msgid "ERROR: "
 msgstr "�G���[: "
 
-#: misc2.c:715
+#: ../misc2.c:710
 #, c-format
 msgid ""
 "\n"
@@ -4199,7 +4693,7 @@ msgstr ""
 "\n"
 "[������(�o�C�g)] ������-������ %lu-%lu, �g�p�� %lu, �s�[�N�� %lu\n"
 
-#: misc2.c:717
+#: ../misc2.c:712
 #, c-format
 msgid ""
 "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
@@ -4208,58 +4702,58 @@ msgstr ""
 "[���o] �� re/malloc() ���� %lu, �� free() ���� %lu\n"
 "\n"
 
-#: misc2.c:772
+#: ../misc2.c:767
 msgid "E340: Line is becoming too long"
-msgstr "E340: �s��������������������"
+msgstr "E340: �s��������������������"
 
-#: misc2.c:816
+#: ../misc2.c:811
 #, c-format
 msgid "E341: Internal error: lalloc(%ld, )"
 msgstr "E341: �����G���[: lalloc(%ld,)"
 
-#: misc2.c:924
+#: ../misc2.c:919
 #, c-format
 msgid "E342: Out of memory!  (allocating %lu bytes)"
 msgstr "E342: ������������������!  (%lu �o�C�g�������v��)"
 
-#: misc2.c:2593
+#: ../misc2.c:2580
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "ﾀ�s���������V�F�������o����: \"%s\""
 
-#: misc2.c:2815
+#: ../misc2.c:2845
 msgid "E545: Missing colon"
 msgstr "E545: �R����������������"
 
-#: misc2.c:2817 misc2.c:2844
+#: ../misc2.c:2847 ../misc2.c:2874
 msgid "E546: Illegal mode"
 msgstr "E546: �s�������[�h����"
 
-#: misc2.c:2883
+#: ../misc2.c:2913
 msgid "E547: Illegal mouseshape"
 msgstr "E547: �s���� 'mouseshape' ����"
 
-#: misc2.c:2923
+#: ../misc2.c:2953
 msgid "E548: digit expected"
 msgstr "E548: ���l���K�v����"
 
-#: misc2.c:2928
+#: ../misc2.c:2958
 msgid "E549: Illegal percentage"
 msgstr "E549: �s�����p�[�Z���e�[�W����"
 
-#: misc2.c:3238
+#: ../misc2.c:3270
 msgid "Enter encryption key: "
 msgstr "�������p���L�[������������������: "
 
-#: misc2.c:3239
+#: ../misc2.c:3271
 msgid "Enter same key again: "
 msgstr "�������x�����L�[������������������: "
 
-#: misc2.c:3249
+#: ../misc2.c:3281
 msgid "Keys don't match!"
 msgstr "�L�[�����v��������"
 
-#: misc2.c:3798
+#: ../misc2.c:3825
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4268,163 +4762,171 @@ msgstr ""
 "E343: �������p�X����: '**[���l]' ��path�������� '%s' "
 "������������������������."
 
-#: misc2.c:5077
+#: ../misc2.c:5104
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: cdpath���� \"%s\" �������t�@�C��������������"
 
-#: misc2.c:5080
+#: ../misc2.c:5107
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: path���� \"%s\" �������t�@�C��������������"
 
-#: misc2.c:5086
+#: ../misc2.c:5113
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: cdpath������������ \"%s\" �������t�@�C��������������"
 
-#: misc2.c:5089
+#: ../misc2.c:5116
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: �p�X������������ \"%s\" �������t�@�C��������������"
 
-#: misc2.c:5323
+#: ../misc2.c:5356
 msgid "E550: Missing colon"
 msgstr "E550: �R����������������"
 
-#: misc2.c:5335
+#: ../misc2.c:5368
 msgid "E551: Illegal component"
 msgstr "E551: �s�����\\���v�f����"
 
-#: misc2.c:5343
+#: ../misc2.c:5376
 msgid "E552: digit expected"
 msgstr "E552: ���l���K�v����"
 
 #. Get here when the server can't be found.
-#: netbeans.c:396
+#: ../netbeans.c:409
 msgid "Cannot connect to Netbeans #2"
 msgstr "Netbeans #2 ����������������"
 
-#: netbeans.c:404
+#: ../netbeans.c:417
 msgid "Cannot connect to Netbeans"
 msgstr "Netbeans ����������������"
 
-#: netbeans.c:450
+#: ../netbeans.c:461
 #, c-format
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: NetBeans�����������t�@�C�����A�N�Z�X���[�h����������������: \"%s\""
 
-#: netbeans.c:749
+#: ../netbeans.c:760
 msgid "read from Netbeans socket"
 msgstr "Netbeans ���\\�P�b�g��������"
 
-#: netbeans.c:1638
+#: ../netbeans.c:1680
 #, c-format
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: �o�b�t�@ %ld �� NetBeans ������ｸ����������"
 
-#: normal.c:2980
+#: ../netbeans.c:3479
+msgid "E505: "
+msgstr "E505: "
+
+#: ../normal.c:2997
 msgid "Warning: terminal cannot highlight"
 msgstr "�x��: �g�p���������[�����n�C���C�g����������"
 
-#: normal.c:3276
+#: ../normal.c:3293
 msgid "E348: No string under cursor"
 msgstr "E348: �J�[�\\�������u����������������������"
 
-#: normal.c:3278
+#: ../normal.c:3295
 msgid "E349: No identifier under cursor"
 msgstr "E349: �J�[�\\�������u����ｯ���q������������"
 
-#: normal.c:4519
+#: ../normal.c:4537
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: ������ 'foldmethod' ��������������������������"
 
-#: normal.c:6708
+#: ../normal.c:6808
 msgid "E664: changelist is empty"
 msgstr "E664: ���X���X�g��������"
 
-#: normal.c:6710
+#: ../normal.c:6810
 msgid "E662: At start of changelist"
 msgstr "E662: ���X���X�g������"
 
-#: normal.c:6712
+#: ../normal.c:6812
 msgid "E663: At end of changelist"
 msgstr "E663: ���X���X�g������"
 
-#: normal.c:7973
+#: ../normal.c:8085
 msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Vim���I���������� :quit<Enter> ������������������"
 
-#: ops.c:294
+#: ../ops.c:291
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 �s�� %s �� 1 ����������������"
 
-#: ops.c:296
+#: ../ops.c:293
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 �s�� %s �� %d ����������������"
 
-#: ops.c:301
+#: ../ops.c:298
 #, c-format
 msgid "%ld lines %sed 1 time"
 msgstr "%ld �s�� %s �� 1 ����������������"
 
-#: ops.c:304
+#: ../ops.c:301
 #, c-format
 msgid "%ld lines %sed %d times"
 msgstr "%ld �s�� %s �� %d ����������������"
 
-#: ops.c:662
+#: ../ops.c:659
 #, c-format
 msgid "%ld lines to indent... "
 msgstr "%ld �s���C���f���g��������... "
 
-#: ops.c:712
+#: ../ops.c:709
 msgid "1 line indented "
 msgstr "1 �s���C���f���g��������"
 
-#: ops.c:714
+#: ../ops.c:711
 #, c-format
 msgid "%ld lines indented "
 msgstr "%ld �s���C���f���g��������"
 
+#: ../ops.c:1111
+msgid "E748: No previously used register"
+msgstr "E748: �������W�X�^���g�p������������"
+
 #. must display the prompt
-#: ops.c:1675
+#: ../ops.c:1633
 msgid "cannot yank; delete anyway"
 msgstr "�����N����������; ������������"
 
-#: ops.c:2185
+#: ../ops.c:2223
 msgid "1 line changed"
 msgstr "1 �s�����X����������"
 
-#: ops.c:2187
+#: ../ops.c:2225
 #, c-format
 msgid "%ld lines changed"
 msgstr "%ld �s�����X����������"
 
-#: ops.c:2571
+#: ../ops.c:2609
 #, c-format
 msgid "freeing %ld lines"
 msgstr "%ld �s���J����"
 
-#: ops.c:2852
+#: ../ops.c:2891
 msgid "1 line yanked"
 msgstr "1 �s�������N����������"
 
-#: ops.c:2854
+#: ../ops.c:2893
 #, c-format
 msgid "%ld lines yanked"
 msgstr "%ld �s�������N����������"
 
-#: ops.c:3139
+#: ../ops.c:3188
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: ���W�X�^ %s ������������������"
 
 #. Highlight title
-#: ops.c:3690
+#: ../ops.c:3751
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4432,11 +4934,11 @@ msgstr ""
 "\n"
 "--- ���W�X�^ ---"
 
-#: ops.c:4997
+#: ../ops.c:5066
 msgid "Illegal register name"
 msgstr "�s�������W�X�^��"
 
-#: ops.c:5085
+#: ../ops.c:5154
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4444,57 +4946,67 @@ msgstr ""
 "\n"
 "# ���W�X�^:\n"
 
-#: ops.c:5135
+#: ../ops.c:5210
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: ���m�����W�X�^�^ %d ����"
 
-#: ops.c:5620
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ���������W�X�^��: '%s'"
-
-#: ops.c:5980
+#: ../ops.c:6084
 #, c-format
 msgid "%ld Cols; "
 msgstr "%ld ��; "
 
-#: ops.c:5987
+#: ../ops.c:6092
 #, c-format
 msgid "Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Bytes"
 msgstr "�I�� %s%ld / %ld �s; %ld / %ld �P��; %ld / %ld ����"
 
-#: ops.c:6003
+#: ../ops.c:6098
+#, c-format
+msgid ""
+"Selected %s%ld of %ld Lines; %ld of %ld Words; %ld of %ld Chars; %ld of %ld "
+"Bytes"
+msgstr "�I�� %s%ld / %ld �s; %ld / %ld �P��; %ld / %ld ����; %ld / %ld �o�C�g"
+
+#: ../ops.c:6116
 #, c-format
 msgid "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Byte %ld of %ld"
 msgstr "�� %s / %s; �s %ld of %ld; �P�� %ld / %ld; ���� %ld / %ld"
 
-#: ops.c:6014
+#: ../ops.c:6123
+#, c-format
+msgid ""
+"Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
+"%ld"
+msgstr ""
+"�� %s / %s; �s %ld / %ld; �P�� %ld / %ld; ���� %ld / %ld; �o�C�g %ld of %ld"
+
+#: ../ops.c:6135
 #, c-format
 msgid "(+%ld for BOM)"
 msgstr "(+%ld for BOM)"
 
-#: option.c:1643
+#: ../option.c:1692
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N �y�[�W"
 
-#: option.c:2092
+#: ../option.c:2171
 msgid "Thanks for flying Vim"
 msgstr "Vim ���g��������������������"
 
-#: option.c:3419 option.c:3535
+#: ../option.c:3594 ../option.c:3716
 msgid "E518: Unknown option"
 msgstr "E518: ���m���I�v�V��������"
 
-#: option.c:3432
+#: ../option.c:3607
 msgid "E519: Option not supported"
 msgstr "E519: �I�v�V�������T�|�[�g��������������"
 
-#: option.c:3457
+#: ../option.c:3632
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline ������������������"
 
-#: option.c:3522
+#: ../option.c:3703
 msgid ""
 "\n"
 "\tLast set from "
@@ -4502,139 +5014,139 @@ msgstr ""
 "\n"
 "\tLast set from "
 
-#: option.c:3661
+#: ../option.c:3842
 msgid "E521: Number required after ="
 msgstr "E521: = ���������������K�v����"
 
-#: option.c:3989 option.c:4619
+#: ../option.c:4170 ../option.c:4831
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap ������������������"
 
-#: option.c:4064
+#: ../option.c:4258
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: �s������������ <%s>"
 
-#: option.c:4611
+#: ../option.c:4823
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' ����������������������������"
 
-#: option.c:4614
+#: ../option.c:4826
 msgid "E530: Cannot change term in GUI"
 msgstr "E530: GUI���� 'term' �����X����������"
 
-#: option.c:4616
+#: ../option.c:4828
 msgid "E531: Use \":gui\" to start the GUI"
 msgstr "E531: GUI���X�^�[�g�������� \":gui\" ���g�p������������"
 
-#: option.c:4645
+#: ../option.c:4857
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' �� 'patchmode' ����������"
 
-#: option.c:4860
+#: ../option.c:5085
 msgid "E617: Cannot be changed in the GTK+ 2 GUI"
 msgstr "E617: GTK+2 GUI�������X����������"
 
-#: option.c:5016
+#: ../option.c:5249
 msgid "E524: Missing colon"
 msgstr "E524: �R����������������"
 
-#: option.c:5018
+#: ../option.c:5251
 msgid "E525: Zero length string"
 msgstr "E525: ���������������[������"
 
-#: option.c:5086
+#: ../option.c:5326
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> ����������������������"
 
-#: option.c:5100
+#: ../option.c:5340
 msgid "E527: Missing comma"
 msgstr "E527: �J���}������������"
 
-#: option.c:5107
+#: ../option.c:5347
 msgid "E528: Must specify a ' value"
 msgstr "E528: ' ���l���w����������������������"
 
-#: option.c:5148
+#: ../option.c:5388
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: �\\ｦ�����������������C�h������������������"
 
-#: option.c:5197
+#: ../option.c:5432
 msgid "E596: Invalid font(s)"
 msgstr "E596: �������t�H���g����"
 
-#: option.c:5205
+#: ../option.c:5440
 msgid "E597: can't select fontset"
 msgstr "E597: �t�H���g�Z�b�g���I������������"
 
-#: option.c:5207
+#: ../option.c:5442
 msgid "E598: Invalid fontset"
 msgstr "E598: �������t�H���g�Z�b�g����"
 
-#: option.c:5214
+#: ../option.c:5449
 msgid "E533: can't select wide font"
 msgstr "E533: ���C�h�t�H���g���I������������"
 
-#: option.c:5216
+#: ../option.c:5451
 msgid "E534: Invalid wide font"
 msgstr "E534: ���������C�h�t�H���g����"
 
-#: option.c:5486
+#: ../option.c:5728
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: <%c> �������s������������������"
 
-#: option.c:5597
+#: ../option.c:5839
 msgid "E536: comma required"
 msgstr "E536: �J���}���K�v����"
 
-#: option.c:5607
+#: ../option.c:5849
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' ������������ %s �������K�v����������"
 
-#: option.c:5679
+#: ../option.c:5924
 msgid "E538: No mouse support"
 msgstr "E538: �}�E�X���T�|�[�g����������"
 
-#: option.c:5947
+#: ../option.c:6195
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: ｮ���I��������������"
 
-#: option.c:5951
+#: ../option.c:6199
 msgid "E541: too many items"
-msgstr "E541: �v�f������������"
+msgstr "E541: �v�f������������"
 
-#: option.c:5953
+#: ../option.c:6201
 msgid "E542: unbalanced groups"
 msgstr "E542: �O���[�v��������������"
 
-#: option.c:6193
+#: ../option.c:6441
 msgid "E590: A preview window already exists"
 msgstr "E590: �v���r���[�E�B���h�E����������������"
 
-#: option.c:6450
+#: ../option.c:6688
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: �A���r�A��������UTF-8���K�v������, ':set encoding=utf-8' ������������"
 
-#: option.c:6776
+#: ../option.c:7052
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: ���� %d ���s�����K�v����"
 
-#: option.c:6786
+#: ../option.c:7062
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: ���� %d ���J���������K�v����"
 
-#: option.c:7093
+#: ../option.c:7371
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: ���m���I�v�V��������: %s"
 
-#: option.c:7213
+#: ../option.c:7504
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4642,7 +5154,7 @@ msgstr ""
 "\n"
 "--- �[���R�[�h ---"
 
-#: option.c:7215
+#: ../option.c:7506
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4650,7 +5162,7 @@ msgstr ""
 "\n"
 "--- �O���[�o���I�v�V�����l ---"
 
-#: option.c:7217
+#: ../option.c:7508
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4658,7 +5170,7 @@ msgstr ""
 "\n"
 "--- ���[�J���I�v�V�����l ---"
 
-#: option.c:7219
+#: ../option.c:7510
 msgid ""
 "\n"
 "--- Options ---"
@@ -4666,152 +5178,157 @@ msgstr ""
 "\n"
 "--- �I�v�V���� ---"
 
-#: option.c:7925
+#: ../option.c:8240
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp �G���["
 
-#: option.c:8896
+#: ../option.c:9217
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': %s ��������������������������"
 
-#: option.c:8930
+#: ../option.c:9243
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': �Z�~�R�����������]������������������: %s"
 
-#: os_amiga.c:280
+#: ../os_amiga.c:280
 msgid "cannot open "
 msgstr "�J�������� "
 
-#: os_amiga.c:314
+#: ../os_amiga.c:314
 msgid "VIM: Can't open window!\n"
 msgstr "VIM: �E�B���h�E���J��������!\n"
 
-#: os_amiga.c:338
+#: ../os_amiga.c:338
 msgid "Need Amigados version 2.04 or later\n"
 msgstr "Amigados���o�[�W���� 2.04���������~���K�v����\n"
 
-#: os_amiga.c:344
+#: ../os_amiga.c:344
 #, c-format
 msgid "Need %s version %ld\n"
 msgstr "%s ���o�[�W���� %ld ���K�v����\n"
 
-#: os_amiga.c:416
+#: ../os_amiga.c:416
 msgid "Cannot open NIL:\n"
 msgstr "NIL���J��������:\n"
 
-#: os_amiga.c:427
+#: ../os_amiga.c:427
 msgid "Cannot create "
 msgstr "�������������� "
 
-#: os_amiga.c:905
+#: ../os_amiga.c:905
 #, c-format
 msgid "Vim exiting with %d\n"
 msgstr "Vim�� %d ���I��������\n"
 
-#: os_amiga.c:937
+#: ../os_amiga.c:941
 msgid "cannot change console mode ?!\n"
 msgstr "�R���\\�[�����[�h�����X����������?!\n"
 
-#: os_amiga.c:1003
+#: ../os_amiga.c:1012
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: �R���\\�[����������??\n"
 
 #. if Vim opened a window: Executing a shell may cause crashes
-#: os_amiga.c:1152
+#: ../os_amiga.c:1161
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: -f �I�v�V�������V�F����ﾀ�s����������"
 
-#: os_amiga.c:1193 os_amiga.c:1283
+#: ../os_amiga.c:1202 ../os_amiga.c:1292
 msgid "Cannot execute "
 msgstr "ﾀ�s���������� "
 
-#: os_amiga.c:1196 os_amiga.c:1293
+#: ../os_amiga.c:1205 ../os_amiga.c:1302
 msgid "shell "
 msgstr "�V�F�� "
 
-#: os_amiga.c:1216 os_amiga.c:1318
+#: ../os_amiga.c:1225 ../os_amiga.c:1327
 msgid " returned\n"
 msgstr " ����������\n"
 
-#: os_amiga.c:1459
+#: ../os_amiga.c:1468
 msgid "ANCHOR_BUF_SIZE too small."
-msgstr "ANCHOR_BUF_SIZE ��������������."
+msgstr "ANCHOR_BUF_SIZE ��������������."
 
-#: os_amiga.c:1463
+#: ../os_amiga.c:1472
 msgid "I/O ERROR"
 msgstr "���o���G���["
 
-#: os_mswin.c:539
+#: ../os_mswin.c:597
 msgid "...(truncated)"
 msgstr "...(����)"
 
-#: os_mswin.c:641
+#: ../os_mswin.c:714
 msgid "'columns' is not 80, cannot execute external commands"
 msgstr "'columns' ��80������������, �O���R�}���h��ﾀ�s����������"
 
-#: os_mswin.c:1973
+#: ../os_mswin.c:2091
 msgid "E237: Printer selection failed"
 msgstr "E237: �v�����^���I����ｸ�s��������"
 
-#: os_mswin.c:2013
+#: ../os_mswin.c:2131
 #, c-format
 msgid "to %s on %s"
 msgstr "%s �� (%s ����)"
 
-#: os_mswin.c:2028
+#: ../os_mswin.c:2146
 #, c-format
 msgid "E613: Unknown printer font: %s"
 msgstr "E613: ���m���v�����^�I�v�V��������: %s"
 
-#: os_mswin.c:2077 os_mswin.c:2087
+#: ../os_mswin.c:2195 ../os_mswin.c:2205
 #, c-format
 msgid "E238: Print error: %s"
 msgstr "E238: �����G���[: %s"
 
-#: os_mswin.c:2088
-msgid "Unknown"
-msgstr "�s��"
-
-#: os_mswin.c:2115
+#: ../os_mswin.c:2233
 #, c-format
 msgid "Printing '%s'"
 msgstr "��������������: '%s'"
 
-#: os_mswin.c:3204
+#: ../os_mswin.c:3372
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
 msgstr "E244: �����Z�b�g�� \"%s\" ���s������ (�t�H���g�� \"%s\")"
 
-#: os_mswin.c:3212
+#: ../os_mswin.c:3382
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
 msgstr "E245: '%c' ���s������������ (�t�H���g�� \"%s\")"
 
-#: os_riscos.c:1259
+#: ../os_riscos.c:1259
 msgid "E366: Invalid 'osfiletype' option - using Text"
 msgstr "E366: ������ 'osfiletype' �I�v�V���� - \"Text\" ���g������"
 
-#: os_unix.c:927
+#: ../os_unix.c:989
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: 2�d���V�O�i��������, �I��������\n"
 
-#: os_unix.c:933
+#: ../os_unix.c:995
 #, c-format
 msgid "Vim: Caught deadly signal %s\n"
 msgstr "Vim: �v���I�V�O�i�� %s �����m��������\n"
 
-#: os_unix.c:936
+#: ../os_unix.c:998
 msgid "Vim: Caught deadly signal\n"
 msgstr "Vim: �v���I�V�O�i�������m��������\n"
 
-#: os_unix.c:1199
+#: ../os_unix.c:1318
 #, c-format
 msgid "Opening the X display took %ld msec"
 msgstr "X�T�[�o���������� %ld �~���b������������"
 
-#: os_unix.c:1226
+#. KDE sometimes produces X error that we want to ignore
+#: ../os_unix.c:1347
+msgid ""
+"\n"
+"Vim: Got X error but we continue...\n"
+msgstr ""
+"\n"
+"Vim: X ���G���[�����o�������������s������...\n"
+
+#: ../os_unix.c:1351
 msgid ""
 "\n"
 "Vim: Got X error\n"
@@ -4819,15 +5336,15 @@ msgstr ""
 "\n"
 "Vim: X ���G���[�����o��������r\n"
 
-#: os_unix.c:1334
+#: ../os_unix.c:1464
 msgid "Testing the X display failed"
 msgstr "X display ���`�F�b�N��ｸ�s��������"
 
-#: os_unix.c:1473
+#: ../os_unix.c:1603
 msgid "Opening the X display timed out"
 msgstr "X display �� open ���^�C���A�E�g��������"
 
-#: os_unix.c:3227 os_unix.c:3907
+#: ../os_unix.c:3384 ../os_unix.c:4220
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -4835,7 +5352,7 @@ msgstr ""
 "\n"
 "�V�F����ﾀ�s���������� "
 
-#: os_unix.c:3275
+#: ../os_unix.c:3432
 msgid ""
 "\n"
 "Cannot execute shell sh\n"
@@ -4843,7 +5360,7 @@ msgstr ""
 "\n"
 "sh �V�F����ﾀ�s����������\n"
 
-#: os_unix.c:3279 os_unix.c:3913
+#: ../os_unix.c:3436 ../os_unix.c:4226
 msgid ""
 "\n"
 "shell returned "
@@ -4851,7 +5368,7 @@ msgstr ""
 "\n"
 "�V�F�����l������������ "
 
-#: os_unix.c:3414
+#: ../os_unix.c:3578
 msgid ""
 "\n"
 "Cannot create pipes\n"
@@ -4859,7 +5376,7 @@ msgstr ""
 "\n"
 "�p�C�v����������������\n"
 
-#: os_unix.c:3429
+#: ../os_unix.c:3591 ../os_unix.c:3822
 msgid ""
 "\n"
 "Cannot fork\n"
@@ -4867,7 +5384,7 @@ msgstr ""
 "\n"
 "fork ����������\n"
 
-#: os_unix.c:3920
+#: ../os_unix.c:4233
 msgid ""
 "\n"
 "Command terminated\n"
@@ -4875,78 +5392,79 @@ msgstr ""
 "\n"
 "�R�}���h�����f��������\n"
 
-#: os_unix.c:4184 os_unix.c:4309 os_unix.c:5975
+#: ../os_unix.c:4520 ../os_unix.c:4662 ../os_unix.c:6392
 msgid "XSMP lost ICE connection"
 msgstr "XSMP ��ICE������ｸ��������"
 
-#: os_unix.c:5558
+#: ../os_unix.c:5792 ../os_unix.c:5893
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = \"%s\""
+
+#: ../os_unix.c:5975
 msgid "Opening the X display failed"
 msgstr "X display �� open ��ｸ�s��������"
 
-#: os_unix.c:5880
+#: ../os_unix.c:6297
 msgid "XSMP handling save-yourself request"
 msgstr "XSMP ��save-yourself�v������������������"
 
-#: os_unix.c:5999
+#: ../os_unix.c:6416
 msgid "XSMP opening connection"
 msgstr "XSMP ���������J�n����������"
 
-#: os_unix.c:6018
+#: ../os_unix.c:6435
 msgid "XSMP ICE connection watch failed"
 msgstr "XSMP ICE������ｸ�s������������"
 
-#: os_unix.c:6038
+#: ../os_unix.c:6455
 #, c-format
 msgid "XSMP SmcOpenConnection failed: %s"
 msgstr "XSMP SmcOpenConnection��ｸ�s��������: %s"
 
-#: os_vms_mms.c:59
+#: ../os_vms_mms.c:59
 msgid "At line"
 msgstr "�s"
 
-#: os_w32exe.c:65
-msgid "Could not allocate memory for command line."
-msgstr "�R�}���h���C������������������������������"
+#: ../os_w32exe.c:88
+msgid "Could not load vim32.dll!"
+msgstr "vim32.dll �����[�h����������������"
 
-#: os_w32exe.c:66 os_w32exe.c:89 os_w32exe.c:100
+#: ../os_w32exe.c:88 ../os_w32exe.c:99
 msgid "VIM Error"
 msgstr "VIM�G���["
 
-#: os_w32exe.c:89
-msgid "Could not load vim32.dll!"
-msgstr "vim32.dll �����[�h����������������"
-
-#: os_w32exe.c:99
+#: ../os_w32exe.c:98
 msgid "Could not fix up function pointers to the DLL!"
 msgstr "DLL���������|�C���^����������������������"
 
-#: os_win16.c:342 os_win32.c:3197
+#: ../os_win16.c:342 ../os_win32.c:3317
 #, c-format
 msgid "shell returned %d"
 msgstr "�V�F�����R�[�h %d ���I����������"
 
-#: os_win32.c:2655
+#: ../os_win32.c:2776
 #, c-format
 msgid "Vim: Caught %s event\n"
 msgstr "Vim: �C�x���g %s �����m\n"
 
-#: os_win32.c:2657
+#: ../os_win32.c:2778
 msgid "close"
 msgstr "������"
 
-#: os_win32.c:2659
+#: ../os_win32.c:2780
 msgid "logoff"
 msgstr "���O�I�t"
 
-#: os_win32.c:2660
+#: ../os_win32.c:2781
 msgid "shutdown"
 msgstr "�V���b�g�_�E��"
 
-#: os_win32.c:3150
+#: ../os_win32.c:3270
 msgid "E371: Command not found"
 msgstr "E371: �R�}���h������������"
 
-#: os_win32.c:3163
+#: ../os_win32.c:3283
 msgid ""
 "VIMRUN.EXE not found in your $PATH.\n"
 "External commands will not pause after completion.\n"
@@ -4956,269 +5474,264 @@ msgstr ""
 "�O���R�}���h���I�������������~����������.\n"
 "������  :help win32-vimrun  ���Q��������������."
 
-#: os_win32.c:3166
+#: ../os_win32.c:3286
 msgid "Vim Warning"
 msgstr "Vim���x��"
 
-#: quickfix.c:258
+#: ../quickfix.c:284
 msgid "E372: Too many %%%c in format string"
-msgstr "E372: �t�H�[�}�b�g�������� %%%c ������������"
+msgstr "E372: �t�H�[�}�b�g�������� %%%c ������������"
 
-#: quickfix.c:271
+#: ../quickfix.c:297
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: �t�H�[�}�b�g���������\\������ %%%c ������������"
 
-#: quickfix.c:325
+#: ../quickfix.c:351
 msgid "E374: Missing ] in format string"
 msgstr "E374: �t�H�[�}�b�g�������� ] ������������"
 
-#: quickfix.c:339
+#: ../quickfix.c:365
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: �t�H�[�}�b�g���������� %%%c ���T�|�[�g����������"
 
-#: quickfix.c:357
+#: ../quickfix.c:383
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: �t�H�[�}�b�g���������O�u�������� %%%c ����������"
 
-#: quickfix.c:365
+#: ../quickfix.c:391
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: �t�H�[�}�b�g�������������� %%%c ����������"
 
-#: quickfix.c:391
+#: ../quickfix.c:417
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' ���p�^�[�����w����������������"
 
-#: quickfix.c:501
+#: ../quickfix.c:537
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �f�B���N�g������������������"
 
-#: quickfix.c:990
+#: ../quickfix.c:1027
 msgid "E553: No more items"
 msgstr "E553: �v�f����������������"
 
-#: quickfix.c:1229
+#: ../quickfix.c:1324
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
 
-#: quickfix.c:1231
+#: ../quickfix.c:1326
 msgid " (line deleted)"
 msgstr " (�s����������������)"
 
-#: quickfix.c:1444
+#: ../quickfix.c:1539
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix �X�^�b�N����������"
 
-#: quickfix.c:1453
+#: ../quickfix.c:1548
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix �X�^�b�N����������"
 
-#: quickfix.c:1465
+#: ../quickfix.c:1560
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "�G���[���� %d of %d; %d ���G���["
 
-#: quickfix.c:1943
+#: ../quickfix.c:2042
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' �I�v�V������������������������������������"
 
-#: regexp.c:838
+#
+#: ../quickfix.c:2326
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: �����p�^�[�����������L�����s������"
+
+#: ../quickfix.c:2337
+msgid "E683: File name missing or invalid pattern"
+msgstr "E683: �t�@�C�������������������p�^�[������"
+
+#: ../quickfix.c:2416
+#, c-format
+msgid "Cannot open file \"%s\""
+msgstr "�t�@�C�� \"%s\" ���J��������"
+
+#: ../quickfix.c:2775
+msgid "E681: Buffer is not loaded"
+msgstr "E681: �o�b�t�@������������������������"
+
+#: ../regexp.c:1006
 msgid "E339: Pattern too long"
-msgstr "E339: �p�^�[��������������"
+msgstr "E339: �p�^�[��������������"
 
-#: regexp.c:1009
+#: ../regexp.c:1177
 msgid "E50: Too many \\z("
-msgstr "E50: \\z( ������������"
+msgstr "E50: \\z( ������������"
 
-#: regexp.c:1020
+#: ../regexp.c:1188
 #, c-format
 msgid "E51: Too many %s("
-msgstr "E51: %s( ������������"
+msgstr "E51: %s( ������������"
 
-#: regexp.c:1077
+#: ../regexp.c:1245
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( ��������������������"
 
-#: regexp.c:1081
+#: ../regexp.c:1249
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( ��������������������"
 
-#: regexp.c:1083
+#: ../regexp.c:1251
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( ��������������������"
 
-#: regexp.c:1088
+#: ../regexp.c:1256
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) ��������������������"
 
-#: regexp.c:1258
-#, c-format
-msgid "E56: %s* operand could be empty"
-msgstr "E56: %s* �������������������\\������������"
-
-#: regexp.c:1261
-#, c-format
-msgid "E57: %s+ operand could be empty"
-msgstr "E57: %s+ �������������������\\������������"
-
-#: regexp.c:1316
+#: ../regexp.c:1474
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ �������s��������������������"
 
-#: regexp.c:1344
-#, c-format
-msgid "E58: %s{ operand could be empty"
-msgstr "E58: %s{ �������������������\\������������"
-
-#: regexp.c:1354
+#: ../regexp.c:1508
 #, c-format
 msgid "E60: Too many complex %s{...}s"
-msgstr "E60: ���G�� %s{...} ������������"
+msgstr "E60: ���G�� %s{...} ������������"
 
-#: regexp.c:1370
+#: ../regexp.c:1524
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61:%s* �������q��������������"
 
-#: regexp.c:1373
+#: ../regexp.c:1527
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62:%s%c �������q��������������"
 
 #
-#: regexp.c:1491
+#: ../regexp.c:1647
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ ���������g�p���@����"
 
-#: regexp.c:1536
+#: ../regexp.c:1692
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c ����������������������"
 
 #
-#: regexp.c:1592
+#: ../regexp.c:1748
 msgid "E65: Illegal back reference"
 msgstr "E65: �s���������Q������"
 
 #
-#: regexp.c:1605
+#: ../regexp.c:1761
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( ���R�R����������������������"
 
 #
-#: regexp.c:1624
+#: ../regexp.c:1780
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 ���������R�R����������������������"
 
 #
-#: regexp.c:1635
+#: ../regexp.c:1791
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z �������s��������������������"
 
 #
-#: regexp.c:1684
+#: ../regexp.c:1840
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ ������ ] ������������"
 
-#: regexp.c:1700
+#: ../regexp.c:1856
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] ��������"
 
 #
-#: regexp.c:1760
+#: ../regexp.c:1901
+msgid "E678: Invalid character after %s%%[dxouU]"
+msgstr "E678: %s%%[dxouU] �������s��������������������"
+
+#
+#: ../regexp.c:1952
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% �������s��������������������"
 
-#: regexp.c:2557
+#: ../regexp.c:2922
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} �������@�G���[����������"
 
-#: regexp.c:2863 regexp.c:3016
-msgid "E361: Crash intercepted; regexp too complex?"
-msgstr "E361: �N���b�V�����������f; ���K�\\�������G����������?"
-
-#: regexp.c:3004 regexp.c:3013
-msgid "E363: pattern caused out-of-stack error"
-msgstr "E363: �p�^�[���������X�^�b�N�s���G���[����"
-
-#: regexp.c:3258
+#: ../regexp.c:3707
 msgid "External submatches:\n"
 msgstr "�O���������Y��:\n"
 
-#: screen.c:2143
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �s����������������"
-
-#: screen.c:7959
+#: ../screen.c:7969
 msgid " VREPLACE"
 msgstr " ���z�u��"
 
-#: screen.c:7963
+#: ../screen.c:7973
 msgid " REPLACE"
 msgstr " �u��"
 
-#: screen.c:7968
+#: ../screen.c:7978
 msgid " REVERSE"
 msgstr " ���]"
 
-#: screen.c:7970
+#: ../screen.c:7980
 msgid " INSERT"
 msgstr " �}��"
 
-#: screen.c:7973
+#: ../screen.c:7983
 msgid " (insert)"
 msgstr " (�}��)"
 
-#: screen.c:7975
+#: ../screen.c:7985
 msgid " (replace)"
 msgstr " (�u��)"
 
-#: screen.c:7977
+#: ../screen.c:7987
 msgid " (vreplace)"
 msgstr " (���z�u��)"
 
-#: screen.c:7980
+#: ../screen.c:7990
 msgid " Hebrew"
 msgstr " �w�u���C"
 
-#: screen.c:7991
+#: ../screen.c:8001
 msgid " Arabic"
 msgstr " �A���r�A"
 
-#: screen.c:7994
+#: ../screen.c:8004
 msgid " (lang)"
 msgstr " (����)"
 
-#: screen.c:7998
+#: ../screen.c:8008
 msgid " (paste)"
 msgstr " (�\\���t��)"
 
-#: screen.c:8011
+#: ../screen.c:8021
 msgid " VISUAL"
 msgstr " �r�W���A��"
 
-#: screen.c:8012
+#: ../screen.c:8022
 msgid " VISUAL LINE"
 msgstr " �r�W���A�� �s"
 
-#: screen.c:8013
+#: ../screen.c:8023
 msgid " VISUAL BLOCK"
 msgstr " �r�W���A�� ���`"
 
-#: screen.c:8014
+#: ../screen.c:8024
 msgid " SELECT"
 msgstr " �Z���N�g"
 
-#: screen.c:8015
+#: ../screen.c:8025
 msgid " SELECT LINE"
 msgstr " �s�w���I��"
 
-#: screen.c:8016
+#: ../screen.c:8026
 msgid " SELECT BLOCK"
 msgstr " ���`�I��"
 
@@ -5226,118 +5739,118 @@ msgstr " ���`�I��"
 # msgstr " �u���b�N"
 # msgid " LINE"
 # msgstr " �s"
-#: screen.c:8031 screen.c:8094
+#: ../screen.c:8041 ../screen.c:8104
 msgid "recording"
 msgstr "�L�^��"
 
-#: search.c:37
+#: ../search.c:37
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "������������������������������"
 
-#: search.c:38
+#: ../search.c:38
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "������������������������������"
 
-#: search.c:526
+#: ../search.c:525
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: ��������������������: %s"
 
-#: search.c:853
+#: ../search.c:868
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: ���������������������Y������������������: %s"
 
-#: search.c:856
+#: ../search.c:871
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: ���������������������Y������������������: %s"
 
-#: search.c:1249
+#: ../search.c:1265
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' ���������� '?' �� '/' ����������������"
 
-#: search.c:3758
+#: ../search.c:4147
 msgid " (includes previously listed match)"
 msgstr " (�O�����������Y������������)"
 
 #. cursor at status line
-#: search.c:3778
+#: ../search.c:4167
 msgid "--- Included files "
 msgstr "--- �C���N���[�h�������t�@�C��"
 
-#: search.c:3780
+#: ../search.c:4169
 msgid "not found "
 msgstr "�������������� "
 
-#: search.c:3781
+#: ../search.c:4170
 msgid "in path ---\n"
 msgstr "�p�X�� ----\n"
 
-#: search.c:3820
+#: ../search.c:4227
 msgid "  (Already listed)"
 msgstr "  (��������)"
 
-#: search.c:3822
+#: ../search.c:4229
 msgid "  NOT FOUND"
 msgstr "  ��������������"
 
-#: search.c:3874
+#: ../search.c:4281
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "�C���N���[�h�������t�@�C�����X�L������: %s"
 
-#: search.c:4092
+#: ../search.c:4499
 msgid "E387: Match is on current line"
 msgstr "E387: �����s���Y������������"
 
-#: search.c:4235
+#: ../search.c:4642
 msgid "All included files were found"
 msgstr "�S�����C���N���[�h�������t�@�C������������������"
 
-#: search.c:4237
+#: ../search.c:4644
 msgid "No included files"
 msgstr "�C���N���[�h�t�@�C��������������"
 
-#: search.c:4253
+#: ../search.c:4660
 msgid "E388: Couldn't find definition"
 msgstr "E388: ���`������������������"
 
-#: search.c:4255
+#: ../search.c:4662
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �p�^�[��������������������"
 
-#: syntax.c:3050
+#: ../syntax.c:3070
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: �s������������: %s"
 
-#: syntax.c:3230
+#: ../syntax.c:3247
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: �����������\\���N���X�^������������: %s"
 
-#: syntax.c:3394
+#: ../syntax.c:3411
 msgid "No Syntax items defined for this buffer"
 msgstr "�����o�b�t�@�����`�������\\���v�f������������"
 
-#: syntax.c:3402
+#: ../syntax.c:3419
 msgid "syncing on C-style comments"
 msgstr "C�������R�����g����������"
 
-#: syntax.c:3410
+#: ../syntax.c:3427
 msgid "no syncing"
 msgstr "������"
 
-#: syntax.c:3413
+#: ../syntax.c:3430
 msgid "syncing starts "
 msgstr "�����J�n "
 
-#: syntax.c:3415 syntax.c:3490
+#: ../syntax.c:3432 ../syntax.c:3507
 msgid " lines before top line"
 msgstr " �s�O(�g�b�v�s������)"
 
-#: syntax.c:3420
+#: ../syntax.c:3437
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5345,7 +5858,7 @@ msgstr ""
 "\n"
 "--- �\\�������v�f ---"
 
-#: syntax.c:3425
+#: ../syntax.c:3442
 msgid ""
 "\n"
 "syncing on items"
@@ -5353,7 +5866,7 @@ msgstr ""
 "\n"
 "�v�f����������"
 
-#: syntax.c:3431
+#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5361,209 +5874,216 @@ msgstr ""
 "\n"
 "--- �\\���v�f ---"
 
-#: syntax.c:3454
+#: ../syntax.c:3471
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: �����������\\���N���X�^������������: %s"
 
-#: syntax.c:3480
+#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimal"
 
-#: syntax.c:3487
+#: ../syntax.c:3504
 msgid "maximal "
 msgstr "maximal"
 
-#: syntax.c:3499
+#: ../syntax.c:3516
 msgid "; match "
 msgstr "; �Y�� "
 
-#: syntax.c:3501
+#: ../syntax.c:3518
 msgid " line breaks"
 msgstr " �������s"
 
-#: syntax.c:4135
+#: ../syntax.c:4146
+msgid "E395: contains argument not accepted here"
+msgstr "E395: ����������������contains��������������������"
+
+#: ../syntax.c:4157
+msgid "E396: containedin argument not accepted here"
+msgstr "E396: ����������������containedin��������������������"
+
+#: ../syntax.c:4179
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: ���������O���[�v����������������"
 
-#: syntax.c:4159
+#: ../syntax.c:4203
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: %s �������v�f����������������"
 
-#: syntax.c:4187
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ����������������contains��������������������"
-
-#: syntax.c:4198
-msgid "E396: containedin argument not accepted here"
-msgstr "E396: ����������������containedin��������������������"
-
-#: syntax.c:4276
+#: ../syntax.c:4281
 msgid "E397: Filename required"
 msgstr "E397: �t�@�C�������K�v����"
 
-#: syntax.c:4614
+#: ../syntax.c:4404
+#, c-format
+msgid "E747: Missing ']': %s"
+msgstr "E747: ']' ������������: %s"
+
+#: ../syntax.c:4644
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' ������������: %s"
 
-#: syntax.c:4772
+#: ../syntax.c:4803
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: ����������������: �\\������ %s"
 
-#: syntax.c:5103
+#: ../syntax.c:5133
 msgid "E400: No cluster specified"
 msgstr "E400: �N���X�^���w����������������"
 
-#: syntax.c:5140
+#: ../syntax.c:5170
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: �p�^�[������������������������: %s"
 
-#: syntax.c:5215
+#: ../syntax.c:5245
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: �p�^�[�����������S�~����������: %s"
 
-#: syntax.c:5305
+#: ../syntax.c:5335
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: �\\������: �A���s�p�^�[����2�x�w������������"
 
-#: syntax.c:5362
+#: ../syntax.c:5392
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: �s������������: %s"
 
-#: syntax.c:5412
+#: ../syntax.c:5442
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: ������ sign ������������: %s"
 
-#: syntax.c:5418
+#: ../syntax.c:5448
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: ��������: %s"
 
-#: syntax.c:5445
+#: ../syntax.c:5475
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s ���R�R����������������������"
 
-#: syntax.c:5452
+#: ../syntax.c:5482
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s �����e���X�g������������������������"
 
-#: syntax.c:5522
+#: ../syntax.c:5552
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: ���m���O���[�v��: %s"
 
-#: syntax.c:5755
+#: ../syntax.c:5786
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ������ :syntax ���T�u�R�}���h: %s"
 
-#: syntax.c:6134
+#: ../syntax.c:6054
+msgid "E679: recursive loop loading syncolor.vim"
+msgstr "E679: syncolor.vim �����A�����o�������o��������"
+
+#: ../syntax.c:6181
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: �n�C���C�g�O���[�v����������������: %s"
 
-#: syntax.c:6158
+#: ../syntax.c:6205
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: �������[����������: \":highlight link %s\""
 
-#: syntax.c:6165
+#: ../syntax.c:6212
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ����������������: \":highlight link %s\""
+msgstr "E413: ����������������: \":highlight link %s\""
 
-#: syntax.c:6185
+#: ../syntax.c:6232
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: �O���[�v���������������������n�C���C�g�����N��������������"
 
-#: syntax.c:6314
+#: ../syntax.c:6361
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: �\\���������� sign ����: %s"
 
-#: syntax.c:6350
+#: ../syntax.c:6397
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: ���� sign ������������: %s"
 
-#: syntax.c:6378
+#: ../syntax.c:6425
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: ����������������: %s"
 
-#: syntax.c:6415
+#: ../syntax.c:6462
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: �s�����l����: %s"
 
-#: syntax.c:6534
+#: ../syntax.c:6581
 msgid "E419: FG color unknown"
 msgstr "E419: ���m���O�i�F����"
 
-#: syntax.c:6545
+#: ../syntax.c:6592
 msgid "E420: BG color unknown"
 msgstr "E420: ���m���w�i�F����"
 
-#: syntax.c:6606
+#: ../syntax.c:6653
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: �J���[�����������Fｯ����������: %s"
 
-#: syntax.c:6812
+#: ../syntax.c:6859
 #, c-format
 msgid "E422: terminal code too long: %s"
-msgstr "E422: �I�[�R�[�h������������: %s"
+msgstr "E422: �I�[�R�[�h������������: %s"
 
-#: syntax.c:6859
+#: ../syntax.c:6906
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: �s������������: %s"
 
-#: syntax.c:7388
+#: ../syntax.c:7435
 msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: �������������n�C���C�g�������g����������������"
+msgstr "E424: �������������n�C���C�g�������g����������������"
 
-#: syntax.c:7909
+#: ../syntax.c:7955
 msgid "E669: Unprintable character in group name"
 msgstr "E669: �O���[�v���������s���\\����������������"
 
-#. This is an error, but since there previously was no check only
-#. * give a warning.
-#: syntax.c:7916
+#: ../syntax.c:7963
 msgid "W18: Invalid character in group name"
 msgstr "W18: �O���[�v�����s������������������"
 
-#: tag.c:90
+#: ../tag.c:90
 msgid "E555: at bottom of tag stack"
 msgstr "E555: �^�O�X�^�b�N����������"
 
-#: tag.c:91
+#: ../tag.c:91
 msgid "E556: at top of tag stack"
 msgstr "E556: �^�O�X�^�b�N����������"
 
-#: tag.c:412
+#: ../tag.c:412
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: �������Y���^�O����������������������������"
 
-#: tag.c:550
+#: ../tag.c:550
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: �^�O����������������: %s"
 
-#: tag.c:583
+#: ../tag.c:583
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: tag.c:586
+#: ../tag.c:586
 msgid "file\n"
 msgstr "�t�@�C��\n"
 
@@ -5571,44 +6091,44 @@ msgstr "�t�@�C��\n"
 #. * Ask to select a tag from the list.
 #. * When using ":silent" assume that <CR> was entered.
 #.
-#: tag.c:744
+#: ../tag.c:744
 msgid "Enter nr of choice (<CR> to abort): "
 msgstr "�I���������������������������� (<CR>�����~): "
 
-#: tag.c:784
+#: ../tag.c:784
 msgid "E427: There is only one matching tag"
 msgstr "E427: �Y���^�O��1��������������������"
 
-#: tag.c:786
+#: ../tag.c:786
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: �������Y�������^�O���������i������������������"
 
-#: tag.c:810
+#: ../tag.c:810
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "�t�@�C�� \"%s\" ������������"
 
 #. Give an indication of the number of matching tags
-#: tag.c:823
+#: ../tag.c:823
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "�^�O %d (�S%d%s)"
 
-#: tag.c:826
+#: ../tag.c:826
 msgid " or more"
 msgstr " ����������"
 
-#: tag.c:828
+#: ../tag.c:828
 msgid "  Using tag with different case!"
 msgstr "  �^�O��������case���g�p������!"
 
-#: tag.c:872
+#: ../tag.c:872
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: �t�@�C�� \"%s\" ������������"
 
 #. Highlight title
-#: tag.c:941
+#: ../tag.c:941
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -5616,75 +6136,75 @@ msgstr ""
 "\n"
 "  # TO �^�O        FROM �s    in file/text"
 
-#: tag.c:1363
+#: ../tag.c:1363
 #, c-format
 msgid "Searching tags file %s"
 msgstr "�^�O�t�@�C�� %s ��������"
 
-#: tag.c:1550
+#: ../tag.c:1550
 #, c-format
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: �^�O�t�@�C�����p�X�� %s ������ﾌ������������\n"
 
-#: tag.c:2203
+#: ../tag.c:2202
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: �^�O�t�@�C�� \"%s\" ���t�H�[�}�b�g���G���[����������"
 
-#: tag.c:2207
+#: ../tag.c:2206
 #, c-format
 msgid "Before byte %ld"
 msgstr "���O�� %ld �o�C�g"
 
-#: tag.c:2240
+#: ../tag.c:2239
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: �^�O�t�@�C�����\\�[�g��������������: %s"
 
 #. never opened any tags file
-#: tag.c:2280
+#: ../tag.c:2279
 msgid "E433: No tags file"
 msgstr "E433: �^�O�t�@�C��������������"
 
-#: tag.c:3016
+#: ../tag.c:3020
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �^�O�p�^�[��������������������"
 
-#: tag.c:3027
+#: ../tag.c:3031
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: �^�O���������������������P������������!"
 
-#: term.c:1759
+#: ../term.c:1776
 msgid "' not known. Available builtin terminals are:"
 msgstr "' �����m����. ���s���g�������[������������������:"
 
-#: term.c:1783
+#: ../term.c:1800
 msgid "defaulting to '"
 msgstr "�����l���������������������� '"
 
-#: term.c:2141
+#: ../term.c:2158
 msgid "E557: Cannot open termcap file"
 msgstr "E557: termcap�t�@�C�����J��������"
 
-#: term.c:2145
+#: ../term.c:2162
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfo���[���G���g��������������������"
 
-#: term.c:2147
+#: ../term.c:2164
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcap���[���G���g��������������������"
 
-#: term.c:2306
+#: ../term.c:2323
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcap�� \"%s\" ���G���g��������������"
 
-#: term.c:2780
+#: ../term.c:2797
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: �[���� \"cm\" �@�\\���K�v����"
 
 #. Highlight title
-#: term.c:4990
+#: ../term.c:5039
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -5692,42 +6212,42 @@ msgstr ""
 "\n"
 "--- �[���L�[ ---"
 
-#: ui.c:258
+#: ../ui.c:276
 msgid "new shell started\n"
 msgstr "�V�����V�F�����N��������\n"
 
-#: ui.c:1841
+#: ../ui.c:1860
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: �����������������G���[�������I��������...\n"
 
 #. must display the prompt
-#: undo.c:405
+#: ../undo.c:422
 msgid "No undo possible; continue anyway"
 msgstr "���\\���A���h�D������������: ������������������"
 
-#: undo.c:561
+#: ../undo.c:578
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: �s��������������������"
 
-#: undo.c:757
+#: ../undo.c:778
 msgid "1 change"
 msgstr "1 �������X��������"
 
-#: undo.c:759
+#: ../undo.c:780
 #, c-format
 msgid "%ld changes"
 msgstr "%ld �������X��������"
 
-#: undo.c:812
+#: ../undo.c:833
 msgid "E439: undo list corrupt"
 msgstr "E439: �A���h�D���X�g��������������"
 
-#: undo.c:844
+#: ../undo.c:865
 msgid "E440: undo line missing"
 msgstr "E440: �A���h�D�s������������"
 
 #. Only MS VC 4.1 and earlier can do Win32s
-#: version.c:1731
+#: ../version.c:722
 msgid ""
 "\n"
 "MS-Windows 16/32 bit GUI version"
@@ -5735,7 +6255,7 @@ msgstr ""
 "\n"
 "MS-Windows 16/32 �r�b�g GUI ��"
 
-#: version.c:1733
+#: ../version.c:724
 msgid ""
 "\n"
 "MS-Windows 32 bit GUI version"
@@ -5743,15 +6263,15 @@ msgstr ""
 "\n"
 "MS-Windows 32 �r�b�g GUI ��"
 
-#: version.c:1736
+#: ../version.c:727
 msgid " in Win32s mode"
 msgstr " in Win32s ���[�h"
 
-#: version.c:1738
+#: ../version.c:729
 msgid " with OLE support"
 msgstr " with OLE �T�|�[�g"
 
-#: version.c:1741
+#: ../version.c:732
 msgid ""
 "\n"
 "MS-Windows 32 bit console version"
@@ -5759,7 +6279,7 @@ msgstr ""
 "\n"
 "MS-Windows 32 �r�b�g �R���\\�[�� ��"
 
-#: version.c:1745
+#: ../version.c:736
 msgid ""
 "\n"
 "MS-Windows 16 bit version"
@@ -5767,7 +6287,7 @@ msgstr ""
 "\n"
 "MS-Windows 16 �r�b�g ��"
 
-#: version.c:1749
+#: ../version.c:740
 msgid ""
 "\n"
 "32 bit MS-DOS version"
@@ -5775,7 +6295,7 @@ msgstr ""
 "\n"
 "32 �r�b�g MS-DOS ��"
 
-#: version.c:1751
+#: ../version.c:742
 msgid ""
 "\n"
 "16 bit MS-DOS version"
@@ -5783,7 +6303,7 @@ msgstr ""
 "\n"
 "16 �r�b�g MS-DOS ��"
 
-#: version.c:1757
+#: ../version.c:748
 msgid ""
 "\n"
 "MacOS X (unix) version"
@@ -5791,7 +6311,7 @@ msgstr ""
 "\n"
 "MacOS X (unix) ��"
 
-#: version.c:1759
+#: ../version.c:750
 msgid ""
 "\n"
 "MacOS X version"
@@ -5799,7 +6319,7 @@ msgstr ""
 "\n"
 "MacOS X ��"
 
-#: version.c:1762
+#: ../version.c:753
 msgid ""
 "\n"
 "MacOS version"
@@ -5807,7 +6327,7 @@ msgstr ""
 "\n"
 "MacOS ��"
 
-#: version.c:1767
+#: ../version.c:758
 msgid ""
 "\n"
 "RISC OS version"
@@ -5815,7 +6335,7 @@ msgstr ""
 "\n"
 "RISC OS ��"
 
-#: version.c:1777
+#: ../version.c:768
 msgid ""
 "\n"
 "Included patches: "
@@ -5823,11 +6343,11 @@ msgstr ""
 "\n"
 "�K�p���p�b�`: "
 
-#: version.c:1803 version.c:2171
+#: ../version.c:794 ../version.c:1162
 msgid "Modified by "
 msgstr "Modified by "
 
-#: version.c:1810
+#: ../version.c:801
 msgid ""
 "\n"
 "Compiled "
@@ -5835,11 +6355,11 @@ msgstr ""
 "\n"
 "Compiled "
 
-#: version.c:1813
+#: ../version.c:804
 msgid "by "
 msgstr "by "
 
-#: version.c:1825
+#: ../version.c:816
 msgid ""
 "\n"
 "Huge version "
@@ -5847,7 +6367,7 @@ msgstr ""
 "\n"
 "Huge �� "
 
-#: version.c:1828
+#: ../version.c:819
 msgid ""
 "\n"
 "Big version "
@@ -5855,7 +6375,7 @@ msgstr ""
 "\n"
 "Big �� "
 
-#: version.c:1831
+#: ../version.c:822
 msgid ""
 "\n"
 "Normal version "
@@ -5863,7 +6383,7 @@ msgstr ""
 "\n"
 "���� �� "
 
-#: version.c:1834
+#: ../version.c:825
 msgid ""
 "\n"
 "Small version "
@@ -5871,7 +6391,7 @@ msgstr ""
 "\n"
 "Small �� "
 
-#: version.c:1836
+#: ../version.c:827
 msgid ""
 "\n"
 "Tiny version "
@@ -5879,320 +6399,268 @@ msgstr ""
 "\n"
 "Tiny �� "
 
-#: version.c:1842
+#: ../version.c:833
 msgid "without GUI."
 msgstr "without GUI."
 
-#: version.c:1847
+#: ../version.c:838
 msgid "with GTK2-GNOME GUI."
 msgstr "with GTK2-GNOME GUI."
 
-#: version.c:1849
+#: ../version.c:840
 msgid "with GTK-GNOME GUI."
 msgstr "with GTK-GNOME GUI."
 
-#: version.c:1853
+#: ../version.c:844
 msgid "with GTK2 GUI."
 msgstr "with GTK2 GUI."
 
-#: version.c:1855
+#: ../version.c:846
 msgid "with GTK GUI."
 msgstr "with GTK GUI."
 
-#: version.c:1860
+#: ../version.c:851
 msgid "with X11-Motif GUI."
 msgstr "with X11-Motif GUI."
 
-#: version.c:1864
+#: ../version.c:855
 msgid "with X11-neXtaw GUI."
 msgstr "with X11-neXtaw GUI."
 
-#: version.c:1866
+#: ../version.c:857
 msgid "with X11-Athena GUI."
 msgstr "with X11-Athena GUI."
 
-#: version.c:1870
-msgid "with BeOS GUI."
-msgstr "with BeOS GUI."
-
-#: version.c:1873
+#: ../version.c:861
 msgid "with Photon GUI."
 msgstr "with Photon GUI."
 
-#: version.c:1876
+#: ../version.c:864
 msgid "with GUI."
 msgstr "with GUI."
 
-#: version.c:1879
+#: ../version.c:867
 msgid "with Carbon GUI."
 msgstr "with Carbon GUI."
 
-#: version.c:1882
+#: ../version.c:870
 msgid "with Cocoa GUI."
 msgstr "with Cocoa GUI."
 
-#: version.c:1885
+#: ../version.c:873
 msgid "with (classic) GUI."
 msgstr "with (�N���V�b�N) GUI."
 
-#: version.c:1896
+#: ../version.c:876
+msgid "with KDE GUI."
+msgstr "with KDE GUI."
+
+#: ../version.c:887
 msgid "  Features included (+) or not (-):\n"
 msgstr "  �@�\\������ �L��(+)/����(-)\n"
 
-#: version.c:1908
+#: ../version.c:899
 msgid "   system vimrc file: \""
 msgstr "      �V�X�e�� vimrc: \""
 
-#: version.c:1913
+#: ../version.c:904
 msgid "     user vimrc file: \""
 msgstr "        ���[�U vimrc: \""
 
-#: version.c:1918
+#: ../version.c:909
 msgid " 2nd user vimrc file: \""
 msgstr "     ��2���[�U vimrc: \""
 
-#: version.c:1923
+#: ../version.c:914
 msgid " 3rd user vimrc file: \""
 msgstr "     ��3���[�U vimrc: \""
 
-#: version.c:1928
+#: ../version.c:919
 msgid "      user exrc file: \""
 msgstr "         ���[�U exrc: \""
 
-#: version.c:1933
+#: ../version.c:924
 msgid "  2nd user exrc file: \""
 msgstr "      ��2���[�U exrc: \""
 
-#: version.c:1939
+#: ../version.c:930
 msgid "  system gvimrc file: \""
 msgstr "     �V�X�e�� gvimrc: \""
 
-#: version.c:1943
+#: ../version.c:934
 msgid "    user gvimrc file: \""
 msgstr "       ���[�U gvimrc: \""
 
-#: version.c:1947
+#: ../version.c:938
 msgid "2nd user gvimrc file: \""
 msgstr "    ��2���[�U gvimrc: \""
 
-#: version.c:1952
+#: ../version.c:943
 msgid "3rd user gvimrc file: \""
 msgstr "    ��3���[�U gvimrc: \""
 
-#: version.c:1959
+#: ../version.c:950
 msgid "    system menu file: \""
 msgstr "    �V�X�e�����j���[: \""
 
-#: version.c:1967
+#: ../version.c:958
 msgid "  fall-back for $VIM: \""
 msgstr "       �������� $VIM: \""
 
-#: version.c:1973
+#: ../version.c:964
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "�������� $VIMRUNTIME: \""
 
-#: version.c:1977
+#: ../version.c:968
 msgid "Compilation: "
 msgstr "�R���p�C��: "
 
-#: version.c:1983
+#: ../version.c:974
 msgid "Compiler: "
 msgstr "�R���p�C��: "
 
-#: version.c:1988
+#: ../version.c:979
 msgid "Linking: "
 msgstr "�����N: "
 
-#: version.c:1993
+#: ../version.c:984
 msgid "  DEBUG BUILD"
 msgstr "�f�o�b�O�r���h"
 
-#: version.c:2032
+#: ../version.c:1023
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: version.c:2034
+#: ../version.c:1025
 msgid "version "
 msgstr "version "
 
-#: version.c:2035
+#: ../version.c:1026
 msgid "by Bram Moolenaar et al."
 msgstr "by Bram Moolenaar ��."
 
-#: version.c:2039
+#: ../version.c:1030
 msgid "Vim is open source and freely distributable"
 msgstr "Vim ���I�[�v���\\�[�X������ｩ�R���z�z���\\����"
 
-#: version.c:2041
+#: ../version.c:1032
 msgid "Help poor children in Uganda!"
 msgstr "�E�K���_���b���������q��������������!"
 
-#: version.c:2042
+#: ../version.c:1033
 msgid "type  :help iccf<Enter>       for information "
 msgstr "������������           :help iccf<Enter>      "
 
-#: version.c:2044
+#: ../version.c:1035
 msgid "type  :q<Enter>               to exit         "
 msgstr "�I����������           :q<Enter>              "
 
-#: version.c:2045
+#: ../version.c:1036
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "�I�����C���w���v��     :help<Enter> �� <F1>   "
 
-#: version.c:2046
-msgid "type  :help version6<Enter>   for version info"
-msgstr "�o�[�W����������       :help version6<Enter>  "
+#: ../version.c:1037
+msgid "type  :help version7<Enter>   for version info"
+msgstr "�o�[�W����������       :help version7<Enter>  "
 
-#: version.c:2049
+#: ../version.c:1040
 msgid "Running in Vi compatible mode"
 msgstr "Vi�������[�h��������"
 
-#: version.c:2050
+#: ../version.c:1041
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "Vim�����l����������    :set nocp<Enter>       "
 
-#: version.c:2051
+#: ../version.c:1042
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "������������           :help cp-default<Enter>"
 
-#: version.c:2066
+#: ../version.c:1057
 msgid "menu  Help->Orphans           for information    "
 msgstr "���������j���[�� �w���v������ ���Q������������   "
 
-#: version.c:2068
+#: ../version.c:1059
 msgid "Running modeless, typed text is inserted"
 msgstr "���[�h����ﾀ�s��, �^�C�v�����������}����������"
 
-#: version.c:2069
+#: ../version.c:1060
 msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
 msgstr "���j���[�� ���W���S���������}��(���Sﾒ)���[�h����"
 
-#: version.c:2070
+#: ../version.c:1061
 msgid "                              for two modes      "
 msgstr "                              �����[�h�L��       "
 
-#: version.c:2074
+#: ../version.c:1065
 msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
 msgstr "���j���[�� ���W���S��������Vi�������[�h����      "
 
-#: version.c:2075
+#: ../version.c:1066
 msgid "                              for Vim defaults   "
 msgstr "                              ��Vim����������    "
 
-#: version.c:2122
+#: ../version.c:1113
 msgid "Sponsor Vim development!"
 msgstr "Vim���J��������������������!"
 
-#: version.c:2123
+#: ../version.c:1114
 msgid "Become a registered Vim user!"
 msgstr "Vim���o�^���[�U����������������!"
 
-#: version.c:2126
+#: ../version.c:1117
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "������������           :help sponsor<Enter>   "
 
-#: version.c:2127
+#: ../version.c:1118
 msgid "type  :help register<Enter>   for information "
 msgstr "������������           :help register<Enter>  "
 
-#: version.c:2129
+#: ../version.c:1120
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "���������j���[�� �w���v���X�|���T�[/�o�^ ���Q������������   "
 
-#: version.c:2139
+#: ../version.c:1130
 msgid "WARNING: Windows 95/98/ME detected"
 msgstr "   �x��: Windows 95/98/Me �����o  "
 
-#: version.c:2142
+#: ../version.c:1133
 msgid "type  :help windows95<Enter>  for info on this"
 msgstr " ������������          :help windows95<Enter> "
 
-#: window.c:203
+#: ../window.c:208
 msgid "E441: There is no preview window"
 msgstr "E441: �v���r���[�E�B���h�E������������"
 
-#: window.c:581
+#: ../window.c:603
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: �������E����������������������������������"
 
-#: window.c:1340
+#: ../window.c:1362
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: �����E�B���h�E������������������������������������"
 
-#: window.c:1836
+#: ../window.c:1858
 msgid "E444: Cannot close last window"
 msgstr "E444: �������E�B���h�E������������������������"
 
-#: window.c:2567
+#: ../window.c:2593
 msgid "Already only one window"
 msgstr "�����E�B���h�E��1����������������"
 
-#: window.c:2614
+#: ../window.c:2640
 msgid "E445: Other window contains changes"
 msgstr "E445: �����E�B���h�E�������X����������"
 
-#: window.c:4480
+#: ../window.c:4564
 msgid "E446: No file name under cursor"
 msgstr "E446: �J�[�\\���������t�@�C����������������"
 
-#: window.c:4599
+#: ../window.c:4683
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: path���� \"%s\" �������t�@�C��������������"
 
-#: globals.h:1232 if_perl.xs:326
-#, c-format
-msgid "E370: Could not load library %s"
-msgstr "E370: ���C�u���� %s �����[�h����������������"
-
-#: if_perl.xs:554
-msgid "Sorry, this command is disabled: the Perl library could not be loaded."
-msgstr ""
-"�����R�}���h����������, ������������: Perl���C�u���������[�h����������������."
-
-#: if_perl.xs:607
-msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-msgstr ""
-"E299: �T���h�{�b�N�X���� Safe "
-"���W���[�����g�p������Perl�X�N���v�g������������������"
-
-#: GvimExt/gvimext.cpp:583
-msgid "Edit with &multiple Vims"
-msgstr "�e�t�@�C�������X�� Vim �����W(&M)"
-
-#: GvimExt/gvimext.cpp:589
-msgid "Edit with single &Vim"
-msgstr "�S�t�@�C����1���� Vim �����W(&V)"
-
-#: GvimExt/gvimext.cpp:598
-msgid "&Diff with Vim"
-msgstr "Vim ���������W(&D)"
-
-#: GvimExt/gvimext.cpp:611
-msgid "Edit with &Vim"
-msgstr "Vim �����W(&V)"
-
-#: GvimExt/gvimext.cpp:633
-msgid "Edit with existing Vim - &"
-msgstr "������ Vim �����W - &"
-
-#: GvimExt/gvimext.cpp:746
-msgid "Edits the selected file(s) with Vim"
-msgstr "�I���������t�@�C���� Vim �����W"
-
-#: GvimExt/gvimext.cpp:885 GvimExt/gvimext.cpp:966
-msgid "Error creating process: Check if gvim is in your path!"
-msgstr "�N���G���[: gvim ���p�X���������������m��������������!"
-
-#: GvimExt/gvimext.cpp:886 GvimExt/gvimext.cpp:900 GvimExt/gvimext.cpp:967
-msgid "gvimext.dll error"
-msgstr "gvimext.dll �G���["
-
-#: GvimExt/gvimext.cpp:899
-msgid "Path length too long!"
-msgstr "�p�X������������!"
-
-#: globals.h:1022
+#: ../globals.h:1056
 msgid "--No lines in buffer--"
 msgstr "--�o�b�t�@���s������������--"
 
@@ -6200,388 +6668,418 @@ msgstr "--�o�b�t�@���s������������--"
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: globals.h:1185
+#: ../globals.h:1247
 msgid "E470: Command aborted"
 msgstr "E470: �R�}���h�����f����������"
 
-#: globals.h:1186
+#: ../globals.h:1248
 msgid "E471: Argument required"
 msgstr "E471: �������K�v����"
 
-#: globals.h:1187
+#: ../globals.h:1249
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ ������ / �� ? �� & ��������������������"
 
-#: globals.h:1189
+#: ../globals.h:1251
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: �R�}���h���C��������������; <CR>��ﾀ�s, CTRL-C��������"
 
-#: globals.h:1191
+#: ../globals.h:1253
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
 "E12: �������f�B���N�g�����^�O��������exrc/vimrc���R�}���h����������������"
 
-#: globals.h:1193
+#: ../globals.h:1255
 msgid "E171: Missing :endif"
 msgstr "E171: :endif ������������"
 
-#: globals.h:1194
+#: ../globals.h:1256
 msgid "E600: Missing :endtry"
 msgstr "E600: :endtry ������������"
 
-#: globals.h:1195
+#: ../globals.h:1257
 msgid "E170: Missing :endwhile"
 msgstr "E170: :endwhile ������������"
 
-#: globals.h:1196
+#: ../globals.h:1258
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ������������"
+
+#: ../globals.h:1259
 msgid "E588: :endwhile without :while"
 msgstr "E588: :while ������ :endwhile ����������"
 
-#: globals.h:1198
+#: ../globals.h:1260
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor ������ :for ����������"
+
+#: ../globals.h:1262
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: �t�@�C�������������� (! ������������)"
 
-#: globals.h:1199
+#: ../globals.h:1263
 msgid "E472: Command failed"
 msgstr "E472: �R�}���h��ｸ�s��������"
 
-#: globals.h:1201
+#: ../globals.h:1265
 #, c-format
 msgid "E234: Unknown fontset: %s"
 msgstr "E234: ���m���t�H���g�Z�b�g: %s"
 
-#: globals.h:1205
+#: ../globals.h:1269
 #, c-format
 msgid "E235: Unknown font: %s"
 msgstr "E235: ���m���t�H���g: %s"
 
-#: globals.h:1208
+#: ../globals.h:1272
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
 msgstr "E236: �t�H���g \"%s\" ����������������������"
 
-#: globals.h:1210
+#: ../globals.h:1274
 msgid "E473: Internal error"
 msgstr "E473: �����G���[����"
 
-#: globals.h:1211
+#: ../globals.h:1275
 msgid "Interrupted"
 msgstr "��������������"
 
-#: globals.h:1212
+#: ../globals.h:1276
 msgid "E14: Invalid address"
 msgstr "E14: �������A�h���X����"
 
-#: globals.h:1213
+#: ../globals.h:1277
 msgid "E474: Invalid argument"
 msgstr "E474: ��������������"
 
-#: globals.h:1214
+#: ../globals.h:1278
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: ��������������: %s"
 
-#: globals.h:1216
+#: ../globals.h:1280
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: ������ｮ����: %s"
 
-#: globals.h:1218
+#: ../globals.h:1282
 msgid "E16: Invalid range"
 msgstr "E16: ��������������"
 
-#: globals.h:1219
+#: ../globals.h:1283
 msgid "E476: Invalid command"
 msgstr "E476: �������R�}���h����"
 
-#: globals.h:1221
+#: ../globals.h:1285
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" ���f�B���N�g������"
 
-#: globals.h:1224
-msgid "E18: Unexpected characters before '='"
-msgstr "E18: �\\������������ '=' ���O������������"
-
-#: globals.h:1227
+#: ../globals.h:1288
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: \"%s\"() �����C�u�������o��ｸ�s��������"
 
-#: globals.h:1233
+#: ../globals.h:1294
 #, c-format
 msgid "E448: Could not load library function %s"
 msgstr "E448: ���C�u���������� %s �����[�h����������������"
 
-#: globals.h:1235
+#: ../globals.h:1296
 msgid "E19: Mark has invalid line number"
 msgstr "E19: �}�[�N���������s�������w����������������"
 
-#: globals.h:1236
+#: ../globals.h:1297
 msgid "E20: Mark not set"
 msgstr "E20: �}�[�N��������������������"
 
-#: globals.h:1237
+#: ../globals.h:1298
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: 'modifiable' ���I�t������, ���X����������"
 
-#: globals.h:1238
+#: ../globals.h:1299
 msgid "E22: Scripts nested too deep"
-msgstr "E22: �X�N���v�g�������q���[��������"
+msgstr "E22: �X�N���v�g�������q���[��������"
 
-#: globals.h:1239
+#: ../globals.h:1300
 msgid "E23: No alternate file"
 msgstr "E23: ���t�@�C��������������"
 
-#: globals.h:1240
+#: ../globals.h:1301
 msgid "E24: No such abbreviation"
 msgstr "E24: �����������Z�k����������������"
 
-#: globals.h:1241
+#: ../globals.h:1302
 msgid "E477: No ! allowed"
 msgstr "E477: ! ��������������������"
 
-#: globals.h:1243
+#: ../globals.h:1304
 msgid "E25: GUI cannot be used: Not enabled at compile time"
 msgstr "E25: GUI���g�p�s���\\����: �R���p�C������������������������"
 
-#: globals.h:1246
+#: ../globals.h:1307
 msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
 msgstr "E26: �w�u���C�����g�p�s���\\����: �R���p�C������������������������\n"
 
-#: globals.h:1249
+#: ../globals.h:1310
 msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
 msgstr "E27: �y���V�A�����g�p�s���\\����: �R���p�C������������������������\n"
 
-#: globals.h:1252
+#: ../globals.h:1313
 msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
 msgstr "E800: �A���r�A�����g�p�s���\\����: �R���p�C������������������������\n"
 
-#: globals.h:1255
+#: ../globals.h:1316
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: ���������������n�C���C�g�O���[�v������������: %s"
 
-#: globals.h:1257
+#: ../globals.h:1318
 msgid "E29: No inserted text yet"
 msgstr "E29: �����e�L�X�g���}����������������"
 
-#: globals.h:1258
+#: ../globals.h:1319
 msgid "E30: No previous command line"
 msgstr "E30: ���O���R�}���h�s������������"
 
-#: globals.h:1259
+#: ../globals.h:1320
 msgid "E31: No such mapping"
 msgstr "E31: �����������}�b�s���O������������"
 
-#: globals.h:1260
+#: ../globals.h:1321
 msgid "E479: No match"
 msgstr "E479: �Y��������������"
 
-#: globals.h:1261
+#: ../globals.h:1322
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: �Y��������������: %s"
 
-#: globals.h:1262
+#: ../globals.h:1323
 msgid "E32: No file name"
 msgstr "E32: �t�@�C����������������"
 
-#: globals.h:1263
+#: ../globals.h:1324
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: ���K�\\���u��������ﾀ�s��������������"
 
-#: globals.h:1264
+#: ../globals.h:1325
 msgid "E34: No previous command"
 msgstr "E34: �R�}���h������ﾀ�s��������������"
 
-#: globals.h:1265
+#: ../globals.h:1326
 msgid "E35: No previous regular expression"
 msgstr "E35: ���K�\\��������ﾀ�s��������������"
 
-#: globals.h:1266
+#: ../globals.h:1327
 msgid "E481: No range allowed"
 msgstr "E481: �����w����������������������"
 
-#: globals.h:1268
+#: ../globals.h:1329
 msgid "E36: Not enough room"
 msgstr "E36: �[�����e��������������"
 
-#: globals.h:1271
+#: ../globals.h:1332
 #, c-format
 msgid "E247: no registered server named \"%s\""
 msgstr "E247: %s ���������O���o�^�������T�[�o������������"
 
-#: globals.h:1273
+#: ../globals.h:1334
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: �t�@�C�� %s ����������������"
 
-#: globals.h:1274
+#: ../globals.h:1335
 msgid "E483: Can't get temp file name"
 msgstr "E483: �����t�@�C�������O����������������"
 
-#: globals.h:1275
+#: ../globals.h:1336
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: �t�@�C�� \"%s\" ���J��������"
 
-#: globals.h:1276
+#: ../globals.h:1337
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: �t�@�C�� %s ��������������"
 
-#: globals.h:1277
+#: ../globals.h:1338
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: ���������X�������������������� (! �����������X���j��)"
 
-#: globals.h:1278
+#: ../globals.h:1339
 msgid "E38: Null argument"
 msgstr "E38: ������������"
 
-#: globals.h:1280
+#: ../globals.h:1341
 msgid "E39: Number expected"
 msgstr "E39: ���l���v��������������"
 
-#: globals.h:1283
+#: ../globals.h:1344
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: �G���[�t�@�C�� %s ���J��������"
 
-#: globals.h:1286
+#: ../globals.h:1347
 msgid "E233: cannot open display"
 msgstr "E233: �f�B�X�v���C���J��������"
 
-#: globals.h:1288
+#: ../globals.h:1349
 msgid "E41: Out of memory!"
 msgstr "E41: ���������s������������!"
 
-#: globals.h:1290
+#: ../globals.h:1351
 msgid "Pattern not found"
 msgstr "�p�^�[������������������������"
 
-#: globals.h:1292
+#: ../globals.h:1353
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: �p�^�[������������������������: %s"
 
-#: globals.h:1293
+#: ../globals.h:1354
 msgid "E487: Argument must be positive"
 msgstr "E487: �����������l��������������������"
 
-#: globals.h:1295
+#: ../globals.h:1356
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: �O���f�B���N�g��������������"
 
-#: globals.h:1299
+#: ../globals.h:1360
 msgid "E42: No Errors"
 msgstr "E42: �G���[������������"
 
-#: globals.h:1301
+#: ../globals.h:1362
 msgid "E43: Damaged match string"
 msgstr "E43: �Y�����������j������������"
 
-#: globals.h:1302
+#: ../globals.h:1363
 msgid "E44: Corrupted regexp program"
 msgstr "E44: �s�������K�\\���v���O��������"
 
-#: globals.h:1303
+#: ../globals.h:1364
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: 'readonly' �I�v�V���������������������� (! ��������������)"
 
-#: globals.h:1305
+#: ../globals.h:1366
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: �������p���� \"%s\" �����l����������������"
+
+#: ../globals.h:1367
 #, c-format
-msgid "E46: Cannot set read-only variable \"%s\""
-msgstr "E46: �������p���� \"%s\" ��������������������������"
+msgid "E46: Cannot set variable in the sandbox: \"%s\""
+msgstr "E46: �T���h�{�b�N�X�������� \"%s\" ���l����������������"
 
-#: globals.h:1308
+#: ../globals.h:1370
 msgid "E47: Error while reading errorfile"
 msgstr "E47: �G���[�t�@�C�������������G���[��������������"
 
-#: globals.h:1311
+#: ../globals.h:1373
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: �T���h�{�b�N�X����������������"
 
-#: globals.h:1313
+#: ../globals.h:1375
 msgid "E523: Not allowed here"
 msgstr "E523: ����������������������"
 
-#: globals.h:1316
+#: ../globals.h:1378
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: �X�N���[�����[�h��������������������������"
 
-#: globals.h:1318
+#: ../globals.h:1380
 msgid "E49: Invalid scroll size"
 msgstr "E49: �������X�N���[��������"
 
-#: globals.h:1319
+#: ../globals.h:1381
 msgid "E91: 'shell' option is empty"
 msgstr "E91: 'shell' �I�v�V������������"
 
-#: globals.h:1321
+#: ../globals.h:1383
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: sign ���f�[�^��������������������"
 
-#: globals.h:1323
+#: ../globals.h:1385
 msgid "E72: Close error on swap file"
 msgstr "E72: �X���b�v�t�@�C�����N���[�Y���G���[����"
 
-#: globals.h:1324
+#: ../globals.h:1386
 msgid "E73: tag stack empty"
 msgstr "E73: �^�O�X�^�b�N��������"
 
-#: globals.h:1325
+#: ../globals.h:1387
 msgid "E74: Command too complex"
-msgstr "E74: �R�}���h�����G��������"
+msgstr "E74: �R�}���h�����G��������"
 
-#: globals.h:1326
+#: ../globals.h:1388
 msgid "E75: Name too long"
-msgstr "E75: ���O������������"
+msgstr "E75: ���O������������"
 
-#: globals.h:1327
+#: ../globals.h:1389
 msgid "E76: Too many ["
-msgstr "E76: [ ������������"
+msgstr "E76: [ ������������"
 
-#: globals.h:1328
+#: ../globals.h:1390
 msgid "E77: Too many file names"
-msgstr "E77: �t�@�C����������������"
+msgstr "E77: �t�@�C����������������"
 
-#: globals.h:1329
+#: ../globals.h:1391
 msgid "E488: Trailing characters"
 msgstr "E488: �]������������������������"
 
-#: globals.h:1330
+#: ../globals.h:1392
 msgid "E78: Unknown mark"
 msgstr "E78: ���m���}�[�N"
 
-#: globals.h:1331
+#: ../globals.h:1393
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: ���C���h�J�[�h���W�J����������"
 
-#: globals.h:1333
+#: ../globals.h:1395
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' �� 'winminheight' ��������������������"
 
-#: globals.h:1335
+#: ../globals.h:1397
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' �� 'winminwidth' ��������������������"
 
-#: globals.h:1338
+#: ../globals.h:1400
 msgid "E80: Error while writing"
 msgstr "E80: �����������G���["
 
-#: globals.h:1339
+#: ../globals.h:1401
 msgid "Zero count"
 msgstr "�[���J�E���g"
 
-#: globals.h:1341
+#: ../globals.h:1403
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: �X�N���v�g���O��<SID>���g����������"
 
-#: globals.h:1344
+#: ../globals.h:1406
 msgid "E449: Invalid expression received"
 msgstr "E449: ������ｮ����������������"
 
-#: globals.h:1347
+#: ../globals.h:1409
 msgid "E463: Region is guarded, cannot modify"
 msgstr "E463: ������������������������, ���X����������"
+
+#: ../globals.h:1410
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ���������p�t�@�C�������X��������������������"
+
+#: ../globals.h:1413
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: �����G���[����: %s"
+
+#: ../globals.h:1416
+msgid "E361: Crash intercepted; regexp too complex?"
+msgstr "E361: �N���b�V�����������f; ���K�\\�������G����������?"
+
+#: ../globals.h:1418
+msgid "E363: pattern caused out-of-stack error"
+msgstr "E363: �p�^�[���������X�^�b�N�s���G���[����"
+
+#: ../globals.h:1419
+msgid "E749: empty buffer"
+msgstr "E749: �o�b�t�@��������"
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index 2a6f12e27..023f422c1 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -43,6 +43,7 @@ char_u *get_function_name __ARGS((expand_T *xp, int idx));
 char_u *get_expr_name __ARGS((expand_T *xp, int idx));
 void set_vim_var_nr __ARGS((int idx, long val));
 long get_vim_var_nr __ARGS((int idx));
+char_u *get_vim_var_str __ARGS((int idx));
 void set_vcount __ARGS((long count, long count1));
 void set_vim_var_string __ARGS((int idx, char_u *val, int len));
 void set_reg_var __ARGS((int c));
diff --git a/src/proto/tag.pro b/src/proto/tag.pro
index f8c236f56..5df6c30f7 100644
--- a/src/proto/tag.pro
+++ b/src/proto/tag.pro
@@ -5,4 +5,5 @@ void do_tags __ARGS((exarg_T *eap));
 int find_tags __ARGS((char_u *pat, int *num_matches, char_u ***matchesp, int flags, int mincount, char_u *buf_ffname));
 void simplify_filename __ARGS((char_u *filename));
 int expand_tags __ARGS((int tagnames, char_u *pat, int *num_file, char_u ***file));
+int get_tags __ARGS((list_T *list, char_u *pat));
 /* vim: set ft=c : */
diff --git a/src/regexp.c b/src/regexp.c
index bf5f7afd1..36f5bb456 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -100,10 +100,10 @@
  *
  *		       +----------------------+
  *		       V		      |
- * <aa>\+	BRANCH <aa> --> BRANCH --> BACK BRANCH --> NOTHING --> END
- *		     |	             |	        ^		       ^
- *		     |	             +----------+		       |
- *		     +-------------------------------------------------+
+ * <aa>\+	BRANCH <aa> --> BRANCH --> BACKP BRANCH --> NOTHING --> END
+ *		     |	             |	         ^		        ^
+ *		     |	             +-----------+		        |
+ *		     +--------------------------------------------------+
  *
  *
  *					+-------------------------+
@@ -229,6 +229,8 @@
 #define RE_COL		205	/* nr cmp  Match column number */
 #define RE_VCOL		206	/* nr cmp  Match virtual column number */
 
+#define BACKP		207	/*	Like BACK but for \+ */
+
 /*
  * Magic characters have a special meaning, they don't match literally.
  * Magic characters are negative.  This separates them from literal characters
@@ -281,6 +283,8 @@ toggle_Magic(x)
  * BACK		Normal "next" pointers all implicitly point forward; BACK
  *		exists to make loop structures possible.
  *
+ * BACKP	Like BACK, but used for \+.  Doesn't check for an empty match.
+ *
  * STAR,PLUS	'=', and complex '*' and '+', are implemented as circular
  *		BRANCH structures using BACK.  Simple cases (one character
  *		per match) are implemented with STAR and PLUS for speed
@@ -1448,7 +1452,7 @@ regpiece(flagp)
 		/* Emit x+ as x(&|), where & means "self". */
 		next = regnode(BRANCH); /* Either */
 		regtail(ret, next);
-		regtail(regnode(BACK), ret);	/* loop back */
+		regtail(regnode(BACKP), ret);	/* loop back */
 		regtail(next, regnode(BRANCH)); /* or */
 		regtail(ret, regnode(NOTHING)); /* null. */
 	    }
@@ -2483,7 +2487,7 @@ regtail(p, val)
 	scan = temp;
     }
 
-    if (OP(scan) == BACK)
+    if (OP(scan) == BACK || OP(scan) == BACKP)
 	offset = (int)(scan - val);
     else
 	offset = (int)(val - scan);
@@ -4092,6 +4096,9 @@ regmatch(scan, startp)
 		return FALSE;
 	    break;
 
+	  case BACKP:
+	    break;
+
 	  case MOPEN + 0:   /* Match start: \zs */
 	  case MOPEN + 1:   /* \( */
 	  case MOPEN + 2:
@@ -4356,6 +4363,10 @@ regmatch(scan, startp)
 	    {
 		if (OP(next) != BRANCH) /* No choice. */
 		    next = OPERAND(scan);	/* Avoid recursion. */
+		else if (startp != NULL && OP(OPERAND(scan)) == BACKP
+						    && reg_save_equal(startp))
+		    /* \+ with something empty before it */
+		    return FALSE;
 		else
 		{
 		    regsave_T	save;
@@ -5134,7 +5145,7 @@ regnext(p)
     if (offset == 0)
 	return NULL;
 
-    if (OP(p) == BACK)
+    if (OP(p) == BACK || OP(p) == BACKP)
 	return p - offset;
     else
 	return p + offset;
@@ -5604,6 +5615,9 @@ regprop(op)
       case BACK:
 	p = "BACK";
 	break;
+      case BACKP:
+	p = "BACKP";
+	break;
       case END:
 	p = "END";
 	break;
diff --git a/src/tag.c b/src/tag.c
index a3bed7a80..e2c5238b3 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -3536,3 +3536,128 @@ expand_tags(tagnames, pat, num_file, file)
     return ret;
 }
 #endif
+
+#if defined(FEAT_EVAL) || defined(PROTO)
+static int add_tag_field __ARGS((dict_T *dict, char *field_name, char_u *start, char_u *end));
+
+/*
+ * Add a tag field to the dictionary "dict"
+ */
+    static int
+add_tag_field(dict, field_name, start, end)
+    dict_T  *dict;
+    char    *field_name;
+    char_u  *start;
+    char_u  *end;
+{
+    char_u	buf[MAXPATHL];
+    int		len;
+
+    len = end - start;
+    if (len > sizeof(buf) - 1)
+	len = sizeof(buf) - 1;
+    STRNCPY(buf, start, len);
+    buf[len] = NUL;
+    return dict_add_nr_str(dict, field_name, 0L, buf);
+}
+
+/*
+ * Add the tags matching the specified pattern to the list "list"
+ * as a dictionary
+ */
+    int
+get_tags(list, pat)
+    list_T *list;
+    char_u *pat;
+{
+    int		num_matches, i, ret;
+    char_u	**matches, *p;
+    dict_T	*dict;
+    tagptrs_T	tp;
+    long	is_static;
+    char_u	buf[200];
+    char_u	*bp;
+
+    ret = find_tags(pat, &num_matches, &matches,
+				    TAG_REGEXP | TAG_NOIC, (int)MAXCOL, NULL);
+    if (ret == OK && num_matches > 0)
+    {
+	for (i = 0; i < num_matches; ++i)
+	{
+	    if ((dict = dict_alloc()) == NULL)
+		ret = FAIL;
+	    if (list_append_dict(list, dict) == FAIL)
+		ret = FAIL;
+
+	    parse_match(matches[i], &tp);
+	    is_static = test_for_static(&tp);
+
+	    if (add_tag_field(dict, "name", tp.tagname, tp.tagname_end) == FAIL
+		    || add_tag_field(dict, "filename", tp.fname,
+							 tp.fname_end) == FAIL
+		    || add_tag_field(dict, "cmd", tp.command,
+						       tp.command_end) == FAIL
+		    || add_tag_field(dict, "kind", tp.tagkind,
+						      tp.tagkind_end) == FAIL
+		    || dict_add_nr_str(dict, "static", is_static, NULL) == FAIL)
+		ret = FAIL;
+
+	    bp = buf;
+
+	    if (tp.command_end != NULL)
+	    {
+		for (p = tp.command_end + 3;
+				   *p != NUL && *p != '\n' && *p != '\r'; ++p)
+		{
+		    if (p == tp.tagkind || (p + 5 == tp.tagkind
+					      && STRNCMP(p, "kind:", 5) == 0))
+			/* skip "kind:<kind>" and "<kind>" */
+			p = tp.tagkind_end - 1;
+		    else if (STRNCMP(p, "file:", 5) == 0)
+			/* skip "file:" (static tag) */
+			p += 4;
+		    else if (STRNCMP(p, "struct:", 7) == 0
+			    || STRNCMP(p, "enum:", 5) == 0
+			    || STRNCMP(p, "class:", 6) == 0)
+		    {
+			char_u	*s, *n;
+
+			/* Field we recognize, add as a dict entry. */
+			n = p;
+			if (*n == 's')
+			    p += 7;
+			else if (*n == 'e')
+			    p += 5;
+			else
+			    p += 6;
+			s = p;
+			while (*p != NUL && *p != '\n' && *p != '\r')
+			    ++p;
+			if (add_tag_field(dict,
+				    *n == 's' ? "struct"
+					       : *n == 'e' ? "enum" : "class",
+								s, p) == FAIL)
+			    ret = FAIL;
+			--p;
+		    }
+		    else if ((bp - buf) < sizeof(buf) - 1
+					    && (bp > buf || !vim_iswhite(*p)))
+			/* Field not recognized, add to "extra" dict entry. */
+			*bp++ = *p;
+		}
+
+		if (bp > buf)
+		{
+		    *bp = NUL;
+		    if (dict_add_nr_str(dict, "extra", 0L, buf) == FAIL)
+			ret = FAIL;
+		}
+	    }
+
+	    vim_free(matches[i]);
+	}
+	vim_free(matches);
+    }
+    return ret;
+}
+#endif
diff --git a/src/term.c b/src/term.c
index 12c506ab2..3097cc324 100644
--- a/src/term.c
+++ b/src/term.c
@@ -931,10 +931,6 @@ struct builtin_term builtin_termcaps[] =
 # endif
 
 # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS) || defined(__EMX__)
-/*
- * The xterm termcap is missing F14 and F15, because they send the same
- * codes as the undo and help key, although they don't work on all keyboards.
- */
     {(int)KS_NAME,	"xterm"},
     {(int)KS_CE,	IF_EB("\033[K", ESC_STR "[K")},
     {(int)KS_AL,	IF_EB("\033[L", ESC_STR "[L")},
@@ -1013,65 +1009,75 @@ struct builtin_term builtin_termcaps[] =
     {K_XF2,		IF_EB("\033OQ", ESC_STR "OQ")},
     {K_XF3,		IF_EB("\033OR", ESC_STR "OR")},
     {K_XF4,		IF_EB("\033OS", ESC_STR "OS")},
-    {K_F1,		IF_EB("\033[11~", ESC_STR "[11~")},
-    {K_F2,		IF_EB("\033[12~", ESC_STR "[12~")},
-    {K_F3,		IF_EB("\033[13~", ESC_STR "[13~")},
-    {K_F4,		IF_EB("\033[14~", ESC_STR "[14~")},
-    {K_F5,		IF_EB("\033[15~", ESC_STR "[15~")},
-    {K_F6,		IF_EB("\033[17~", ESC_STR "[17~")},
-    {K_F7,		IF_EB("\033[18~", ESC_STR "[18~")},
-    {K_F8,		IF_EB("\033[19~", ESC_STR "[19~")},
-    {K_F9,		IF_EB("\033[20~", ESC_STR "[20~")},
-    {K_F10,		IF_EB("\033[21~", ESC_STR "[21~")},
-    {K_F11,		IF_EB("\033[23~", ESC_STR "[23~")},
-    {K_F12,		IF_EB("\033[24~", ESC_STR "[24~")},
+    {K_F1,		IF_EB("\033[11;*~", ESC_STR "[11;*~")},
+    {K_F2,		IF_EB("\033[12;*~", ESC_STR "[12;*~")},
+    {K_F3,		IF_EB("\033[13;*~", ESC_STR "[13;*~")},
+    {K_F4,		IF_EB("\033[14;*~", ESC_STR "[14;*~")},
+    {K_F5,		IF_EB("\033[15;*~", ESC_STR "[15;*~")},
+    {K_F6,		IF_EB("\033[17;*~", ESC_STR "[17;*~")},
+    {K_F7,		IF_EB("\033[18;*~", ESC_STR "[18;*~")},
+    {K_F8,		IF_EB("\033[19;*~", ESC_STR "[19;*~")},
+    {K_F9,		IF_EB("\033[20;*~", ESC_STR "[20;*~")},
+    {K_F10,		IF_EB("\033[21;*~", ESC_STR "[21;*~")},
+    {K_F11,		IF_EB("\033[23;*~", ESC_STR "[23;*~")},
+    {K_F12,		IF_EB("\033[24;*~", ESC_STR "[24;*~")},
     {K_S_XF1,		IF_EB("\033O2P", ESC_STR "O2P")},
     {K_S_XF2,		IF_EB("\033O2Q", ESC_STR "O2Q")},
     {K_S_XF3,		IF_EB("\033O2R", ESC_STR "O2R")},
     {K_S_XF4,		IF_EB("\033O2S", ESC_STR "O2S")},
-    {K_S_F1,		IF_EB("\033[11;2~", ESC_STR "[11;2~")},
-    {K_S_F2,		IF_EB("\033[12;2~", ESC_STR "[12;2~")},
-    {K_S_F3,		IF_EB("\033[13;2~", ESC_STR "[13;2~")},
-    {K_S_F4,		IF_EB("\033[14;2~", ESC_STR "[14;2~")},
-    {K_S_F5,		IF_EB("\033[15;2~", ESC_STR "[15;2~")},
-    {K_S_F6,		IF_EB("\033[17;2~", ESC_STR "[17;2~")},
-    {K_S_F7,		IF_EB("\033[18;2~", ESC_STR "[18;2~")},
-    {K_S_F8,		IF_EB("\033[19;2~", ESC_STR "[19;2~")},
-    {K_S_F9,		IF_EB("\033[20;2~", ESC_STR "[20;2~")},
-    {K_S_F10,		IF_EB("\033[21;2~", ESC_STR "[21;2~")},
-    {K_S_F11,		IF_EB("\033[23;2~", ESC_STR "[23;2~")},
-    {K_S_F12,		IF_EB("\033[24;2~", ESC_STR "[24;2~")},
     {K_S_TAB,		IF_EB("\033[Z", ESC_STR "[Z")},
-    {K_HELP,		IF_EB("\033[28~", ESC_STR "[28~")},
-    {K_UNDO,		IF_EB("\033[26~", ESC_STR "[26~")},
-    {K_INS,		IF_EB("\033[2~", ESC_STR "[2~")},
-    {K_HOME,		IF_EB("\033[7~", ESC_STR "[7~")},
+    {K_HELP,		IF_EB("\033[28;*~", ESC_STR "[28;*~")},
+    {K_UNDO,		IF_EB("\033[26;*~", ESC_STR "[26;*~")},
+    {K_INS,		IF_EB("\033[2;*~", ESC_STR "[2;*~")},
+    {K_HOME,		IF_EB("\033[1;*H", ESC_STR "[1;*H")},
     {K_S_HOME,		IF_EB("\033O2H", ESC_STR "O2H")},
     {K_C_HOME,		IF_EB("\033O5H", ESC_STR "O5H")},
-    {K_KHOME,		IF_EB("\033[1~", ESC_STR "[1~")},
+    {K_KHOME,		IF_EB("\033[7;*~", ESC_STR "[7;*~")},
     {K_XHOME,		IF_EB("\033OH", ESC_STR "OH")},	/* alternate Home */
-    {K_END,		IF_EB("\033[8~", ESC_STR "[8~")},
+    {K_END,		IF_EB("\033[1;*F", ESC_STR "[1;*F")},
     {K_S_END,		IF_EB("\033O2F", ESC_STR "O2F")},
     {K_C_END,		IF_EB("\033O5F", ESC_STR "O5F")},
-    {K_KEND,		IF_EB("\033[4~", ESC_STR "[4~")},
+    {K_KEND,		IF_EB("\033[4;*~", ESC_STR "[4;*~")},
     {K_XEND,		IF_EB("\033OF", ESC_STR "OF")},	/* alternate End */
-    {K_PAGEUP,		IF_EB("\033[5~", ESC_STR "[5~")},
-    {K_PAGEDOWN,	IF_EB("\033[6~", ESC_STR "[6~")},
+    {K_PAGEUP,		IF_EB("\033[5;*~", ESC_STR "[5;*~")},
+    {K_PAGEDOWN,	IF_EB("\033[6;*~", ESC_STR "[6;*~")},
     {K_KPLUS,		IF_EB("\033Ok", ESC_STR "Ok")},	/* keypad plus */
     {K_KMINUS,		IF_EB("\033Om", ESC_STR "Om")},	/* keypad minus */
     {K_KDIVIDE,		IF_EB("\033Oo", ESC_STR "Oo")},	/* keypad / */
     {K_KMULTIPLY,	IF_EB("\033Oj", ESC_STR "Oj")},	/* keypad * */
     {K_KENTER,		IF_EB("\033OM", ESC_STR "OM")},	/* keypad Enter */
-    {K_KDEL,		IF_EB("\033[3~", ESC_STR "[3~")},	/* keypad Del */
+    {K_KPOINT,		IF_EB("\033On", ESC_STR "On")},	/* keypad . */
+    {K_KDEL,		IF_EB("\033[3;*~", ESC_STR "[3;*~")},	/* keypad Del */
 
     {BT_EXTRA_KEYS,   ""},
-    {TERMCAP2KEY('k', '0'), IF_EB("\033[10~", ESC_STR "[10~")},	/* F0 */
-    {TERMCAP2KEY('F', '3'), IF_EB("\033[25~", ESC_STR "[25~")},	/* F13 */
-    {TERMCAP2KEY('F', '6'), IF_EB("\033[29~", ESC_STR "[29~")},	/* F16 */
-    {TERMCAP2KEY('F', '7'), IF_EB("\033[31~", ESC_STR "[31~")},	/* F17 */
-    {TERMCAP2KEY('F', '8'), IF_EB("\033[32~", ESC_STR "[32~")},	/* F18 */
-    {TERMCAP2KEY('F', '9'), IF_EB("\033[33~", ESC_STR "[33~")},	/* F19 */
-    {TERMCAP2KEY('F', 'A'), IF_EB("\033[34~", ESC_STR "[34~")},	/* F20 */
+    {TERMCAP2KEY('k', '0'), IF_EB("\033[10;*~", ESC_STR "[10;*~")}, /* F0 */
+    {TERMCAP2KEY('F', '3'), IF_EB("\033[25;*~", ESC_STR "[25;*~")}, /* F13 */
+    /* F14 and F15 are missing, because they send the same codes as the undo
+     * and help key, although they don't work on all keyboards. */
+    {TERMCAP2KEY('F', '6'), IF_EB("\033[29;*~", ESC_STR "[29;*~")}, /* F16 */
+    {TERMCAP2KEY('F', '7'), IF_EB("\033[31;*~", ESC_STR "[31;*~")}, /* F17 */
+    {TERMCAP2KEY('F', '8'), IF_EB("\033[32;*~", ESC_STR "[32;*~")}, /* F18 */
+    {TERMCAP2KEY('F', '9'), IF_EB("\033[33;*~", ESC_STR "[33;*~")}, /* F19 */
+    {TERMCAP2KEY('F', 'A'), IF_EB("\033[34;*~", ESC_STR "[34;*~")}, /* F20 */
+
+    {TERMCAP2KEY('F', 'B'), IF_EB("\033[42;*~", ESC_STR "[42;*~")}, /* F21 */
+    {TERMCAP2KEY('F', 'C'), IF_EB("\033[43;*~", ESC_STR "[43;*~")}, /* F22 */
+    {TERMCAP2KEY('F', 'D'), IF_EB("\033[44;*~", ESC_STR "[44;*~")}, /* F23 */
+    {TERMCAP2KEY('F', 'E'), IF_EB("\033[45;*~", ESC_STR "[45;*~")}, /* F24 */
+    {TERMCAP2KEY('F', 'F'), IF_EB("\033[46;*~", ESC_STR "[46;*~")}, /* F25 */
+    {TERMCAP2KEY('F', 'G'), IF_EB("\033[47;*~", ESC_STR "[47;*~")}, /* F26 */
+    {TERMCAP2KEY('F', 'H'), IF_EB("\033[48;*~", ESC_STR "[48;*~")}, /* F27 */
+    {TERMCAP2KEY('F', 'I'), IF_EB("\033[49;*~", ESC_STR "[49;*~")}, /* F28 */
+    {TERMCAP2KEY('F', 'J'), IF_EB("\033[50;*~", ESC_STR "[50;*~")}, /* F29 */
+    {TERMCAP2KEY('F', 'K'), IF_EB("\033[51;*~", ESC_STR "[51;*~")}, /* F30 */
+
+    {TERMCAP2KEY('F', 'L'), IF_EB("\033[52;*~", ESC_STR "[52;*~")}, /* F31 */
+    {TERMCAP2KEY('F', 'M'), IF_EB("\033[53;*~", ESC_STR "[53;*~")}, /* F32 */
+    {TERMCAP2KEY('F', 'N'), IF_EB("\033[54;*~", ESC_STR "[54;*~")}, /* F33 */
+    {TERMCAP2KEY('F', 'O'), IF_EB("\033[55;*~", ESC_STR "[55;*~")}, /* F34 */
+    {TERMCAP2KEY('F', 'P'), IF_EB("\033[56;*~", ESC_STR "[56;*~")}, /* F35 */
+    {TERMCAP2KEY('F', 'Q'), IF_EB("\033[57;*~", ESC_STR "[57;*~")}, /* F36 */
+    {TERMCAP2KEY('F', 'R'), IF_EB("\033[58;*~", ESC_STR "[58;*~")}, /* F37 */
 # endif
 
 # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS)
@@ -1564,6 +1570,10 @@ static char *(key_names[]) =
     "#2", "#4", "%i", "*7",
     "k1", "k2", "k3", "k4", "k5", "k6",
     "k7", "k8", "k9", "k;", "F1", "F2",
+    "F3", "F4", "F5", "F6", "F7", "F8",
+    "F9", "FA", "FB", "FC", "FD", "FE",
+    "FF", "FG", "FH", "FI", "FJ", "FK",
+    "FL", "FM", "FN", "FO", "FP", "FQ", "FR",
     "%1", "&8", "kb", "kI", "kD", "kh",
     "@7", "kP", "kN", "K1", "K3", "K4", "K5", "kB",
     NULL
@@ -2996,7 +3006,7 @@ win_new_shellsize()
     if (old_Rows != Rows)
     {
 	/* if 'window' uses the whole screen, keep it using that */
-	if (p_window == old_Rows - 1)
+	if (p_window == old_Rows - 1 || old_Rows == 0)
 	    p_window = Rows - 1;
 	old_Rows = Rows;
 	shell_new_rows();	/* update window sizes */
@@ -3481,6 +3491,7 @@ struct termcode
     char_u  name[2];	    /* termcap name of entry */
     char_u  *code;	    /* terminal code (in allocated memory) */
     int	    len;	    /* STRLEN(code) */
+    int	    modlen;	    /* length of part before ";*~". */
 } *termcodes = NULL;
 
 static int  tc_max_len = 0; /* number of entries that termcodes[] can hold */
@@ -3518,6 +3529,7 @@ add_termcode(name, string, use_8bit)
     struct termcode *new_tc;
     int		    i, j;
     char_u	    *s;
+    int		    len;
 
     if (string == NULL || *string == NUL)
     {
@@ -3535,6 +3547,7 @@ add_termcode(name, string, use_8bit)
 	mch_memmove(s, s + 1, STRLEN(s));
 	s[0] = term_7to8bit(string);
     }
+    len = (int)STRLEN(s);
 
     need_gather = TRUE;		/* need to fill termleader[] */
 
@@ -3572,12 +3585,29 @@ add_termcode(name, string, use_8bit)
 		continue;
 	    /*
 	     * Exact match: Replace old code.
+	     * But don't replace ESC[123;*X with another.
 	     */
 	    if (termcodes[i].name[1] == name[1])
 	    {
-		vim_free(termcodes[i].code);
-		--tc_len;
-		break;
+		if (termcodes[i].len >= 4
+			&& STRNCMP(termcodes[i].code + termcodes[i].len - 3,
+								";*", 2) == 0)
+		{
+		    /* if they are equal but for the ";*" don't add it */
+		    if (len == termcodes[i].len - 2
+			    && STRNCMP(s, termcodes[i].code, len - 1) == 0
+			    && s[len - 1] == termcodes[i].code[len + 1])
+		    {
+			vim_free(s);
+			return;
+		    }
+		}
+		else
+		{
+		    vim_free(termcodes[i].code);
+		    --tc_len;
+		    break;
+		}
 	    }
 	}
 	/*
@@ -3591,7 +3621,12 @@ add_termcode(name, string, use_8bit)
     termcodes[i].name[0] = name[0];
     termcodes[i].name[1] = name[1];
     termcodes[i].code = s;
-    termcodes[i].len = (int)STRLEN(s);
+    termcodes[i].len = len;
+    /* recognize special code like "ESC[42;*X" that accepts modifiers */
+    if (len >= 5 && STRNCMP(s + len - 3, ";*", 2) == 0)
+	termcodes[i].modlen = len - 3;
+    else
+	termcodes[i].modlen = 0;
     ++tc_len;
 }
 
@@ -3886,6 +3921,69 @@ check_termcode(max_offset, buf, buflen)
 
 		    break;
 		}
+
+		/*
+		 * Check for code with modifier, like xterm uses:
+		 * ESC[123;2X (shift) ESC[123;3X (alt), etc.
+		 */
+		if (termcodes[idx].modlen > 0)
+		{
+		    slen = termcodes[idx].modlen;
+		    if (cpo_koffset && offset && len < slen)
+			continue;
+		    if (STRNCMP(termcodes[idx].code, tp,
+				      (size_t)(slen > len ? len : slen)) == 0)
+		    {
+			int	    n;
+			int	    mod;
+
+			if (len <= slen)	/* got a partial sequence */
+			    return -1;		/* need to get more chars */
+
+			if (tp[slen] == termcodes[idx].code[slen + 2])
+			    ++slen;	/* no modifiers */
+			else if (tp[slen] != ';')
+			    continue;	/* no match */
+			else
+			{
+			    /* Skip over the digits, the final char must
+			     * follow. */
+			    for (j = slen + 1; j < len && isdigit(tp[j]); ++j)
+				;
+			    ++j;
+			    if (len < j)	/* got a partial sequence */
+				return -1;	/* need to get more chars */
+			    if (tp[j - 1] != termcodes[idx].code[slen + 2])
+				continue;
+
+			    /* Match!  Convert modifier bits. */
+			    n = atoi((char *)tp + slen + 1) - 1;
+			    mod = 0x0;
+			    if (n & 1)
+				mod |= MOD_MASK_SHIFT;
+			    if (n & 2)
+				mod |= MOD_MASK_ALT;
+			    if (n & 4)
+				mod |= MOD_MASK_CTRL;
+			    if (n & 8)
+				mod |= MOD_MASK_META;
+
+			    /* Add the modifier codes to our string */
+			    if (mod != 0)
+			    {
+				string[new_slen++] = K_SPECIAL;
+				string[new_slen++] = (int)KS_MODIFIER;
+				string[new_slen++] = mod;
+			    }
+
+			    slen = j;
+			}
+			key_name[0] = termcodes[idx].name[0];
+			key_name[1] = termcodes[idx].name[1];
+
+			break;
+		    }
+		}
 	    }
 	}
 
diff --git a/src/testdir/test24.in b/src/testdir/test24.in
index b7bbedf5f..d9640e5f2 100644
--- a/src/testdir/test24.in
+++ b/src/testdir/test24.in
diff --git a/src/testdir/test24.ok b/src/testdir/test24.ok
index d5bc95623..752dad583 100644
--- a/src/testdir/test24.ok
+++ b/src/testdir/test24.ok
@@ -17,3 +17,6 @@ test text test text  [\x00]
 test text test text  [\x00-\x10]
 test text test text  [\x-z]
 test text test text  [\u-z]
+xx  xx a
+xx aaaaa xx a
+xx aaaaa xx a
diff --git a/src/undo.c b/src/undo.c
index 4675d9972..1abd41df4 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -492,6 +492,8 @@ u_doit(count)
 
     u_newcount = 0;
     u_oldcount = 0;
+    if (curbuf->b_ml.ml_flags & ML_EMPTY)
+	u_oldcount = -1;
     while (count--)
     {
 	if (undo_undoes)
@@ -525,6 +527,8 @@ u_doit(count)
 	    curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev;
 	}
     }
+    if (curbuf->b_ml.ml_flags & ML_EMPTY)
+	--u_newcount;
     u_undo_end();
 }
 
diff --git a/src/version.h b/src/version.h
index 9451a0e9f..b537d7208 100644
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Feb 28)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Feb 28, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 4)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Mar 4, compiled "
diff --git a/src/vim.h b/src/vim.h
index 3fb9fa332..facb51a22 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -1534,7 +1534,9 @@ int vim_memcmp __ARGS((void *, void *, size_t));
 #define VV_VAL		34
 #define VV_KEY		35
 #define VV_PROFILING	36
-#define VV_LEN		37	/* number of v: vars */
+#define VV_FCS_REASON	37
+#define VV_FCS_CHOICE	38
+#define VV_LEN		39	/* number of v: vars */
 
 #ifdef FEAT_CLIPBOARD