From 85240709b6ae61ba2259f0b314fc2c3754e78209 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Mon, 31 Dec 2018 22:59:51 +0100 Subject: [PATCH] Some strings correction --- archfi | 23 +++++++++-------------- lng/English | 3 +++ lng/French | 3 +++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/archfi b/archfi index 8831bca..31e5b97 100644 --- a/archfi +++ b/archfi @@ -1269,23 +1269,22 @@ archbootloadersyslinuxbmenu(){ archbootloadersyslinuxbmenu "$nextblitem" fi } - archsyslinuxinstall(){ clear if [ "$efimode" == "1" ]||[ "$efimode" == "2" ]; then - echo "Add efibootmgr to support your efi installation" + echo "$txtsyslinuxaddefibootmgr" additionalpkg=$additionalpkg"efibootmgr " fi if [ "$(parted ${realrootdev::8} print|grep gpt)" != "" ]; then - echo "Add gptfdisk to support your gpt disk" + echo "$txtsyslinuxaddgptfdisk" additionalpkg=$additionalpkg"gptfdisk " fi if [ "$bootdev" != "" ]; then if [ "$(parted $bootdev print|grep fat)" != "" ]; then - echo "Add mtools to support your fat boot partition" + echo "$txtsyslinuxaddmtools" additionalpkg=$additionalpkg"mtools " fi fi @@ -1306,7 +1305,6 @@ archsyslinuxinstall(){ pressanykey } - archsyslinuxinstallbootloader(){ clear if [ "$efimode" == "1" ]||[ "$efimode" == "2" ]; then @@ -1344,7 +1342,7 @@ archbootloadersystemdbmenu(){ options+=("${txtinstall//%1/systemd-boot}" "bootctl install") options+=("${txtedit//%1/loader.conf}" "($txtoptional)") options+=("${txtedit//%1/entries}" "($txtoptional)") - sel=$(whiptail --backtitle "$apptitle" --title "$txtbootloadersyslinuxmenu" --menu "" --cancel-button "$txtback" --default-item "$nextblitem" 0 0 0 \ + sel=$(whiptail --backtitle "$apptitle" --title "$txtbootloadersystemdmenu" --menu "" --cancel-button "$txtback" --default-item "$nextblitem" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) if [ "$?" = "0" ]; then @@ -1365,7 +1363,6 @@ archbootloadersystemdbmenu(){ archbootloadersystemdbmenu "$nextblitem" fi } - archsystemdinstall(){ clear archchroot systemdbootloaderinstall $realrootdev @@ -1403,16 +1400,10 @@ archsystemdinstall(){ sed -i "s/XXXX/$parttype/" /mnt/boot/loader/entries/arch.conf fi - - - cp /mnt/boot/loader/entries/arch.conf /mnt/boot/loader/entries/arch-fallback.conf sed -i "s/Arch Linux/Arch Linux Fallback/" /mnt/boot/loader/entries/arch-fallback.conf sed -i "s/initramfs-linux/initramfs-linux-fallback/" /mnt/boot/loader/entries/arch-fallback.conf - - - pressanykey } archsystemdinstallchroot(){ @@ -1448,7 +1439,6 @@ archbootloaderrefindmenu(){ fi } - archrefindinstall(){ clear @@ -1640,6 +1630,11 @@ loadstrings(){ txtgrubluksdetected="Encrypted root partion !\n\nAdd cryptdevice= to GRUB_CMDLINE_LINUX in /etc/default/grub ?" txtbootloadersyslinuxmenu="Syslinux Install Menu" + txtsyslinuxaddefibootmgr="EFI install require efibootmgr" + txtsyslinuxaddgptfdisk="GPT disk require gptfdisk" + txtsyslinuxaddmtools="FAT boot part require mtools" + + txtbootloadersystemdmenu="Systemd-boot Install Menu" txtbootloaderrefindmenu="rEFInd Install Menu" diff --git a/lng/English b/lng/English index 73a4410..36c084b 100644 --- a/lng/English +++ b/lng/English @@ -80,6 +80,9 @@ txtrungrubmakeconfig="Run grub-mkconfig ?" txtgrubluksdetected="Encrypted root partion !\n\nAdd cryptdevice= to GRUB_CMDLINE_LINUX in /etc/default/grub ?" txtbootloadersyslinuxmenu="Syslinux Install Menu" +txtsyslinuxaddefibootmgr="EFI install require efibootmgr" +txtsyslinuxaddgptfdisk="GPT disk require gptfdisk" +txtsyslinuxaddmtools="FAT boot part require mtools" txtbootloaderrefindmenu="rEFInd Install Menu" diff --git a/lng/French b/lng/French index ca31da0..6f3de89 100644 --- a/lng/French +++ b/lng/French @@ -80,6 +80,9 @@ txtrungrubmakeconfig="Exécuter grub-mkconfig ?" txtgrubluksdetected="Partition root cryptée !\n\nAjouter cryptdevice= to GRUB_CMDLINE_LINUX dans /etc/default/grub ?" txtbootloadersyslinuxmenu="Menu Installation Syslinux" +txtsyslinuxaddefibootmgr="Une installation EFI nécessite efibootmgr" +txtsyslinuxaddgptfdisk="Un disque GPT nécessite gptfdisk" +txtsyslinuxaddmtools="Un partition de boot FAT nécessite mtools" txtbootloaderrefindmenu="Menu Installation rEFInd"