Merge branch 'master' of https://github.com/Chrysostomus/manjaro-architect

data/translations/danish.trans

@@ -263,6 +263,7 @@ _InstStandBase="Standard Installation"
 _InstAdvBase="Avanceret Installation"
 _InstAdvBseBody="\nADVARSEL: Dette er kun for erfarne brugere. Brugere med mindre erfaring bør vælge 'standard' installation."
 _InstAdvWait="\nIndsamler pakke oplysninger."
+_InstGrub="Install Grub"        # translate me !
 
 # Install BIOS Bootloader
 _InstBiosBtTitle="Installer BIOS Bootloader"
@@ -342,6 +343,10 @@ _ChsInit="Vælg system type"
 _WarnOrc="Nogle Manjaro udgaver som Gnome kan ikke bruges med openrc"
 _ChsAddPkgs="Vælg ekstra moduler til kernen"
 _InstBootldr="Installer Bootloader"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards\nmay need special drivers.\nOptions 1 and 2 choose drivers automatically,\noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Configure Base Menu
 _ConfBseMenuTitle="Opsætning af Manjaro Base"
@@ -375,6 +380,8 @@ _InstGrMenuDM="Installer Display Manager"
 
 # Networking Menu
 _InstNMMenuTitle="Installerer Netværk"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nEkstra pakker kan være nødvendige for netværk og trådløse enheder. Nogle trådløse enheder kan kræve ekstra firmware for at fungere.\n\n"
 _InstNMMenuPkg="Installerer Trådløse enheder"
 _InstNMMenuNM="Installerer Network Connection Manager"

data/translations/dutch.trans

@@ -262,6 +262,7 @@ _InstStandBase="Standaard Installatie"
 _InstAdvBase="Geadvanceerde Installatie"
 _InstAdvBseBody="\nWAARSCHUWING: Dit is enkel voor ervaren gebruikers. Nieuwere gebruikers gebruiken best de 'standaard' installatie optie."
 _InstAdvWait="\nVerzameling pakketbeschrijvingen."
+_InstGrub="Install Grub"        # translate me !
 
 # Installeer BIOS Bootloader
 _InstBiosBtTitle="Installeer BIOS Bootlader"
@@ -341,6 +342,10 @@ _ChsInit="Choose your initsystem"                                        # trans
 _WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
 _ChsAddPkgs="Choose additional modules for your kernels"                 # translate me !
 _InstBootldr="Installeer de Bootlader"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards\nmay need special drivers.\nOptions 1 and 2 choose drivers automatically,\noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Configureer het basissysteem
 _ConfBseMenuTitle=" Configureer het Basissysteem"
@@ -374,6 +379,8 @@ _InstGrMenuDM="Installeer Weergave Manager"
 
 # Netwerk Menu
 _InstNMMenuTitle="Installeer Netwerk mogelijkheden"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nAanvullende pakketten kunnen nodig zijn om netwerken en draadloze apparaten aan te sturen. Sommige draadloze apparaten kunnen ook extra firmware nodig hebben om te functioneren.\n\n"
 _InstNMMenuPkg="Install Wireless Device Packages"
 _InstNMMenuNM="Installeer Netwerkmanager"

data/translations/english.trans

@@ -261,6 +261,7 @@ _InstStandBase="Standard Installation"
 _InstAdvBase="Advanced Installation"
 _InstAdvBseBody="\nWARNING: This is for experienced users only. Newer users should use the 'standard' installation option."
 _InstAdvWait="\nGathering package descriptions."
+_InstGrub="Install Grub"
 
 # Install BIOS Bootloader
 _InstBiosBtTitle="Install BIOS Bootloader"
@@ -340,6 +341,10 @@ _ChsInit="Choose your initsystem"
 _WarnOrc="Some manjaro editions like gnome are incompatible with openrc"
 _ChsAddPkgs="Choose additional modules for your kernels"
 _InstBootldr="Install Bootloader"
+_InstDrvTitle="Install Hardware Drivers"
+_InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOptions 1 and 2 choose drivers automatically, \noptions 3 and 4 let you choose specific drivers"
+_InstFree="Install free drivers"
+_InstProp="Install proprietary drivers"
 
 # Configure Base Menu
 _ConfBseMenuTitle="Configure Base"
@@ -373,6 +378,8 @@ _InstGrMenuDM="Install Display Manager"
 
 # Networking Menu
 _InstNMMenuTitle="Install Networking Capabilties"
