From 57dd4a412eb9a6e8ffb80508d74cec3837707c80 Mon Sep 17 00:00:00 2001
From: ut001695 <zhangkea@uniontech.com>
Date: Fri, 30 Jul 2021 15:22:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BF=9B=E5=85=A5=E6=95=91=E6=8F=B4?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=AD=E5=87=BA=E7=8E=B0=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>
---
 ...lete-chinese-translation-for-sulogin.patch | 66 +++++++++++++++++++
 util-linux.spec                               |  9 ++-
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 2.35-delete-chinese-translation-for-sulogin.patch

diff --git a/2.35-delete-chinese-translation-for-sulogin.patch b/2.35-delete-chinese-translation-for-sulogin.patch
new file mode 100644
index 0000000..cf454a5
--- /dev/null
+++ b/2.35-delete-chinese-translation-for-sulogin.patch
@@ -0,0 +1,66 @@
+From 7ca2804c8eb9883c5187a00f80c2d6806f29a01d Mon Sep 17 00:00:00 2001
+From: root <root@localhost.localdomain>
+Date: Fri, 18 Sep 2020 19:18:40 +0800
+Subject: [PATCH 2/2] delete chinese translation for sulogin
+
+---
+ po/util-linux.pot | 15 ---------------
+ po/zh_CN.po       | 15 ---------------
+ 2 files changed, 30 deletions(-)
+
+diff --git a/po/util-linux.pot b/po/util-linux.pot
+index 7b51013..fe84f6e 100644
+--- a/po/util-linux.pot
++++ b/po/util-linux.pot
+@@ -8433,21 +8433,6 @@ msgstr ""
+ msgid "Press Enter for login: "
+ msgstr ""
+ 
+-#: login-utils/sulogin.c:542
+-#, c-format
+-msgid "Give root password for maintenance\n"
+-msgstr ""
+-
+-#: login-utils/sulogin.c:544
+-#, c-format
+-msgid "Press Enter for maintenance\n"
+-msgstr ""
+-
+-#: login-utils/sulogin.c:545
+-#, c-format
+-msgid "(or press Control-D to continue): "
+-msgstr ""
+-
+ #: login-utils/sulogin.c:735
+ msgid "change directory to system root failed"
+ msgstr ""
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index a04c9cf..9da9f78 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -8457,21 +8457,6 @@ msgstr "指定 root 的登录密码："
+ msgid "Press Enter for login: "
+ msgstr "按 Enter 键登录："
+ 
+-#: login-utils/sulogin.c:542
+-#, c-format
+-msgid "Give root password for maintenance\n"
+-msgstr "指定 root 的维护密码\n"
+-
+-#: login-utils/sulogin.c:544
+-#, c-format
+-msgid "Press Enter for maintenance\n"
+-msgstr "按 Enter 键进行维护\n"
+-
+-#: login-utils/sulogin.c:545
+-#, c-format
+-msgid "(or press Control-D to continue): "
+-msgstr "(或按 Control-D 键继续)："
+-
+ #: login-utils/sulogin.c:735
+ msgid "change directory to system root failed"
+ msgstr "更改到系统根目录失败"
+-- 
+2.23.0
+
+
diff --git a/util-linux.spec b/util-linux.spec
index 8542e49..affcad7 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
 
 Name:           util-linux
 Version:        2.35.2
-Release:        7
+Release:        8
 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
@@ -59,6 +59,7 @@ Patch20:        backpaort-fix-uint64_t-overflow.patch
 Patch21:        backpaort-update-fdisk-outputs-due-to-sizes-rounding-change.patch
 
 Patch9000:	Add-check-to-resolve-uname26-version-test-failed.patch
+Patch10000:     2.35-delete-chinese-translation-for-sulogin.patch
 
 %description
 The util-linux package contains a random collection of files that
@@ -406,6 +407,12 @@ fi
 %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*}
 
 %changelog
+* Fri Jul 30 2021 zhangke <zhangke@uniontech.com> - 2.35.2-8
+- Type:enhancement
+- Id:NA
+- SUG:NA
+- DESC:Delete Chinese translation for sulogin
+
 * Wed Jul 28 2021 shangyibin <shangyibin1@huawei.com> - 2.35.2-7
 - Type:bugfix
 - ID:NA
-- 
Gitee