Remove oneshot(), functions will be run multiple times if choosing the relevant section

lang/english.trans

@@ -26,25 +26,21 @@ _NoNetwork="\nThis installer needs to be run with an active internet connection
 # Preparation Menu
 _PrepTitle="Prepare System for Install"
 _PrepBody="\nFollow the below steps in order.\n\nTo begin the install, a root (/) partition must first be mounted and the system settings must be configured (UEFI systems also require a boot partition to be mounted).\n\nIf you have already created a partition table and partition(s) you can begin mounting and skip over the editing step."
-_PrepLayout="Select Keyboard Layout"
-_PrepShowDev="Show Device Tree (optional)"
-_PrepParts="Edit Partitions (optional)"
-_PrepLUKS="LUKS Encryption (optional)"
-_PrepLVM="Logical Volume Management (optional)"
-_PrepMount="Mount and Format Partitions"
-_PrepUser="Create User and Set root Password"
-_PrepConfig="Configure System Settings"
-_PrepWM="Select Window Manager or Desktop"
-_PrepPkg="Select Additional Packages"
-_PrepShow="Check Configuration Choices"
-_PrepInstall="Begin $DIST Installation"
-
-# Configure
-_ConfHost="System Hostname"
-_ConfLocale="Language and Timezone"
+_PrepLayout="Select keyboard layout"
+_PrepShowDev="Show device tree (optional)"
+_PrepParts="Edit partitions (optional)"
+_PrepLUKS="LUKS encryption (optional)"
+_PrepLVM="Logical volume management (optional)"
+_PrepMount="Mount and format partitions"
+_PrepUser="Create user and set root Password"
+_PrepConfig="Configure system settings"
+_PrepWM="Select window manager or desktop (optional)"
+_PrepPkg="Select additional packages (optional)"
+_PrepShow="Check configuration choices (optional)"
+_PrepInstall="Start the installation"
 
 # Select Config Files
-_EditTitle="Edit Files"
+_EditTitle="Edit System Configuration"
 _EditBody="\nBefore exiting you can select configuration files from below to review/change.\n\nIf you need to make additional changes with the drives still mounted, use Ctrl-z to pause the installer and return to the terminal, when finished type 'fg' and Enter or Ctrl-z again to resume the installer."
 
 # Close Installer
@@ -59,7 +55,7 @@ _ErrChoiceConsole="\nUnmount the partitions and exit to view the error log or ke
 _TimeZTitle="Set Timezone"
 _TimeZBody="\nThe time zone is used to set the system clock.\n\nSelect your country or continent from the list below"
 _TimeSubZBody="\nSelect the nearest city to your location from the list below."
-_TimeZQ="\nSet time zone as:"
+_TimeZQ="\nConfirm time zone:"
 
 # bootloader
 _MntBootBody="\nSelect which bootloader to use."
@@ -68,19 +64,19 @@ _InstSysBody="\nInstall syslinux to the master boot record (MBR) or to root (/)?
 
 # mirrors
 _MirrorTitle="Setup Mirrorlist"
-_MirrorSetup="\nWant the mirrorlist automatically sorted?\n\nThis will take longer but gets the fastest mirrors.\n"
-_MirrorCmd="\nThe command below will be used to sort the mirrorlist, edit the command if needed.\n"
+_MirrorSetup="\nSort the mirrorlist automatically?\n\nThis takes longer but gets the fastest mirrors.\n"
+_MirrorCmd="\nThe command below will be used to sort the mirrorlist, edit if needed.\n"
 
 # window managers and packages
 _WMChoice="Select WMs or DEs"
-_WMChoiceBody="\nUse [Space] to (de)select window manager(s) or desktop environment(s) to install.\n\nDepending on your choice additional packages may be installed to improve the experience."
+_WMChoiceBody="\nUse [Space] to toggle the selection of your desired window manager(s) or desktop environment(s).\n\nDepending on your choice additional packages may be installed to improve the experience."
 
 _Packages="Install Packages"
 _PackageMenu="\nSelect a package category to choose packages from that category.\n\nWhen finished select '$_Done' to finalize choices and continue.\n\nAdditional packages can be added by simply re-visiting the menu, however removing choices will require starting from the beginning of the configure menu."
 _PackageBody="\nUse [Space] to (de)select packages(s) to install from the list below.\n\nNOTE: Some packages may already be installed by your DE (if any) or added automatically depending on your choice of WM. Additionally, extra packages may be installed to improve the experience for another choice eg. when installing qutebrowser qt5ct (the Qt5 theme tool) will also be installed."
 
 # login setup
-_WMLogin="Select Login Managment"
+_WMLogin="Setup Login Managment"
 _LoginTypeBody="\nSelect which login managment to use."
 _AutoLoginBody="\nDo you want auto login+startx enabled?"
 _WMLoginBody="\nSelect which to use as your primary login session.\n\nThis can be changed by editing your ~/.xinitrc"
@@ -91,7 +87,9 @@ _CMapBody="\nSelect virtual console keymap.\n\nVirtual console is the shell prom
 _XMapBody="\nSelect the system wide keymap, this is the keyboard layout used once a graphical environment (Xorg) is running.\n\nIf a matching virtual console keymap exists it will be used, otherwise you will be asked to pick one.\n\nDefault: us"
 _LocaleBody="\nLocale determines the date, time, currency, and language.\n\nThe format is language_COUNTRY\n\neg. en_US: english United States\n    en_GB: english Great Britain"
 
-# Set hostname
+# Configure
+_ConfLocale="System Language and Locale"
+_ConfHost="System Hostname"
 _HostNameBody="\nEnter the hostname for the new system.\n\nA hostname is used to identify systems on the network.\n\nIt's restricted to alphanumeric characters (a-z, A-Z, 0-9).\nIt can contain hyphens (-) BUT NOT at the beggining or end."
 
 # Create new user and set password
@@ -125,7 +123,7 @@ _KernelBody="\nSelect which kernel to use for the install."
 
 # shell
 _ShellTitle="Choose Login Shell"
-_ShellBody="\nSelect which shell to use as the new user's login shell."
+_ShellBody="\nChoose a shell for the new user and root."
 
 # Partitioning Menu
 _PartTitle="Partitioning Tool"