fix submenu counts

data/translations/english.trans

@@ -210,7 +210,7 @@ _WarnMount2="option listed at the top of the file system menu.\n\nEnsure the cor
 
 # Select Device (installation)
 _DevSelTitle="Select Device"
-_DevSelBody="Devices (/dev/) are available hard-disks and USB-sticks to install on. The first is /sda, the second /sdb, and so on.\n\nWhere using a USB-stick to boot Architect, be careful as it will also be listed!"
+_DevSelBody="Devices (/dev/) are available hard-disks and USB-sticks to install on. The first is /sda, the second /sdb, and so on.\n\nIf you're booting Manjaro-Architect from a USB-stick, be careful as it will also be listed!"
 
 # Partitioning Tool
 _PartToolTitle="Partitioning Tool"
@@ -425,7 +425,7 @@ _InstMulCustBody="Enter the (exact) names of packages to be installed from the M
 # Main Menu
 _MMTitle="Main Menu"
 _MMBody="Steps should be followed IN ORDER. Once complete, select 'Done' to finalise the installation."
-_MMNewBody="After mounting the partitions in the preparation section, select your installation type. If you are unsure, choose Desktop system for a default Manjaro installation."
+_MMNewBody="After mounting the partitions in the preparation section, select your installation type. If you are unsure, choose Desktop System for a default Manjaro installation."
 
 # Final Check
 _BaseCheck="Base is not installed"

lib/util-menu.sh

@@ -90,7 +90,7 @@ install_core_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 6
+        submenu 8
         DIALOG " $_InstCrMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_MMBody\n$_InstCrMenuBody\n " 0 0 8 \
           "1" "$_InstBse" \
           "2" "$_InstBootldr" \
@@ -131,7 +131,7 @@ install_desktop_system_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 6
+        submenu 7
         DIALOG " $_InstDsMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_MMBody\n$_InstDsMenuBody\n " 0 0 7 \
           "1" "$_InstDEStable|>" \
           "2" "$_InstBootldr" \
@@ -169,7 +169,7 @@ install_custom_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 6
+        submenu 9
         DIALOG " $_InstCsMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_InstCsMenuBody\n " 0 0 9 \
           "1" "$_InstBse" \
           "2" "$_InstDE|>" \
@@ -214,7 +214,7 @@ prep_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 7
+        submenu 9
         DIALOG " $_PrepMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_PrepMenuBody\n " 0 0 9 \
           "1" "$_VCKeymapTitle" \
           "2" "$_DevShowOpt" \
@@ -356,7 +356,7 @@ config_cli_base_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 8
+        submenu 7
         DIALOG " $_ConfBseMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_ConfBseBody\n " 0 0 7 \
           "1" "$_ConfBseFstab" \
           "2" "$_ConfBseHost" \
@@ -436,4 +436,4 @@ install_graphics_menu() {
             touch /mnt/.video_installed
             ;;
     esac
-}
+}