From d0d9a4596a8ba0ef4e59b6d1cebd28ce2d679736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=94=9F=E6=9D=82=E7=89=A9=E6=88=BF?= <88823709+TC999@users.noreply.github.com> Date: Fri, 11 Apr 2025 18:03:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20diff.c=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- po/zh_CN.po | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/po/zh_CN.po b/po/zh_CN.po index 5cde4011e750ce..9f7584ffb3140c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -19875,6 +19875,27 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误:\n" "%s" +#: diff.c +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d 文件更改" +msgstr[1] " %d 文件更改" + +#: diff.c +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d 添加(+)" +msgstr[1] ", %d 添加(+)" + +#: diff.c +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ". %d 删除(-)" +msgstr[1] ", %d 删除(-)" + #: diff.c #, c-format msgid "external diff died, stopping at %s" From 9d29b1686d7cc95e8137ab6b0d57d3241d32e827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=94=9F=E6=9D=82=E7=89=A9=E6=88=BF?= <88823709+TC999@users.noreply.github.com> Date: Fri, 11 Apr 2025 18:03:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20diff.c=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 20e1b42e34b4a535e1397ee5d301abddbce85ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=94=9F=E6=9D=82=E7=89=A9=E6=88=BF?= <88823709+TC999@users.noreply.github.com> Date: Fri, 11 Apr 2025 10:29:55 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20diff.c?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- diff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index c89c15d98e0e29..0f4681ff468e8c 100644 --- a/diff.c +++ b/diff.c @@ -2612,7 +2612,7 @@ static void print_stat_summary_inserts_deletes(struct diff_options *options, } strbuf_addf(&sb, - (files == 1) ? " %d file changed" : " %d files changed", + (files == 1) ? _(" %d file changed") : _(" %d files changed"), files); /* @@ -2625,13 +2625,13 @@ static void print_stat_summary_inserts_deletes(struct diff_options *options, */ if (insertions || deletions == 0) { strbuf_addf(&sb, - (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)", + (insertions == 1) ? _(", %d insertion(+)") : _(", %d insertions(+)"), insertions); } if (deletions || insertions == 0) { strbuf_addf(&sb, - (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)", + (deletions == 1) ? _(", %d deletion(-)") : _(", %d deletions(-)"), deletions); } strbuf_addch(&sb, '\n'); From 6bc199daf679afa1088ac73bcd485604cbd045ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=94=9F=E6=9D=82=E7=89=A9=E6=88=BF?= <88823709+TC999@users.noreply.github.com> Date: Fri, 11 Apr 2025 18:48:40 +0800 Subject: [PATCH 4/5] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9959b61ece2bcc..7124386075441d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: CI -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] env: DEVELOPER: 1 From c6c4f221c6605e19a8b5cbf88ea3fb2d00cb724a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=94=9F=E6=9D=82=E7=89=A9=E6=88=BF?= <88823709+TC999@users.noreply.github.com> Date: Sun, 13 Apr 2025 22:50:18 +0800 Subject: [PATCH 5/5] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7124386075441d..9959b61ece2bcc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ name: CI -on: [push, pull_request, workflow_dispatch] +on: [push, pull_request] env: DEVELOPER: 1