runtime(diff): fix mixed translations in zh_CN
Commit:
https://github.com/vim/vim/commit/3cee950fc9f8cdcfe3f168fe83072b2a9eb15d47
Author: 毛逸宁 <[email protected]>
Date: Sat Aug 16 17:22:36 2025 +0200
runtime(diff): fix mixed translations in zh_CN
some translations confused zh_CN and zh_TW
Signed-off-by: 毛逸宁 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index 50efe32c5..71d2763ba 100644
--- a/runtime/syntax/diff.vim
+++ b/runtime/syntax/diff.vim
@@ -2,7 +2,7 @@
" Language: Diff (context or unified)
" Maintainer: The Vim Project <https://github.com/vim/vim>
" Translations by Jakson Alves de Aquino.
-" Last Change: 2025 Jun 26
+" Last Change: 2025 Aug 16
" Former Maintainer: Bram Moolenaar <[email protected]>
" Quit when a (custom) syntax file was already loaded
@@ -312,9 +312,9 @@ syn match diffCommon "^Thư mục con chung: .* và .*"
" zh_CN
syn match diffOnly "^只在 .* 存在：.*"
-syn match diffIdentical "^檔案 .* 和 .* 相同$"
+syn match diffIdentical "^文件 .* 和 .* 相同$"
syn match diffDiffer "^文件 .* 和 .* 不同$"
-syn match diffBDiffer "^文件 .* 和 .* 不同$"
+syn match diffBDiffer "^二进制文件 .* 和 .* 不同$"
syn match diffIsA "^文件 .* 是.*而文件 .* 是.*"
syn match diffNoEOL "^\ 文件尾没有 newline 字符"
syn match diffCommon "^.* 和 .* 有共同的子目录$"
diff --git a/runtime/syntax/shared/hgcommitDiff.vim
b/runtime/syntax/shared/hgcommitDiff.vim
index 949cdf0b1..0ab9c3d8c 100644
--- a/runtime/syntax/shared/hgcommitDiff.vim
+++ b/runtime/syntax/shared/hgcommitDiff.vim
@@ -3,6 +3,7 @@
" Maintainer: Max Coplan <[email protected]>
" Translations by Jakson Alves de Aquino.
" Last Change: 2022-12-08
+" 2025-08-16 by Vim project, update zh_CN translations, #18011
" Copied from: runtime/syntax/diff.vim
" Quit when a (custom) syntax file was already loaded
@@ -312,9 +313,9 @@ syn match hgDiffCommon "^\%(SL\|HG\): Thư mục
con chung: .* và .*"
" zh_CN
syn match hgDiffOnly "^\%(SL\|HG\): 只在 .* 存在：.*"
-syn match hgDiffIdentical "^\%(SL\|HG\): 檔案 .* 和 .* 相同$"
+syn match hgDiffIdentical "^\%(SL\|HG\): 文件 .* 和 .* 相同$"
syn match hgDiffDiffer "^\%(SL\|HG\): 文件 .* 和 .* 不同$"
-syn match hgDiffBDiffer "^\%(SL\|HG\): 文件 .* 和 .* 不同$"
+syn match hgDiffBDiffer "^\%(SL\|HG\): 二进制文件 .* 和 .* 不同$"
syn match hgDiffIsA "^\%(SL\|HG\): 文件 .* 是.*而文件 .* 是.*"
syn match hgDiffNoEOL "^\%(SL\|HG\): \ 文件尾没有 newline 字符"
syn match hgDiffCommon "^\%(SL\|HG\): .* 和 .* 有共同的子目录$"
diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po
index f368f6f21..0470f9f29 100644
--- a/src/po/zh_CN.UTF-8.po
+++ b/src/po/zh_CN.UTF-8.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)
"
"Report-Msgid-Bugs-To:
"
-"POT-Creation-Date: 2022-06-24 13:26+0800
"
+"POT-Creation-Date: 2025-08-16 15:05+0000
"
"PO-Revision-Date: 2006-04-21 14:00+0800
"
"Last-Translator: lilydjwg, Ada (Haowen) Yu
"
"Language-Team: Simplified Chinese
"
@@ -8486,7 +8486,7 @@ msgid "\" Hit <Enter> on an index line to jump there."
msgstr "\" 在索引行上按 <回车> 来跳转到那里。"
msgid "\" Hit <Space> on a \"set\" line to refresh it."
-msgstr "\" 在 \"set\" 行上按 <空格> 来刷新。 "
+msgstr "\" 在 \"set\" 行上按 <空格> 来刷新。"
msgid "important"
msgstr "重要选项"
diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po
index 89b4bfc61..0ece05191 100644
--- a/src/po/zh_CN.cp936.po
+++ b/src/po/zh_CN.cp936.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)
"
"Report-Msgid-Bugs-To:
"
-"POT-Creation-Date: 2022-06-24 13:26+0800
"
+"POT-Creation-Date: 2025-08-16 15:05+0000
"
"PO-Revision-Date: 2006-04-21 14:00+0800
"
"Last-Translator: lilydjwg, Ada (Haowen) Yu
"
"Language-Team: Simplified Chinese
"
@@ -8486,7 +8486,7 @@ msgid "\" Hit <Enter> on an index line to jump there."
msgstr "\" ���������ϰ´ <�سµ> ����ת�����"
msgid "\" Hit <Space> on a \"set\" line to refresh it."
-msgstr "\" �Ú \"set\" ���ϰ´ <�ոñ> ��ˢ�¡£ "
+msgstr "\" �Ú \"set\" ���ϰ´ <�ոñ> ��ˢ�¡£"
msgid "important"
msgstr "��Ҫѡ�î"
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 8e4571d38..45b66d11d 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)
"
"Report-Msgid-Bugs-To:
"
-"POT-Creation-Date: 2022-06-24 13:26+0800
"
+"POT-Creation-Date: 2025-08-16 15:05+0000
"
"PO-Revision-Date: 2006-04-21 14:00+0800
"
"Last-Translator: lilydjwg, Ada (Haowen) Yu
"
"Language-Team: Simplified Chinese
"
@@ -8486,7 +8486,7 @@ msgid "\" Hit <Enter> on an index line to jump there."
msgstr "\" ���������ϰ´ <�سµ> ����ת�����"
msgid "\" Hit <Space> on a \"set\" line to refresh it."
-msgstr "\" �Ú \"set\" ���ϰ´ <�ոñ> ��ˢ�¡£ "
+msgstr "\" �Ú \"set\" ���ϰ´ <�ոñ> ��ˢ�¡£"
msgid "important"
msgstr "��Ҫѡ�î"
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1unIr6-0014wB-0y%40256bit.org.
