From: Mao-Yining <mao.yining@outlook.com>
Date: Mon, 6 Apr 2026 12:54:33 +0000 (+0000)
Subject: patch 9.2.0308: Error message E1547 is wrong
X-Git-Tag: v9.2.0308^0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea5084d1f1918fc5510a8817ea893e7cde35a2c6;p=thirdparty%2Fvim.git

patch 9.2.0308: Error message E1547 is wrong

Problem:  Error message E1547 is wrong
Solution: Fix error message, re-generate Chinese translations
          (Mao-Yining).

closes: #19920

Signed-off-by: Mao-Yining <mao.yining@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/errors.h b/src/errors.h
index fba5b93f19..85e802eb30 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -3737,7 +3737,7 @@ EXTERN char e_no_quickfix_stack[]
 EXTERN char e_cannot_switch_to_a_closing_buffer[]
 	INIT(= N_("E1546: Cannot switch to a closing buffer"));
 EXTERN char e_cannot_not_support_redrawtabpanel[]
-	INIT(= N_("E1547: This version of Vim does support :redrawtabpanel"));
+	INIT(= N_("E1547: This version of Vim does not support :redrawtabpanel"));
 #ifdef FEAT_WAYLAND
 EXTERN char e_wayland_connection_unavailable[]
 	INIT(= N_("E1548: Wayland connection is unavailable"));
diff --git a/src/po/vim.pot b/src/po/vim.pot
index 029a19449e..de2f0bd77e 100644
--- a/src/po/vim.pot
+++ b/src/po/vim.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim\n"
 "Report-Msgid-Bugs-To: vim-dev@vim.org\n"
-"POT-Creation-Date: 2026-03-25 21:51+0000\n"
+"POT-Creation-Date: 2026-04-05 23:26+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8756,7 +8756,7 @@ msgstr ""
 msgid "E1546: Cannot switch to a closing buffer"
 msgstr ""
 
-msgid "E1547: This version of Vim does support :redrawtabpanel"
+msgid "E1547: This version of Vim does not support :redrawtabpanel"
 msgstr ""
 
 msgid "E1548: Wayland connection is unavailable"
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index c7b23a925c..8762ffc953 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
 "Report-Msgid-Bugs-To: vim-dev@vim.org\n"
-"POT-Creation-Date: 2026-03-20 20:44+0800\n"
+"POT-Creation-Date: 2026-04-05 23:26+0800\n"
 "PO-Revision-Date: 2025-12-28 14:27+0800\n"
 "Last-Translator: Mao-Yining\n"
 "Language-Team: Simplified Chinese\n"
@@ -55,7 +55,7 @@ msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "自动删除自动命令： %s <buffer=%d>"
 
 msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: 删除依旧在使用中的自动组"
+msgstr "W19: 删除仍在使用中的自动命令组"
 
 msgid ""
 "\n"
@@ -600,11 +600,11 @@ msgstr "警告: 意外地进入了其它缓冲区 (请检查自动命令)"
 
 #, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
-msgstr "W20: 不支持需要的 Python 2.x 版本，忽略文件：%s"
+msgstr "W20: 所需的 Python 2.x 版本不受支持，忽略文件：%s"
 
 #, c-format
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
-msgstr "W21: 不支持需要的 Python 3.x 版本，忽略文件：%s"
+msgstr "W21: 所需的 Python 3.x 版本不受支持，忽略文件：%s"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
@@ -743,7 +743,7 @@ msgid "[character special]"
 msgstr "[字符设备]"
 
 msgid "[CR missing]"
-msgstr "[缺少 CR]'"
+msgstr "[缺少 CR]"
 
 msgid "[long lines split]"
 msgstr "[长行分割]"
@@ -824,7 +824,7 @@ msgstr "请参阅 \":help W11\" 以获取更多信息。"
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: 警告: 编辑开始后，文件 \"%s\" 的模式已变动"
+msgstr "W16: 警告: 编辑开始后，文件 \"%s\" 的权限模式已变动"
 
 msgid "See \":help W16\" for more info."
 msgstr "请参阅 \":help W16\" 以获取更多信息。"
@@ -1137,7 +1137,7 @@ msgid "cs_create_connection setpgid failed"
 msgstr "cs_create_connection setpgid 失败"
 
 msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection 执行失败"
