Large update to package handling, cleanup

lang/english.trans

@@ -23,8 +23,8 @@ _Not64Bit="\nThis installer only supports x86_64 capable machines.\n"
 _NoNetwork="\nThis installer needs to be run with an active internet connection in order to update and install packages.\n"
 
 # Preparation Menu
-_PrepTitle="Prepare System for Install"
+_PrepTitle="Prep for Install"
-_PrepBody="\nThis is the menu in which you will prepare your system for the install.\n\nTo begin the install you must first have:\n\n  - A root (/) partition mounted (UEFI systems also require a seperate boot partition).\n  - A new user must be created and the passwords set.\n  - The System settings must be configured.\n\nAlready created your partition(s)? Move on to mounting."
+_PrepBody="\nThis is the menu in which you will prepare your system for the install.\n\nTo begin the install you must first have:\n\n  - A root (/) partition mounted (UEFI systems also require a seperate boot partition).\n  - A user created and the passwords set.\n  - The system settings configured."
 _PrepLayout="Select keyboard layout"
 _PrepShowDev="Show device tree (optional)"
 _PrepParts="Edit partitions (optional)"
@@ -39,60 +39,56 @@ _PrepShow="Check configuration choices (optional)"
 _PrepInstall="Start the installation"
 
 # Select Config Files
-_EditTitle="Edit System Configuration"
+_EditTitle="Finalization"
 _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
-_CloseInst="Close Installer"
+_CloseInst="Exit"
-_CloseInstBody="\nUnmount partitions (if any) and close the installer?\n"
+_CloseInstBody="\nUnmount partitions (if any) and exit the installer?\n"
-
-# error message
-_ErrChoice="\nUnmount the partitions and shutdown or keep them mounted and continue?\n"
-_ErrChoiceConsole="\nUnmount the partitions and exit to view the error log or keep them mounted and continue?\n"
 
 # timezone
-_TimeZTitle="Set Timezone"
+_TimeZTitle="Timezone"
 _TimeZQ="\nConfirm time zone:"
-_TimeSubZBody="\nSelect the nearest city to your location from the list below."
+_TimeSubZBody="\nSelect the nearest city to you or one with the same time zone.\n\nTIP: Pressing the first letter of the city name repeatedly will navigate between entries beggining with that letter."
 _TimeZBody="\nThe time zone is used to set the system clock.\n\nSelect your country or continent from the list below"
 
 # bootloader
 _MntBootBody="\nSelect which bootloader to use."
-_InstSysTitle="Install Syslinux"
+_InstSysTitle="Syslinux"
-_InstSysBody="\nInstall syslinux to the master boot record (MBR) or to root (/)?"
+_InstSysBody="\nInstall syslinux to the master boot record (MBR) or to the root (/) partition?"
 
 # mirrors
-_MirrorTitle="Setup Mirrorlist"
+_MirrorTitle="Mirrorlist Sorting"
-_MirrorSetup="\nSort the mirrorlist automatically?\n\nThis takes longer but gets the fastest mirrors.\n"
+_MirrorSetup="\nSort the mirrorlist automatically?\n\nTakes longer but gets 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"
+_WMChoice="Sessions"
-_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."
+_WMChoiceBody="\nUse [Space] to toggle available sessions.\n\nFor all sessions a basic package set will be installed for basic compatibilty across sessions. In addition to this extra packages specific to each sessions will also be installed to provide basic functionality most people expect from an environment."
 
-_Packages="Install Packages"
+_Packages="Additional Packages"
-_PackageMenu="\nSelect a package category to choose packages from, when finished select '$_Done' to finalize choices and continue."
+_PackageMenu="\nSelect a category to choose packages from, once finished select '$_Done' to return to the main menu."
-_PackageBody="\nUse [Space] to toggle the selection of packages(s) and press [Enter] to accept the selection.\n\nNOTE: Some packages may already be installed by your desktop environment (if any). Extra packages may also be installed for the chosen packages eg. install qutebrowser and qt5ct (the Qt5 theme tool) will also be installed."
+_PackageBody="\nUse [Space] to toggle packages(s) and press [Enter] to accept the selection.\n\nNOTE: Some packages may already be installed by your desktop environment (if any). Extra packages may also be installed for the selected packages eg. Selecting qutebrowser will also install qt5ct (the Qt5 theme tool) and qt5-styleplugins (for Gtk themes in Qt applications)."
 
 # login setup
-_WMLogin="Setup Login Managment"
+_WMLogin="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."
 
 # Set keymap, hwclock, local and timezone
-_CMapTitle="Virtual Console Keymap"
+_CMapTitle="Console Keymap"
-_CMapBody="\nSelect virtual console keymap, virtual console is the shell before reaching a graphical environment (Xorg).\n\nIts keymap is seperate from the one used by Xorg.\n\nDefault: us"
+_CMapBody="\nSelect console keymap, the console is the tty shell you reach before starting a graphical environment (usually Xorg).\n\nIts keymap is seperate from the one used by the graphical environments, though many do use the same such as 'us' English.\n\nDefault: us"
-_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"
+_XMapBody="\nPick your system keymap from the list below\n\nThis keymap layout is used once a graphical environment is running (usually Xorg).\n\nIf a matching console keymap exists it will be used, otherwise you will be asked to select one for that as well.\n\nDefault: us"
 _LocaleBody="\nLocale determines the system language and currency formats.\n\nThe format for locale names is languagecode_COUNTRYCODE\n\neg. en_US is: english United States\n    en_GB is: english Great Britain"
 
 # Configure
