Update translations and reorder menus

data/translations/danish.trans

@@ -455,9 +455,11 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/dutch.trans

@@ -454,9 +454,10 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/english.trans

@@ -425,6 +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 partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."
 
 # Final Check
 _BaseCheck="Base is not installed"
@@ -454,7 +455,7 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."

data/translations/french.trans

@@ -455,9 +455,10 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/german.trans

@@ -449,9 +449,10 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/hungarian.trans

@@ -450,9 +450,10 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/italian.trans

@@ -454,9 +454,10 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/polish.trans

@@ -454,9 +454,10 @@ _InstSystdBBody="Ta opcja zainstaluje systemd-boot i utworzy wpisy uruchamiając
 _SystdBReady="Systemd-boot został zainstalowany"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/portuguese.trans

@@ -453,9 +453,10 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/portuguese_brasil.trans

@@ -453,9 +453,10 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/russian.trans

@@ -462,3 +462,4 @@ _InstDsMenuTitle="Установка настольной системы"
 _InstDsMenuBody="Устанавливает полный выпуск манджаро с графической среде. Шаги 1-4 необходимы для работы системы, остальное опционально."
 _InstCsMenuTitle="Установка пользовательской системы"
 _InstCsMenuBody="Устанавливает базовую систему манджаро без графической среды рабочего стола. Шаги 1-4 необходимы для работы системы, остальное опционально."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

data/translations/spanish.trans

@@ -453,9 +453,10 @@ _InstSystdBBody="This installs systemd-boot and generates boot entries for the c
 _SystdBReady="Systemd-boot was installed"
 
 #Meta menu
-_InstCrMenuTitle="Install core system"
+_InstCrMenuTitle="Install CLI system"
 _InstDsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-3 are needed for working system, the rest is optional."
 _InstDsMenuTitle="Install desktop system"
 _InstDsMenuBody="This installs full manjaro edition with graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
 _InstCsMenuTitle="Install custom system"
 _InstCsMenuBody="This installs base manjaro system without graphical desktop environment. Steps 1-4 are needed for working system, the rest is optional."
+_MMNewBody="After mounting partitions in preparation section, select your installation type. If you are unsure, choose Desktop system for default manjaro."

lib/util-menu.sh

@@ -63,8 +63,8 @@ main_menu() {
         DIALOG " $_MMTitle " --default-item ${HIGHLIGHT} \
           --menu "\n$_MMBody\n " 0 0 5 \
           "1" "$_PrepMenuTitle|>" \
-          "2" "$_InstCrMenuTitle|>" \
-          "3" "$_InstDsMenuTitle|>" \
+          "2" "$_InstDsMenuTitle|>" \
+          "3" "$_InstCrMenuTitle|>" \
           "4" "$_InstCsMenuTitle|>" \
           "5" "$_Done" 2>${ANSWER}
         HIGHLIGHT=$(cat ${ANSWER})
@@ -72,9 +72,9 @@ main_menu() {
         case $(cat ${ANSWER}) in
             "1") prep_menu
                 ;;
-            "2") check_mount && install_core_menu
+            "2") check_mount && install_desktop_system_menu
                 ;;
-            "3") check_mount && install_desktop_system_menu
+            "3") check_mount && install_core_menu
                 ;;
             "4") check_mount && install_custom_menu
                 ;;
@@ -107,7 +107,7 @@ install_core_menu() {
                  ;;
             "2") check_base && install_bootloader
                  ;;
-            "3") check_base && config_base_menu
+            "3") check_base && config_cli_base_menu
                  ;;
             "4") install_cust_pkgs
                  ;;
@@ -351,6 +351,42 @@ config_base_menu() {
     done
 }
 
+# Base Configuration
+config_cli_base_menu() {
+    local PARENT="$FUNCNAME"
+    declare -i loopmenu=1
+    while ((loopmenu)); do
+        submenu 8
+        DIALOG " $_ConfBseMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_ConfBseBody\n " 0 0 7 \
+          "1" "$_ConfBseFstab" \
+          "2" "$_ConfBseHost" \
+          "3" "$_ConfBseSysLoc" \
+          "4" "$_ConfBseTimeHC" \
+          "5" "$_ConfUsrRoot" \
+          "6" "$_ConfUsrNew" \
+          "7" "$_Back" 2>${ANSWER}
+        HIGHLIGHT_SUB=$(cat ${ANSWER})
+
+        case $(cat ${ANSWER}) in
+            "1") generate_fstab
+                ;;
+            "2") set_hostname
+                ;;
+            "3") set_locale
+                ;;
+            "4") set_timezone && set_hw_clock
+                ;;
+            "5") set_root_password
+                ;;
+            "6") create_new_user
+                ;;
+            *) loopmenu=0
+                return 0
+                ;;
+        esac
+    done
+}
+
 install_drivers_menu() {
     HIGHLIGHT_SUB=1
     declare -i loopmenu=1