+_InstNWDrv="Install Network Drivers"
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."
 _InstNMMenuBody="\nSupplementary packages may be required for networking and wireless devices. Some wireless devices may also require additional firmware to function.\n\n"
 _InstNMMenuPkg="Install Wireless Device Packages"
 _InstNMMenuNM="Install Network Connection Manager"

data/translations/french.trans

@@ -263,6 +263,7 @@ _InstStandBase="Installation standard"
 _InstAdvBase="Installation avancée"
 _InstAdvBseBody="\nAVERTISSEMENT : Utilisateurs avancés uniquement. Pour les nouveaux utilisateurs, utiliser l'option d'installation standard."
 _InstAdvWait="\nCollecte des descriptions de paquet."
+_InstGrub="Install Grub"        # translate me !
 
 # Installer le chargeur d'amorçage BIOS
 _InstBiosBtTitle="Installer le chargeur d'amorçage BIOS"
@@ -342,6 +343,10 @@ _ChsInit="Choisir son système d'init"
 _WarnOrc="Quelques éditions manjaro comme gnome sont incompatibles avec openrc"
 _ChsAddPkgs="Choisir des modules additionnels pour le noyau"
 _InstBootldr="Installer le chargeur d'amorçage"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards\nmay need special drivers.\nOptions 1 and 2 choose drivers automatically,\noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Configurer le menu de Base
 _ConfBseMenuTitle="Configurer Base"
@@ -375,6 +380,8 @@ _InstGrMenuDM="Installer le gestionnaire d'affichage"
 
 # Menu de gestion de réseau
 _InstNMMenuTitle="Installer les capacités de gestion de réseau"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nDes paquets supplémentaires peuvent être nécessaires pour les périphériques WIFI et la gestion de réseau. Certains périphériques WIFI nécessitent également un microcode additionnel pour fonctionner.\n\n"
 _InstNMMenuPkg="Installer les paquets du périphérique WIFI"
 _InstNMMenuNM="Installer le gestionnaire de connexion réseau"

data/translations/german.trans

@@ -261,6 +261,7 @@ _InstStandBase="Standard Installation"
 _InstAdvBase="Advanced Installation"
 _InstAdvBseBody="\nWARNING: This is for experienced users only. Newer users should use the 'standard' installation option."
 _InstAdvWait="\nGathering package descriptions."
+_InstGrub="Install Grub"        # translate me !
 
 # Install BIOS Bootloader
 _InstBiosBtTitle="Install BIOS Bootloader"
@@ -340,6 +341,10 @@ _ChsInit="Choose your initsystem"                                        # trans
 _WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
 _ChsAddPkgs="Choose additional modules for your kernels"                 # translate me !
 _InstBootldr="Install Bootloader"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards\nmay need special drivers.\nOptions 1 and 2 choose drivers automatically,\noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Configure Base Menu
 _ConfBseMenuTitle="Configure Base"
@@ -373,6 +378,8 @@ _InstGrMenuDM="Install Display Manager"
 
 # Networking Menu
 _InstNMMenuTitle="Install Networking Capabilties"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nSupplementary packages may be required for networking and wireless devices. Some wireless devices may also require additional firmware to function.\n\n"
 _InstNMMenuPkg="Install Wireless Device Packages"
 _InstNMMenuNM="Install Network Connection Manager"

data/translations/hungarian.trans

@@ -257,6 +257,7 @@ _InstStandBase="Normál telepítés"
 _InstAdvBase="Haladó telepítés"
 _InstAdvBseBody="\nFIGYELEM: Ez csak tapasztalt felhasználók részére ajánlott. Kezdő felhasználók használják a ‘normál’ telepítési módot."
 _InstAdvWait="\nCsomagleírók összegyűjtése"
+_InstGrub="Install Grub"        # translate me !
 
 # BIOS rendszertöltő telepítése
 _InstBiosBtTitle="BIOS rendszertöltő telepítése"
@@ -336,6 +337,10 @@ _ChsInit="Válaszd ki az ‘init’ rendszert"
 _WarnOrc="Egyes asztali környezetek, mint például a GNOME, nem kompatibilisek az ‘openrc’-vel"
 _ChsAddPkgs="Válassz további kernelmodulokat"
 _InstBootldr="Rendszertöltő telepítése"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards\nmay need special drivers.\nOptions 1 and 2 choose drivers automatically,\noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Alapbeállítás menü
 _ConfBseMenuTitle="Alaprendszer  beállítása"