+msgstr "cs_create_connection exec 失败"
 
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: fdopen to_fp 失败"
@@ -2347,6 +2347,10 @@ msgstr " (已中断)"
 msgid "Beep!"
 msgstr "Beep!"
 
+#, c-format
+msgid "Executing directly: \"%s\""
+msgstr "直接执行：%s"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "调用 shell 执行: \"%s\""
@@ -3279,7 +3283,7 @@ msgstr "查找 tag 文件 %s"
 
 #, c-format
 msgid "Duplicate field name: %s"
-msgstr "重复的字段名：%s"
+msgstr "重复的字段名称：%s"
 
 msgid "' not known. Available builtin terminals are:"
 msgstr "' 未知。可用的内建终端有:"
@@ -4325,7 +4329,7 @@ msgstr "E127: 函数 %s 正在使用中，不能重新定义"
 
 #, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: 函数名必须以大写字母或 \"s:\" 开头: %s"
+msgstr "E128: 函数名必须以大写字母或 \"s:\" 开头：%s"
 
 msgid "E129: Function name required"
 msgstr "E129: 需要函数名"
@@ -4351,7 +4355,7 @@ msgstr "E136: viminfo: 错误过多，忽略文件的剩余部分"
 
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo 文件不可写入: %s"
+msgstr "E137: Viminfo 文件不可写入：%s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
@@ -5257,7 +5261,7 @@ msgid "E418: Illegal value: %s"
 msgstr "E418: 不合法的值: %s"
 
 msgid "E418: I'm a teapot"
-msgstr "E418: 我是茶壶，不煮咖啡（彩蛋）"
+msgstr "E418: 我是茶壶"
 
 msgid "E419: FG color unknown"
 msgstr "E419: 错误的前景颜色"
@@ -5564,7 +5568,7 @@ msgid "E503: \"%s\" is not a file or writable device"
 msgstr "E503: \"%s\" 不是文件或可写的设备"
 
 msgid "E503: Coffee is currently not available"
-msgstr "E503: 当前无法提供咖啡（彩蛋）"
+msgstr "E503: 咖啡当前不可用"
 
 msgid "is read-only (cannot override: \"W\" in 'cpoptions')"
 msgstr "只读 (不能强制执行：'cpoptions' 中包含 \"W\")"
@@ -6047,7 +6051,7 @@ msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: 符号连接过多(循环？)"
 
 msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans 不允许未修改的缓冲区写入"
+msgstr "NetBeans 不允许写入未修改的缓冲区"
 
 msgid "Partial writes disallowed for NetBeans buffers"
 msgstr "NetBeans 不允许缓冲区部分写入"
@@ -8920,8 +8924,8 @@ msgstr "E1545: Quickfix 列表栈不可用"
 msgid "E1546: Cannot switch to a closing buffer"
 msgstr "E1546: 不能切换到正在关闭的缓冲区"
 
-msgid "E1547: This version of Vim does support :redrawtabpanel"
-msgstr "E1547: 此版本的 Vim 支持 :redrawtabpanel"
+msgid "E1547: This version of Vim does not support :redrawtabpanel"
+msgstr "E1547: 此版本的 Vim 不支持 :redrawtabpanel"
 
 msgid "E1548: Wayland connection is unavailable"
 msgstr "E1548: Wayland 连接不可用"
@@ -9017,6 +9021,9 @@ msgstr "E1573: 无法监听端口"
 msgid "E1574: gethostbyname(): cannot resolve hostname in channel_listen()"
 msgstr "E1574: gethostbyname()：无法在 channel_listen() 中解析主机名"
 
+msgid "E1575: Cannot create pipes"
+msgstr "E1575: 无法建立管道"
+
 msgid "--No lines in buffer--"
 msgstr "--缓冲区无内容--"
 
@@ -9320,7 +9327,7 @@ msgid ""
 "You should now append vim.VIM_SPECIAL_PATH to sys.path"
 msgstr ""
 "路径设置失败：sys.path 不是列表\n"
-"你应该现在添加 vim.VIM_SPECIAL_PATH 到 sys.path"
+"你现在应该添加 vim.VIM_SPECIAL_PATH 到 sys.path"
 
 msgid ""
 "Vim macro files (*.vim)\t*.vim\n"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index d6f1b870c9..f0d18b14c6 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
 "Report-Msgid-Bugs-To: vim-dev@vim.org\n"
