Control: tags 978736 + patch Control: tags 978736 + pending Dear maintainer,
I've prepared an NMU for diffutils (versioned as 1:3.7-3.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards, Boyuan Yang diff -Nru diffutils-3.7/debian/changelog diffutils-3.7/debian/changelog --- diffutils-3.7/debian/changelog 2019-04-08 08:04:00.000000000 -0400 +++ diffutils-3.7/debian/changelog 2020-12-30 23:03:26.000000000 -0500 @@ -1,3 +1,11 @@ +diffutils (1:3.7-3.1) unstable; urgency=medium + + * Non-maintainer upload from Debian Chinese Team. + * debian/patches/03-zh_CN-translation-hotfix.patch: Add patch to fix + some critical zh_CN translation errors. (Closes: #978736) + + -- Boyuan Yang <by...@debian.org> Wed, 30 Dec 2020 23:03:26 -0500 + diffutils (1:3.7-3) unstable; urgency=medium * Disable tests/colors completely for buster. Closes: #922552. diff -Nru diffutils-3.7/debian/patches/03-zh_CN-translation- hotfix.patch diffutils-3.7/debian/patches/03-zh_CN-translation- hotfix.patch --- diffutils-3.7/debian/patches/03-zh_CN-translation- hotfix.patch 1969-12-31 19:00:00.000000000 -0500 +++ diffutils-3.7/debian/patches/03-zh_CN-translation- hotfix.patch 2020-12-30 22:52:18.000000000 -0500 @@ -0,0 +1,31 @@ +From: Boyuan Yang <by...@debian.org> +Date: Wed, 30 Dec 2020 22:50:55 -0500 +Subject: zh_CN translation hotfix + +Applied-Upstream: https://translationproject.org/team/zh_CN.html +--- + po/zh_CN.po | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 05cbef6..67d30ac 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -265,7 +265,7 @@ msgstr "无效的前导正则表达式" + + #: lib/regcomp.c:177 + msgid "Premature end of regular expression" +-msgstr "正则表达式过旱结束" ++msgstr "正则表达式过早结束" + + #: lib/regcomp.c:180 + msgid "Regular expression too big" +@@ -1114,7 +1114,7 @@ msgstr "软链接 %s 和 %s 不同\n" + #: src/diff.c:1460 + #, c-format + msgid "Files %s and %s are identical\n" +-msgstr "檔案 %s 和 %s 相同\n" ++msgstr "文件 %s 和 %s 相同\n" + + #. This is a proper name. See the gettext manual, section Names. + #: src/diff3.c:42 diff -Nru diffutils-3.7/debian/patches/series diffutils- 3.7/debian/patches/series --- diffutils-3.7/debian/patches/series 2019-04-08 07:00:00.000000000 -0400 +++ diffutils-3.7/debian/patches/series 2020-12-30 22:52:44.000000000 -0500 @@ -1,2 +1,3 @@ 01-fix-race-condition-in-colors-test.patch 02-disable-colors-test.patch +03-zh_CN-translation-hotfix.patch
signature.asc
Description: This is a digitally signed message part