@@ -368,6 +373,8 @@ _InstGrMenuDM="Bejelentkezéskezelő telepítése"
 
 # Hálózatok Menü
 _InstNMMenuTitle="Hálózati eszközkezelő(k) telepítése"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nTovábbi, kiegészítő csomagokra is szükség lehet a hálózati és vezeték nélküli eszközök megfelelő működéséhez. Bizonyos vezeték nélküli eszközök számára további 'firmware'-re is szükség lehet.\n\n"
 _InstNMMenuPkg="Csomagok telepítése vezeték nélküli eszközökhöz"
 _InstNMMenuNM="Hálózatkezelő alkalmazás telepítése"

data/translations/italian.trans

@@ -262,6 +262,7 @@ _InstStandBase="Installazione Standard"
 _InstAdvBase="Installazione Avanzata"
 _InstAdvBseBody="\nATTENZIONE: solo per utenti esperti. Per i principianti è consigliato selezionare l'opzione di installazione 'standard'."
 _InstAdvWait="\nRaccolta descrizioni pacchetti."
+_InstGrub="Install Grub"        # translate me !
 
 # Install BIOS Bootloader
 _InstBiosBtTitle="Installazione Bootloader BIOS"
@@ -340,7 +341,11 @@ _InstBse="Installa Pacchetti Base"
 _ChsInit="Choose your initsystem"                                        # translate me !
 _WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
 _ChsAddPkgs="Choose additional modules for your kernels"                 # translate me !
-_InstBootldr="Installa il  Bootloader"
+_InstBootldr="Installa il Bootloader"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOptions 1 and 2 choose drivers automatically, \noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Configure Base Menu
 _ConfBseMenuTitle="Configurazione di base"
@@ -374,6 +379,8 @@ _InstGrMenuDM="Installazione Display Manager"
 
 # Networking Menu
 _InstNMMenuTitle="Installazione Funzioni di Rete"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nPotrebbero essere richiesti pacchetti aggiuntivi per funzionalità di rete e dispositivi wireless. Alcune schede wireless potrebbero richiedere firmware appositi per funzionare.\n\n"
 _InstNMMenuPkg="Installazione pacchetti per Dispositivi Wireless"
 _InstNMMenuNM="Installazione Network Connection Manager"

data/translations/portuguese.trans

@@ -261,6 +261,7 @@ _InstStandBase="Instalação Padrão"
 _InstAdvBase="Instalação Avançada"
 _InstAdvBseBody="\nATENÇÃO: Isto é apenas para usuários experientes. Usuários novatos devem utilizar a opção de instalação 'padrão'."
 _InstAdvWait="\nReunindo descrições dos pacotes."
+_InstGrub="Install Grub"        # translate me !
 
 # Instalar BIOS Bootloader
 _InstBiosBtTitle="Instalar BIOS Bootloader"
@@ -340,6 +341,10 @@ _ChsInit="Choose your initsystem"                                        # trans
 _WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
 _ChsAddPkgs="Choose additional modules for your kernels"                 # translate me !
 _InstBootldr="Instalar Bootloader"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOptions 1 and 2 choose drivers automatically, \noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Configurar Menu Base
 _ConfBseMenuTitle="Configurar Base"
@@ -373,6 +378,8 @@ _InstGrMenuDM="Instalar o Gerenciador de Exibição"
 
 # Menu Rede
 _InstNMMenuTitle="Instalar os Recursos de Rede"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nPodem ser necessários pacotes suplementares para a rede e dispositivos sem fios. Alguns dispositivos sem fios também podem exigir firmware adicionais para funcionar.\n\n"
 _InstNMMenuPkg="Instalar os Pacotes do Dispositivo sem fios"
 _InstNMMenuNM="Instalar o Gerenciador de Conexão de Rede"

data/translations/portuguese_brasil.trans

@@ -262,6 +262,7 @@ _InstStandBase="Instalação padrão"
 _InstAdvBase="Instalação avançada"
 _InstAdvBseBody="\nATENÇÃO: Isto é apenas para usuários experientes. Usuários novatos devem utilizar a opção de instalação 'padrão'."
 _InstAdvWait="\nReunindo descrições dos pacotes."
+_InstGrub="Install Grub"        # translate me !
 
 # Instalar o carregador de boot BIOS"
 _InstBiosBtTitle="Instalar o carregador de boot BIOS"
@@ -340,7 +341,11 @@ _InstBse="Instalar pacotes Base"
 _ChsInit="Choose your initsystem"                                        # translate me !
 _WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
 _ChsAddPkgs="Choose additional modules for your kernels"                 # translate me !
-_InstBootldr="Instalar o carregador do sistema "
+_InstBootldr="Instalar o carregador do sistema"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOptions 1 and 2 choose drivers automatically, \noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Configurar Menu Base
 _ConfBseMenuTitle="Configurar Base"
