aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

runtime(diff): fix mixed translations in zh_CN

Browse Source 
some translations confused zh_CN and zh_TW

Signed-off-by: 毛逸宁 <mao.yining@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
毛逸宁
2025-08-16 17:22:36 +02:00
committed by Christian Brabandt
parent d6a762fe1b
commit 3cee950fc9
5 changed files with 12 additions and 11 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\): .* 和 .* 有共同的子目录$"

4
src/po/zh_CN.UTF-8.po
View File

@@ -17,7 +17,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n" "Project-Id-Version: Vim(Simplified Chinese)\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2006-04-21 14:00+0800\n"
"Last-Translator: lilydjwg, Ada (Haowen) Yu\n" "Last-Translator: lilydjwg, Ada (Haowen) Yu\n"
"Language-Team: Simplified Chinese\n" "Language-Team: Simplified Chinese\n"
@@ -8486,7 +8486,7 @@ msgid "\" Hit <Enter> on an index line to jump there."
msgstr "\" 在索引行上按 <回车> 来跳转到那里。" msgstr "\" 在索引行上按 <回车> 来跳转到那里。"
msgid "\" Hit <Space> on a \"set\" line to refresh it." msgid "\" Hit <Space> on a \"set\" line to refresh it."
msgstr "\" 在 \"set\" 行上按 <空格> 来刷新。 " msgstr "\" 在 \"set\" 行上按 <空格> 来刷新。"
msgid "important" msgid "important"
msgstr "重要选项" msgstr "重要选项"

4
src/po/zh_CN.cp936.po
View File

@@ -17,7 +17,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n" "Project-Id-Version: Vim(Simplified Chinese)\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2006-04-21 14:00+0800\n"
"Last-Translator: lilydjwg, Ada (Haowen) Yu\n" "Last-Translator: lilydjwg, Ada (Haowen) Yu\n"
"Language-Team: Simplified Chinese\n" "Language-Team: Simplified Chinese\n"
@@ -8486,7 +8486,7 @@ msgid "\" Hit <Enter> on an index line to jump there."
msgstr "\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD> <<3C>س<EFBFBD>> <20><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD>" msgstr "\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD> <<3C>س<EFBFBD>> <20><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD>"
msgid "\" Hit <Space> on a \"set\" line to refresh it." msgid "\" Hit <Space> on a \"set\" line to refresh it."
msgstr "\" <20><> \"set\" <20><><EFBFBD>ϰ<EFBFBD> <<3C>ո<EFBFBD>> <20><>ˢ<EFBFBD>¡<EFBFBD> " msgstr "\" <20><> \"set\" <20><><EFBFBD>ϰ<EFBFBD> <<3C>ո<EFBFBD>> <20><>ˢ<EFBFBD>¡<EFBFBD>"
msgid "important" msgid "important"
msgstr "<22><>Ҫѡ<D2AA><D1A1>" msgstr "<22><>Ҫѡ<D2AA><D1A1>"

4
src/po/zh_CN.po
View File

@@ -17,7 +17,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim(Simplified Chinese)\n" "Project-Id-Version: Vim(Simplified Chinese)\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2006-04-21 14:00+0800\n"
"Last-Translator: lilydjwg, Ada (Haowen) Yu\n" "Last-Translator: lilydjwg, Ada (Haowen) Yu\n"
"Language-Team: Simplified Chinese\n" "Language-Team: Simplified Chinese\n"
@@ -8486,7 +8486,7 @@ msgid "\" Hit <Enter> on an index line to jump there."
msgstr "\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD> <<3C>س<EFBFBD>> <20><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD>" msgstr "\" <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD> <<3C>س<EFBFBD>> <20><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD><EFBFBD>"
msgid "\" Hit <Space> on a \"set\" line to refresh it." msgid "\" Hit <Space> on a \"set\" line to refresh it."
msgstr "\" <20><> \"set\" <20><><EFBFBD>ϰ<EFBFBD> <<3C>ո<EFBFBD>> <20><>ˢ<EFBFBD>¡<EFBFBD> " msgstr "\" <20><> \"set\" <20><><EFBFBD>ϰ<EFBFBD> <<3C>ո<EFBFBD>> <20><>ˢ<EFBFBD>¡<EFBFBD>"
msgid "important" msgid "important"
msgstr "<22><>Ҫѡ<D2AA><D1A1>" msgstr "<22><>Ҫѡ<D2AA><D1A1>"