-"POT-Creation-Date: 2026-03-20 20:44+0800\n"
+"POT-Creation-Date: 2026-04-05 23:26+0800\n"
 "PO-Revision-Date: 2025-12-28 14:27+0800\n"
 "Last-Translator: Mao-Yining\n"
 "Language-Team: Simplified Chinese\n"
@@ -55,7 +55,7 @@ msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "×Ô¶¯É¾³ý×Ô¶¯ÃüÁ %s <buffer=%d>"
 
 msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: ɾ³ýÒÀ¾ÉÔÚʹÓÃÖеÄ×Ô¶¯×é"
+msgstr "W19: ɾ³ýÈÔÔÚʹÓÃÖеÄ×Ô¶¯ÃüÁî×é"
 
 msgid ""
 "\n"
@@ -600,11 +600,11 @@ msgstr "
 
 #, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
-msgstr "W20: ²»Ö§³ÖÐèÒªµÄ Python 2.x °æ±¾£¬ºöÂÔÎļþ£º%s"
+msgstr "W20: ËùÐèµÄ Python 2.x °æ±¾²»ÊÜÖ§³Ö£¬ºöÂÔÎļþ£º%s"
 
 #, c-format
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
-msgstr "W21: ²»Ö§³ÖÐèÒªµÄ Python 3.x °æ±¾£¬ºöÂÔÎļþ£º%s"
+msgstr "W21: ËùÐèµÄ Python 3.x °æ±¾²»ÊÜÖ§³Ö£¬ºöÂÔÎļþ£º%s"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "½øÈë Ex ģʽ¡£ÊäÈë \"visual\" »Øµ½Õý³£Ä£Ê½¡£"
@@ -743,7 +743,7 @@ msgid "[character special]"
 msgstr "[×Ö·ûÉ豸]"
 
 msgid "[CR missing]"
-msgstr "[ȱÉÙ CR]'"
+msgstr "[ȱÉÙ CR]"
 
 msgid "[long lines split]"
 msgstr "[³¤Ðзָî]"
@@ -824,7 +824,7 @@ msgstr "
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ¾¯¸æ: ±à¼­¿ªÊ¼ºó£¬Îļþ \"%s\" µÄģʽÒѱ䶯"
+msgstr "W16: ¾¯¸æ: ±à¼­¿ªÊ¼ºó£¬Îļþ \"%s\" µÄȨÏÞģʽÒѱ䶯"
 
 msgid "See \":help W16\" for more info."
 msgstr "Çë²ÎÔÄ \":help W16\" ÒÔ»ñÈ¡¸ü¶àÐÅÏ¢¡£"
@@ -1137,7 +1137,7 @@ msgid "cs_create_connection setpgid failed"
 msgstr "cs_create_connection setpgid ʧ°Ü"
 
 msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection Ö´ÐÐʧ°Ü"
+msgstr "cs_create_connection exec ʧ°Ü"
 
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: fdopen to_fp ʧ°Ü"
@@ -2347,6 +2347,10 @@ msgstr " (
 msgid "Beep!"
 msgstr "Beep!"
 
+#, c-format
+msgid "Executing directly: \"%s\""
+msgstr "Ö±½ÓÖ´ÐУº%s"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "µ÷ÓÃ shell Ö´ÐÐ: \"%s\""
@@ -3279,7 +3283,7 @@ msgstr "
 
 #, c-format
 msgid "Duplicate field name: %s"
-msgstr "Öظ´µÄ×Ö¶ÎÃû£º%s"
+msgstr "Öظ´µÄ×Ö¶ÎÃû³Æ£º%s"
 
 msgid "' not known. Available builtin terminals are:"
 msgstr "' δ֪¡£¿ÉÓõÄÄÚ½¨ÖÕ¶ËÓÐ:"
@@ -4325,7 +4329,7 @@ msgstr "E127: 
 
 #, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: º¯ÊýÃû±ØÐëÒÔ´óд×Öĸ»ò \"s:\" ¿ªÍ·: %s"
+msgstr "E128: º¯ÊýÃû±ØÐëÒÔ´óд×Öĸ»ò \"s:\" ¿ªÍ·£º%s"
 
 msgid "E129: Function name required"
 msgstr "E129: ÐèÒªº¯ÊýÃû"
