Merge remote-tracking branch 'origin/SLE-15-SP6' into secure_boot_upd…

…ate_master

package/yast2-bootloader.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr  5 08:08:09 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
+
+- Follow up of previous change to use even more precise wording
+  (bsc#1219989,bsc#1222353)
+- 4.6.7
+
 -------------------------------------------------------------------
 Fri Mar 15 10:11:13 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
 

src/lib/bootloader/grub2_widgets.rb

@@ -389,16 +389,17 @@ def validate
           !value ||
           value == Systeminfo.secure_boot_active?
 
-        Yast::Popup.ContinueCancel(
-          _(
-            "The secure boot IPL works only on IBM z15, IBM LinuxONE III or later.\n" \
-            "Also note the following restrictions:" \
-            "NVMe disks work since IBM LinuxONE III.\n" \
-            "FC-attached SCSI disks need at least IBM LinuxONE III or IBM z15.\n" \
-            "ECKD DASDs with CDL layout work on IBM z16, LinuxONE 4 or newer.\n" \
-            "If these requirements are not met, the system will not IPL in secure mode."
+          Yast::Popup.ContinueCancel(
+            # TRANSLATORS: IPL stands for Initial Program Load, IBM speak for system boot
+            _(
+              "Secure boot IPL has the following minimum system requirements,\n" \
+              "depending on the boot device to be IPLed:\n" \
+              "NVMe disk: IBM LinuxONE III or newer.\n" \
+              "FC-attached SCSI disk: IBM LinuxONE III, IBM z15 or newer.\n" \
+              "ECKD DASD with CDL layout: IBM z16, LinuxONE 4 or newer.\n" \
+              "If these requirements are not met, the system can be IPLed in non-secure mode only."
+            )
           )
-        )
       end
     end