mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-15 02:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:3cee950: runtime(diff): fix mixed translations in zh_CN (#35362)

Browse Source 
some translations confused zh_CN and zh_TW

3cee950fc9

Co-authored-by: 毛逸宁 <mao.yining@outlook.com>
This commit is contained in:
zeertzjq
2025-08-17 18:33:29 +08:00
committed by GitHub
parent 7e450aa383
commit 35a7642647
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/syntax/diff.vim
View File

@@ -2,7 +2,7 @@
" Language: Diff (context or unified) " Language: Diff (context or unified)
" Maintainer: The Vim Project <https://github.com/vim/vim> " Maintainer: The Vim Project <https://github.com/vim/vim>
" Translations by Jakson Alves de Aquino. " Translations by Jakson Alves de Aquino.
" Last Change: 2025 Jun 26 " Last Change: 2025 Aug 16
" Former Maintainer: Bram Moolenaar <Bram@vim.org> " Former Maintainer: Bram Moolenaar <Bram@vim.org>
" Quit when a (custom) syntax file was already loaded " Quit when a (custom) syntax file was already loaded
@@ -312,9 +312,9 @@ syn match diffCommon "^Thư mục con chung: .* và .*"
" zh_CN " zh_CN
syn match diffOnly "^只在 .* 存在：.*" syn match diffOnly "^只在 .* 存在：.*"
syn match diffIdentical "^檔案 .* 和 .* 相同$" syn match diffIdentical "^文件 .* 和 .* 相同$"
syn match diffDiffer "^文件 .* 和 .* 不同$" syn match diffDiffer "^文件 .* 和 .* 不同$"
syn match diffBDiffer "^文件 .* 和 .* 不同$" syn match diffBDiffer "^二进制文件 .* 和 .* 不同$"
syn match diffIsA "^文件 .* 是.*而文件 .* 是.*" syn match diffIsA "^文件 .* 是.*而文件 .* 是.*"
syn match diffNoEOL "^\\ 文件尾没有 newline 字符" syn match diffNoEOL "^\\ 文件尾没有 newline 字符"
syn match diffCommon "^.* 和 .* 有共同的子目录$" syn match diffCommon "^.* 和 .* 有共同的子目录$"

5
runtime/syntax/shared/hgcommitDiff.vim
View File

@@ -3,6 +3,7 @@
" Maintainer: Max Coplan <mchcopl@gmail.com> " Maintainer: Max Coplan <mchcopl@gmail.com>
" Translations by Jakson Alves de Aquino. " Translations by Jakson Alves de Aquino.
" Last Change: 2022-12-08 " Last Change: 2022-12-08
" 2025-08-16 by Vim project, update zh_CN translations, #18011
" Copied from: runtime/syntax/diff.vim " Copied from: runtime/syntax/diff.vim
" Quit when a (custom) syntax file was already loaded " 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 " zh_CN
syn match hgDiffOnly "^\%(SL\|HG\): 只在 .* 存在：.*" syn match hgDiffOnly "^\%(SL\|HG\): 只在 .* 存在：.*"
syn match hgDiffIdentical "^\%(SL\|HG\): 檔案 .* 和 .* 相同$" syn match hgDiffIdentical "^\%(SL\|HG\): 文件 .* 和 .* 相同$"
syn match hgDiffDiffer "^\%(SL\|HG\): 文件 .* 和 .* 不同$" syn match hgDiffDiffer "^\%(SL\|HG\): 文件 .* 和 .* 不同$"
syn match hgDiffBDiffer "^\%(SL\|HG\): 文件 .* 和 .* 不同$" syn match hgDiffBDiffer "^\%(SL\|HG\): 二进制文件 .* 和 .* 不同$"
syn match hgDiffIsA "^\%(SL\|HG\): 文件 .* 是.*而文件 .* 是.*" syn match hgDiffIsA "^\%(SL\|HG\): 文件 .* 是.*而文件 .* 是.*"
syn match hgDiffNoEOL "^\%(SL\|HG\): \\ 文件尾没有 newline 字符" syn match hgDiffNoEOL "^\%(SL\|HG\): \\ 文件尾没有 newline 字符"
syn match hgDiffCommon "^\%(SL\|HG\): .* 和 .* 有共同的子目录$" syn match hgDiffCommon "^\%(SL\|HG\): .* 和 .* 有共同的子目录$"

2
src/nvim/po/zh_CN.UTF-8.po
View File

@@ -7597,7 +7597,7 @@ msgstr "\" 在索引行上按 <回车> 来跳转到那里。"
#: ../../../runtime/optwin.vim:159 #: ../../../runtime/optwin.vim:159
msgid "\" Hit <Space> on a \"set\" line to refresh it." msgid "\" Hit <Space> on a \"set\" line to refresh it."
msgstr "\" 在 \"set\" 行上按 <空格> 来刷新。 " msgstr "\" 在 \"set\" 行上按 <空格> 来刷新。"
#: ../../../runtime/optwin.vim:228 #: ../../../runtime/optwin.vim:228
msgid "important" msgid "important"