@@ -374,6 +379,8 @@ _InstGrMenuDM="Instalar o gerenciador de exibição"
 
 # Menu Rede
 _InstNMMenuTitle="Instalar os recursos de rede"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nPodem ser necessários pacotes suplementares para a rede e dispositivos sem fios. Alguns dispositivos sem fios também podem exigir firmware adicionais para funcionar.\n\n"
 _InstNMMenuPkg="Instalar os pacotes do dispositivo sem fios"
 _InstNMMenuNM="Instalar o gerenciador de conexão de rede"

data/translations/russian.trans

@@ -262,6 +262,7 @@ _InstStandBase="Стандартная установка"
 _InstAdvBase="Расширенная установка"
 _InstAdvBseBody="\nПРЕДУПРЕЖДЕНИЕ: Только для опытных пользователей. Новые пользователи должны использовать опцию 'стандартной' установки."
 _InstAdvWait="\nПолучение описания пакетов."
+_InstGrub="Install Grub"        # translate me !
 
 # Install BIOS Bootloader
 _InstBiosBtTitle="Установка загрузчика BIOS"
@@ -341,6 +342,10 @@ _ChsInit="Choose your initsystem"                                        # trans
 _WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
 _ChsAddPkgs="Choose additional modules for your kernels"                 # translate me !
 _InstBootldr="Установить загрузчик"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOptions 1 and 2 choose drivers automatically, \noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Configure Base Menu
 _ConfBseMenuTitle="Настройка базовой системы"
@@ -374,6 +379,8 @@ _InstGrMenuDM="Установка экранного менеджера"
 
 # Networking Menu
 _InstNMMenuTitle="Установка сетевых возможностей"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nДополнительные пакеты могут быть необходимы для работы сети и беспроводных устройств. Также некоторые беспроводные устройства могут требовать дополнитеьную прошивку для работы.\n\n"
 _InstNMMenuPkg="Установка пакетов беспроводных устройств"
 _InstNMMenuNM="Установка менеджера сети"

data/translations/spanish.trans

@@ -262,6 +262,7 @@ _InstStandBase="Instalación estándar"
 _InstAdvBase="Instalación avanzada"
 _InstAdvBseBody="\nAVISO: Ésto es sólo para usuarios experimentados. Los usuarios novatos deberían utilizar la opción de instalación estándar."
 _InstAdvWait="\nRecopilando información de paquetes."
+_InstGrub="Install Grub"        # translate me !
 
 # Instalar gestor de arranque BIOS
 _InstBiosBtTitle="Instalar gestor de arranque BIOS"
@@ -341,6 +342,10 @@ _ChsInit="Choose your initsystem"                                        # trans
 _WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
 _ChsAddPkgs="Choose additional modules for your kernels"                 # translate me !
 _InstBootldr="Instalar gestor de arranque"
+_InstDrvTitle="Install Hardware Drivers"                                 # translate me !
+_InstDrvBody="Some network and graphics cards \nmay need special drivers. \nOptions 1 and 2 choose drivers automatically, \noptions 3 and 4 let you choose specific drivers"                       # translate me !
+_InstFree="Install free drivers"                                         # translate me !
+_InstProp="Install proprietary drivers"                                  # translate me !
 
 # Menú de configuración del sistema base
 _ConfBseMenuTitle="Configurar sistema base"
@@ -374,6 +379,8 @@ _InstGrMenuDM="Instalar gestor de pantalla"
 
 # Menú de redes
 _InstNMMenuTitle="Instalar componentes de red"
+_InstNWDrv="Network Drivers"                                                                            # translate me !
+_InfoNWKernel="Support for your network card is built into the kernel, \nno need to install anything."  # translate me !
 _InstNMMenuBody="\nPueden ser necesarios paquetes complementarios para los dispositivos de red e inalámbricos. Algunos dispositivos ianlámbricos pueden requerir firmwares adicionales para funcionar.\n\n"
 _InstNMMenuPkg="Instalar paquetes de dispositivo inalámbrico"
 _InstNMMenuNM="Instalar administrador de conexiones"

lib/util-base.sh