-_ConfHost="System Hostname"
+_ConfHost="Hostname"
-_ConfLocale="System Language and Locale"
+_ConfLocale="Language and Locale"
 _HostNameBody="\nEnter a 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
-_UserTitle="Create New User"
+_UserTitle="User Creation"
 _Username="Username:"
 _Password="Password:"
 _Password2="Password2:"
@@ -105,36 +101,36 @@ _MntFail="\nMount Failed!\n"
 _MntSucc="\nMount Succeeded!\n"
 _MntConfBody="\nConfirm mount options:"
 _WarnMount="\nIMPORTANT: Please choose carefully during mounting and formatting.\n\nDuring mounting, partitions can be mounted without formatting by selecting '$_Skip'.\nThis can be useful for data partitions or previously formatted partitions.\n\nThe one exception to this is the root (/) partition, it must be formatted before unpacking to ensure the system stability.\n"
-_MntBody="\nUse [Space] to de/select the desired mount options.\n\nIf the device is an SSD the 'discard' option provides active TRIM support and will be automatically selected.\n\nChoosing none will result in an automatic mount with system applied options."
+_MntBody="\nUse [Space] to toggle mount options from below, press [Enter] when done to confirm selection.\n\nNot selecting any and confirming will run an automatic mount."
 
 # Select Device
-_DevSelTitle="Select Device"
+_DevSelTitle="Device Selection"
 _DevSelBody="\nSelect a device to use from the list below.\n\nDevices (/dev) are the available drives on the system. /sda, /sdb ..."
 
 # Extra Partitions
 _ExtPartBody="\nYou can now select additional partitions you want mounted, once choosen you will be asked to enter a mountpoint.\n\nSelect '$_Done' to finish the mounting step and return to the main menu."
-_ExtPartBody1="\nWhere do you want the partition mounted?\n\nEnsure the name begins with a slash (/).\nSome examples include:"
+_ExtPartBody1="\nWhere do you want the partition mounted?\n\nEnsure the name begins with a slash (/).\nExamples include: /usr, /home, /var, etc.\n"
 
 # kernel
-_KernelTitle="Choose Kernel"
+_KernelTitle="Linux Kernel"
 _KernelBody="\nSelect which kernel to use for the install."
 
 # shell
-_ShellTitle="Choose Login Shell"
+_ShellTitle="Login Shell"
 _ShellBody="\nChoose a shell for the new user and root."
 
 # Partitioning Menu
-_PartTitle="Partitioning Tool"
+_PartTitle="Partitioning"
-_PartWipe="Secure Wipe Device"
+_PartWipe="Secure Wipe"
 _PartAuto="Automatic Partitioning"
-_PartShowTree="Show Partition Tree"
+_PartShowTree="Show Partition Table"
-_PartBody="\nWhole device auto partitioning is available for beginners.\n\nUEFI systems require a vfat/fat32 partition between 100-512M in size to be mounted at /boot or /boot/efi, BIOS systems using LUKS will also require this but formatted as ext3 or ext4 instead."
+_PartBody="\nFull device auto partitioning is available for beginners.\n\nUEFI systems require a vfat/fat32 partition between 100-512M in size to be mounted at /boot or /boot/efi, BIOS systems using LUKS will also require this but formatted as ext3 or ext4 instead."
 
 # Auto partition
 _PartBody1="\nWARNING:\n\nALL data on"
 _PartBody2="will be destroyed and the following partitions will be created\n\n- A 512M vfat/fat32 boot partition with boot flags enabled.\n- An ext4 partition using all remaining space"
 _PartBody3="\n\nDo you want to continue?\n"
-_PartWipeBody="will be destroyed using 'wipe -Ifre'.\n\nThis process can take a long time depending on the size of the drive.\n\nDo you want to continue?\n"
+_PartWipeBody="will be destroyed using 'wipe -Ifre'.\n\nThis is ONLY intended for use on devices before sale or disposal to   reliably destroy your data beyond recovery by filling it with random data multiple times. This is NOT for devices you intend to continue using.\nThe wiping process can take a long time depending on the size and speed of the drive.\n\nDo you still want to continue?\n"
 
 # bootloader
 _InstSysTitle="Install Syslinux"
@@ -142,7 +138,6 @@ _InstSysBody="\nInstall syslinux to the master boot record (MBR) or to root (/)?
 
 # File System
 _FSTitle="Choose Filesystem"
-_FSBody="\nDefault Filesystem:  ext4\n\nNOTE: Not all filesystems are usable for root (/) or boot (/boot) partitions."
 _SelRootBody="\nSelect root (/) partition.\n\nThis is the partition where $DIST will be installed."
 _SelBiosBody="\nDo you want to use a separate boot partition? (required for LUKS)\n\nThis partition is where the bootloader will be installed.\n"