From eaddceac486392b14f1421b91c85b99422f904a4 Mon Sep 17 00:00:00 2001
From: ut001695 <zhangkea@uniontech.com>
Date: Fri, 20 Aug 2021 11:44:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5=E6=95=91?=
 =?UTF-8?q?=E6=8F=B4=E6=A8=A1=E5=BC=8F=E4=B8=AD=E6=96=87=E4=B9=B1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: ut001695 <zhangkea@uniontech.com>
---
 modify-rescuemode-chinese-error.patch | 56 +++++++++++++++++++++++++++
 util-linux.spec                       |  9 ++++-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 modify-rescuemode-chinese-error.patch

diff --git a/modify-rescuemode-chinese-error.patch b/modify-rescuemode-chinese-error.patch
new file mode 100644
index 0000000..62c7b4d
--- /dev/null
+++ b/modify-rescuemode-chinese-error.patch
@@ -0,0 +1,56 @@
+From 5b81afefaba928dfb2f6686ed90e4512fff19357 Mon Sep 17 00:00:00 2001
+From: ut001695 <zhangkea@uniontech.com>
+Date: Fri, 6 Nov 2020 16:28:05 +0800
+Subject: [PATCH] 1
+
+---
+ po/util-linux.pot |  8 ++++----
+ po/zh_CN.po       | 12 ++++++------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/po/util-linux.pot b/po/util-linux.pot
+index fe84f6e..ebbc162 100644
+--- a/po/util-linux.pot
++++ b/po/util-linux.pot
+@@ -7622,10 +7622,10 @@ msgstr ""
+ 
+ #: login-utils/login.c:801 login-utils/sulogin.c:1013
+ #, c-format
+-msgid ""
+-"Login incorrect\n"
+-"\n"
+-msgstr ""
++#msgid ""
++#"Login incorrect\n"
++#"\n"
++#msgstr ""
+ 
+ #: login-utils/login.c:816
+ #, c-format
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index 9da9f78..2f6e31b 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -7624,12 +7624,12 @@ msgstr "FAILED LOGIN %u FROM %s FOR %s, %s"
+ 
+ #: login-utils/login.c:801 login-utils/sulogin.c:1013
+ #, c-format
+-msgid ""
+-"Login incorrect\n"
+-"\n"
+-msgstr ""
+-"登录不正确\n"
+-"\n"
++#msgid ""
++#"Login incorrect\n"
++#"\n"
++#msgstr ""
++#"登录不正确\n"
++#"\n"
+ 
+ #: login-utils/login.c:816
+ #, c-format
+-- 
+2.23.0
+
+
diff --git a/util-linux.spec b/util-linux.spec
index 2bfc285..92881f6 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
 
 Name:           util-linux
 Version:        2.35.2
-Release:        8
+Release:        9
 Summary:        A random collection of Linux utilities
 License:        GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 URL:            https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
@@ -60,6 +60,7 @@ Patch21:        backpaort-update-fdisk-outputs-due-to-sizes-rounding-change.patc
 Patch6000:      backport-CVE-2021-37600.patch
 
 Patch9000:	Add-check-to-resolve-uname26-version-test-failed.patch
+Patch9001:      modify-rescuemode-chinese-error.patch
 
 %description
 The util-linux package contains a random collection of files that
@@ -407,6 +408,12 @@ fi
 %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*}
 
 %changelog
+* Fri Aug 20 2021 zhangkea <zhangkea@uniontech.com> - 2.35.2-9
+- Type:enhancement
+- Id:NA
+- SUG:NA
+- DESC:modify rescuemode chinese error
+
 * Tue Aug 10 2021 shixuantong<shixuantong@huawei.com> - 2.35.2-8
 - Type:CVE
 - ID:CVE-2021-37600
-- 
Gitee