Commit: patch 9.2.0308: Error message E1547 is wrong
1 view
Skip to first unread message
Christian Brabandt
Apr 6, 2026, 9:02:23 AMApr 6
to vim...@googlegroups.com
patch 9.2.0308: Error message E1547 is wrong
Commit: https://github.com/vim/vim/commit/ea5084d1f1918fc5510a8817ea893e7cde35a2c6
Author: Mao-Yining <mao.y...@outlook.com>
Date: Mon Apr 6 12:54:33 2026 +0000
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.y...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/errors.h b/src/errors.h
index fba5b93f1..85e802eb3 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 029a19449..de2f0bd77 100644
--- a/src/po/vim.pot
+++ b/src/po/vim.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim
"
"Report-Msgid-Bugs-To: vim...@vim.org
"
-"POT-Creation-Date: 2026-03-25 21:51+0000
"
+"POT-Creation-Date: 2026-04-05 23:26+0800
"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE
"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>
"
"Language-Team: LANGUAGE <L...@li.org>
"
@@ -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 c7b23a925..8762ffc95 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)
"
"Report-Msgid-Bugs-To: vim...@vim.org
"
-"POT-Creation-Date: 2026-03-20 20:44+0800
"
+"POT-Creation-Date: 2026-04-05 23:26+0800
"
"PO-Revision-Date: 2025-12-28 14:27+0800
"
"Last-Translator: Mao-Yining
"
"Language-Team: Simplified Chinese
"
@@ -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 ""
"
"
@@ -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 ""
"璺緞璁剧疆澶辫触锛歴ys.path 涓嶆槸鍒楄〃
"
-"浣犲簲璇ョ幇鍦ㄦ坊鍔�vim.VIM_SPECIAL_PATH 鍒�sys.path"
+"浣犵幇鍦ㄥ簲璇ユ坊鍔�vim.VIM_SPECIAL_PATH 鍒�sys.path"
msgid ""
"Vim macro files (*.vim) *.vim
"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index d6f1b870c..f0d18b14c 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)
"
"Report-Msgid-Bugs-To: vim...@vim.org
"
-"POT-Creation-Date: 2026-03-20 20:44+0800
"
+"POT-Creation-Date: 2026-04-05 23:26+0800
"
"PO-Revision-Date: 2025-12-28 14:27+0800
"
"Last-Translator: Mao-Yining
"
"Language-Team: Simplified Chinese
"
@@ -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 ""
"
"
@@ -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: 我是茶壶，不煮咖啡（彩蛋）"
+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 不是列表
"
-"你应该现在添加 vim.VIM_SPECIAL_PATH 到 sys.path"
+"你现在应该添加 vim.VIM_SPECIAL_PATH 到 sys.path"
msgid ""
"Vim macro files (*.vim) *.vim
"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 7f4aa908a..05b171701 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)
"
"Report-Msgid-Bugs-To: vim...@vim.org
"
-"POT-Creation-Date: 2026-03-20 20:44+0800
"
+"POT-Creation-Date: 2026-04-05 23:26+0800
"
"PO-Revision-Date: 2025-12-28 14:27+0800
"
"Last-Translator: Mao-Yining
"
"Language-Team: Simplified Chinese
"
@@ -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 ""
"
"
@@ -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: 我是茶壶，不煮咖啡（彩蛋）"
+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 不是列表
"
-"你应该现在添加 vim.VIM_SPECIAL_PATH 到 sys.path"
+"你现在应该添加 vim.VIM_SPECIAL_PATH 到 sys.path"
msgid ""
"Vim macro files (*.vim) *.vim
"
diff --git a/src/version.c b/src/version.c
index e66c21d47..4ebfc1522 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,
/**/
Commit: https://github.com/vim/vim/commit/ea5084d1f1918fc5510a8817ea893e7cde35a2c6
Author: Mao-Yining <mao.y...@outlook.com>
Date: Mon Apr 6 12:54:33 2026 +0000
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.y...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/errors.h b/src/errors.h
index fba5b93f1..85e802eb3 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 029a19449..de2f0bd77 100644
--- a/src/po/vim.pot
+++ b/src/po/vim.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim
"
"Report-Msgid-Bugs-To: vim...@vim.org
"
-"POT-Creation-Date: 2026-03-25 21:51+0000
"
+"POT-Creation-Date: 2026-04-05 23:26+0800
"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE
"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>
"
"Language-Team: LANGUAGE <L...@li.org>
"
@@ -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 c7b23a925..8762ffc95 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)
"
"Report-Msgid-Bugs-To: vim...@vim.org
"
-"POT-Creation-Date: 2026-03-20 20:44+0800
"
+"POT-Creation-Date: 2026-04-05 23:26+0800
"
"PO-Revision-Date: 2025-12-28 14:27+0800
"
"Last-Translator: Mao-Yining
"
"Language-Team: Simplified Chinese
"
@@ -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 ""
"
"
@@ -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 ""
"璺緞璁剧疆澶辫触锛歴ys.path 涓嶆槸鍒楄〃
"
-"浣犲簲璇ョ幇鍦ㄦ坊鍔�vim.VIM_SPECIAL_PATH 鍒�sys.path"
+"浣犵幇鍦ㄥ簲璇ユ坊鍔�vim.VIM_SPECIAL_PATH 鍒�sys.path"
msgid ""
"Vim macro files (*.vim) *.vim
"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index d6f1b870c..f0d18b14c 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)
"
"Report-Msgid-Bugs-To: vim...@vim.org
"
-"POT-Creation-Date: 2026-03-20 20:44+0800
"
+"POT-Creation-Date: 2026-04-05 23:26+0800
"
"PO-Revision-Date: 2025-12-28 14:27+0800
"
"Last-Translator: Mao-Yining
"
"Language-Team: Simplified Chinese
"
@@ -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 ""
"
"
@@ -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: 我是茶壶，不煮咖啡（彩蛋）"
+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 不是列表
"
-"你应该现在添加 vim.VIM_SPECIAL_PATH 到 sys.path"
+"你现在应该添加 vim.VIM_SPECIAL_PATH 到 sys.path"
msgid ""
"Vim macro files (*.vim) *.vim
"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 7f4aa908a..05b171701 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)
"
"Report-Msgid-Bugs-To: vim...@vim.org
"
-"POT-Creation-Date: 2026-03-20 20:44+0800
"
+"POT-Creation-Date: 2026-04-05 23:26+0800
"
"PO-Revision-Date: 2025-12-28 14:27+0800
"
"Last-Translator: Mao-Yining
"
"Language-Team: Simplified Chinese
"
@@ -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 ""
"
"
@@ -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: 我是茶壶，不煮咖啡（彩蛋）"
+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 不是列表
"
-"你应该现在添加 vim.VIM_SPECIAL_PATH 到 sys.path"
+"你现在应该添加 vim.VIM_SPECIAL_PATH 到 sys.path"
msgid ""
"Vim macro files (*.vim) *.vim
"
diff --git a/src/version.c b/src/version.c
index e66c21d47..4ebfc1522 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,
/**/
Reply all
Reply to author
Forward
0 new messages