diff --git a/PKGBUILD b/PKGBUILD index 4c7415a..723aaa3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,6 +12,8 @@ license=(GPL2) depends=('bash' 'dialog') makedepends=('git') +optdepends=('maia-console' + 'terminus-font') source=("git+$url.git#branch=master") md5sums=('SKIP') diff --git a/data/translations/danish.trans b/data/translations/danish.trans index 74c78cc..83bf6f5 100644 --- a/data/translations/danish.trans +++ b/data/translations/danish.trans @@ -272,6 +272,7 @@ _InstGrub="Install Grub" # translate me ! # Install BIOS Bootloader _InstBiosBtTitle="Installer BIOS Bootloader" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="Grub2 is anbefalet for uerfarne brugere. Den ønskede enhed kan også vælges.\n\nSyslinux er enklere alternativ men vil kun fungere med et ext/btrfs filsystem." _InstSysTitle="Installer Syslinux" _InstSysBody="Installer syslinux i Master Boot Record (MBR) eller Root (/)?" diff --git a/data/translations/dutch.trans b/data/translations/dutch.trans index 239b1ea..18b4cdb 100644 --- a/data/translations/dutch.trans +++ b/data/translations/dutch.trans @@ -271,6 +271,7 @@ _InstGrub="Install Grub" # translate me ! # Installeer BIOS Bootloader _InstBiosBtTitle="Installeer BIOS Bootlader" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="Grub2 is aanbevolen voor beginners. De installatieschijf kan ook worden geselecteerd.\n\nSyslinux is een lichter en eenvoudiger alternatief dat enkel werkt met de ext/btrfs -bestandsystemen." _InstSysTitle="Installeer Syslinux" _InstSysBody="Installeer syslinux op Master Boot Record (MBR) of op Root (/)?" diff --git a/data/translations/english.trans b/data/translations/english.trans index e30f0a6..1a2be64 100644 --- a/data/translations/english.trans +++ b/data/translations/english.trans @@ -270,6 +270,7 @@ _InstGrub="Install Grub" # Install BIOS Bootloader _InstBiosBtTitle="Install BIOS Bootloader" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." _InstBiosBtBody="Grub2 is recommended for beginners. The installation device can also be selected.\n\nSyslinux is a lighter and simpler alternative that will only work with ext/btrfs filesystems." _InstSysTitle="Install Syslinux" _InstSysBody="Install syslinux to Master Boot Record (MBR) or to Root (/)?" diff --git a/data/translations/french.trans b/data/translations/french.trans index f13400a..720b192 100644 --- a/data/translations/french.trans +++ b/data/translations/french.trans @@ -272,6 +272,7 @@ _InstGrub="Installer Grub" # Installer le chargeur d'amorçage BIOS _InstBiosBtTitle="Installer le chargeur d'amorçage BIOS" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="Grub2 est recommandé pour les débutants. Le périphérique d'installation peut également être sélectionné.\n\nSyslinux est une alternative simple et légère qui fonctionne uniquement avec les systèmes de fichiers ext/btrfs." _InstSysTitle="Installer Syslinux" _InstSysBody="Installer syslinux dans le Master Boot Record (MBR) ou à la racine (/) ?" diff --git a/data/translations/german.trans b/data/translations/german.trans index 809a6ea..3c3c0ab 100644 --- a/data/translations/german.trans +++ b/data/translations/german.trans @@ -270,7 +270,8 @@ _InstGrub="Installiere GRUB" # Install BIOS Bootloader _InstBiosBtTitle="Installiere BIOS Bootloader" -_InstBiosBtBody="Grub2 wird für Anfähnger empfohlen. Das Blockgerät für den Bootloader kann festgelegtwerden.\n\nSyslinux ist eine leichtere und simplere Alternative, die jedoch nur mit ext4/btrfs Dateisystemen funktioniert." +_InstGrubBody="Das Blockgerät für die Installation von GRUB kann im nächsten Schritt ausgewählt werden\n\Os-prober wird zur automatischen Erkennung von bereits installierten Systemen auf anderen Partitionen benötigt." +_InstBiosBtBody="Grub2 wird für Anfähnger empfohlen. Das Blockgerät für den Bootloader kann festgelegt werden.\n\nSyslinux ist eine leichtere und simplere Alternative, die jedoch nur mit ext4/btrfs Dateisystemen funktioniert." _InstSysTitle="Installiere Syslinux" _InstSysBody="Syslinux in den Master Boot Record (MBR) oder in Root (/) installieren?" diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans index 65fe262..d0df946 100644 --- a/data/translations/hungarian.trans +++ b/data/translations/hungarian.trans @@ -268,6 +268,7 @@ _InstGrub="Install Grub" # translate me ! # BIOS rendszertöltő telepítése _InstBiosBtTitle="BIOS rendszertöltő telepítése" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="A kezdők számára a 'Grub2' ajánlott. A telepítési eszköz is kiválasztható.\n\nA 'Syslinux' egy egyszerűbb és kevésbe erőforrás-igényes megoldás, de csak 'ext' vagy 'btrfs' fájlrendszereknél használható." _InstSysTitle="Syslinux telepítése" _InstSysBody="A 'Master Boot Record'-ba \(MBR\) vagy a Gyökérpartícióra \(/\) akarod a ‘syslinux’-ot telepíteni?" diff --git a/data/translations/italian.trans b/data/translations/italian.trans index 1633eba..0b097ea 100644 --- a/data/translations/italian.trans +++ b/data/translations/italian.trans @@ -271,6 +271,7 @@ _InstGrub="Install Grub" # translate me ! # Install BIOS Bootloader _InstBiosBtTitle="Installazione Bootloader BIOS" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="Grub2 è consigliato per i principianti. E' possibile specificare il dispositivo sul quale installarlo.\n\nSyslinux rappresenta un'alternativa più leggera e semplice che funzionerà solo con i filesystem ext/btrfs." _InstSysTitle="Installa Syslinux" _InstSysBody="Installare syslinux nel Master Boot Record (MBR) on in Root (/)?" diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans index 83436ce..51c2800 100644 --- a/data/translations/portuguese.trans +++ b/data/translations/portuguese.trans @@ -270,6 +270,7 @@ _InstGrub="Install Grub" # translate me ! # Instalar BIOS Bootloader _InstBiosBtTitle="Instalar BIOS Bootloader" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="Grub2 é recomendado para iniciantes. O dispositivo de instalação também pode ser seleccionado.\n\nSyslinux é uma alternativa mais leve e simples, que só funcionará com sistemas de arquivos ext/btrfs." _InstSysTitle="Instalar o Syslinux" _InstSysBody="Instalar o syslinux no Master Boot Record (MBR) ou para Root (/)?" diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans index 108cdc7..11499a9 100644 --- a/data/translations/portuguese_brasil.trans +++ b/data/translations/portuguese_brasil.trans @@ -271,6 +271,7 @@ _InstGrub="Install Grub" # translate me ! # Instalar o carregador de boot BIOS" _InstBiosBtTitle="Instalar o carregador de boot BIOS" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="Grub2 é recomendado para iniciantes. O dispositivo de instalação também pode ser selecionado.\n\nSyslinux é uma alternativa mais leve e simples, que só funcionará com sistemas de arquivos ext/btrfs." _InstSysTitle="Instalar o Syslinux" _InstSysBody="Instalar o syslinux no Master Boot Record (MBR) ou no Root (/)?" diff --git a/data/translations/russian.trans b/data/translations/russian.trans index 75cb239..671729f 100644 --- a/data/translations/russian.trans +++ b/data/translations/russian.trans @@ -271,6 +271,7 @@ _InstGrub="Установить GRUB" # Install BIOS Bootloader _InstBiosBtTitle="Установка загрузчика BIOS" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="Новичкам рекомендуется использовать Grub2. Устройство для установки также может быть выбрано.\n\nSyslinux более легкая и простая альтернитива, однако может работать только с файловыми системами ext/btrfs." _InstSysTitle="Установка Syslinux" _InstSysBody="Установить syslinux в Главную Загрузочную Запись (MBR) или в Root (/)?" diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans index 025526d..0c90b4b 100644 --- a/data/translations/spanish.trans +++ b/data/translations/spanish.trans @@ -271,6 +271,7 @@ _InstGrub="Install Grub" # translate me ! # Instalar gestor de arranque BIOS _InstBiosBtTitle="Instalar gestor de arranque BIOS" +_InstGrubBody="The installation device for GRUB can be selected in the next step.\n\nOs-prober is needed for automatic detection of already installed systems on other partitions." # translate me ! _InstBiosBtBody="Se recomienda Grub2 para usuarios principiantes. También se puede seleccionar el dispositivo de instalación.\n\nSyslinux es una alternativa más ligera y más simple que sólo funciona con sistemas de archivos ext o btrfs." _InstSysTitle="Instalar Syslinux" _InstSysBody="¿Desea instalar 'syslinux' en el Registro de Arranque Maestro (MBR) o en la raíz (/)?" diff --git a/lib/util-base.sh b/lib/util-base.sh index fad943b..7af6ef2 100644 --- a/lib/util-base.sh +++ b/lib/util-base.sh @@ -409,7 +409,7 @@ DISABLED_FOR_NOW # Grub auto-detects installed kernels, etc. Syslinux does not, hence the extra code for it. bios_bootloader() { - DIALOG " $_InstBiosBtTitle " --menu "\n$_InstBiosBtBody\n " 0 0 2 \ + DIALOG " $_InstBiosBtTitle " --menu "\n$_InstGrubBody\n " 0 0 2 \ "grub" "" \ "grub + os-prober" "" 2>${PACKAGES} || return 0 clear diff --git a/lib/util.sh b/lib/util.sh index 4bb2bec..4c332b1 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -323,7 +323,7 @@ select_language() { ini linux.font "$FONT" # does user want to change the default keymap? - DIALOG " $_VCKeymapTitle " --yesno "\n${_DefKeymap}:\n\n[ ${KEYMAP} ]\n\n${_Change}\n " 0 0 && select_keymap + DIALOG " $_VCKeymapTitle " --yesno "\n${_DefKeymap}:\n\n[ ${KEYMAP} ]\n\n${_Change}\n " --defaultno 0 0 && select_keymap } select_keymap() {