diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim index 50efe32c5c..71d2763bab 100644 --- a/runtime/syntax/diff.vim +++ b/runtime/syntax/diff.vim @@ -2,7 +2,7 @@ " Language: Diff (context or unified) " Maintainer: The Vim Project " Translations by Jakson Alves de Aquino. -" Last Change: 2025 Jun 26 +" Last Change: 2025 Aug 16 " Former Maintainer: Bram Moolenaar " 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 949cdf0b1c..0ab9c3d8c9 100644 --- a/runtime/syntax/shared/hgcommitDiff.vim +++ b/runtime/syntax/shared/hgcommitDiff.vim @@ -3,6 +3,7 @@ " Maintainer: Max Coplan " 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/nvim/po/zh_CN.UTF-8.po b/src/nvim/po/zh_CN.UTF-8.po index b75308695e..c5043c15c5 100644 --- a/src/nvim/po/zh_CN.UTF-8.po +++ b/src/nvim/po/zh_CN.UTF-8.po @@ -7597,7 +7597,7 @@ msgstr "\" 在索引行上按 <回车> 来跳转到那里。" #: ../../../runtime/optwin.vim:159 msgid "\" Hit on a \"set\" line to refresh it." -msgstr "\" 在 \"set\" 行上按 <空格> 来刷新。 " +msgstr "\" 在 \"set\" 行上按 <空格> 来刷新。" #: ../../../runtime/optwin.vim:228 msgid "important"