runtime(diff): fix mixed translations in zh_CN

some translations confused zh_CN and zh_TW

Signed-off-by: 毛逸宁 <mao.yining@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index 50efe32c5c2b1cc5a554f4a8976a9ad9b6a9917f..71d2763babbcab7e4a8060bd2c7f553ee22599d6 100644 (file)
--- 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 <Bram@vim.org>
 
 " 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        "^æª\94æ¡\88 .* 和 .* 相同$"
+syn match diffIdentical        "^æ\96\87件 .* 和 .* 相同$"
 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 949cdf0b1c879a646b9b86171bf942db383292e8..0ab9c3d8c902c2904a3a17d89093652a2bc3b2c8 100644 (file)
--- a/runtime/syntax/shared/hgcommitDiff.vim
+++ b/runtime/syntax/shared/hgcommitDiff.vim
@@ -3,6 +3,7 @@
 " Maintainer:  Max Coplan <mchcopl@gmail.com>
 "               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\): æª\94æ¡\88 .* 和 .* 相同$"
+syn match hgDiffIdentical      "^\%(SL\|HG\): æ\96\87件 .* 和 .* 相同$"
 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 f368f6f214c4e08f11c223b7e3c9bfb36d1eb585..0470f9f299c0de6c63daf8911b5d5bbf0965cffd 100644 (file)
--- 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)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-24 13:26+0800\n"
+"POT-Creation-Date: 2025-08-16 15:05+0000\n"
 "PO-Revision-Date: 2006-04-21 14:00+0800\n"
 "Last-Translator: lilydjwg, Ada (Haowen) Yu\n"
 "Language-Team: Simplified Chinese\n"
@@ -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 89b4bfc61cabb30834a3bb82b7a042c676d220cd..0ece0519115411dc340fd7c095e4fe5a79746cf5 100644 (file)
--- 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)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-24 13:26+0800\n"
+"POT-Creation-Date: 2025-08-16 15:05+0000\n"
 "PO-Revision-Date: 2006-04-21 14:00+0800\n"
 "Last-Translator: lilydjwg, Ada (Haowen) Yu\n"
 "Language-Team: Simplified Chinese\n"
@@ -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 8e4571d38e02b53384f55d70c51e03afaa24932d..45b66d11d075e70c148cfea73e3179379194635d 100644 (file)
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Simplified Chinese)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-24 13:26+0800\n"
+"POT-Creation-Date: 2025-08-16 15:05+0000\n"
 "PO-Revision-Date: 2006-04-21 14:00+0800\n"
 "Last-Translator: lilydjwg, Ada (Haowen) Yu\n"
 "Language-Team: Simplified Chinese\n"
@@ -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 "ÖØҪѡÏî"