@@ -4351,7 +4355,7 @@ msgstr "E136: viminfo: 
 
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo Îļþ²»¿ÉдÈë: %s"
+msgstr "E137: Viminfo Îļþ²»¿ÉдÈ룺%s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
@@ -5257,7 +5261,7 @@ msgid "E418: Illegal value: %s"
 msgstr "E418: ²»ºÏ·¨µÄÖµ: %s"
 
 msgid "E418: I'm a teapot"
-msgstr "E418: ÎÒÊDzèºø£¬²»Ö󿧷ȣ¨²Êµ°£©"
+msgstr "E418: ÎÒÊDzèºø"
 
 msgid "E419: FG color unknown"
 msgstr "E419: ´íÎóµÄÇ°¾°ÑÕÉ«"
@@ -5564,7 +5568,7 @@ msgid "E503: \"%s\" is not a file or writable device"
 msgstr "E503: \"%s\" ²»ÊÇÎļþ»ò¿ÉдµÄÉ豸"
 
 msgid "E503: Coffee is currently not available"
-msgstr "E503: µ±Ç°ÎÞ·¨Ìṩ¿§·È£¨²Êµ°£©"
+msgstr "E503: ¿§·Èµ±Ç°²»¿ÉÓÃ"
 
 msgid "is read-only (cannot override: \"W\" in 'cpoptions')"
 msgstr "Ö»¶Á (²»ÄÜÇ¿ÖÆÖ´ÐУº'cpoptions' Öаüº¬ \"W\")"
@@ -6047,7 +6051,7 @@ msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: ·ûºÅÁ¬½Ó¹ý¶à(Ñ­»·£¿)"
 
 msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans ²»ÔÊÐíδÐ޸ĵĻº³åÇøдÈë"
+msgstr "NetBeans ²»ÔÊÐíдÈëδÐ޸ĵĻº³åÇø"
 
 msgid "Partial writes disallowed for NetBeans buffers"
 msgstr "NetBeans ²»ÔÊÐí»º³åÇø²¿·ÖдÈë"
@@ -8920,8 +8924,8 @@ msgstr "E1545: Quickfix 
 msgid "E1546: Cannot switch to a closing buffer"
 msgstr "E1546: ²»ÄÜÇл»µ½ÕýÔڹرյĻº³åÇø"
 
-msgid "E1547: This version of Vim does support :redrawtabpanel"
-msgstr "E1547: ´Ë°æ±¾µÄ Vim Ö§³Ö :redrawtabpanel"
+msgid "E1547: This version of Vim does not support :redrawtabpanel"
+msgstr "E1547: ´Ë°æ±¾µÄ Vim ²»Ö§³Ö :redrawtabpanel"
 
 msgid "E1548: Wayland connection is unavailable"
 msgstr "E1548: Wayland Á¬½Ó²»¿ÉÓÃ"
@@ -9017,6 +9021,9 @@ msgstr "E1573: 
 msgid "E1574: gethostbyname(): cannot resolve hostname in channel_listen()"
 msgstr "E1574: gethostbyname()£ºÎÞ·¨ÔÚ channel_listen() ÖнâÎöÖ÷»úÃû"
 
+msgid "E1575: Cannot create pipes"
+msgstr "E1575: ÎÞ·¨½¨Á¢¹ÜµÀ"
+
 msgid "--No lines in buffer--"
 msgstr "--»º³åÇøÎÞÄÚÈÝ--"
 
@@ -9320,7 +9327,7 @@ msgid ""
 "You should now append vim.VIM_SPECIAL_PATH to sys.path"
 msgstr ""
 "·¾¶ÉèÖÃʧ°Ü£ºsys.path ²»ÊÇÁбí\n"
-"ÄãÓ¦¸ÃÏÖÔÚÌí¼Ó vim.VIM_SPECIAL_PATH µ½ sys.path"
+"ÄãÏÖÔÚÓ¦¸ÃÌí¼Ó vim.VIM_SPECIAL_PATH µ½ sys.path"
 
 msgid ""
 "Vim macro files (*.vim)\t*.vim\n"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 7f4aa908a4..05b1717015 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
 "Report-Msgid-Bugs-To: vim-dev@vim.org\n"
