anaconda/bugfix-change-root-and-storage-interface-shows.patch
2024-06-13 23:21:18 +08:00

127 lines
4.7 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

From c8d6fa0fa3ba5820f6f2239064d33fabc17cb671 Mon Sep 17 00:00:00 2001
From: s30028044 <sunhai10@huawei.com>
Date: Thu, 31 Aug 2023 20:32:50 +0800
Subject: [PATCH] change root and custom storage interface shows
---
po/zh_CN.po | 22 +++++++++++++------
pyanaconda/modules/storage/bootloader/base.py | 2 +-
pyanaconda/ui/gui/spokes/lib/accordion.py | 2 +-
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3b6fc12..4b2d109 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -866,6 +866,10 @@ msgstr "引导加载程序阶段1设备不能在一个没有在 iBFT 中配置
msgid "%s cannot be on an encrypted block device."
msgstr "%s 不能位于加密的块设备上。"
+#: pyanaconda/modules/storage/bootloader/base.py:612
+msgid "Failed to find a suitable stage1 device"
+msgstr "未能找到合适的stage1设备"
+
#: pyanaconda/modules/storage/bootloader/base.py:644
#, python-format
msgid ""
@@ -1745,6 +1749,10 @@ msgctxt "GUI|Custom Partitioning|Autopart Page"
msgid "_Encrypt automatically created mount points by default:"
msgstr "自动地加密默认创建的挂载点(_E)"
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:547
+msgid "Encrypt my data."
+msgstr "加密我的数据(_E)。"
+
#: pyanaconda/ui/gui/spokes/lib/resize.py:54
msgid "Preserve"
msgstr "保留"
@@ -1990,7 +1998,7 @@ msgstr "未注册。"
#: pyanaconda/ui/gui/spokes/subscription.py:1024
msgid "Registered with account {}"
-msgstr "已使用账户 {} 注册"
+msgstr "已使用帐户 {} 注册"
#: pyanaconda/ui/gui/spokes/subscription.py:1028
msgid "Registered with organization {}"
@@ -2821,7 +2829,7 @@ msgstr "正在检查存储配置..."
#: pyanaconda/ui/lib/users.py:35
msgid "Root account is disabled"
-msgstr "Root 账户已禁用"
+msgstr "Root 帐户已禁用"
#: pyanaconda/ui/lib/users.py:37
msgid "Root password is set"
@@ -5417,7 +5425,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"
@@ -5646,7 +5654,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
@@ -6454,12 +6462,12 @@ msgstr ""
#: pyanaconda/ui/gui/spokes/root_password.glade:97
msgctxt "GUI|Password"
msgid "_Disable root account"
-msgstr "禁用 root 账户(_D)"
+msgstr "禁用 root 帐户(_D)"
#: pyanaconda/ui/gui/spokes/root_password.glade:125
msgctxt "GUI|Password"
msgid "_Enable root account"
-msgstr "启用 root 账户(_E)"
+msgstr "启用 root 帐户(_E)"
#: pyanaconda/ui/gui/spokes/root_password.glade:146
msgid ""
@@ -7043,7 +7051,7 @@ msgstr "需要密码才能使用该帐户(_R)"
msgctxt "GUI|User"
msgid ""
"Add ad_ministrative privileges to this user account (wheel group membership)"
-msgstr "为此用户账户 (wheel 组成员) 添加管理权限(_M)"
+msgstr "为此用户帐户 (wheel 组成员) 添加管理权限(_M)"
#: pyanaconda/ui/gui/spokes/user.glade:269
msgctxt "GUI|User"
diff --git a/pyanaconda/modules/storage/bootloader/base.py b/pyanaconda/modules/storage/bootloader/base.py
index 533d528..d40086d 100644
--- a/pyanaconda/modules/storage/bootloader/base.py
+++ b/pyanaconda/modules/storage/bootloader/base.py
@@ -609,7 +609,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)
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
index 3a75565..b9344da 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -544,7 +544,7 @@ class CreateNewPage(BasePage):
)
self._createBox.attach(label, 0, 6, 2, 1)
- checkbox = Gtk.CheckButton(label="Encrypt my data.")
+ checkbox = Gtk.CheckButton(label=_("Encrypt my data."))
checkbox.connect("toggled", encrypted_changed_cb)
checkbox.set_active(default_encryption)
checkbox.set_margin_start(18)
--
2.27.0