Some strings correction

This commit is contained in:
MatMoul 2018-12-31 22:59:51 +01:00
parent c4dac15291
commit 85240709b6
3 changed files with 15 additions and 14 deletions

23
archfi
View file

@ -1269,23 +1269,22 @@ archbootloadersyslinuxbmenu(){
archbootloadersyslinuxbmenu "$nextblitem" archbootloadersyslinuxbmenu "$nextblitem"
fi fi
} }
archsyslinuxinstall(){ archsyslinuxinstall(){
clear clear
if [ "$efimode" == "1" ]||[ "$efimode" == "2" ]; then if [ "$efimode" == "1" ]||[ "$efimode" == "2" ]; then
echo "Add efibootmgr to support your efi installation" echo "$txtsyslinuxaddefibootmgr"
additionalpkg=$additionalpkg"efibootmgr " additionalpkg=$additionalpkg"efibootmgr "
fi fi
if [ "$(parted ${realrootdev::8} print|grep gpt)" != "" ]; then if [ "$(parted ${realrootdev::8} print|grep gpt)" != "" ]; then
echo "Add gptfdisk to support your gpt disk" echo "$txtsyslinuxaddgptfdisk"
additionalpkg=$additionalpkg"gptfdisk " additionalpkg=$additionalpkg"gptfdisk "
fi fi
if [ "$bootdev" != "" ]; then if [ "$bootdev" != "" ]; then
if [ "$(parted $bootdev print|grep fat)" != "" ]; then if [ "$(parted $bootdev print|grep fat)" != "" ]; then
echo "Add mtools to support your fat boot partition" echo "$txtsyslinuxaddmtools"
additionalpkg=$additionalpkg"mtools " additionalpkg=$additionalpkg"mtools "
fi fi
fi fi
@ -1306,7 +1305,6 @@ archsyslinuxinstall(){
pressanykey pressanykey
} }
archsyslinuxinstallbootloader(){ archsyslinuxinstallbootloader(){
clear clear
if [ "$efimode" == "1" ]||[ "$efimode" == "2" ]; then if [ "$efimode" == "1" ]||[ "$efimode" == "2" ]; then
@ -1344,7 +1342,7 @@ archbootloadersystemdbmenu(){
options+=("${txtinstall//%1/systemd-boot}" "bootctl install") options+=("${txtinstall//%1/systemd-boot}" "bootctl install")
options+=("${txtedit//%1/loader.conf}" "($txtoptional)") options+=("${txtedit//%1/loader.conf}" "($txtoptional)")
options+=("${txtedit//%1/entries}" "($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[@]}" \ "${options[@]}" \
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
@ -1365,7 +1363,6 @@ archbootloadersystemdbmenu(){
archbootloadersystemdbmenu "$nextblitem" archbootloadersystemdbmenu "$nextblitem"
fi fi
} }
archsystemdinstall(){ archsystemdinstall(){
clear clear
archchroot systemdbootloaderinstall $realrootdev archchroot systemdbootloaderinstall $realrootdev
@ -1403,16 +1400,10 @@ archsystemdinstall(){
sed -i "s/XXXX/$parttype/" /mnt/boot/loader/entries/arch.conf sed -i "s/XXXX/$parttype/" /mnt/boot/loader/entries/arch.conf
fi fi
cp /mnt/boot/loader/entries/arch.conf /mnt/boot/loader/entries/arch-fallback.conf 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/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 sed -i "s/initramfs-linux/initramfs-linux-fallback/" /mnt/boot/loader/entries/arch-fallback.conf
pressanykey pressanykey
} }
archsystemdinstallchroot(){ archsystemdinstallchroot(){
@ -1448,7 +1439,6 @@ archbootloaderrefindmenu(){
fi fi
} }
archrefindinstall(){ archrefindinstall(){
clear clear
@ -1640,6 +1630,11 @@ loadstrings(){
txtgrubluksdetected="Encrypted root partion !\n\nAdd cryptdevice= to GRUB_CMDLINE_LINUX in /etc/default/grub ?" txtgrubluksdetected="Encrypted root partion !\n\nAdd cryptdevice= to GRUB_CMDLINE_LINUX in /etc/default/grub ?"
txtbootloadersyslinuxmenu="Syslinux Install Menu" 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" txtbootloaderrefindmenu="rEFInd Install Menu"

View file

@ -80,6 +80,9 @@ txtrungrubmakeconfig="Run grub-mkconfig ?"
txtgrubluksdetected="Encrypted root partion !\n\nAdd cryptdevice= to GRUB_CMDLINE_LINUX in /etc/default/grub ?" txtgrubluksdetected="Encrypted root partion !\n\nAdd cryptdevice= to GRUB_CMDLINE_LINUX in /etc/default/grub ?"
txtbootloadersyslinuxmenu="Syslinux Install Menu" txtbootloadersyslinuxmenu="Syslinux Install Menu"
txtsyslinuxaddefibootmgr="EFI install require efibootmgr"
txtsyslinuxaddgptfdisk="GPT disk require gptfdisk"
txtsyslinuxaddmtools="FAT boot part require mtools"
txtbootloaderrefindmenu="rEFInd Install Menu" txtbootloaderrefindmenu="rEFInd Install Menu"

View file

@ -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 ?" txtgrubluksdetected="Partition root cryptée !\n\nAjouter cryptdevice= to GRUB_CMDLINE_LINUX dans /etc/default/grub ?"
txtbootloadersyslinuxmenu="Menu Installation Syslinux" 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" txtbootloaderrefindmenu="Menu Installation rEFInd"