-"POT-Creation-Date: 2026-03-20 20:44+0800\n"
+"POT-Creation-Date: 2026-04-05 23:26+0800\n"
 "PO-Revision-Date: 2025-12-28 14:27+0800\n"
 "Last-Translator: Mao-Yining\n"
 "Language-Team: Simplified Chinese\n"
@@ -55,7 +55,7 @@ msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "×Ô¶¯É¾³ý×Ô¶¯ÃüÁ %s <buffer=%d>"
 
 msgid "W19: Deleting augroup that is still in use"
-msgstr "W19: ɾ³ýÒÀ¾ÉÔÚʹÓÃÖеÄ×Ô¶¯×é"
+msgstr "W19: ɾ³ýÈÔÔÚʹÓÃÖеÄ×Ô¶¯ÃüÁî×é"
 
 msgid ""
 "\n"
@@ -600,11 +600,11 @@ msgstr "
 
 #, c-format
 msgid "W20: Required python version 2.x not supported, ignoring file: %s"
-msgstr "W20: ²»Ö§³ÖÐèÒªµÄ Python 2.x °æ±¾£¬ºöÂÔÎļþ£º%s"
+msgstr "W20: ËùÐèµÄ Python 2.x °æ±¾²»ÊÜÖ§³Ö£¬ºöÂÔÎļþ£º%s"
 
 #, c-format
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
-msgstr "W21: ²»Ö§³ÖÐèÒªµÄ Python 3.x °æ±¾£¬ºöÂÔÎļþ£º%s"
+msgstr "W21: ËùÐèµÄ Python 3.x °æ±¾²»ÊÜÖ§³Ö£¬ºöÂÔÎļþ£º%s"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "½øÈë Ex ģʽ¡£ÊäÈë \"visual\" »Øµ½Õý³£Ä£Ê½¡£"
@@ -743,7 +743,7 @@ msgid "[character special]"
 msgstr "[×Ö·ûÉ豸]"
 
 msgid "[CR missing]"
-msgstr "[ȱÉÙ CR]'"
+msgstr "[ȱÉÙ CR]"
 
 msgid "[long lines split]"
 msgstr "[³¤Ðзָî]"
@@ -824,7 +824,7 @@ msgstr "
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ¾¯¸æ: ±à¼­¿ªÊ¼ºó£¬Îļþ \"%s\" µÄģʽÒѱ䶯"
+msgstr "W16: ¾¯¸æ: ±à¼­¿ªÊ¼ºó£¬Îļþ \"%s\" µÄȨÏÞģʽÒѱ䶯"
 
 msgid "See \":help W16\" for more info."
 msgstr "Çë²ÎÔÄ \":help W16\" ÒÔ»ñÈ¡¸ü¶àÐÅÏ¢¡£"
@@ -1137,7 +1137,7 @@ msgid "cs_create_connection setpgid failed"
 msgstr "cs_create_connection setpgid ʧ°Ü"
 
 msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection Ö´ÐÐʧ°Ü"
+msgstr "cs_create_connection exec ʧ°Ü"
 
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: fdopen to_fp ʧ°Ü"
@@ -2347,6 +2347,10 @@ msgstr " (
 msgid "Beep!"
 msgstr "Beep!"
 
+#, c-format
+msgid "Executing directly: \"%s\""
+msgstr "Ö±½ÓÖ´ÐУº%s"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "µ÷ÓÃ shell Ö´ÐÐ: \"%s\""
@@ -3279,7 +3283,7 @@ msgstr "
 
 #, c-format
 msgid "Duplicate field name: %s"
-msgstr "Öظ´µÄ×Ö¶ÎÃû£º%s"
+msgstr "Öظ´µÄ×Ö¶ÎÃû³Æ£º%s"
 
 msgid "' not known. Available builtin terminals are:"
 msgstr "' δ֪¡£¿ÉÓõÄÄÚ½¨ÖÕ¶ËÓÐ:"
@@ -4325,7 +4329,7 @@ msgstr "E127: 
 
 #, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: º¯ÊýÃû±ØÐëÒÔ´óд×Öĸ»ò \"s:\" ¿ªÍ·: %s"
+msgstr "E128: º¯ÊýÃû±ØÐëÒÔ´óд×Öĸ»ò \"s:\" ¿ªÍ·£º%s"
 
 msgid "E129: Function name required"
 msgstr "E129: ÐèÒªº¯ÊýÃû"
