From 3528df462f4aa74100b79f917c1c41375c029cbf Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Thu, 28 Feb 2019 11:18:06 +0100 Subject: [PATCH] make help texts consistent --- src/lib/bootloader/generic_widgets.rb | 7 ++-- src/lib/bootloader/grub2_widgets.rb | 49 +++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/lib/bootloader/generic_widgets.rb b/src/lib/bootloader/generic_widgets.rb index 4b8ab28fb..deadf9c13 100644 --- a/src/lib/bootloader/generic_widgets.rb +++ b/src/lib/bootloader/generic_widgets.rb @@ -73,9 +73,10 @@ def handle def help _( - "

Boot Loader Type
\n" \ - "To select whether to install a boot loader and which bootloader to install,\n" \ - "use Boot Loader.

" + "

Boot Loader\n" \ + "specifies which bootloader to install. Can be also specified None " \ + "which mean that bootloader configuration is not managed by YaST2 and also " \ + "kernel post install script does not update bootloader configuration." ) end end diff --git a/src/lib/bootloader/grub2_widgets.rb b/src/lib/bootloader/grub2_widgets.rb index 307cbc30b..8de021667 100644 --- a/src/lib/bootloader/grub2_widgets.rb +++ b/src/lib/bootloader/grub2_widgets.rb @@ -57,8 +57,8 @@ def label end def help - _("

Timeout in Seconds
\n" \ - "Specifies the time the bootloader will wait until the default kernel is loaded.

\n") + _("

Timeout in Seconds\n" \ + "specifies the time the bootloader will wait until the default kernel is loaded.

\n") end def init @@ -94,8 +94,8 @@ def label def help _( - "

Set active Flag in Partition Table for Boot Partition
\n" \ - "To activate the partition which contains the boot loader." \ + "

Set active Flag in Partition Table for Boot Partition\n" \ + "specify if the partition which contains the boot loader will have active flag." \ " The generic MBR code will then\n" \ "boot the active partition. Older BIOSes require one partition to be active even\n" \ "if the boot loader is installed in the MBR.

" @@ -272,7 +272,7 @@ def label end def help - _("Tick to enable UEFI Secure Boot\n") + _("

Enable Secure Boot Support if checked enable UEFI Secure Boot.

") end def init @@ -299,15 +299,17 @@ def label def help # TRANSLATORS: TrustedGRUB2 is a name, don't translate it res = _("

Trusted Boot will install TrustedGRUB2\n" \ - "instead of regular GRUB2.

\n" \ - "

It means measuring the integrity of the boot process,\n" \ + "instead of regular GRUB2." \ + "It means measuring the integrity of the boot process,\n" \ "with the help from the hardware (a TPM, Trusted Platform Module,\n" \ - "chip).

\n") + "chip).\n") if grub2.name == "grub2" - res += _("

First you need to make sure Trusted Boot is enabled in the BIOS\n" \ - "setup (the setting may be named Security Chip, for example).

\n") + res += _(" First you need to make sure Trusted Boot is enabled in the BIOS\n" \ + "setup (the setting may be named Security Chip, for example).\n") end + res += "

" + res end @@ -435,16 +437,16 @@ def store def help _( - "

Protect Boot Loader with Password
\n" \ - "At boot time, modifying or even booting any entry will require the" \ + "

Protect Boot Loader with Password\n" \ + "at boot time, modifying or even booting any entry will require the" \ " password. If Protect Entry Modification Only is checked then " \ "booting any entry is not restricted but modifying entries requires " \ "the password (which is the way GRUB 1 behaved). As side-effect of " \ "this option, rd.shell=0 is added to kernel parameters, to prevent " \ - "an unauthorized access to the initrd shell.
" \ + "an unauthorized access to the initrd shell. " \ "YaST will only accept the password if you repeat it in " \ "Retype Password. The password applies to the GRUB2 user 'root' " \ - "which is distinct from the Linux 'root'. YaST currently does not support" \ + "which is distinct from the Linux 'root'. YaST currently does not support " \ "other GRUB2 users. If you need them, use a separate GRUB2 script.

" ) end @@ -475,11 +477,11 @@ def contents def help # Translators: do not translate the quoted parts like "unit" _( - "

When a graphical console is used it allows to use various " \ + "

Use graphical console when checked it allows to use various " \ "display resolutions. The auto option tries to find " \ "the best one when booting starts.

\n" \ - "

When a serial console is used the boot output " \ - "will be printed to a serial device like ttyS0. " \ + "

Use serial console when checked it redirect the boot output " \ + "a serial device like ttyS0. " \ "At least the --unit option has to be specified, " \ "and the complete syntax is %s. " \ "Other parts are optional and if not set, a default is used. " \ @@ -671,12 +673,9 @@ def label def help _( - "

By pressing Set as Default you mark the selected section as\n" \ - "the default. When booting, the boot loader will provide a boot menu and\n" \ - "wait for the user to select a kernel or OS to boot. If no\n" \ - "key is pressed before the timeout, the default kernel or OS will\n" \ - "boot. The order of the sections in the boot loader menu can be changed\n" \ - "using the Up and Down buttons.

\n" + "

Default Boot Section selects boot section to be booted as default.\n" \ + " If YaST2 does not know yet naming of sections, it will be empty and default \n" \ + "is let on grub2 itself.

" \ ) end @@ -819,8 +818,8 @@ def help textdomain "bootloader" _( - "

Disks Order
\n" \ - "To specify the order of the disks according to the order in BIOS, use\n" \ + "

Edit Disk Boot Order\n" \ + "allows to specify the order of the disks according to the order in BIOS, use\n" \ "the Up and Down buttons to reorder the disks.\n" \ "To add a disk, push Add.\n" \ "To remove a disk, push Remove.

"