78 lines
2.8 KiB
Diff
78 lines
2.8 KiB
Diff
From 01f8849201fdd007e53fe3ab4ea27b297500e11e Mon Sep 17 00:00:00 2001
|
|
From: sun_hai_10 <sunhai10@huawei.com>
|
|
Date: Wed, 15 Nov 2023 11:43:55 +0800
|
|
Subject: [PATCH] bugfix change root and storage interface shows
|
|
|
|
---
|
|
po/zh_CN.po | 12 ++++++++----
|
|
pyanaconda/modules/storage/bootloader/base.py | 2 +-
|
|
2 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/po/zh_CN.po b/po/zh_CN.po
|
|
index a208c70..44513ca 100644
|
|
--- a/po/zh_CN.po
|
|
+++ b/po/zh_CN.po
|
|
@@ -848,7 +848,7 @@ msgstr "未注册。"
|
|
|
|
#: pyanaconda/ui/gui/spokes/subscription.py:995
|
|
msgid "Registered with account {}"
|
|
-msgstr "用账户 {} 注册"
|
|
+msgstr "用帐户 {} 注册"
|
|
|
|
#: pyanaconda/ui/gui/spokes/subscription.py:999
|
|
msgid "Registered with organization {}"
|
|
@@ -1296,7 +1296,7 @@ msgstr "禁用的，设置密码以启用。"
|
|
#: pyanaconda/ui/gui/spokes/root_password.py:172
|
|
#: pyanaconda/ui/tui/spokes/root_password.py:77
|
|
msgid "Root account is disabled."
|
|
-msgstr "root 账户已禁用。"
|
|
+msgstr "root 帐户已禁用。"
|
|
|
|
#: pyanaconda/ui/gui/spokes/root_password.py:175
|
|
msgid "Root password is set"
|
|
@@ -3565,6 +3565,10 @@ msgstr ""
|
|
msgid "%s cannot be on an encrypted block device."
|
|
msgstr "%s 不能位于加密的块设备中。"
|
|
|
|
+#: pyanaconda/modules/storage/bootloader/base.py:595
|
|
+msgid "Failed to find a suitable stage1 device"
|
|
+msgstr "未能找到合适的stage1设备"
|
|
+
|
|
#: pyanaconda/modules/storage/bootloader/base.py:624
|
|
#, python-format
|
|
msgid ""
|
|
@@ -6156,7 +6160,7 @@ msgid ""
|
|
"Note: The settings you make on this screen will not be applied until you "
|
|
"click on the main menu's 'Begin Installation' button."
|
|
msgstr ""
|
|
-"注意：在您点击主菜单上的“开始安装“按钮之前”，您在本屏幕内所做的设置更改不会被"
|
|
+"注意：在您点击主菜单上的“开始安装”按钮之前，您在本屏幕内所做的设置更改不会被"
|
|
"应用。"
|
|
|
|
#: pyanaconda/ui/gui/spokes/custom_storage.glade:1129
|
|
@@ -6888,7 +6892,7 @@ msgstr "连接至红帽"
|
|
#: pyanaconda/ui/gui/spokes/subscription.glade:100
|
|
msgctxt "GUI|Subscription|Authentication|Account"
|
|
msgid "_Account"
|
|
-msgstr "账户(_A)"
|
|
+msgstr "帐户(_A)"
|
|
|
|
#: pyanaconda/ui/gui/spokes/subscription.glade:117
|
|
msgctxt "GUI|Subscription|Authetication|Activation Key"
|
|
diff --git a/pyanaconda/modules/storage/bootloader/base.py b/pyanaconda/modules/storage/bootloader/base.py
|
|
index f6d6059..c83e72f 100644
|
|
--- a/pyanaconda/modules/storage/bootloader/base.py
|
|
+++ b/pyanaconda/modules/storage/bootloader/base.py
|
|
@@ -592,7 +592,7 @@ class BootLoader(object):
|
|
|
|
if not self.stage1_device:
|
|
self.reset()
|
|
- msg = "Failed to find a suitable stage1 device"
|
|
+ msg = _("Failed to find a suitable stage1 device")
|
|
if errors:
|
|
msg = msg + ": " + "; ".join(errors)
|
|
raise BootLoaderError(msg)
|
|
--
|
|
2.23.0
|
|
|