Skip to content

Commit ea5084d

Browse files
mao-yiningchrisbra
mao-yining
authored and
chrisbra
committed
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>
1 parent 002fdde commit ea5084d

File tree

6 files changed

+74
-51
lines changed

6 files changed

+74
-51
lines changed

‎src/errors.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3737,7 +3737,7 @@ EXTERN char e_no_quickfix_stack[]
37373737
EXTERN char e_cannot_switch_to_a_closing_buffer[]
37383738
INIT(= N_("E1546: Cannot switch to a closing buffer"));
37393739
EXTERN char e_cannot_not_support_redrawtabpanel[]
3740-
INIT(= N_("E1547: This version of Vim does support :redrawtabpanel"));
3740+
INIT(= N_("E1547: This version of Vim does not support :redrawtabpanel"));
37413741
#ifdef FEAT_WAYLAND
37423742
EXTERN char e_wayland_connection_unavailable[]
37433743
INIT(= N_("E1548: Wayland connection is unavailable"));

‎src/po/vim.pot‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/po/zh_CN.UTF-8.po‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ msgid ""
1818
msgstr ""
1919
"Project-Id-Version: Vim(Simplified Chinese)\n"
2020
"Report-Msgid-Bugs-To: vim-dev@vim.org\n"
21-
"POT-Creation-Date: 2026-03-20 20:44+0800\n"
21+
"POT-Creation-Date: 2026-04-05 23:26+0800\n"
2222
"PO-Revision-Date: 2025-12-28 14:27+0800\n"
2323
"Last-Translator: Mao-Yining\n"
2424
"Language-Team: Simplified Chinese\n"
@@ -55,7 +55,7 @@ msgid "auto-removing autocommand: %s <buffer=%d>"
5555
msgstr "自动删除自动命令： %s <buffer=%d>"
5656

5757
msgid "W19: Deleting augroup that is still in use"
58-
msgstr "W19: 删除依旧在使用中的自动组"
58+
msgstr "W19: 删除仍在使用中的自动命令组"
5959

6060
msgid ""
6161
"\n"
@@ -600,11 +600,11 @@ msgstr "警告: 意外地进入了其它缓冲区 (请检查自动命令)"
600600

601601
#, c-format
602602
msgid "W20: Required python version 2.x not supported, ignoring file: %s"
603-
msgstr "W20: 不支持需要的 Python 2.x 版本，忽略文件：%s"
603+
msgstr "W20: 所需的 Python 2.x 版本不受支持，忽略文件：%s"
604604

605605
#, c-format
606606
msgid "W21: Required python version 3.x not supported, ignoring file: %s"
607-
msgstr "W21: 不支持需要的 Python 3.x 版本，忽略文件：%s"
607+
msgstr "W21: 所需的 Python 3.x 版本不受支持，忽略文件：%s"
608608

609609
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
610610
msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
@@ -743,7 +743,7 @@ msgid "[character special]"
743743
msgstr "[字符设备]"
744744

745745
msgid "[CR missing]"
746-
msgstr "[缺少 CR]'"
746+
msgstr "[缺少 CR]"
747747

748748
msgid "[long lines split]"
749749
msgstr "[长行分割]"
@@ -824,7 +824,7 @@ msgstr "请参阅 \":help W11\" 以获取更多信息。"
824824

825825
#, c-format
826826
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
827-
msgstr "W16: 警告: 编辑开始后，文件 \"%s\" 的模式已变动"
827+
msgstr "W16: 警告: 编辑开始后，文件 \"%s\" 的权限模式已变动"
828828

829829
msgid "See \":help W16\" for more info."
830830
msgstr "请参阅 \":help W16\" 以获取更多信息。"
@@ -1137,7 +1137,7 @@ msgid "cs_create_connection setpgid failed"
11371137
msgstr "cs_create_connection setpgid 失败"
11381138

11391139
msgid "cs_create_connection exec failed"
1140-
msgstr "cs_create_connection 执行失败"
1140+
msgstr "cs_create_connection exec 失败"
11411141

11421142
msgid "cs_create_connection: fdopen for to_fp failed"
11431143
msgstr "cs_create_connection: fdopen to_fp 失败"
@@ -2347,6 +2347,10 @@ msgstr " (已中断)"
23472347
msgid "Beep!"
23482348
msgstr "Beep!"
23492349