@@ -4351,7 +4355,7 @@ msgstr "E136: viminfo: 
 
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo Îļþ²»¿ÉдÈë: %s"
+msgstr "E137: Viminfo Îļþ²»¿ÉдÈ룺%s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
@@ -5257,7 +5261,7 @@ msgid "E418: Illegal value: %s"
 msgstr "E418: ²»ºÏ·¨µÄÖµ: %s"
 
 msgid "E418: I'm a teapot"
-msgstr "E418: ÎÒÊDzèºø£¬²»Ö󿧷ȣ¨²Êµ°£©"
+msgstr "E418: ÎÒÊDzèºø"
 
 msgid "E419: FG color unknown"
 msgstr "E419: ´íÎóµÄÇ°¾°ÑÕÉ«"
@@ -5564,7 +5568,7 @@ msgid "E503: \"%s\" is not a file or writable device"
 msgstr "E503: \"%s\" ²»ÊÇÎļþ»ò¿ÉдµÄÉ豸"
 
 msgid "E503: Coffee is currently not available"
-msgstr "E503: µ±Ç°ÎÞ·¨Ìṩ¿§·È£¨²Êµ°£©"
+msgstr "E503: ¿§·Èµ±Ç°²»¿ÉÓÃ"
 
 msgid "is read-only (cannot override: \"W\" in 'cpoptions')"
 msgstr "Ö»¶Á (²»ÄÜÇ¿ÖÆÖ´ÐУº'cpoptions' Öаüº¬ \"W\")"
@@ -6047,7 +6051,7 @@ msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: ·ûºÅÁ¬½Ó¹ý¶à(Ñ­»·£¿)"
 
 msgid "NetBeans disallows writes of unmodified buffers"
-msgstr "NetBeans ²»ÔÊÐíδÐ޸ĵĻº³åÇøдÈë"
+msgstr "NetBeans ²»ÔÊÐíдÈëδÐ޸ĵĻº³åÇø"
 
 msgid "Partial writes disallowed for NetBeans buffers"
 msgstr "NetBeans ²»ÔÊÐí»º³åÇø²¿·ÖдÈë"
@@ -8920,8 +8924,8 @@ msgstr "E1545: Quickfix 
 msgid "E1546: Cannot switch to a closing buffer"
 msgstr "E1546: ²»ÄÜÇл»µ½ÕýÔڹرյĻº³åÇø"
 
-msgid "E1547: This version of Vim does support :redrawtabpanel"
-msgstr "E1547: ´Ë°æ±¾µÄ Vim Ö§³Ö :redrawtabpanel"
+msgid "E1547: This version of Vim does not support :redrawtabpanel"
+msgstr "E1547: ´Ë°æ±¾µÄ Vim ²»Ö§³Ö :redrawtabpanel"
 
 msgid "E1548: Wayland connection is unavailable"
 msgstr "E1548: Wayland Á¬½Ó²»¿ÉÓÃ"
@@ -9017,6 +9021,9 @@ msgstr "E1573: 
 msgid "E1574: gethostbyname(): cannot resolve hostname in channel_listen()"
 msgstr "E1574: gethostbyname()£ºÎÞ·¨ÔÚ channel_listen() ÖнâÎöÖ÷»úÃû"
 
+msgid "E1575: Cannot create pipes"
+msgstr "E1575: ÎÞ·¨½¨Á¢¹ÜµÀ"
+
 msgid "--No lines in buffer--"
 msgstr "--»º³åÇøÎÞÄÚÈÝ--"
 
@@ -9320,7 +9327,7 @@ msgid ""
 "You should now append vim.VIM_SPECIAL_PATH to sys.path"
 msgstr ""
 "·¾¶ÉèÖÃʧ°Ü£ºsys.path ²»ÊÇÁбí\n"
-"ÄãÓ¦¸ÃÏÖÔÚÌí¼Ó vim.VIM_SPECIAL_PATH µ½ sys.path"
+"ÄãÏÖÔÚÓ¦¸ÃÌí¼Ó vim.VIM_SPECIAL_PATH µ½ sys.path"
 
 msgid ""
 "Vim macro files (*.vim)\t*.vim\n"
diff --git a/src/version.c b/src/version.c
index e66c21d47e..4ebfc1522d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    308,
 /**/
     307,
 /**/