@@ -13,7 +13,6 @@
 setup_profiles() {
     # setup profiles with either git or package 
     if [[ -e /tmp/.git_profiles ]]; then 
-        
         PROFILES="$DATADIR/profiles"
         clear
         # install git if not already installed
@@ -26,18 +25,15 @@ setup_profiles() {
             git clone --depth 1 https://github.com/manjaro/iso-profiles.git $PROFILES 2>$ERR
             check_for_error "clone profiles repo" $?
         fi
-        
     else
         PROFILES="/usr/share/manjaro-tools/iso-profiles"
         # Only show this information box once
         clear
         pacman -Sy --noconfirm $p manjaro-iso-profiles-{base,official,community} 2>$ERR
         check_for_error "update profiles pkgs" $?
-        
     fi
 }
 
-
 enable_services() {
         # Enable services in the chosen profile
         echo "Enabling services"
@@ -95,14 +91,11 @@ enable_services() {
                 sleep 2
             fi
         fi
-
 }
 
-
 install_extra() {
 
     # Offer to install various "common" packages.
-
     DIALOG " $_InstComTitle " --checklist "\n$_InstComBody\n\n$_UseSpaceBar" 0 50 20 \
       "manjaro-settings-manager" "-" off \
       "pamac" "-" off \
@@ -219,7 +212,6 @@ filter_packages() {
         mv /tmp/.tmp /mnt/.base
 }
 
-
 install_base() {
     # Prep variables
     setup_profiles
@@ -366,7 +358,7 @@ uefi_bootloader() {
     basestrap ${MOUNTPOINT} grub efibootmgr dosfstools 2>$ERR
     check_for_error "$FUNCNAME grub" $?
 
-    DIALOG " Grub-install " --infobox "$_PlsWaitBody" 0 0
+    DIALOG " $_InstGrub " --infobox "$_PlsWaitBody" 0 0
     # if root is encrypted, amend /etc/default/grub
     boot_encrypted_setting
     #install grub
@@ -426,7 +418,6 @@ uefi_bootloader() {
             [[ $LUKS_DEV != "" ]] && sed -i "s~rw~$LUKS_DEV rw~g" ${i}
         done
 DISABLED_FOR_NOW
-
 }
 
 # Grub auto-detects installed kernels, etc. Syslinux does not, hence the extra code for it.
@@ -449,7 +440,7 @@ bios_bootloader() {
             boot_encrypted_setting
             # If a device has been selected, configure
             if [[ $DEVICE != "" ]]; then
-                DIALOG " Grub-install " --infobox "$_PlsWaitBody" 0 0
+                DIALOG " $_InstGrub " --infobox "$_PlsWaitBody" 0 0
                 arch_chroot "grub-install --target=i386-pc --recheck $DEVICE" 2>$ERR
                 check_for_error "grub-install --target=i386-pc" $?
 

lib/util-desktop.sh

@@ -39,7 +39,7 @@ setup_graphics_card() {
 
 setup_network_drivers() {
     if [[ $(mhwd -l | awk '/network-/' | wc -l) -eq 0 ]]; then 
-        DIALOG " Network Drivers " --msgbox "Support for your network card is built into the kernel, \nno need to install anything" 0 0
+        DIALOG " $_InstNWDrv " --msgbox "$_InfoNWKernel" 0 0
     else
         DIALOG " $_InstGrDrv " --radiolist "\n$_UseSpaceBar" 0 0 12 \
           $(mhwd -l | awk '/network-/{print $1}' |awk '$0=$0" - off"')  2> /tmp/.network_driver || return 0

lib/util-menu.sh

@@ -92,13 +92,13 @@ install_base_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 5
+        submenu 7
         DIALOG " $_InstBsMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "$_InstBseMenuBody" 0 0 7 \
           "1" "$_PrepMirror|>" \
           "2" "$_PrepPacKey" \
           "3" "$_InstBse" \
           "4" "$_InstDEStable|>" \
-          "5" "Install drivers|>" \
+          "5" "$_InstDrvTitle|>" \
           "6" "$_InstBootldr" \
           "7" "$_Back" 2>${ANSWER}
         HIGHLIGHT_SUB=$(cat ${ANSWER})
@@ -201,12 +201,12 @@ install_drivers_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 4
+        submenu 5
-        DIALOG " Install hardware drivers " --default-item ${HIGHLIGHT_SUB} --menu "Some network and graphics cards \nmay need special drivers. \nOptions 1 and 2 choose drivers automatically, \noptions 3 and 4 let you choose specific drivers" 0 0 5 \
+        DIALOG " _InstDrvTitle " --default-item ${HIGHLIGHT_SUB} --menu "$_InstDrvBody" 0 0 5 \
-          "1" "Install free drivers" \
+          "1" "$_InstFree" \
-          "2" "Install proprietary drivers" \
+          "2" "$_InstProp" \
           "3" "$_InstGrMenuDD|>" \
-          "4" "install network drivers|>" \
+          "4" "$_InstNWDrv|>" \
           "5" "$_Back" 2>${ANSWER}
         HIGHLIGHT_SUB=$(cat ${ANSWER})