2350+
#, c-format
2351+
msgid "Executing directly: \"%s\""
2352+
msgstr "直接执行：%s"
2353+
23502354
#, c-format
23512355
msgid "Calling shell to execute: \"%s\""
23522356
msgstr "调用 shell 执行: \"%s\""
@@ -3279,7 +3283,7 @@ msgstr "查找 tag 文件 %s"
32793283

32803284
#, c-format
32813285
msgid "Duplicate field name: %s"
3282-
msgstr "重复的字段名：%s"
3286+
msgstr "重复的字段名称：%s"
32833287

32843288
msgid "' not known. Available builtin terminals are:"
32853289
msgstr "' 未知。可用的内建终端有:"
@@ -4325,7 +4329,7 @@ msgstr "E127: 函数 %s 正在使用中，不能重新定义"
43254329

43264330
#, c-format
43274331
msgid "E128: Function name must start with a capital or \"s:\": %s"
4328-
msgstr "E128: 函数名必须以大写字母或 \"s:\" 开头: %s"
4332+
msgstr "E128: 函数名必须以大写字母或 \"s:\" 开头：%s"
43294333

43304334
msgid "E129: Function name required"
43314335
msgstr "E129: 需要函数名"
@@ -4351,7 +4355,7 @@ msgstr "E136: viminfo: 错误过多，忽略文件的剩余部分"
43514355

43524356
#, c-format
43534357
msgid "E137: Viminfo file is not writable: %s"
4354-
msgstr "E137: Viminfo 文件不可写入: %s"
4358+
msgstr "E137: Viminfo 文件不可写入：%s"
43554359

43564360
#, c-format
43574361
msgid "E138: Can't write viminfo file %s!"
@@ -5257,7 +5261,7 @@ msgid "E418: Illegal value: %s"
52575261
msgstr "E418: 不合法的值: %s"
52585262

52595263
msgid "E418: I'm a teapot"
5260-
msgstr "E418: 我是茶壶，不煮咖啡（彩蛋）"
5264+
msgstr "E418: 我是茶壶"
52615265

52625266
msgid "E419: FG color unknown"
52635267
msgstr "E419: 错误的前景颜色"
@@ -5564,7 +5568,7 @@ msgid "E503: \"%s\" is not a file or writable device"
55645568
msgstr "E503: \"%s\" 不是文件或可写的设备"
55655569

55665570
msgid "E503: Coffee is currently not available"
5567-
msgstr "E503: 当前无法提供咖啡（彩蛋）"
5571+
msgstr "E503: 咖啡当前不可用"
55685572

55695573
msgid "is read-only (cannot override: \"W\" in 'cpoptions')"
55705574
msgstr "只读 (不能强制执行：'cpoptions' 中包含 \"W\")"
@@ -6047,7 +6051,7 @@ msgid "E655: Too many symbolic links (cycle?)"
60476051
msgstr "E655: 符号连接过多(循环？)"
60486052

60496053
msgid "NetBeans disallows writes of unmodified buffers"
6050-
msgstr "NetBeans 不允许未修改的缓冲区写入"
6054+
msgstr "NetBeans 不允许写入未修改的缓冲区"
60516055

60526056
msgid "Partial writes disallowed for NetBeans buffers"
60536057
msgstr "NetBeans 不允许缓冲区部分写入"
@@ -8920,8 +8924,8 @@ msgstr "E1545: Quickfix 列表栈不可用"
89208924
msgid "E1546: Cannot switch to a closing buffer"
89218925
msgstr "E1546: 不能切换到正在关闭的缓冲区"
89228926

8923-
msgid "E1547: This version of Vim does support :redrawtabpanel"
8924-
msgstr "E1547: 此版本的 Vim 支持 :redrawtabpanel"
8927+
msgid "E1547: This version of Vim does not support :redrawtabpanel"
8928+
msgstr "E1547: 此版本的 Vim 不支持 :redrawtabpanel"
89258929

89268930
msgid "E1548: Wayland connection is unavailable"
89278931
msgstr "E1548: Wayland 连接不可用"
@@ -9017,6 +9021,9 @@ msgstr "E1573: 无法监听端口"
90179021
msgid "E1574: gethostbyname(): cannot resolve hostname in channel_listen()"
90189022
msgstr "E1574: gethostbyname()：无法在 channel_listen() 中解析主机名"
90199023

9024+
msgid "E1575: Cannot create pipes"
9025+
msgstr "E1575: 无法建立管道"
9026+
90209027
msgid "--No lines in buffer--"
90219028
msgstr "--缓冲区无内容--"
90229029

@@ -9320,7 +9327,7 @@ msgid ""
93209327
"You should now append vim.VIM_SPECIAL_PATH to sys.path"
93219328
msgstr ""
93229329
"路径设置失败：sys.path 不是列表\n"
9323-
"你应该现在添加 vim.VIM_SPECIAL_PATH 到 sys.path"
9330+
"你现在应该添加 vim.VIM_SPECIAL_PATH 到 sys.path"
93249331

93259332
msgid ""
93269333
"Vim macro files (*.vim)\t*.vim\n"

‎src/po/zh_CN.cp936.po‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ msgid ""
1818
msgstr ""
1919
"Project-Id-Version: Vim(Simplified Chinese)\n"
2020
"Report-Msgid-Bugs-To: vim-dev@vim.org\n"
21-
"POT-Creation-Date: 2026-03-20 20:44+0800\n"
21+
"POT-Creation-Date: 2026-04-05 23:26+0800\n"
2222
"PO-Revision-Date: 2025-12-28 14:27+0800\n"
2323
"Last-Translator: Mao-Yining\n"
2424
"Language-Team: Simplified Chinese\n"
@@ -55,7 +55,7 @@ msgid "auto-removing autocommand: %s <buffer=%d>"
5555
msgstr "自动删除自动命令： %s <buffer=%d>"
5656

5757
msgid "W19: Deleting augroup that is still in use"
58-
msgstr "W19: 删除依旧在使用中的自动组"
58+
msgstr "W19: 删除仍在使用中的自动命令组"
5959

6060
msgid ""
6161
"\n"
@@ -600,11 +600,11 @@ msgstr "
600600

601601
#, c-format
602602
msgid "W20: Required python version 2.x not supported, ignoring file: %s"
603-
msgstr "W20: 不支持需要的 Python 2.x 版本，忽略文件：%s"
603+
msgstr "W20: 所需的 Python 2.x 版本不受支持，忽略文件：%s"
604604

605605
#, c-format
606606
msgid "W21: Required python version 3.x not supported, ignoring file: %s"
607-
msgstr "W21: 不支持需要的 Python 3.x 版本，忽略文件：%s"
607+
msgstr "W21: 所需的 Python 3.x 版本不受支持，忽略文件：%s"
608608

609609
msgid "Entering Ex mode. Type \"visual\" to go to Normal mode."
610610
msgstr "进入 Ex 模式。输入 \"visual\" 回到正常模式。"
@@ -743,7 +743,7 @@ msgid "[character special]"
743743
msgstr "[字符设备]"
744744

745745
msgid "[CR missing]"
746-
msgstr "[缺少 CR]'"
746+
msgstr "[缺少 CR]"
747747

748748
msgid "[long lines split]"
749749
msgstr "[长行分割]"
@@ -824,7 +824,7 @@ msgstr "
824824

825825
#, c-format
826826
msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
827-
msgstr "W16: 警告: 编辑开始后，文件 \"%s\" 的模式已变动"
827+
msgstr "W16: 警告: 编辑开始后，文件 \"%s\" 的权限模式已变动"
828828

829829
msgid "See \":help W16\" for more info."
830830
msgstr "请参阅 \":help W16\" 以获取更多信息。"
@@ -1137,7 +1137,7 @@ msgid "cs_create_connection setpgid failed"
11371137
msgstr "cs_create_connection setpgid 失败"
11381138

11391139
msgid "cs_create_connection exec failed"
1140-
msgstr "cs_create_connection 执行失败"
1140+
msgstr "cs_create_connection exec 失败"
11411141

11421142
msgid "cs_create_connection: fdopen for to_fp failed"
11431143
msgstr "cs_create_connection: fdopen to_fp 失败"
@@ -2347,6 +2347,10 @@ msgstr " (
23472347
msgid "Beep!"
23482348
msgstr "Beep!"
23492349

2350+
#, c-format
2351+
msgid "Executing directly: \"%s\""
2352+
msgstr "直接执行：%s"
2353+
23502354
#, c-format
23512355
msgid "Calling shell to execute: \"%s\""
23522356
msgstr "调用 shell 执行: \"%s\""
@@ -3279,7 +3283,7 @@ msgstr "
32793283

32803284
#, c-format
32813285
msgid "Duplicate field name: %s"
3282-
msgstr "重复的字段名：%s"
3286+
msgstr "重复的字段名称：%s"
32833287

32843288
msgid "' not known. Available builtin terminals are:"
32853289
msgstr "' 未知。可用的内建终端有:"
@@ -4325,7 +4329,7 @@ msgstr "E127:
43254329

43264330
#, c-format
43274331
msgid "E128: Function name must start with a capital or \"s:\": %s"
4328-
msgstr "E128: 函数名必须以大写字母或 \"s:\" 开头: %s"
4332+
msgstr "E128: 函数名必须以大写字母或 \"s:\" 开头：%s"
43294333

43304334
msgid "E129: Function name required"
43314335
msgstr "E129: 需要函数名"
@@ -4351,7 +4355,7 @@ msgstr "E136: viminfo:
43514355

43524356
#, c-format
43534357
msgid "E137: Viminfo file is not writable: %s"
4354-
msgstr "E137: Viminfo 文件不可写入: %s"
4358+
msgstr "E137: Viminfo 文件不可写入：%s"
43554359

43564360
#, c-format
43574361
msgid "E138: Can't write viminfo file %s!"
@@ -5257,7 +5261,7 @@ msgid "E418: Illegal value: %s"
52575261
msgstr "E418: 不合法的值: %s"
52585262

52595263
msgid "E418: I'm a teapot"
5260-
msgstr "E418: 我是茶壶，不煮咖啡（彩蛋）"
5264+
msgstr "E418: 我是茶壶"
52615265

52625266
msgid "E419: FG color unknown"
52635267
msgstr "E419: 错误的前景颜色"
@@ -5564,7 +5568,7 @@ msgid "E503: \"%s\" is not a file or writable device"
55645568
msgstr "E503: \"%s\" 不是文件或可写的设备"
55655569

55665570
msgid "E503: Coffee is currently not available"
5567-
msgstr "E503: 当前无法提供咖啡（彩蛋）"
5571+
msgstr "E503: 咖啡当前不可用"
55685572

55695573
msgid "is read-only (cannot override: \"W\" in 'cpoptions')"
55705574
msgstr "只读 (不能强制执行：'cpoptions' 中包含 \"W\")"
@@ -6047,7 +6051,7 @@ msgid "E655: Too many symbolic links (cycle?)"
60476051
msgstr "E655: 符号连接过多(循环？)"
60486052

60496053
msgid "NetBeans disallows writes of unmodified buffers"
6050-
msgstr "NetBeans 不允许未修改的缓冲区写入"
6054+
msgstr "NetBeans 不允许写入未修改的缓冲区"
60516055

60526056
msgid "Partial writes disallowed for NetBeans buffers"
60536057
msgstr "NetBeans 不允许缓冲区部分写入"
@@ -8920,8 +8924,8 @@ msgstr "E1545: Quickfix
89208924
msgid "E1546: Cannot switch to a closing buffer"
89218925
msgstr "E1546: 不能切换到正在关闭的缓冲区"
89228926

8923-
msgid "E1547: This version of Vim does support :redrawtabpanel"
8924-
msgstr "E1547: 此版本的 Vim 支持 :redrawtabpanel"
8927+
msgid "E1547: This version of Vim does not support :redrawtabpanel"
8928+
msgstr "E1547: 此版本的 Vim 不支持 :redrawtabpanel"
89258929

89268930
msgid "E1548: Wayland connection is unavailable"
89278931
msgstr "E1548: Wayland 连接不可用"
@@ -9017,6 +9021,9 @@ msgstr "E1573:
90179021
msgid "E1574: gethostbyname(): cannot resolve hostname in channel_listen()"
90189022
msgstr "E1574: gethostbyname()：无法在 channel_listen() 中解析主机名"
90199023

9024+
msgid "E1575: Cannot create pipes"
9025+
msgstr "E1575: 无法建立管道"
9026+
90209027
msgid "--No lines in buffer--"
90219028
msgstr "--缓冲区无内容--"
90229029

@@ -9320,7 +9327,7 @@ msgid ""
93209327
"You should now append vim.VIM_SPECIAL_PATH to sys.path"
93219328
msgstr ""
93229329
"路径设置失败：sys.path 不是列表\n"
9323-
"你应该现在添加 vim.VIM_SPECIAL_PATH 到 sys.path"
9330+
"你现在应该添加 vim.VIM_SPECIAL_PATH 到 sys.path"
93249331

93259332
msgid ""
93269333
"Vim macro files (*.vim)\t*.vim\n"

0 commit comments

Comments
 (0)